*** old/src/share/vm/services/mallocTracker.hpp	Fri Nov 14 17:44:13 2014
--- new/src/share/vm/services/mallocTracker.hpp	Fri Nov 14 17:44:13 2014

*** 241,259 ****
--- 241,259 ----
  #ifdef _LP64
    size_t           _size      : 64;
    size_t           _flags     : 8;
    size_t           _pos_idx   : 16;
    size_t           _bucket_idx: 40;
! #define MAX_MALLOCSITE_TABLE_SIZE ((size_t)1 << 40)
! #define MAX_BUCKET_LENGTH         ((size_t)(1 << 16))
! #define MAX_MALLOCSITE_TABLE_SIZE right_n_bits(40)
! #define MAX_BUCKET_LENGTH         right_n_bits(16)
  #else
    size_t           _size      : 32;
    size_t           _flags     : 8;
    size_t           _pos_idx   : 8;
    size_t           _bucket_idx: 16;
! #define MAX_MALLOCSITE_TABLE_SIZE  ((size_t)(1 << 16))
! #define MAX_BUCKET_LENGTH          ((size_t)(1 << 8))
! #define MAX_MALLOCSITE_TABLE_SIZE  right_n_bits(16)
! #define MAX_BUCKET_LENGTH          right_n_bits(8)
  #endif  // _LP64
  
   public:
    MallocHeader(size_t size, MEMFLAGS flags, const NativeCallStack& stack, NMT_TrackingLevel level) {
      assert(sizeof(MallocHeader) == sizeof(void*) * 2,