# HG changeset patch
# User dbuck
# Date 1415275543 0
# Node ID 28ab1380ec65d0425da9b33316e38a2966058297
# Parent  5217eef2497f8d2fb9a96f17833410f0416f8e39# Parent  0d754e6851d3dd53b7c2f1db9c46edc8dbcb0b0a
Merge

diff -r 5217eef2497f -r 28ab1380ec65 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- 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.
   }