Commit 7f6fa101 authored by Ira Weiny's avatar Ira Weiny Committed by Thomas Gleixner
Browse files

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: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200723161405.852613-1-ira.weiny@intel.com
parent 790ce3b4

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/mce/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE