]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4 fuzz back (did it against a wrong kernel version...)
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Aug 2013 21:38:21 +0000 (14:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Aug 2013 21:38:21 +0000 (14:38 -0700)
queue-3.4/perf-fix-event-group-context-move.patch

index b162d31bc3d556c74a0f792463464f80401a658b..7be9fedf224a6cb6aef7ffa6bbbc40ef55c593df 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -898,6 +898,15 @@ list_add_event(struct perf_event *event,
+@@ -911,6 +911,15 @@ list_add_event(struct perf_event *event,
  }
  
  /*
@@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * Called at perf_event creation and when events are attached/detached from a
   * group.
   */
-@@ -6036,8 +6045,7 @@ perf_event_alloc(struct perf_event_attr
+@@ -6058,8 +6067,7 @@ perf_event_alloc(struct perf_event_attr
        event->overflow_handler = overflow_handler;
        event->overflow_handler_context = context;
  
@@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pmu = NULL;
  
-@@ -6459,9 +6467,17 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -6481,9 +6489,17 @@ SYSCALL_DEFINE5(perf_event_open,
  
                mutex_lock(&gctx->mutex);
                perf_remove_from_context(group_leader);