1.1 --- a/src/share/vm/runtime/os.cpp Tue Nov 11 10:46:07 2014 -0800
1.2 +++ b/src/share/vm/runtime/os.cpp Tue Nov 11 10:48:06 2014 -0800
1.3 @@ -571,17 +571,6 @@
1.4 NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
1.5 NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size));
1.6
1.7 -#if INCLUDE_NMT
1.8 - // NMT can not track malloc allocation size > MAX_MALLOC_SIZE, which is
1.9 - // (1GB - 1) on 32-bit system. It is not an issue on 64-bit system, where
1.10 - // MAX_MALLOC_SIZE = ((1 << 62) - 1).
1.11 - // VM code does not have such large malloc allocation. However, it can come
1.12 - // Unsafe call.
1.13 - if (MemTracker::tracking_level() >= NMT_summary && size > MAX_MALLOC_SIZE) {
1.14 - return NULL;
1.15 - }
1.16 -#endif
1.17 -
1.18 #ifdef ASSERT
1.19 // checking for the WatcherThread and crash_protection first
1.20 // since os::malloc can be called when the libjvm.{dll,so} is
1.21 @@ -652,12 +641,6 @@
1.22 }
1.23
1.24 void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
1.25 -#if INCLUDE_NMT
1.26 - // See comments in os::malloc() above
1.27 - if (MemTracker::tracking_level() >= NMT_summary && size > MAX_MALLOC_SIZE) {
1.28 - return NULL;
1.29 - }
1.30 -#endif
1.31
1.32 #ifndef ASSERT
1.33 NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1));
