# HG changeset patch
# Parent  c903378d8d1d029168ca82a20c602369d6fb6c11

diff -r c903378d8d1d make/aix/makefiles/mapfile-vers-debug
--- a/make/aix/makefiles/mapfile-vers-debug	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/aix/makefiles/mapfile-vers-debug	Mon Dec 07 22:40:01 2015 -0800
@@ -227,6 +227,8 @@
                 JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
+                JVM_GetVmMemoryPressure;
+                JVM_SetVmMemoryPressure;
                 JVM_Sleep;
                 JVM_Socket;
                 JVM_SocketAvailable;
diff -r c903378d8d1d make/aix/makefiles/mapfile-vers-product
--- a/make/aix/makefiles/mapfile-vers-product	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/aix/makefiles/mapfile-vers-product	Mon Dec 07 22:40:01 2015 -0800
@@ -225,6 +225,8 @@
                 JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
+                JVM_GetVmMemoryPressure;
+                JVM_SetVmMemoryPressure;
                 JVM_Sleep;
                 JVM_Socket;
                 JVM_SocketAvailable;
diff -r c903378d8d1d make/bsd/makefiles/mapfile-vers-debug
--- a/make/bsd/makefiles/mapfile-vers-debug	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/bsd/makefiles/mapfile-vers-debug	Mon Dec 07 22:40:01 2015 -0800
@@ -228,6 +228,8 @@
                 _JVM_SetPrimitiveArrayElement
                 _JVM_SetSockOpt
                 _JVM_SetThreadPriority
+                _JVM_GetVmMemoryPressure
+                _JVM_SetVmMemoryPressure
                 _JVM_Sleep
                 _JVM_Socket
                 _JVM_SocketAvailable
diff -r c903378d8d1d make/bsd/makefiles/mapfile-vers-product
--- a/make/bsd/makefiles/mapfile-vers-product	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/bsd/makefiles/mapfile-vers-product	Mon Dec 07 22:40:01 2015 -0800
@@ -228,6 +228,8 @@
                 _JVM_SetPrimitiveArrayElement
                 _JVM_SetSockOpt
                 _JVM_SetThreadPriority
+                _JVM_GetVmMemoryPressure
+                _JVM_SetVmMemoryPressure
                 _JVM_Sleep
                 _JVM_Socket
                 _JVM_SocketAvailable
diff -r c903378d8d1d make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/linux/makefiles/mapfile-vers-debug	Mon Dec 07 22:40:01 2015 -0800
@@ -230,6 +230,8 @@
                 JVM_SetPrimitiveArrayElement;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
+                JVM_GetVmMemoryPressure;
+                JVM_SetVmMemoryPressure;
                 JVM_Sleep;
                 JVM_Socket;
                 JVM_SocketAvailable;
diff -r c903378d8d1d make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/linux/makefiles/mapfile-vers-product	Mon Dec 07 22:40:01 2015 -0800
@@ -230,6 +230,8 @@
                 JVM_SetPrimitiveArrayElement;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
+                JVM_GetVmMemoryPressure;
+                JVM_SetVmMemoryPressure;
                 JVM_Sleep;
                 JVM_Socket;
                 JVM_SocketAvailable;
diff -r c903378d8d1d make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers	Mon Dec 07 21:47:43 2015 -0800
+++ b/make/solaris/makefiles/mapfile-vers	Mon Dec 07 22:40:01 2015 -0800
@@ -230,6 +230,8 @@
                 JVM_SetPrimitiveArrayElement;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
+                JVM_GetVmMemoryPressure;
+                JVM_SetVmMemoryPressure;
                 JVM_Sleep;
                 JVM_Socket;
                 JVM_SocketAvailable;
diff -r c903378d8d1d src/share/vm/prims/jvm.cpp
--- a/src/share/vm/prims/jvm.cpp	Mon Dec 07 21:47:43 2015 -0800
+++ b/src/share/vm/prims/jvm.cpp	Mon Dec 07 22:40:01 2015 -0800
@@ -4305,6 +4305,15 @@
   return Management::get_jmm_interface(version);
 JVM_END
 
+JVM_ENTRY_NO_ENV(jint, JVM_GetVmMemoryPressure())
+  // Do nothing, this function is only to make management.dll happy
+  return 0;
+JVM_END
+
+JVM_ENTRY_NO_ENV(void, JVM_SetVmMemoryPressure(jint pressure))
+  // Do nothing, this function is only to make management.dll happy
+JVM_END
+
 // com.sun.tools.attach.VirtualMachine agent properties support
 //
 // Initialize the agent properties with the properties maintained in the VM
diff -r c903378d8d1d src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h	Mon Dec 07 21:47:43 2015 -0800
+++ b/src/share/vm/prims/jvm.h	Mon Dec 07 22:40:01 2015 -0800
@@ -1490,6 +1490,12 @@
 JNIEXPORT void* JNICALL
 JVM_GetManagement(jint version);
 
+JNIEXPORT jint JNICALL
+JVM_GetVmMemoryPressure();
+
+JNIEXPORT void JNICALL
+JVM_SetVmMemoryPressure(jint pressure);
+
 /*
  * com.sun.tools.attach.VirtualMachine support
  *