# HG changeset patch
# User stefank
# Date 1574850706 -3600
# Node ID 95b1385dd47605749bc3d67c070036b2fec7c9e2
# Parent  54cf02d52c1b984e555041d686811dae5d8371d0
8234897: 8234748: Clean up atomic and orderAccess includes - part 2
Reviewed-by: tschatzl, dholmes

diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/os/posix/os_posix.cpp
--- a/src/hotspot/os/posix/os_posix.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/os/posix/os_posix.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -30,6 +30,7 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "services/memTracker.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/events.hpp"
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -38,7 +38,6 @@
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/atomic.hpp"
 #include "runtime/extendedPC.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/gc/g1/g1CardTable.cpp
--- a/src/hotspot/share/gc/g1/g1CardTable.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/gc/g1/g1CardTable.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -27,7 +27,6 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomic.hpp"
 
 void G1CardTable::g1_mark_as_young(const MemRegion& mr) {
   CardValue *const first = byte_for(mr.start());
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	Wed Nov 27 11:31:46 2019 +0100
@@ -27,7 +27,6 @@
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
 #include "oops/markWord.inline.hpp"
-#include "runtime/atomic.hpp"
 
 inline HeapWord* ShenandoahForwarding::get_forwardee_raw(oop obj) {
   shenandoah_assert_in_heap(NULL, obj);
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -36,6 +36,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 
 // Avoid name collision on verify_oop (defined in macroAssembler_arm.hpp)
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/gc/z/zLiveMap.inline.hpp
--- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp	Wed Nov 27 11:31:46 2019 +0100
@@ -30,7 +30,6 @@
 #include "gc/z/zOop.inline.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/debug.hpp"
 
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/gc/z/zNMethodTable.cpp
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -42,7 +42,6 @@
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 
 ZNMethodTableEntry* ZNMethodTable::_table = NULL;
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -34,6 +34,7 @@
 #include "memory/metaspace/occupancyMap.hpp"
 #include "memory/metaspace/virtualSpaceNode.hpp"
 #include "memory/virtualspace.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
@@ -585,4 +586,3 @@
 }
 
 } // namespace metaspace
-
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/oops/constantPool.cpp
--- a/src/hotspot/share/oops/constantPool.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/oops/constantPool.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -49,6 +49,7 @@
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/fieldType.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
diff -r 54cf02d52c1b -r 95b1385dd476 src/hotspot/share/oops/methodData.cpp
--- a/src/hotspot/share/oops/methodData.cpp	Fri Nov 15 16:39:08 2019 +0100
+++ b/src/hotspot/share/oops/methodData.cpp	Wed Nov 27 11:31:46 2019 +0100
@@ -35,6 +35,7 @@
 #include "oops/methodData.inline.hpp"
 #include "prims/jvmtiRedefineClasses.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/orderAccess.hpp"