src/hotspot/cpu/s390/assembler_s390.cpp

*** 36,49 ****
  #include "runtime/objectMonitor.hpp"
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc/g1/g1BarrierSet.hpp"
- #include "gc/g1/heapRegion.hpp"
- #endif
  
  // Convention: Use Z_R0 and Z_R1 instead of Z_scratch_* in all
  // assembler_s390.* files.
  
  // Convert the raw encoding form into the form expected by the
--- 36,45 ----