Merge
authorzgu
Fri, 08 Feb 2013 16:56:03 -0800
changeset 15600 753e5733b5c9
parent 15597 b9ec29960f2b (current diff)
parent 15599 5522c001696a (diff)
child 15601 df8faef6efaf
Merge
--- a/hotspot/src/share/vm/prims/jvm.cpp	Fri Feb 08 14:32:13 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Fri Feb 08 16:56:03 2013 -0800
@@ -4528,6 +4528,5 @@
   // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
   // counter defined in runtimeService.cpp.
   info->is_attachable = AttachListener::is_attach_supported();
-  info->is_kernel_jvm = 0; // false;
 }
 JVM_END
--- a/hotspot/src/share/vm/prims/jvm.h	Fri Feb 08 14:32:13 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvm.h	Fri Feb 08 16:56:03 2013 -0800
@@ -1559,8 +1559,7 @@
      * the new bit is also added in the main/baseline.
      */
     unsigned int is_attachable : 1;
-    unsigned int is_kernel_jvm : 1;
-    unsigned int : 30;
+    unsigned int : 31;
     unsigned int : 32;
     unsigned int : 32;
 } jvm_version_info;