Skip to content

Commit 7f6fa10

Browse files
weiny2KAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Tony Luck <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 790ce3b commit 7f6fa10

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/kernel/alternative.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ static __always_inline int patch_cmp(const void *key, const void *elt)
10441044
return 0;
10451045
}
10461046

1047-
int noinstr poke_int3_handler(struct pt_regs *regs)
1047+
noinstr int poke_int3_handler(struct pt_regs *regs)
10481048
{
10491049
struct bp_patching_desc *desc;
10501050
struct text_poke_loc *tp;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ static void kill_me_maybe(struct callback_head *cb)
12121212
* backing the user stack, tracing that reads the user stack will cause
12131213
* potentially infinite recursion.
12141214
*/
1215-
void noinstr do_machine_check(struct pt_regs *regs)
1215+
noinstr void do_machine_check(struct pt_regs *regs)
12161216
{
12171217
DECLARE_BITMAP(valid_banks, MAX_NR_BANKS);
12181218
DECLARE_BITMAP(toclear, MAX_NR_BANKS);

0 commit comments

Comments
 (0)