From: Ingo Molnar <mingo@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Borislav Petkov <bp@alien8.de>
Subject: [PATCH 2/2] entry: Correct 'noinstr' attributes
Date: Sat, 25 Jul 2020 11:19:51 +0200 [thread overview]
Message-ID: <20200725091951.744848-3-mingo@kernel.org> (raw)
In-Reply-To: <20200725091951.744848-1-mingo@kernel.org>
The noinstr attribute is to be specified before the return type in the
same way 'inline' is used.
Similar cases were recently fixed for x86, via:
7f6fa101dfac: ("x86: Correct noinstr qualifiers")
These 2 cases were carried over by the new generic entry code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/entry/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 49ed8b47773a..a6da0e4adf93 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -258,7 +258,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs)
exit_to_user_mode();
}
-irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs)
+noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
{
irqentry_state_t ret = {
.exit_rcu = false,
@@ -335,7 +335,7 @@ void irqentry_exit_cond_resched(void)
}
}
-void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
+noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
{
lockdep_assert_irqs_disabled();
--
2.25.1
next prev parent reply other threads:[~2020-07-25 9:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 9:19 [PATCH 0/2] Fixes for the generic entry/exit framework Ingo Molnar
2020-07-25 9:19 ` [PATCH 1/2] entry: Fix CONFIG_SECCOMP assumption Ingo Molnar
2020-07-26 13:38 ` Thomas Gleixner
2020-07-26 17:47 ` Ingo Molnar
2020-07-27 13:39 ` Thomas Gleixner
2020-07-25 9:19 ` Ingo Molnar [this message]
2020-07-26 13:39 ` [PATCH 2/2] entry: Correct 'noinstr' attributes Thomas Gleixner
2020-07-26 13:47 ` [tip: core/entry] " tip-bot2 for Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200725091951.744848-3-mingo@kernel.org \
--to=mingo@kernel.org \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox