summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-25 22:03:26 +0200
committerIngo Molnar <mingo@elte.hu>2009-05-25 22:02:23 +0200
commit0127c3ea082ee9f1034789b978dfc7fd83254617 (patch)
treed3d9f8bc4544359f2aa6f65b4881ffa625c93742 /kernel
parent53b441a565bf4036ab49c8ea04c5ad06ace7dd6b (diff)
downloadop-kernel-dev-0127c3ea082ee9f1034789b978dfc7fd83254617.zip
op-kernel-dev-0127c3ea082ee9f1034789b978dfc7fd83254617.tar.gz
perf_counter: fix warning & lockup
- remove bogus warning - fix wakeup from NMI path lockup - also fix up whitespace noise in perf_counter.h Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: John Kacur <jkacur@redhat.com> LKML-Reference: <20090525153931.703093461@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index ec9c4007..070f92d 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -2576,7 +2576,7 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
.time = sched_clock(),
};
- ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 0, 0);
+ ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);
if (ret)
return;
@@ -3449,8 +3449,6 @@ void perf_counter_exit_task(struct task_struct *child)
struct perf_counter_context *child_ctx;
unsigned long flags;
- WARN_ON_ONCE(child != current);
-
child_ctx = child->perf_counter_ctxp;
if (likely(!child_ctx))
OpenPOWER on IntegriCloud