Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot

changeset 7367:28ab1380ec65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dbuck
date Thu, 06 Nov 2014 12:05:43 +0000
parents 5217eef2497f (current diff) 0d754e6851d3 (diff)
children 7024b693c8f9
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Nov 06 10:35:36 2014 +0000
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Nov 06 12:05:43 2014 +0000
@@ -909,7 +909,7 @@
    */
   char* hint = (char*) (Linux::initial_thread_stack_bottom() -
                         ((StackYellowPages + StackRedPages + 1) * page_size));
-  char* codebuf = os::reserve_memory(page_size, hint);
+  char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
   if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
     return; // No matter, we tried, best effort.
   }