aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/irq.c7
-rw-r--r--arch/s390/kernel/irq.c8
-rw-r--r--kernel/softirq.c4
3 files changed, 5 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 027728b9542..e3774f6b57c 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -424,13 +424,8 @@ void do_softirq(void)
local_irq_save(flags);
- if (local_softirq_pending()) {
- account_system_vtime(current);
- local_bh_disable();
+ if (local_softirq_pending())
do_softirq_onstack();
- account_system_vtime(current);
- _local_bh_enable();
- }
local_irq_restore(flags);
}
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index e347190d9ae..1eef5091861 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -69,10 +69,6 @@ asmlinkage void do_softirq(void)
local_irq_save(flags);
- account_system_vtime(current);
-
- local_bh_disable();
-
if (local_softirq_pending()) {
/* Get current stack pointer. */
asm volatile("la %0,0(15)" : "=a" (old));
@@ -95,10 +91,6 @@ asmlinkage void do_softirq(void)
__do_softirq();
}
- account_system_vtime(current);
-
- _local_bh_enable();
-
local_irq_restore(flags);
}
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 584609b6a66..215541e26c1 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();
}