dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent

Browse source
This commit is contained in:
Ingo Molnar 2011-01-22 11:08:52 +01:00
commit 01bb2dc4e4
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/perf/builtin-test.c
View file

@ -380,13 +380,18 @@ static int test__open_syscall_event_on_all_cpus(void)
for (cpu = 0; cpu < cpus->nr; ++cpu) {
unsigned int ncalls = nr_open_calls + cpu;
CPU_SET(cpu, cpu_set);
sched_setaffinity(0, cpu_set_size, cpu_set);
CPU_SET_S(cpus->map[cpu], cpu_set_size, cpu_set);
if (sched_setaffinity(0, cpu_set_size, cpu_set) < 0) {
pr_debug("sched_setaffinity() failed on CPU %d: %s ",
cpus->map[cpu],
strerror(errno));
goto out_close_fd;
}
for (i = 0; i < ncalls; ++i) {
fd = open("/etc/passwd", O_RDONLY);
close(fd);
}
CPU_CLR(cpu, cpu_set);
CPU_CLR_S(cpus->map[cpu], cpu_set_size, cpu_set);
}
/*
@ -410,7 +415,7 @@ static int test__open_syscall_event_on_all_cpus(void)
expected = nr_open_calls + cpu;
if (evsel->counts->cpu[cpu].val != expected) {
pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %Ld\n",
expected, cpu, evsel->counts->cpu[cpu].val);
expected, cpus->map[cpu], evsel->counts->cpu[cpu].val);
goto out_close_fd;
}
}

7
tools/perf/util/symbol.c
View file

@ -1161,6 +1161,13 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
section_name = elf_sec__name(&shdr, secstrs);
/* On ARM, symbols for thumb functions have 1 added to
* the symbol address as a flag - remove it */
if ((ehdr.e_machine == EM_ARM) &&
(map->type == MAP__FUNCTION) &&
(sym.st_value & 1))
--sym.st_value;
if (self->kernel != DSO_TYPE_USER || kmodule) {
char dso_name[PATH_MAX];