[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-48bda43eabb8d086204f543cf8bbad696b8c6391@git.kernel.org>
Date: Mon, 14 May 2018 05:52:20 -0700
From: tip-bot for Frederic Weisbecker <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: mpe@...erman.id.au, jejb@...isc-linux.org,
torvalds@...ux-foundation.org, ysato@...rs.sourceforge.jp,
fenghua.yu@...el.com, benh@...nel.crashing.org, mingo@...nel.org,
tony.luck@...el.com, heiko.carstens@...ibm.com, paulus@...ba.org,
linux-kernel@...r.kernel.org, schwidefsky@...ibm.com,
bigeasy@...utronix.de, hpa@...or.com, dalias@...c.org,
frederic@...nel.org, deller@....de, tglx@...utronix.de,
peterz@...radead.org, davem@...emloft.net
Subject: [tip:irq/core] softirq/s390: Move default mutators of overwritten
softirq mask to s390
Commit-ID: 48bda43eabb8d086204f543cf8bbad696b8c6391
Gitweb: https://git.kernel.org/tip/48bda43eabb8d086204f543cf8bbad696b8c6391
Author: Frederic Weisbecker <frederic@...nel.org>
AuthorDate: Tue, 8 May 2018 15:38:26 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 14 May 2018 11:25:28 +0200
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 <peterz@...radead.org>
Signed-off-by: Frederic Weisbecker <frederic@...nel.org>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Peter Zijlstra <peterz@...radead.org>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Cc: David S. Miller <davem@...emloft.net>
Cc: Fenghua Yu <fenghua.yu@...el.com>
Cc: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Helge Deller <deller@....de>
Cc: James E.J. Bottomley <jejb@...isc-linux.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@...ibm.com>
Cc: Michael Ellerman <mpe@...erman.id.au>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Rich Felker <dalias@...c.org>
Cc: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc: Tony Luck <tony.luck@...el.com>
Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp>
Link: http://lkml.kernel.org/r/1525786706-22846-12-git-send-email-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/s390/include/asm/hardirq.h | 2 ++
include/linux/interrupt.h | 7 -------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index a296c6acfd07..dfbc3c6c0674 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -14,6 +14,8 @@
#include <asm/lowcore.h>
#define local_softirq_pending() (S390_lowcore.softirq_pending)
+#define set_softirq_pending(x) (S390_lowcore.softirq_pending = (x))
+#define or_softirq_pending(x) (S390_lowcore.softirq_pending |= (x))
#define __ARCH_IRQ_STAT
#define __ARCH_HAS_DO_SOFTIRQ
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 7a11f73c5c3b..eeceac3376fc 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -442,13 +442,6 @@ extern bool force_irqthreads;
#define set_softirq_pending(x) (__this_cpu_write(local_softirq_pending_ref, (x)))
#define or_softirq_pending(x) (__this_cpu_or(local_softirq_pending_ref, (x)))
-#else /* local_softirq_pending */
-
-#ifndef __ARCH_SET_SOFTIRQ_PENDING
-#define set_softirq_pending(x) (local_softirq_pending() = (x))
-#define or_softirq_pending(x) (local_softirq_pending() |= (x))
-#endif
-
#endif /* local_softirq_pending */
/* Some architectures might implement lazy enabling/disabling of
Powered by blists - more mailing lists