--- a/hotspot/src/share/vm/runtime/init.cpp	Fri Oct 05 13:37:08 2012 -0700
+++ b/hotspot/src/share/vm/runtime/init.cpp	Wed Oct 10 14:35:58 2012 -0400
@@ -114,9 +114,9 @@
   universe2_init();  // dependent on codeCache_init and stubRoutines_init1
   referenceProcessor_init();
   jni_handles_init();
-#ifndef VM_STRUCTS_KERNEL
+#if INCLUDE_VM_STRUCTS
   vmStructs_init();
-#endif // VM_STRUCTS_KERNEL
+#endif // INCLUDE_VM_STRUCTS
 
   vtableStubs_init();
   InlineCacheBuffer_init();