Merge commit 'v2.6.33' into perf/core
Frederic Weisbecker [Sat, 27 Feb 2010 15:18:46 +0000 (16:18 +0100)]
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.

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

1  2 
arch/x86/kernel/hw_breakpoint.c
arch/x86/kernel/ptrace.c
include/linux/perf_event.h
kernel/perf_event.c
kernel/sched.c
kernel/trace/trace_kprobe.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/probe-event.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);