The following commit has been merged into the x86/entry branch of tip: Commit-ID: 7f6fa101dfac8739764e47751d314551f6160c98 Gitweb: https://git.kernel.org/tip/7f6fa101dfac8739764e47751d314551f6160c98 Author: Ira Weiny <ira.we...@intel.com> AuthorDate: Thu, 23 Jul 2020 09:14:05 -07:00 Committer: Thomas Gleixner <t...@linutronix.de> CommitterDate: Fri, 24 Jul 2020 09:54:15 +02:00
x86: Correct noinstr qualifiers The noinstr qualifier is to be specified before the return type in the same way inline is used. These 2 cases were missed by previous patches. Signed-off-by: Ira Weiny <ira.we...@intel.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Reviewed-by: Tony Luck <tony.l...@intel.com> Link: https://lkml.kernel.org/r/20200723161405.852613-1-ira.we...@intel.com --- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/cpu/mce/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 8fd39ff..069e77c 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1044,7 +1044,7 @@ static __always_inline int patch_cmp(const void *key, const void *elt) return 0; } -int noinstr poke_int3_handler(struct pt_regs *regs) +noinstr int poke_int3_handler(struct pt_regs *regs) { struct bp_patching_desc *desc; struct text_poke_loc *tp; diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 14e4b4d..6d7aa56 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1212,7 +1212,7 @@ static void kill_me_maybe(struct callback_head *cb) * backing the user stack, tracing that reads the user stack will cause * potentially infinite recursion. */ -void noinstr do_machine_check(struct pt_regs *regs) +noinstr void do_machine_check(struct pt_regs *regs) { DECLARE_BITMAP(valid_banks, MAX_NR_BANKS); DECLARE_BITMAP(toclear, MAX_NR_BANKS);
