--- a/hotspot/src/os/linux/vm/perfMemory_linux.cpp	Wed Aug 05 21:44:54 2015 -0400
+++ b/hotspot/src/os/linux/vm/perfMemory_linux.cpp	Thu Aug 06 00:08:57 2015 -0700
@@ -217,9 +217,9 @@
     //
     return false;
   }
-  // See if the uid of the directory matches the effective uid of the process.
-  //
-  if (statp->st_uid != geteuid()) {
+  // If user is not root then see if the uid of the directory matches the effective uid of the process.
+  uid_t euid = geteuid();
+  if ((euid != 0) && (statp->st_uid != euid)) {
     // The directory was not created by this user, declare it insecure.
     //
     return false;

--- a/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp	Wed Aug 05 21:44:54 2015 -0400
+++ b/hotspot/src/os/solaris/vm/perfMemory_solaris.cpp	Thu Aug 06 00:08:57 2015 -0700
@@ -219,9 +219,9 @@
     //
     return false;
   }
-  // See if the uid of the directory matches the effective uid of the process.
-  //
-  if (statp->st_uid != geteuid()) {
+  // If user is not root then see if the uid of the directory matches the effective uid of the process.
+  uid_t euid = geteuid();
+  if ((euid != 0) && (statp->st_uid != euid)) {
     // The directory was not created by this user, declare it insecure.
     //
     return false;