--- old/src/java.base/macosx/native/libjli/java_md_macosx.c	2017-03-15 15:48:12.893952074 -0700
+++ new/src/java.base/macosx/native/libjli/java_md_macosx.c	2017-03-15 15:48:12.792951776 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -885,6 +885,7 @@
 
     if (stack_size > 0) {
       pthread_attr_setstacksize(&attr, stack_size);
+      pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads
     }
 
     if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
--- old/src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-15 15:48:13.187952940 -0700
+++ new/src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-15 15:48:13.089952651 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -898,6 +898,7 @@
 
     if (stack_size > 0) {
       pthread_attr_setstacksize(&attr, stack_size);
+      pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads
     }
 
     if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {