lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core

Browse Source 
Merge reason: We want to queue up a dependent patch. Also update to
              later -rc's.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-01-29 09:24:57 +01:00
parent 64abebf731 b23ff0e933
commit ae7f6711d6
669 changed files with 18384 additions and 4847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/perf_event.c
View File

@@ -3408,6 +3408,9 @@ static void perf_event_task_output(struct perf_event *event,
static int perf_event_task_match(struct perf_event *event)
{
if (event->state != PERF_EVENT_STATE_ACTIVE)
return 0;
if (event->cpu != -1 && event->cpu != smp_processor_id())
return 0;
@@ -3517,6 +3520,9 @@ static void perf_event_comm_output(struct perf_event *event,
static int perf_event_comm_match(struct perf_event *event)
{
if (event->state != PERF_EVENT_STATE_ACTIVE)
return 0;
if (event->cpu != -1 && event->cpu != smp_processor_id())
return 0;
@@ -3634,6 +3640,9 @@ static void perf_event_mmap_output(struct perf_event *event,
static int perf_event_mmap_match(struct perf_event *event,
struct perf_mmap_event *mmap_event)
{
if (event->state != PERF_EVENT_STATE_ACTIVE)
return 0;
if (event->cpu != -1 && event->cpu != smp_processor_id())
return 0;