diff -r d2be62fdfa50 -r 873fd82b133d src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Wed Jun 22 14:26:49 2016 +0800
+++ b/src/share/vm/runtime/globals.hpp	Fri Jun 24 17:12:13 2016 +0800
@@ -22,12 +22,6 @@
  *
  */
 
-/*
- * 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.
- */
-
 #ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
 #define SHARE_VM_RUNTIME_GLOBALS_HPP
 
@@ -575,28 +569,9 @@
   develop(bool, TracePageSizes, false,                                      \
           "Trace page size selection and usage")                            \
                                                                             \
-  /* 2013/12/18 Jin: disable UseNUMA until OS is fixed*/                    \
-  product(bool, UseNUMA, MIPS64_ONLY(false) NOT_MIPS64(false),              \
+  product(bool, UseNUMA, false,                                             \
           "Use NUMA if available")                                          \
                                                                             \
-  product(bool, UseOldNUMA, MIPS64_ONLY(true) NOT_MIPS64(false),            \
-          "Use Old NUMA if available")                                      \
-                                                                            \
-  product(bool, UseNUMAThreadRoots, MIPS64_ONLY(true) NOT_MIPS64(false),    \
-          "Use NUMAThreadRoots if available")                               \
-                                                                            \
-  product(bool, UseNUMASteal, MIPS64_ONLY(true) NOT_MIPS64(false),          \
-          "Use NUMASteal if available")                                     \
-                                                                            \
-  product(bool, UseNUMAGC, MIPS64_ONLY(true) NOT_MIPS64(false),             \
-          "Use NUMAGC if available")                                        \
-                                                                            \
-  product(bool, UseStasticScavenge, false,                                  \
-          "Use StasticScavenge if available")                               \
-                                                                            \
-  product(bool, UseStasticCopy, false,                                      \
-          "Use StasticCopy if available")                                   \
-                                                                            \
   product(bool, UseNUMAInterleaving, false,                                 \
           "Interleave memory across NUMA nodes if available")               \
                                                                             \
@@ -2294,7 +2269,7 @@
   diagnostic(uintx, CPUForCMSThread, 0,                                     \
           "When BindCMSThreadToCPU is true, the CPU to bind CMS thread to") \
                                                                             \
-  product(bool, BindGCTaskThreadsToCPUs, MIPS64_ONLY(true) NOT_MIPS64(false), \
+  product(bool, BindGCTaskThreadsToCPUs, false,                             \
           "Bind GCTaskThreads to CPUs if possible")                         \
                                                                             \
   product(bool, UseGCTaskAffinity, false,                                   \
@@ -3140,10 +3115,10 @@
           "Number of times to spin wait before inflation")                  \
                                                                             \
   /* gc parameters */                                                       \
-  product(uintx, InitialHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(0) *M),                 \
+  product(uintx, InitialHeapSize, 0,                                        \
           "Initial heap size (in bytes); zero means use ergonomics")        \
                                                                             \
-  product(uintx, MaxHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(96) *M),                     \
+  product(uintx, MaxHeapSize, ScaleForWordSize(96*M),                       \
           "Maximum heap size (in bytes)")                                   \
                                                                             \
   product(uintx, OldSize, ScaleForWordSize(4*M),                            \