From fc024934c7df77129bbf47392d5e70eba13e893f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 8 Aug 2013 14:38:21 -0700 Subject: [PATCH] 3.4 fuzz back (did it against a wrong kernel version...) --- queue-3.4/perf-fix-event-group-context-move.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/queue-3.4/perf-fix-event-group-context-move.patch b/queue-3.4/perf-fix-event-group-context-move.patch index b162d31bc3d..7be9fedf224 100644 --- a/queue-3.4/perf-fix-event-group-context-move.patch +++ b/queue-3.4/perf-fix-event-group-context-move.patch @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman --- 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 * 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 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); -- 2.47.3