--- a/src/hotspot/os/linux/os_linux.cpp Mon Oct 30 16:37:53 2017 +0100
+++ b/src/hotspot/os/linux/os_linux.cpp Tue Oct 31 11:55:09 2017 -0400
@@ -23,6 +23,7 @@
*/
// no precompiled headers
+#include "jvm.h"
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
@@ -31,7 +32,6 @@
#include "compiler/compileBroker.hpp"
#include "compiler/disassembler.hpp"
#include "interpreter/interpreter.hpp"
-#include "jvm_linux.h"
#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/filemap.hpp"
@@ -39,7 +39,6 @@
#include "os_linux.inline.hpp"
#include "os_share_linux.hpp"
#include "prims/jniFastGetField.hpp"
-#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
#include "runtime/atomic.hpp"
@@ -4664,7 +4663,7 @@
#endif
// ReduceSignalUsage allows the user to override these handlers
- // see comments at the very top and jvm_solaris.h
+ // see comments at the very top and jvm_md.h
if (!ReduceSignalUsage) {
DO_SIGNAL_CHECK(SHUTDOWN1_SIGNAL);
DO_SIGNAL_CHECK(SHUTDOWN2_SIGNAL);