Mercurial > hg > truffle
changeset 8029:3f11b37f047c
Merge
author | zgu |
---|---|
date | Fri, 08 Feb 2013 13:55:41 -0800 |
parents | 41d73c9b30a8 (diff) 7194f764221c (current diff) |
children | f989aff6946f |
files | |
diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;