--- a/hotspot/src/os/linux/vm/perfMemory_linux.cpp	Thu Nov 13 16:11:00 2014 -0800
+++ b/hotspot/src/os/linux/vm/perfMemory_linux.cpp	Mon Nov 17 21:32:32 2014 +0100
@@ -422,7 +422,7 @@
 // return the name of the user that owns the JVM indicated by the given vmid.
 //
 static char* get_user_name(int vmid, TRAPS) {
-  return get_user_name_slow(vmid, CHECK_NULL);
+  return get_user_name_slow(vmid, THREAD);
 }
 
 // return the file name of the backing store file for the named