--- a/hotspot/src/share/vm/memory/allocation.hpp Fri Oct 05 13:37:08 2012 -0700
+++ b/hotspot/src/share/vm/memory/allocation.hpp Wed Oct 10 14:35:58 2012 -0400
@@ -27,6 +27,7 @@
#include "runtime/globals.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
#ifdef COMPILER1
#include "c1/c1_globals.hpp"
#endif
@@ -157,8 +158,16 @@
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)