--- a/src/hotspot/share/runtime/thread.inline.hpp	Mon Nov 20 09:46:55 2017 +0000
+++ b/src/hotspot/share/runtime/thread.inline.hpp	Mon Nov 20 15:56:32 2017 -0500
@@ -156,7 +156,8 @@
 
 inline bool JavaThread::stack_guards_enabled() {
 #ifdef ASSERT
-  if (os::uses_stack_guard_pages()) {
+  if (os::uses_stack_guard_pages() &&
+      !(DisablePrimordialThreadGuardPages && os::is_primordial_thread())) {
     assert(_stack_guard_state != stack_guard_unused, "guard pages must be in use");
   }
 #endif