sparc: Revert unintended perf changes.

Some local debugging hacks accidently slipped into the VDSO commit.

Sorry!

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 651cd6f6762cb42ed0b5b3b483582553ae82cc67..0cd42150f712e88b89614952c65293a9451dffe9 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1081,7 +1081,6 @@ void *cpu_map_data__alloc(struct cpu_map *map, size_t *size, u16 *type, int *max
        }
 
        *size += sizeof(struct cpu_map_data);
-       *size = PERF_ALIGN(*size, sizeof(u64));
        return zalloc(*size);
 }
 
@@ -1561,9 +1560,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,
 
                return NULL;
        }
-#if 0
 try_again:
-#endif
        al->map = map_groups__find(mg, al->addr);
        if (al->map == NULL) {
                /*
@@ -1575,7 +1572,6 @@ try_again:
                 * "[vdso]" dso, but for now lets use the old trick of looking
                 * in the whole kernel symbol list.
                 */
-#if 0
                if (cpumode == PERF_RECORD_MISC_USER && machine &&
                    mg != &machine->kmaps &&
                    machine__kernel_ip(machine, al->addr)) {
@@ -1583,7 +1579,6 @@ try_again:
                        load_map = true;
                        goto try_again;
                }
-#endif
        } else {
                /*
                 * Kernel maps might be changed when loading symbols so loading