--- a/hotspot/src/os/windows/vm/os_windows.inline.hpp	Tue Dec 22 00:08:38 2015 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.inline.hpp	Tue Dec 22 05:26:55 2015 -0800
@@ -50,11 +50,10 @@
 }
 
 inline bool os::uses_stack_guard_pages() {
-  return os::win32::is_nt();
+  return true;
 }
 
 inline bool os::allocate_stack_guard_pages() {
-  assert(uses_stack_guard_pages(), "sanity check");
   return true;
 }
 
@@ -98,7 +97,7 @@
 }
 
 inline bool os::supports_monotonic_clock() {
-  return win32::_has_performance_count;
+  return true;
 }
 
 inline void os::exit(int num) {