1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp Mon Jun 10 11:30:51 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp Thu Jun 13 11:16:38 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -101,7 +101,8 @@
1.11 }
1.12
1.13 char* const base_addr = committed_high_addr();
1.14 - bool result = special() || os::commit_memory(base_addr, bytes, alignment());
1.15 + bool result = special() ||
1.16 + os::commit_memory(base_addr, bytes, alignment(), !ExecMem);
1.17 if (result) {
1.18 _committed_high_addr += bytes;
1.19 }
1.20 @@ -154,7 +155,7 @@
1.21 if (tmp_bytes > 0) {
1.22 char* const commit_base = committed_high_addr();
1.23 if (other_space->special() ||
1.24 - os::commit_memory(commit_base, tmp_bytes, alignment())) {
1.25 + os::commit_memory(commit_base, tmp_bytes, alignment(), !ExecMem)) {
1.26 // Reduce the reserved region in the other space.
1.27 other_space->set_reserved(other_space->reserved_low_addr() + tmp_bytes,
1.28 other_space->reserved_high_addr(),
1.29 @@ -269,7 +270,8 @@
1.30 }
1.31
1.32 char* const base_addr = committed_low_addr() - bytes;
1.33 - bool result = special() || os::commit_memory(base_addr, bytes, alignment());
1.34 + bool result = special() ||
1.35 + os::commit_memory(base_addr, bytes, alignment(), !ExecMem);
1.36 if (result) {
1.37 _committed_low_addr -= bytes;
1.38 }
1.39 @@ -322,7 +324,7 @@
1.40 if (tmp_bytes > 0) {
1.41 char* const commit_base = committed_low_addr() - tmp_bytes;
1.42 if (other_space->special() ||
1.43 - os::commit_memory(commit_base, tmp_bytes, alignment())) {
1.44 + os::commit_memory(commit_base, tmp_bytes, alignment(), !ExecMem)) {
1.45 // Reduce the reserved region in the other space.
1.46 other_space->set_reserved(other_space->reserved_low_addr(),
1.47 other_space->reserved_high_addr() - tmp_bytes,
