Merge
authordbuck
Thu, 06 Nov 2014 08:18:10 +0000
changeset 27477 1b27e73be477
parent 27476 6ac67737d359 (diff)
parent 27475 1f22a5d5be00 (current diff)
child 27479 389ec536ece9
Merge
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Nov 06 07:27:25 2014 +0100
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Nov 06 08:18:10 2014 +0000
@@ -910,7 +910,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.
   }