diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-18 14:32:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-18 14:32:29 -0400 |
commit | 27faeebd00813cd52a140e8944b6b32729b50e61 (patch) | |
tree | b263130cc20d4d586085aa12bd9e032bc39def0c /tools | |
parent | 62d6f3b7b85e9ba79c96bfd36f501f180908e623 (diff) |
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/event.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 651cd6f6762c..0cd42150f712 100644 --- 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 | |||
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | *size += sizeof(struct cpu_map_data); | 1083 | *size += sizeof(struct cpu_map_data); |
1084 | *size = PERF_ALIGN(*size, sizeof(u64)); | ||
1085 | return zalloc(*size); | 1084 | return zalloc(*size); |
1086 | } | 1085 | } |
1087 | 1086 | ||
@@ -1561,9 +1560,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr, | |||
1561 | 1560 | ||
1562 | return NULL; | 1561 | return NULL; |
1563 | } | 1562 | } |
1564 | #if 0 | ||
1565 | try_again: | 1563 | try_again: |
1566 | #endif | ||
1567 | al->map = map_groups__find(mg, al->addr); | 1564 | al->map = map_groups__find(mg, al->addr); |
1568 | if (al->map == NULL) { | 1565 | if (al->map == NULL) { |
1569 | /* | 1566 | /* |
@@ -1575,7 +1572,6 @@ try_again: | |||
1575 | * "[vdso]" dso, but for now lets use the old trick of looking | 1572 | * "[vdso]" dso, but for now lets use the old trick of looking |
1576 | * in the whole kernel symbol list. | 1573 | * in the whole kernel symbol list. |
1577 | */ | 1574 | */ |
1578 | #if 0 | ||
1579 | if (cpumode == PERF_RECORD_MISC_USER && machine && | 1575 | if (cpumode == PERF_RECORD_MISC_USER && machine && |
1580 | mg != &machine->kmaps && | 1576 | mg != &machine->kmaps && |
1581 | machine__kernel_ip(machine, al->addr)) { | 1577 | machine__kernel_ip(machine, al->addr)) { |
@@ -1583,7 +1579,6 @@ try_again: | |||
1583 | load_map = true; | 1579 | load_map = true; |
1584 | goto try_again; | 1580 | goto try_again; |
1585 | } | 1581 | } |
1586 | #endif | ||
1587 | } else { | 1582 | } else { |
1588 | /* | 1583 | /* |
1589 | * Kernel maps might be changed when loading symbols so loading | 1584 | * Kernel maps might be changed when loading symbols so loading |