1.1 --- a/src/share/vm/runtime/arguments.cpp Fri Sep 06 09:55:38 2013 +0100
1.2 +++ b/src/share/vm/runtime/arguments.cpp Sat Sep 14 20:40:34 2013 +0100
1.3 @@ -1605,17 +1605,6 @@
1.4 return result;
1.5 }
1.6
1.7 -void Arguments::set_heap_base_min_address() {
1.8 - if (FLAG_IS_DEFAULT(HeapBaseMinAddress) && UseG1GC && HeapBaseMinAddress < 1*G) {
1.9 - // By default HeapBaseMinAddress is 2G on all platforms except Solaris x86.
1.10 - // G1 currently needs a lot of C-heap, so on Solaris we have to give G1
1.11 - // some extra space for the C-heap compared to other collectors.
1.12 - // Use FLAG_SET_DEFAULT here rather than FLAG_SET_ERGO to make sure that
1.13 - // code that checks for default values work correctly.
1.14 - FLAG_SET_DEFAULT(HeapBaseMinAddress, 1*G);
1.15 - }
1.16 -}
1.17 -
1.18 void Arguments::set_heap_size() {
1.19 if (!FLAG_IS_DEFAULT(DefaultMaxRAMFraction)) {
1.20 // Deprecated flag
1.21 @@ -2230,7 +2219,7 @@
1.22 // among the distinct pages.
1.23 if (ContendedPaddingWidth < 0 || ContendedPaddingWidth > 8192) {
1.24 jio_fprintf(defaultStream::error_stream(),
1.25 - "ContendedPaddingWidth=" INTX_FORMAT " must be the between %d and %d\n",
1.26 + "ContendedPaddingWidth=" INTX_FORMAT " must be in between %d and %d\n",
1.27 ContendedPaddingWidth, 0, 8192);
1.28 status = false;
1.29 }
1.30 @@ -2239,7 +2228,7 @@
1.31 // It is sufficient to check against the largest type size.
1.32 if ((ContendedPaddingWidth % BytesPerLong) != 0) {
1.33 jio_fprintf(defaultStream::error_stream(),
1.34 - "ContendedPaddingWidth=" INTX_FORMAT " must be the multiple of %d\n",
1.35 + "ContendedPaddingWidth=" INTX_FORMAT " must be a multiple of %d\n",
1.36 ContendedPaddingWidth, BytesPerLong);
1.37 status = false;
1.38 }
1.39 @@ -3537,8 +3526,6 @@
1.40 }
1.41 }
1.42
1.43 - set_heap_base_min_address();
1.44 -
1.45 // Set heap size based on available physical memory
1.46 set_heap_size();
1.47
