# HG changeset patch
# User dsamersoff
# Date 1421323375 0
# Node ID 0e23eb51d29e74cafa8015379c3ec9ce2a5beacf
# Parent  12ae756253c28b29eb93d96dffed50466bf564fa# Parent  adeadd271a0fb625f0282e78a51c589649e6cd73
Merge

diff -r 12ae756253c2 -r 0e23eb51d29e hotspot/src/share/vm/prims/perf.cpp
--- a/hotspot/src/share/vm/prims/perf.cpp	Wed Jan 07 08:37:49 2015 +0100
+++ b/hotspot/src/share/vm/prims/perf.cpp	Thu Jan 15 12:02:55 2015 +0000
@@ -100,6 +100,11 @@
 
   PerfWrapper("Perf_Detach");
 
+  if (!UsePerfData) {
+    // With -XX:-UsePerfData, detach is just a NOP
+    return;
+  }
+
   void* address = 0;
   jlong capacity = 0;