diff options
| -rw-r--r-- | hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch | 17 | ||||
| -rw-r--r-- | hotspot/.hg/patches/series | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch b/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch new file mode 100644 index 00000000..dd9e6396 --- /dev/null +++ b/hotspot/.hg/patches/JVM_SetVmMemoryPressure.patch @@ -0,0 +1,17 @@ +# HG changeset patch +# Parent 41a800a10f56ae750a3a327463422f3c6cfd2544 + +diff -r 41a800a10f56 src/share/vm/prims/jvm.cpp +--- a/src/share/vm/prims/jvm.cpp Thu Jun 18 15:13:34 2015 -0700 ++++ b/src/share/vm/prims/jvm.cpp Thu Jun 18 15:14:09 2015 -0700 +@@ -4235,6 +4235,10 @@ + return DTraceJSDT::is_supported(); + JVM_END + ++JVM_ENTRY_NO_ENV(void, JVM_SetVmMemoryPressure(jint pressure)) ++ // Do nothing, this function is only to make management.dll happy ++JVM_END ++ + // Returns an array of all live Thread objects (VM internal JavaThreads, + // jvmti agent threads, and JNI attaching threads are skipped) + // See CR 6404306 regarding JNI attaching threads diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series index c118b5ef..e490aa43 100644 --- a/hotspot/.hg/patches/series +++ b/hotspot/.hg/patches/series @@ -42,3 +42,6 @@ light-jdk8u20-b22.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 light-jdk8u40-b25.patch #+light-jdk8u40-b25 #+light-jdk8u45-b14 light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 #+light-jdk8u40-b25 #+light-jdk8u45-b14 +# Stub JVM_SetVmMemoryPressure function +JVM_SetVmMemoryPressure.patch #+light-jdk8u45-b14 + |