aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-07-03 00:25:40 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 15:27:10 -0700
commit829035fd709119d9def124a6d40b94d317573e6f (patch)
tree09dfdf1a8cf02ccd88716b9b4701cb17b03fa06f /kernel/softirq.c
parent8688cfcebf09b84385b5e2c461ae08fcde8a5d18 (diff)
[PATCH] lockdep: irqtrace subsystem, move account_system_vtime() calls into kernel/softirq.c
At the moment, powerpc and s390 have their own versions of do_softirq which include local_bh_disable() and __local_bh_enable() calls. They end up calling __do_softirq (in kernel/softirq.c) which also does local_bh_disable/enable. Apparently the two levels of disable/enable trigger a warning from some validation code that Ingo is working on, and he would like to see the outer level removed. But to do that, we have to move the account_system_vtime calls that are currently in the arch do_softirq() implementations for powerpc and s390 into the generic __do_softirq() (this is a no-op for other archs because account_system_vtime is defined to be an empty inline function on all other archs). This patch does that. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 584609b6a66e..215541e26c1a 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -193,6 +193,8 @@ asmlinkage void __do_softirq(void)
int cpu;
pending = local_softirq_pending();
+ account_system_vtime(current);
+
__local_bh_disable((unsigned long)__builtin_return_address(0));
trace_softirq_enter();
@@ -224,6 +226,8 @@ restart:
wakeup_softirqd();
trace_softirq_exit();
+
+ account_system_vtime(current);
_local_bh_enable();
}

Privacy Policy