--- a/hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp	Wed Feb 03 12:19:03 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1RemSetSummary.cpp	Thu Feb 04 11:38:11 2016 +0100
@@ -221,7 +221,7 @@
 class HRRSStatsIter: public HeapRegionClosure {
 private:
   RegionTypeCounter _young;
-  RegionTypeCounter _humonguous;
+  RegionTypeCounter _humongous;
   RegionTypeCounter _free;
   RegionTypeCounter _old;
   RegionTypeCounter _all;
@@ -245,7 +245,7 @@
   HeapRegion* max_code_root_mem_sz_region() const { return _max_code_root_mem_sz_region; }
 
 public:
-  HRRSStatsIter() : _all("All"), _young("Young"), _humonguous("Humonguous"),
+  HRRSStatsIter() : _all("All"), _young("Young"), _humongous("Humongous"),
     _free("Free"), _old("Old"), _max_code_root_mem_sz_region(NULL), _max_rs_mem_sz_region(NULL),
     _max_rs_mem_sz(0), _max_code_root_mem_sz(0)
   {}
@@ -274,7 +274,7 @@
     } else if (r->is_young()) {
       current = &_young;
     } else if (r->is_humongous()) {
-      current = &_humonguous;
+      current = &_humongous;
     } else if (r->is_old()) {
       current = &_old;
     } else {
@@ -287,7 +287,7 @@
   }
 
   void print_summary_on(outputStream* out) {
-    RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
+    RegionTypeCounter* counters[] = { &_young, &_humongous, &_free, &_old, NULL };
 
     out->print_cr(" Current rem set statistics");
     out->print_cr("  Total per region rem sets sizes = " SIZE_FORMAT "K."

--- a/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp	Wed Feb 03 12:19:03 2016 +0100
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp	Thu Feb 04 11:38:11 2016 +0100
@@ -285,9 +285,6 @@
   // Save the tops for eden, from, and to
   virtual void record_spaces_top();
 
-  // Doesn't require additional work during GC prologue and epilogue
-  virtual bool performs_in_place_marking() const { return false; }
-
   // Accessing marks
   void save_marks();
   void reset_saved_marks();

--- a/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Wed Feb 03 12:19:03 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/genCollectedHeap.cpp	Thu Feb 04 11:38:11 2016 +0100
@@ -458,7 +458,6 @@
         prepared_for_verification = true;
       }
 
-      assert(!_young_gen->performs_in_place_marking(), "No young generation do in place marking");
       collect_generation(_young_gen,
                          full,
                          size,
@@ -489,8 +488,6 @@
         prepare_for_verify();
       }
 
-      assert(_old_gen->performs_in_place_marking(), "All old generations do in place marking");
-
       if (do_young_collection) {
         // We did a young GC. Need a new GC id for the old GC.
         GCIdMarkAndRestore gc_id_mark;

--- a/hotspot/src/share/vm/gc/shared/generation.hpp	Wed Feb 03 12:19:03 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/generation.hpp	Thu Feb 04 11:38:11 2016 +0100
@@ -309,13 +309,6 @@
   // do nothing.
   virtual void par_oop_since_save_marks_iterate_done(int thread_num) {}
 
-  // This generation does in-place marking, meaning that mark words
-  // are mutated during the marking phase and presumably reinitialized
-  // to a canonical value after the GC. This is currently used by the
-  // biased locking implementation to determine whether additional
-  // work is required during the GC prologue and epilogue.
-  virtual bool performs_in_place_marking() const { return true; }
-
   // Returns "true" iff collect() should subsequently be called on this
   // this generation. See comment below.
   // This is a generic implementation which can be overridden.

--- a/hotspot/test/gc/g1/TestRemsetLoggingTools.java	Wed Feb 03 12:19:03 2016 +0100
+++ b/hotspot/test/gc/g1/TestRemsetLoggingTools.java	Thu Feb 04 11:38:11 2016 +0100
@@ -96,7 +96,7 @@
     public static void expectPerRegionRSetSummaries(String result, int expectedCumulative, int expectedPeriodic) throws Exception {
         expectRSetSummaries(result, expectedCumulative, expectedPeriodic);
         int actualYoung = result.split("Young regions").length - 1;
-        int actualHumonguous = result.split("Humonguous regions").length - 1;
+        int actualHumongous = result.split("Humongous regions").length - 1;
         int actualFree = result.split("Free regions").length - 1;
         int actualOther = result.split("Old regions").length - 1;
 
@@ -104,7 +104,7 @@
         int expectedPerRegionTypeInfo = (expectedCumulative + expectedPeriodic) * 4;
 
         checkCounts(expectedPerRegionTypeInfo, actualYoung, "Young");
-        checkCounts(expectedPerRegionTypeInfo, actualHumonguous, "Humonguous");
+        checkCounts(expectedPerRegionTypeInfo, actualHumongous, "Humongous");
         checkCounts(expectedPerRegionTypeInfo, actualFree, "Free");
         checkCounts(expectedPerRegionTypeInfo, actualOther, "Old");
     }