*** old/src/share/vm/memory/allocation.hpp	Fri Sep 21 10:48:54 2012
--- new/src/share/vm/memory/allocation.hpp	Fri Sep 21 10:48:54 2012

*** 25,34 ****
--- 25,35 ----
  #ifndef SHARE_VM_MEMORY_ALLOCATION_HPP
  #define SHARE_VM_MEMORY_ALLOCATION_HPP
  
  #include "runtime/globals.hpp"
  #include "utilities/globalDefinitions.hpp"
+ #include "utilities/macros.hpp"
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
  #ifdef COMPILER2
  #include "opto/c2_globals.hpp"

*** 145,166 ****
--- 146,177 ----
    otArena             = 0x0010, // an arena object
    otNMTRecorder       = 0x0020, // memory recorder object
    ot_masks            = 0x00F0
  };
  
+ #if INCLUDE_NMT
  #define IS_MEMORY_TYPE(flags, type) ((flags & mt_masks) == type)
  #define HAS_VALID_MEMORY_TYPE(flags)((flags & mt_masks) != mtNone)
  #define FLAGS_TO_MEMORY_TYPE(flags) (flags & mt_masks)
  
  #define IS_ARENA_OBJ(flags)         ((flags & ot_masks) == otArena)
  #define IS_NMT_RECORDER(flags)      ((flags & ot_masks) == otNMTRecorder)
  #define NMT_CAN_TRACK(flags)        (!IS_NMT_RECORDER(flags) && !(IS_MEMORY_TYPE(flags, mtDontTrack)))
+ #endif // INCLUDE_NMT
  
  typedef unsigned short MEMFLAGS;
  
+ #if INCLUDE_NMT
+ 
  extern bool NMT_track_callsite;
  
+ #else
+ 
+ const bool NMT_track_callsite = false;
+ 
+ #endif // INCLUDE_NMT
+ 
  // debug build does not inline
  #if defined(_DEBUG_)
    #define CURRENT_PC       (NMT_track_callsite ? os::get_caller_pc(1) : 0)
    #define CALLER_PC        (NMT_track_callsite ? os::get_caller_pc(2) : 0)
    #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)