From 3d0acc7c95cba596925276e759cdff10c5a2a173 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sun, 17 Jan 2010 12:15:31 +0100 Subject: [PATCH] --- yaml --- r: 182387 b: refs/heads/master c: 7defb0f879bbcfe29e3c6f29d685d4f29b7a0700 h: refs/heads/master i: 182385: 7b6e1976af438e1e568e204aadb8a6fc1380cd80 182383: a565cacd7fb973c24e1c72762bb2d636724c9170 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d117f0f24fdc..c340140dd6e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b0311e1f2464547fc6f17a82d7ea2538c8c7a70 +refs/heads/master: 7defb0f879bbcfe29e3c6f29d685d4f29b7a0700 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index bfc4ee015c87..a90ae694cbc1 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -1525,17 +1525,17 @@ void perf_event_task_tick(struct task_struct *curr) if (ctx) perf_ctx_adjust_freq(ctx); - cpu_ctx_sched_out(cpuctx, EVENT_ALL); + cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE); if (ctx) - task_ctx_sched_out(ctx, EVENT_ALL); + task_ctx_sched_out(ctx, EVENT_FLEXIBLE); rotate_ctx(&cpuctx->ctx); if (ctx) rotate_ctx(ctx); - cpu_ctx_sched_in(cpuctx, EVENT_ALL); + cpu_ctx_sched_in(cpuctx, EVENT_FLEXIBLE); if (ctx) - task_ctx_sched_in(curr, EVENT_ALL); + task_ctx_sched_in(curr, EVENT_FLEXIBLE); } static int event_enable_on_exec(struct perf_event *event,