aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/irq.c7
-rw-r--r--arch/s390/kernel/irq.c8
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 027728b95429..e3774f6b57cc 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -424,13 +424,8 @@ void do_softirq(void)
424 424
425 local_irq_save(flags); 425 local_irq_save(flags);
426 426
427 if (local_softirq_pending()) { 427 if (local_softirq_pending())
428 account_system_vtime(current);
429 local_bh_disable();
430 do_softirq_onstack(); 428 do_softirq_onstack();
431 account_system_vtime(current);
432 _local_bh_enable();
433 }
434 429
435 local_irq_restore(flags); 430 local_irq_restore(flags);
436} 431}
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index e347190d9aea..1eef50918615 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -69,10 +69,6 @@ asmlinkage void do_softirq(void)
69 69
70 local_irq_save(flags); 70 local_irq_save(flags);
71 71
72 account_system_vtime(current);
73
74 local_bh_disable();
75
76 if (local_softirq_pending()) { 72 if (local_softirq_pending()) {
77 /* Get current stack pointer. */ 73 /* Get current stack pointer. */
78 asm volatile("la %0,0(15)" : "=a" (old)); 74 asm volatile("la %0,0(15)" : "=a" (old));
@@ -95,10 +91,6 @@ asmlinkage void do_softirq(void)
95 __do_softirq(); 91 __do_softirq();
96 } 92 }
97 93
98 account_system_vtime(current);
99
100 _local_bh_enable();
101
102 local_irq_restore(flags); 94 local_irq_restore(flags);
103} 95}
104 96