OpenJDK / graal / graal-jvmci-8
changeset 8030:f989aff6946f
Merge
author | zgu |
---|---|
date | Fri, 08 Feb 2013 16:56:03 -0800 |
parents | 1ba5b18088a8 3f11b37f047c |
children | 927a311d00f9 |
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:32:13 2013 -0800 +++ b/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
--- a/src/share/vm/prims/jvm.h Fri Feb 08 14:32:13 2013 -0800 +++ b/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;