lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.33' into perf/core

Browse Source 
Merge reason:
	__percpu annotations need the corresponding sparse address
space definition upstream.

Conflicts:
	tools/perf/util/probe-event.c (trivial)
This commit is contained in:
Frederic Weisbecker
2010-02-27 16:18:46 +01:00
parent 1dd2980d99 60b341b778
commit 018cbffe68
696 changed files with 10855 additions and 6150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/util/probe-event.c
View File

@@ -310,6 +310,7 @@ int synthesize_perf_probe_point(struct probe_point *pp)
int ret;
pp->probes[0] = buf = zalloc(MAX_CMDLEN);
pp->found = 1;
if (!buf)
die("Failed to allocate memory by zalloc.");
if (pp->offset) {
@@ -332,6 +333,7 @@ int synthesize_perf_probe_point(struct probe_point *pp)
error:
free(pp->probes[0]);
pp->probes[0] = NULL;
pp->found = 0;
}
return ret;
}
@@ -494,6 +496,7 @@ void show_perf_probe_events(void)
struct str_node *ent;
setup_pager();
memset(&pp, 0, sizeof(pp));
fd = open_kprobe_events(O_RDONLY, 0);
rawlist = get_trace_kprobe_event_rawlist(fd);