# HG changeset patch
# User zgu
# Date 1360371363 28800
# Node ID 753e5733b5c9e24ccb3f48362a4ad49d9aebbd3a
# Parent  b9ec29960f2b6f947375993a93a2ed328c7bd472# Parent  5522c001696a6a6d6c2c5bd15b5b97ce9b889448
Merge

diff -r b9ec29960f2b -r 753e5733b5c9 hotspot/src/share/vm/prims/jvm.cpp
--- 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
diff -r b9ec29960f2b -r 753e5733b5c9 hotspot/src/share/vm/prims/jvm.h
--- 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;