Mercurial > hg > icedtea7-forest > hotspot
changeset 6230:6c8949f0d39d
Merge
| author | asaha |
|---|---|
| date | Tue, 11 Nov 2014 15:35:04 -0800 |
| parents | 910fecb1311d (current diff) a1dfdc02bf22 (diff) |
| children | bf47dae82737 |
| files | src/share/vm/runtime/arguments.cpp |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Nov 11 09:44:53 2014 -0600 +++ b/.hgtags Tue Nov 11 15:35:04 2014 -0800 @@ -760,6 +760,7 @@ d81faf9016ce5c9f98264b1f724b3d6d85b12c07 jdk7u75-b05 2ec4b796b1de3cfe58f051111dfd70ab367e553e jdk7u75-b06 1d3906064cae18fdb0ff9a2045f2d8d48067bcd1 jdk7u75-b07 +dfcf951330b6f7c1a3cb88c819e94f680054a970 jdk7u75-b08 3c01618f40c059bf192c0b16176b144113965ea7 jdk7u76-b00 7b5d132c3a70f3c0667fe9df4cae045b46673267 jdk7u76-b01 10c2cb5743cac7d6fedc9307af8450283367e5e2 jdk7u76-b02 @@ -768,5 +769,6 @@ 0ac38b5b642738fb27b446b0c1bc6108f31f197c jdk7u76-b05 8580db8e38a232978f69fe627f3373e12c467803 jdk7u76-b06 475a5cf6fc80c085c1be11b502ef44e7206c73d3 jdk7u76-b07 +64a7fa638019deebae59be4a4a262cfa1d7947ad jdk7u76-b08 2480d9d778301a3f88b0ab8ee35a585df82528e5 jdk7u79-b00
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Nov 11 09:44:53 2014 -0600 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Nov 11 15:35:04 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -899,7 +899,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::pd_attempt_reserve_memory_at(page_size, hint); if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) { return; // No matter, we tried, best effort. }
--- a/src/share/vm/runtime/arguments.cpp Tue Nov 11 09:44:53 2014 -0600 +++ b/src/share/vm/runtime/arguments.cpp Tue Nov 11 15:35:04 2014 -0800 @@ -55,7 +55,7 @@ #endif // Note: This is a special bug reporting site for the JVM -#define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp" +#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" #define DEFAULT_JAVA_LAUNCHER "generic" char** Arguments::_jvm_flags_array = NULL;