* [tip: locking/core] s390: Use arch_local_irq_{save,restore}() in early boot code
@ 2021-02-10 13:59 tip-bot2 for Sven Schnelle
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Sven Schnelle @ 2021-02-10 13:59 UTC (permalink / raw)
To: linux-tip-commits
Cc: Sven Schnelle, Peter Zijlstra (Intel), x86, linux-kernel
The following commit has been merged into the locking/core branch of tip:
Commit-ID: b38085ba60246fccc2f49d2ac162528dedbc4e71
Gitweb: https://git.kernel.org/tip/b38085ba60246fccc2f49d2ac162528dedbc4e71
Author: Sven Schnelle <svens@linux.ibm.com>
AuthorDate: Wed, 10 Feb 2021 14:24:16 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 10 Feb 2021 14:44:39 +01:00
s390: Use arch_local_irq_{save,restore}() in early boot code
Commit 997acaf6b4b5 ("lockdep: report broken irq restoration") makes
compiling s390 fail because the irq enable/disable functions are now
no longer fully contained in header files.
Fixes: 997acaf6b4b5 ("lockdep: report broken irq restoration")
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
drivers/s390/char/sclp_early_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/s390/char/sclp_early_core.c b/drivers/s390/char/sclp_early_core.c
index ec9f8ad..b7329af 100644
--- a/drivers/s390/char/sclp_early_core.c
+++ b/drivers/s390/char/sclp_early_core.c
@@ -66,13 +66,13 @@ int sclp_early_cmd(sclp_cmdw_t cmd, void *sccb)
unsigned long flags;
int rc;
- raw_local_irq_save(flags);
+ flags = arch_local_irq_save();
rc = sclp_service_call(cmd, sccb);
if (rc)
goto out;
sclp_early_wait_irq();
out:
- raw_local_irq_restore(flags);
+ arch_local_irq_restore(flags);
return rc;
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-10 14:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-10 13:59 [tip: locking/core] s390: Use arch_local_irq_{save,restore}() in early boot code tip-bot2 for Sven Schnelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).