forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf_counter: fix warning & lockup

Browse source 
- 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>
This commit is contained in:
Ingo Molnar 2009-05-25 22:03:26 +02:00
commit 0127c3ea08
2 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/perf_counter.c
View file

@ -2576,7 +2576,7 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
.time = sched_clock(), .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) if (ret)
return; return;
@ -3449,8 +3449,6 @@ void perf_counter_exit_task(struct task_struct *child)
struct perf_counter_context *child_ctx; struct perf_counter_context *child_ctx;
unsigned long flags; unsigned long flags;
WARN_ON_ONCE(child != current);
child_ctx = child->perf_counter_ctxp; child_ctx = child->perf_counter_ctxp;
if (likely(!child_ctx)) if (likely(!child_ctx))