diff -r d2be62fdfa50 -r 873fd82b133d src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Wed Jun 22 14:26:49 2016 +0800
+++ b/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Fri Jun 24 17:12:13 2016 +0800
@@ -22,18 +22,11 @@
  *
  */
 
-/*
- * This file has been modified by Loongson Technology in 2015. These
- * modifications are Copyright (c) 2015 Loongson Technology, and are made
- * available on the same license terms set forth above.
- */
-
 #include "precompiled.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
 #include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp"
 #include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp"
 #include "gc_implementation/parallelScavenge/psOldGen.hpp"
-#include "gc_implementation/shared/mutableNUMASpace.hpp"
 #include "gc_implementation/shared/spaceDecorator.hpp"
 #include "memory/cardTableModRefBS.hpp"
 #include "memory/gcLocker.inline.hpp"
@@ -135,12 +128,8 @@
   //
   // ObjectSpace stuff
   //
-  if(UseOldNUMA) {
-    _object_space = new MutableNUMASpace(virtual_space()->alignment());
-  }
-  else {
-    _object_space = new MutableSpace(virtual_space()->alignment());
-  }
+
+  _object_space = new MutableSpace(virtual_space()->alignment());
 
   if (_object_space == NULL)
     vm_exit_during_initialization("Could not allocate an old gen space");
@@ -225,12 +214,12 @@
   return allocate_noexpand(word_size);
 }
 
-HeapWord* PSOldGen::expand_and_cas_allocate(size_t word_size, int node) {
+HeapWord* PSOldGen::expand_and_cas_allocate(size_t word_size) {
   expand(word_size*HeapWordSize);
   if (GCExpandToAllocateDelayMillis > 0) {
     os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false);
   }
-  return cas_allocate_noexpand(word_size, node);
+  return cas_allocate_noexpand(word_size);
 }
 
 void PSOldGen::expand(size_t bytes) {
@@ -413,16 +402,10 @@
   Universe::heap()->barrier_set()->resize_covered_region(new_memregion);
 
   // ALWAYS do this last!!
-  if(UseOldNUMA) {
-    HeapWord* const virtual_space_high = (HeapWord*) virtual_space()->high();
-    object_space()->set_end(virtual_space_high);                          
-  }
-  else {
-    object_space()->initialize(new_memregion,
-                               SpaceDecorator::DontClear,
-                               SpaceDecorator::DontMangle);
-  }
- 
+  object_space()->initialize(new_memregion,
+                             SpaceDecorator::DontClear,
+                             SpaceDecorator::DontMangle);
+
   assert(new_word_size == heap_word_size(object_space()->capacity_in_bytes()),
     "Sanity");
 }