Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

Conflicts:
	arch/x86/kernel/head64.c
	arch/x86/mm/mmap.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 7 insertions, 5 deletions

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index a4d3762cd825..83874b0e266c 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
                 ui_browser__gotorc(browser, row, column + 1);
                 SLsmg_draw_hline(2);
 
-                if (row++ == 0)
+                if (++row == 0)
                         goto out;
         } else
                 row = 0;
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;