# HG changeset patch
# User vinnie
# Date 1360771404 0
# Node ID 9695257b9b496628f01d7fea6a3f25841ee7a685
# Parent  282a9cfb26cafbdedd10d2d5c23ef19d7914bd89# Parent  1649006b5598e2c5bf20a4ee82c4583821ca7c2e
Merge

diff -r 282a9cfb26ca -r 9695257b9b49 jdk/src/share/javavm/export/jvm.h
--- 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;