Revert "perf tools: Fix jump label always changing during tracing"

This reverts commit deaff8b659cf4d34181c087b8cdf74f1eb17b02b.

This commit makes CLOEXEC feature undetected for normal users,
because per-cpu events are priviledged.

Reported-by: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20140728065844.GK6758@twins.programming.kicks-ass.net
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c
index 6a37be53a5d2..c5d05ec17220 100644
--- a/tools/perf/util/cloexec.c
+++ b/tools/perf/util/cloexec.c
@@ -1,4 +1,3 @@
-#include <sched.h>
 #include "util.h"
 #include "../perf.h"
 #include "cloexec.h"
@@ -15,13 +14,9 @@ static int perf_flag_probe(void)
         };
         int fd;
         int err;
-        int cpu = sched_getcpu();
-
-        if (cpu < 0)
-                cpu = 0;
 
         /* check cloexec flag */
-        fd = sys_perf_event_open(&attr, -1, cpu, -1,
+        fd = sys_perf_event_open(&attr, 0, -1, -1,
                                  PERF_FLAG_FD_CLOEXEC);
         err = errno;
 
@@ -35,7 +30,7 @@ static int perf_flag_probe(void)
                   err, strerror(err));
 
         /* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */
-        fd = sys_perf_event_open(&attr, -1, cpu, -1, 0);
+        fd = sys_perf_event_open(&attr, 0, -1, -1, 0);
         err = errno;
 
         if (WARN_ONCE(fd < 0,