Mercurial > hg > graal-jvmci-8

diff src/share/vm/prims/whitebox.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents a837fa3d3f86
children f99558245e5c
line wrap: on
line diff
--- a/src/share/vm/prims/whitebox.cpp	Tue Jul 30 13:03:28 2013 -0700
+++ b/src/share/vm/prims/whitebox.cpp	Wed Jul 31 11:00:54 2013 +0200
@@ -159,7 +159,7 @@
 
 
 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
-  os::commit_memory((char *)(uintptr_t)addr, size);
+  os::commit_memory((char *)(uintptr_t)addr, size, !ExecMem);
   MemTracker::record_virtual_memory_type((address)(uintptr_t)addr, mtTest);
 WB_END