# HG changeset patch
# User zgu
# Date 1390919196 28800
# Node ID ceddae1a16c968d2b6bf23241bcce17fcf6e7430
# Parent  d5b8799dfbd75c7d31a40577dc0dc68eae99ab99# Parent  dbcbdca5dc04f87d292853c4f8a47426ce8ddfac
Merge

diff -r dbcbdca5dc04 -r ceddae1a16c9 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jan 28 11:42:30 2014 +0000
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jan 28 06:26:36 2014 -0800
@@ -49,6 +49,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
@@ -906,6 +907,9 @@
   if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
     return; // No matter, we tried, best effort.
   }
+
+  MemTracker::record_virtual_memory_type((address)codebuf, mtInternal);
+
   if (PrintMiscellaneous && (Verbose || WizardMode)) {
      tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
   }