Skip to content

Commit 48bda43

Browse files
Frederic WeisbeckerIngo Molnar
authored andcommitted
softirq/s390: Move default mutators of overwritten softirq mask to s390
s390 is now the last architecture that entirely overwrites local_softirq_pending() and uses the according default definitions of set_softirq_pending() and or_softirq_pending(). Just move these to s390 to debloat the generic code complexity. Suggested-by: Peter Zijlstra <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: David S. Miller <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Helge Deller <[email protected]> Cc: James E.J. Bottomley <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Rich Felker <[email protected]> Cc: Sebastian Andrzej Siewior <[email protected]> Cc: Tony Luck <[email protected]> Cc: Yoshinori Sato <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 1a8bc8f commit 48bda43

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

arch/s390/include/asm/hardirq.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <asm/lowcore.h>
1515

1616
#define local_softirq_pending() (S390_lowcore.softirq_pending)
17+
#define set_softirq_pending(x) (S390_lowcore.softirq_pending = (x))
18+
#define or_softirq_pending(x) (S390_lowcore.softirq_pending |= (x))
1719

1820
#define __ARCH_IRQ_STAT
1921
#define __ARCH_HAS_DO_SOFTIRQ

include/linux/interrupt.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,6 @@ extern bool force_irqthreads;
442442
#define set_softirq_pending(x) (__this_cpu_write(local_softirq_pending_ref, (x)))
443443
#define or_softirq_pending(x) (__this_cpu_or(local_softirq_pending_ref, (x)))
444444

445-
#else /* local_softirq_pending */
446-
447-
#ifndef __ARCH_SET_SOFTIRQ_PENDING
448-
#define set_softirq_pending(x) (local_softirq_pending() = (x))
449-
#define or_softirq_pending(x) (local_softirq_pending() |= (x))
450-
#endif
451-
452445
#endif /* local_softirq_pending */
453446

454447
/* Some architectures might implement lazy enabling/disabling of

0 commit comments

Comments
 (0)