From e7d4f6e37834cdc9f0b2d64480e564b49ee9fc81 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 4 May 2009 18:54:32 +0200 Subject: [PATCH] --- yaml --- r: 147424 b: refs/heads/master c: b82914ce33146186d554b0f5c41e4e13693614ce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c9ab7a09548c..5ed2bca8a2c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dab6f6a3401f596fe934f41fc5da3f401adfdfb1 +refs/heads/master: b82914ce33146186d554b0f5c41e4e13693614ce diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 8660ae579530..b9679c36bcc2 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -1069,18 +1069,14 @@ void perf_counter_task_tick(struct task_struct *curr, int cpu) { struct perf_cpu_context *cpuctx = &per_cpu(perf_cpu_context, cpu); struct perf_counter_context *ctx = &curr->perf_counter_ctx; - const int rotate_percpu = 0; - if (rotate_percpu) - perf_counter_cpu_sched_out(cpuctx); + perf_counter_cpu_sched_out(cpuctx); perf_counter_task_sched_out(curr, cpu); - if (rotate_percpu) - rotate_ctx(&cpuctx->ctx); + rotate_ctx(&cpuctx->ctx); rotate_ctx(ctx); - if (rotate_percpu) - perf_counter_cpu_sched_in(cpuctx, cpu); + perf_counter_cpu_sched_in(cpuctx, cpu); perf_counter_task_sched_in(curr, cpu); }