2 files changed, 6 insertions, 4 deletions

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 87b431886670..413f74df08de 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -273,7 +273,7 @@ struct perf_evsel *perf_evsel__new_cycles(void)
         struct perf_event_attr attr = {
                 .type   = PERF_TYPE_HARDWARE,
                 .config = PERF_COUNT_HW_CPU_CYCLES,
-                .exclude_kernel = 1,
+                .exclude_kernel = geteuid() != 0,
         };
         struct perf_evsel *evsel;
 
@@ -298,8 +298,10 @@ struct perf_evsel *perf_evsel__new_cycles(void)
                 goto out;
 
         /* use asprintf() because free(evsel) assumes name is allocated */
-        if (asprintf(&evsel->name, "cycles%.*s",
-                     attr.precise_ip ? attr.precise_ip + 1 : 0, ":ppp") < 0)
+        if (asprintf(&evsel->name, "cycles%s%s%.*s",
+                     (attr.precise_ip || attr.exclude_kernel) ? ":" : "",
+                     attr.exclude_kernel ? "u" : "",
+                     attr.precise_ip ? attr.precise_ip + 1 : 0, "ppp") < 0)
                 goto error_free;
 out:
         return evsel;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 5de2b86b9880..2e9eb6aa3ce2 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -2209,7 +2209,7 @@ int machine__get_kernel_start(struct machine *machine)
         machine->kernel_start = 1ULL << 63;
         if (map) {
                 err = map__load(map);
-                if (map->start)
+                if (!err)
                         machine->kernel_start = map->start;
         }
         return err;