From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 27 Feb 2010 15:18:46 +0000 (+0100)
Subject: Merge commit 'v2.6.33' into perf/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=018cbffe6819f6f8db20a0a3acd9bab9bfd667e4;p=linux.git

Merge commit 'v2.6.33' into perf/core

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

Conflicts:
	tools/perf/util/probe-event.c (trivial)
---

018cbffe6819f6f8db20a0a3acd9bab9bfd667e4
diff --cc tools/perf/util/probe-event.c
index 71b0dd590a374,fde17b090a47d..a21b6bf055acb
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@@ -493,8 -457,7 +495,9 @@@ void show_perf_probe_events(void
  	struct strlist *rawlist;
  	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);
  	close(fd);