hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
David S. Miller 2018-10-18 11:32:29 -07:00
parent 62d6f3b7b8
commit 27faeebd00
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/util/event.c
View File

@ -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 += sizeof(struct cpu_map_data);
*size = PERF_ALIGN(*size, sizeof(u64));
return zalloc(*size); return zalloc(*size);
} }
@ -1561,9 +1560,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,
return NULL; return NULL;
} }
#if 0
try_again: try_again:
#endif
al->map = map_groups__find(mg, al->addr); al->map = map_groups__find(mg, al->addr);
if (al->map == NULL) { if (al->map == NULL) {
/* /*
@ -1575,7 +1572,6 @@ try_again:
* "[vdso]" dso, but for now lets use the old trick of looking * "[vdso]" dso, but for now lets use the old trick of looking
* in the whole kernel symbol list. * in the whole kernel symbol list.
*/ */
#if 0
if (cpumode == PERF_RECORD_MISC_USER && machine && if (cpumode == PERF_RECORD_MISC_USER && machine &&
mg != &machine->kmaps && mg != &machine->kmaps &&
machine__kernel_ip(machine, al->addr)) { machine__kernel_ip(machine, al->addr)) {
@ -1583,7 +1579,6 @@ try_again:
load_map = true; load_map = true;
goto try_again; goto try_again;
} }
#endif
} else { } else {
/* /*
* Kernel maps might be changed when loading symbols so loading * Kernel maps might be changed when loading symbols so loading