Merge
authorvinnie
Wed, 13 Feb 2013 16:03:24 +0000
changeset 15662 9695257b9b49
parent 15661 282a9cfb26ca (current diff)
parent 15660 1649006b5598 (diff)
child 15663 aab03a20f48f
Merge
--- a/jdk/src/share/javavm/export/jvm.h	Wed Feb 13 16:01:26 2013 +0000
+++ b/jdk/src/share/javavm/export/jvm.h	Wed Feb 13 16:03:24 2013 +0000
@@ -1401,8 +1401,7 @@
      * the new bit is also added in the main/baseline.
      */
     unsigned int is_attach_supported : 1;
-    unsigned int is_kernel_jvm : 1;
-    unsigned int : 30;
+    unsigned int : 31;
     unsigned int : 32;
     unsigned int : 32;
 } jvm_version_info;