ARM: dts: sun8i: Add dts file for the Orange Pi One SBC

[deliverable/linux.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 94af190f6843d2c92e68b2dfef8dc51017c42079..833214979c4f49c7e211ecef49d8e4833635ad41 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -67,6 +67,7 @@
 #include <sys/utsname.h>
 #include <sys/mman.h>
 
+#include <linux/stringify.h>
 #include <linux/types.h>
 
 static volatile int done;
@@ -728,7 +729,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
        if (event->header.misc & PERF_RECORD_MISC_EXACT_IP)
                top->exact_samples++;
 
-       if (perf_event__preprocess_sample(event, machine, &al, sample) < 0)
+       if (machine__resolve(machine, &al, sample) < 0)
                return;
 
        if (!top->kptr_restrict_warned &&
@@ -809,7 +810,6 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
        struct perf_session *session = top->session;
        union perf_event *event;
        struct machine *machine;
-       u8 origin;
        int ret;
 
        while ((event = perf_evlist__mmap_read(top->evlist, idx)) != NULL) {
@@ -822,12 +822,10 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                evsel = perf_evlist__id2evsel(session->evlist, sample.id);
                assert(evsel != NULL);
 
-               origin = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
-
                if (event->header.type == PERF_RECORD_SAMPLE)
                        ++top->samples;
 
-               switch (origin) {
+               switch (sample.cpumode) {
                case PERF_RECORD_MISC_USER:
                        ++top->us_samples;
                        if (top->hide_user_symbols)