1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp Mon Jun 10 11:30:51 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp Thu Jun 13 11:16:38 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 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 @@ -565,11 +565,9 @@
1.11 if(new_start_aligned < new_end_for_commit) {
1.12 MemRegion new_committed =
1.13 MemRegion(new_start_aligned, new_end_for_commit);
1.14 - if (!os::commit_memory((char*)new_committed.start(),
1.15 - new_committed.byte_size())) {
1.16 - vm_exit_out_of_memory(new_committed.byte_size(), OOM_MMAP_ERROR,
1.17 - "card table expansion");
1.18 - }
1.19 + os::commit_memory_or_exit((char*)new_committed.start(),
1.20 + new_committed.byte_size(), !ExecMem,
1.21 + "card table expansion");
1.22 }
1.23 result = true;
1.24 } else if (new_start_aligned > cur_committed.start()) {
