comparison src/os_cpu/linux_x86/vm/os_linux_x86.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 52b4284cb496 ef6b27d844cc
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
907 * If we are embedded in an app other than launcher (initial != main stack), 907 * If we are embedded in an app other than launcher (initial != main stack),
908 * we don't have much control or understanding of the address space, just let it slide. 908 * we don't have much control or understanding of the address space, just let it slide.
909 */ 909 */
910 char* hint = (char*) (Linux::initial_thread_stack_bottom() - 910 char* hint = (char*) (Linux::initial_thread_stack_bottom() -
911 ((StackYellowPages + StackRedPages + 1) * page_size)); 911 ((StackYellowPages + StackRedPages + 1) * page_size));
912 char* codebuf = os::reserve_memory(page_size, hint); 912 char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
913 if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) { 913 if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
914 return; // No matter, we tried, best effort. 914 return; // No matter, we tried, best effort.
915 } 915 }
916 if (PrintMiscellaneous && (Verbose || WizardMode)) { 916 if (PrintMiscellaneous && (Verbose || WizardMode)) {
917 tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf); 917 tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf);