# HG changeset patch
# User asiebenborn <axel.siebenborn@sap.com>
# Date 1521705808 -3600
#      Thu Mar 22 09:03:28 2018 +0100
# Node ID 962be92808921ca9305338981e003c9ae2127f50
# Parent  305a5f1372f491d13151686f8512e7c22927dc9d
[mq]: StackGuardPages_1

diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
--- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -70,7 +70,7 @@
 #define DEFAULT_STACK_SHADOW_PAGES (NOT_WIN64(20) WIN64_ONLY(7) DEBUG_ONLY(+2))
 // For those clients that do not use write socket, we allow
 // the min range value to be below that of the default
-#define MIN_STACK_SHADOW_PAGES (NOT_WIN64(10) WIN64_ONLY(7) DEBUG_ONLY(+2))
+#define MIN_STACK_SHADOW_PAGES (NOT_WIN64(6) WIN64_ONLY(7) DEBUG_ONLY(+2))
 #else
 #define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
 #define MIN_STACK_SHADOW_PAGES DEFAULT_STACK_SHADOW_PAGES
diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
--- a/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
+++ b/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
@@ -217,7 +217,7 @@
 
 int main (int argc, const char** argv) {
   JavaVMInitArgs vm_args;
-  JavaVMOption options[3];
+  JavaVMOption options[4];
   JNIEnv* env;
   int optlen;
   char *javaclasspath = NULL;
@@ -242,12 +242,13 @@
 
   options[0].optionString = "-Xint";
   options[1].optionString = "-Xss1M";
-  options[2].optionString = javaclasspathopt;
+  options[2].optionString = "-XX:StackShadowPages=8";
+  options[3].optionString = javaclasspathopt;
 
   vm_args.version = JNI_VERSION_1_2;
   vm_args.ignoreUnrecognized = JNI_TRUE;
   vm_args.options = options;
-  vm_args.nOptions = 3;
+  vm_args.nOptions = 4;
 
   if (JNI_CreateJavaVM (&_jvm, (void **)&env, &vm_args) < 0 ) {
     fprintf(stderr, "Test ERROR. Can't create JavaVM\n");