# HG changeset patch
# User dbuck
# Date 1415270461 0
# Node ID 0d754e6851d3dd53b7c2f1db9c46edc8dbcb0b0a
# Parent  ef6b27d844cc0fa6724ca658cf0f70a6bf932e20# Parent  6f06ebb090805c6eb961ada13d05ccd67c34f78b
Merge

diff -r 6f06ebb09080 -r 0d754e6851d3 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Oct 28 18:41:34 2014 +0400
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu Nov 06 10:41:01 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.
   }