aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-04-06 05:45:12 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-07 04:49:01 -0400
commit849691a6cd40270ff5f4a8846d5f6bf8df663ffc (patch)
treeb61157f375905d21bf0facae603e4247e1de9007 /include/linux
parenta39d6f2556c4a19f58f538c6aa28bf8faca4fcb8 (diff)
perf_counter: remove rq->lock usage
Now that all the task runtime clock users are gone, remove the ugly rq->lock usage from perf counters, which solves the nasty deadlock seen when a software task clock counter was read from an NMI overflow context. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> LKML-Reference: <20090406094518.531137582@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kernel_stat.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index b6d2887a5d88..080d1fd461d7 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -85,8 +85,6 @@ static inline unsigned int kstat_irqs(unsigned int irq)
85/* 85/*
86 * Lock/unlock the current runqueue - to extract task statistics: 86 * Lock/unlock the current runqueue - to extract task statistics:
87 */ 87 */
88extern void curr_rq_lock_irq_save(unsigned long *flags);
89extern void curr_rq_unlock_irq_restore(unsigned long *flags);
90extern unsigned long long __task_delta_exec(struct task_struct *tsk, int update); 88extern unsigned long long __task_delta_exec(struct task_struct *tsk, int update);
91extern unsigned long long task_delta_exec(struct task_struct *); 89extern unsigned long long task_delta_exec(struct task_struct *);
92 90