.32: fix up perf patch merge problem found by Stefan Bader

diff --git a/queue-2.6.32/perf-events-dont-report-side-band-events-on-each-cpu-for-per-task-per-cpu-events.patch b/queue-2.6.32/perf-events-dont-report-side-band-events-on-each-cpu-for-per-task-per-cpu-events.patch
index a9df23b5815ec8d60859af84904331a7e182eab9..0824ec6541912659b0685795745d4c55602d1268 100644 (file)
--- a/queue-2.6.32/perf-events-dont-report-side-band-events-on-each-cpu-for-per-task-per-cpu-events.patch
+++ b/queue-2.6.32/perf-events-dont-report-side-band-events-on-each-cpu-for-per-task-per-cpu-events.patch
@@ -21,8 +21,8 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- kernel/perf_event.c |   20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
+ kernel/perf_event.c |   21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
 
 --- a/kernel/perf_event.c
 +++ b/kernel/perf_event.c
@@ -46,7 +46,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        if (event->attr.comm || event->attr.mmap || event->attr.task)
                return 1;
  
-@@ -3262,6 +3268,7 @@ static void perf_event_task_event(struct
+@@ -3255,13 +3261,13 @@ static void perf_event_task_event(struct
+ 
+       cpuctx = &get_cpu_var(perf_cpu_context);
+       perf_event_task_ctx(&cpuctx->ctx, task_event);
+-      put_cpu_var(perf_cpu_context);
+ 
+       rcu_read_lock();
+       if (!ctx)
                ctx = rcu_dereference(task_event->task->perf_event_ctxp);
        if (ctx)
                perf_event_task_ctx(ctx, task_event);
@@ -54,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        rcu_read_unlock();
  }
  
-@@ -3338,6 +3345,9 @@ static void perf_event_comm_output(struc
+@@ -3338,6 +3344,9 @@ static void perf_event_comm_output(struc
  
  static int perf_event_comm_match(struct perf_event *event)
  {
@@ -64,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        if (event->attr.comm)
                return 1;
  
-@@ -3378,7 +3388,6 @@ static void perf_event_comm_event(struct
+@@ -3378,7 +3387,6 @@ static void perf_event_comm_event(struct
  
        cpuctx = &get_cpu_var(perf_cpu_context);
        perf_event_comm_ctx(&cpuctx->ctx, comm_event);
@@ -72,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
        rcu_read_lock();
        /*
-@@ -3388,6 +3397,7 @@ static void perf_event_comm_event(struct
+@@ -3388,6 +3396,7 @@ static void perf_event_comm_event(struct
        ctx = rcu_dereference(current->perf_event_ctxp);
        if (ctx)
                perf_event_comm_ctx(ctx, comm_event);
@@ -80,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        rcu_read_unlock();
  }
  
-@@ -3462,6 +3472,9 @@ static void perf_event_mmap_output(struc
+@@ -3462,6 +3471,9 @@ static void perf_event_mmap_output(struc
  static int perf_event_mmap_match(struct perf_event *event,
                                   struct perf_mmap_event *mmap_event)
  {
@@ -90,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        if (event->attr.mmap)
                return 1;
  
-@@ -3539,7 +3552,6 @@ got_name:
+@@ -3539,7 +3551,6 @@ got_name:
  
        cpuctx = &get_cpu_var(perf_cpu_context);
        perf_event_mmap_ctx(&cpuctx->ctx, mmap_event);
@@ -98,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
        rcu_read_lock();
        /*
-@@ -3549,6 +3561,7 @@ got_name:
+@@ -3549,6 +3560,7 @@ got_name:
        ctx = rcu_dereference(current->perf_event_ctxp);
        if (ctx)
                perf_event_mmap_ctx(ctx, mmap_event);
@@ -106,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        rcu_read_unlock();
  
        kfree(buf);
-@@ -3811,6 +3824,9 @@ static int perf_swevent_match(struct per
+@@ -3811,6 +3823,9 @@ static int perf_swevent_match(struct per
                                enum perf_type_id type,
                                u32 event_id, struct pt_regs *regs)
  {

diff --git a/queue-2.6.32/perf-honour-event-state-for-aux-stream-data.patch b/queue-2.6.32/perf-honour-event-state-for-aux-stream-data.patch
index 29888f874f3e8fdbf6bd8a6a2e3a04a1c86d1245..1b87e292bdb452f44526e087fe4cb3fd3ac90aac 100644 (file)
--- a/queue-2.6.32/perf-honour-event-state-for-aux-stream-data.patch
+++ b/queue-2.6.32/perf-honour-event-state-for-aux-stream-data.patch
@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        if (event->cpu != -1 && event->cpu != smp_processor_id())
                return 0;
  
-@@ -3345,6 +3348,9 @@ static void perf_event_comm_output(struc
+@@ -3344,6 +3347,9 @@ static void perf_event_comm_output(struc
  
  static int perf_event_comm_match(struct perf_event *event)
  {
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        if (event->cpu != -1 && event->cpu != smp_processor_id())
                return 0;
  
-@@ -3472,6 +3478,9 @@ static void perf_event_mmap_output(struc
+@@ -3471,6 +3477,9 @@ static void perf_event_mmap_output(struc
  static int perf_event_mmap_match(struct perf_event *event,
                                   struct perf_mmap_event *mmap_event)
  {