# HG changeset patch
# User stefank
# Date 1424452128 0
# Node ID b16546c98e0a78574b903921a579b9ff6601a056
# Parent  5024f7b3322cddf4a40f8abc10a6c7ae3d5097e8# Parent  c2fa06b633b354b4e283a517678dbdd257187c7a
Merge

diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/code/codeCache.cpp
--- a/hotspot/src/share/vm/code/codeCache.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -31,7 +31,6 @@
 #include "code/nmethod.hpp"
 #include "code/pcDesc.hpp"
 #include "compiler/compileBroker.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/gcLocker.hpp"
 #include "memory/iterator.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/oops/cpCache.cpp
--- a/hotspot/src/share/vm/oops/cpCache.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/rewriter.hpp"
 #include "memory/universe.inline.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/oops/klassVtable.cpp
--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -25,7 +25,6 @@
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "gc_implementation/shared/markSweep.inline.hpp"
 #include "memory/gcLocker.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.inline.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/precompiled/precompiled.hpp
--- a/hotspot/src/share/vm/precompiled/precompiled.hpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/precompiled/precompiled.hpp	Fri Feb 20 17:08:48 2015 +0000
@@ -90,8 +90,6 @@
 # include "gc_implementation/shared/gcUtil.hpp"
 # include "gc_implementation/shared/generationCounters.hpp"
 # include "gc_implementation/shared/immutableSpace.hpp"
-# include "gc_implementation/shared/markSweep.hpp"
-# include "gc_implementation/shared/markSweep.inline.hpp"
 # include "gc_implementation/shared/mutableSpace.hpp"
 # include "gc_implementation/shared/spaceCounters.hpp"
 # include "gc_implementation/shared/spaceDecorator.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/runtime/interfaceSupport.cpp
--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "gc_interface/collectedHeap.inline.hpp"
 #include "memory/genCollectedHeap.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/runtime/vmStructs.cpp
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -46,7 +46,6 @@
 #include "compiler/oopMap.hpp"
 #include "compiler/compileBroker.hpp"
 #include "gc_implementation/shared/immutableSpace.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "interpreter/bytecodeInterpreter.hpp"
diff -r 5024f7b3322c -r b16546c98e0a hotspot/src/share/vm/utilities/debug.cpp
--- a/hotspot/src/share/vm/utilities/debug.cpp	Fri Feb 20 16:07:12 2015 +0100
+++ b/hotspot/src/share/vm/utilities/debug.cpp	Fri Feb 20 17:08:48 2015 +0000
@@ -30,7 +30,6 @@
 #include "code/vtableStubs.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/disassembler.hpp"
-#include "gc_implementation/shared/markSweep.hpp"
 #include "gc_interface/collectedHeap.hpp"
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"