1.1 --- a/src/share/vm/runtime/init.cpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/runtime/init.cpp Wed Aug 27 08:19:12 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -34,8 +34,10 @@
1.11 #include "runtime/init.hpp"
1.12 #include "runtime/safepoint.hpp"
1.13 #include "runtime/sharedRuntime.hpp"
1.14 +#include "services/memTracker.hpp"
1.15 #include "utilities/macros.hpp"
1.16
1.17 +
1.18 // Initialization done by VM thread in vm_init_globals()
1.19 void check_ThreadShadow();
1.20 void eventlog_init();
1.21 @@ -131,6 +133,12 @@
1.22 javaClasses_init(); // must happen after vtable initialization
1.23 stubRoutines_init2(); // note: StubRoutines need 2-phase init
1.24
1.25 +#if INCLUDE_NMT
1.26 + // Solaris stack is walkable only after stubRoutines are set up.
1.27 + // On Other platforms, the stack is always walkable.
1.28 + NMT_stack_walkable = true;
1.29 +#endif // INCLUDE_NMT
1.30 +
1.31 // All the flags that get adjusted by VM_Version_init and os::init_2
1.32 // have been set so dump the flags now.
1.33 if (PrintFlagsFinal) {
