# HG changeset patch
# User zgu
# Date 1360360541 28800
# Node ID 3f11b37f047c0ce2b8fcb20ff4b1f15945f47bd6
# Parent  41d73c9b30a83de69ef0739d802ac98d20fe0164# Parent  7194f764221cb69095aa8e5571ea7cb8b663f8dd
Merge

diff -r 7194f764221c -r 3f11b37f047c src/share/vm/prims/jvm.cpp
--- a/src/share/vm/prims/jvm.cpp	Fri Feb 08 14:05:36 2013 +0100
+++ b/src/share/vm/prims/jvm.cpp	Fri Feb 08 13:55:41 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 7194f764221c -r 3f11b37f047c src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h	Fri Feb 08 14:05:36 2013 +0100
+++ b/src/share/vm/prims/jvm.h	Fri Feb 08 13:55:41 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;