1.1 --- a/src/share/vm/runtime/globals.hpp Wed Jun 22 14:26:49 2016 +0800
1.2 +++ b/src/share/vm/runtime/globals.hpp Fri Jun 24 17:12:13 2016 +0800
1.3 @@ -22,12 +22,6 @@
1.4 *
1.5 */
1.6
1.7 -/*
1.8 - * This file has been modified by Loongson Technology in 2015. These
1.9 - * modifications are Copyright (c) 2015 Loongson Technology, and are made
1.10 - * available on the same license terms set forth above.
1.11 - */
1.12 -
1.13 #ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
1.14 #define SHARE_VM_RUNTIME_GLOBALS_HPP
1.15
1.16 @@ -575,28 +569,9 @@
1.17 develop(bool, TracePageSizes, false, \
1.18 "Trace page size selection and usage") \
1.19 \
1.20 - /* 2013/12/18 Jin: disable UseNUMA until OS is fixed*/ \
1.21 - product(bool, UseNUMA, MIPS64_ONLY(false) NOT_MIPS64(false), \
1.22 + product(bool, UseNUMA, false, \
1.23 "Use NUMA if available") \
1.24 \
1.25 - product(bool, UseOldNUMA, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.26 - "Use Old NUMA if available") \
1.27 - \
1.28 - product(bool, UseNUMAThreadRoots, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.29 - "Use NUMAThreadRoots if available") \
1.30 - \
1.31 - product(bool, UseNUMASteal, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.32 - "Use NUMASteal if available") \
1.33 - \
1.34 - product(bool, UseNUMAGC, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.35 - "Use NUMAGC if available") \
1.36 - \
1.37 - product(bool, UseStasticScavenge, false, \
1.38 - "Use StasticScavenge if available") \
1.39 - \
1.40 - product(bool, UseStasticCopy, false, \
1.41 - "Use StasticCopy if available") \
1.42 - \
1.43 product(bool, UseNUMAInterleaving, false, \
1.44 "Interleave memory across NUMA nodes if available") \
1.45 \
1.46 @@ -2294,7 +2269,7 @@
1.47 diagnostic(uintx, CPUForCMSThread, 0, \
1.48 "When BindCMSThreadToCPU is true, the CPU to bind CMS thread to") \
1.49 \
1.50 - product(bool, BindGCTaskThreadsToCPUs, MIPS64_ONLY(true) NOT_MIPS64(false), \
1.51 + product(bool, BindGCTaskThreadsToCPUs, false, \
1.52 "Bind GCTaskThreads to CPUs if possible") \
1.53 \
1.54 product(bool, UseGCTaskAffinity, false, \
1.55 @@ -3140,10 +3115,10 @@
1.56 "Number of times to spin wait before inflation") \
1.57 \
1.58 /* gc parameters */ \
1.59 - product(uintx, InitialHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(0) *M), \
1.60 + product(uintx, InitialHeapSize, 0, \
1.61 "Initial heap size (in bytes); zero means use ergonomics") \
1.62 \
1.63 - product(uintx, MaxHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(96) *M), \
1.64 + product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
1.65 "Maximum heap size (in bytes)") \
1.66 \
1.67 product(uintx, OldSize, ScaleForWordSize(4*M), \
