OpenJDK / jdk / jdk
changeset 29588:106bee013e6a
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 20:25:32 +0200 |
| parents | 82711ddae051 4ada9ce756d0 |
| children | fc12c12989ab |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Wed Apr 01 12:30:00 2015 -0700 +++ b/.hgtags-top-repo Wed Jul 05 20:25:32 2017 +0200 @@ -298,3 +298,4 @@ d6ed47125a76cd1cf8a100568507bfb5e9669d9f jdk9-b53 cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54 0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 jdk9-b55 +eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56
--- a/test/lib/sun/hotspot/WhiteBox.java Wed Apr 01 12:30:00 2015 -0700 +++ b/test/lib/sun/hotspot/WhiteBox.java Wed Jul 05 20:25:32 2017 +0200 @@ -107,7 +107,6 @@ public native void NMTUncommitMemory(long addr, long size); public native void NMTReleaseMemory(long addr, long size); public native long NMTMallocWithPseudoStack(long size, int index); - public native boolean NMTIsDetailSupported(); public native boolean NMTChangeTrackingLevel(); public native int NMTGetHashSize();