x86: Correct noinstr qualifiers
Subsystems (3)
PATCH 1/1 x86: Correct noinstr qualifiers
From: Ira Weiny <[email protected]>
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.
Reviewed-by Tony Luck <[email protected]>
Signed-off-by Ira Weiny <[email protected]>
--- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/cpu/mce/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +1 -1
@@ -1046,7 +1046,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
@@ -1214,7 +1214,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 );
Signature · 1 line
2.25.1
The following commit has been merged into the x86/entry branch of tip:
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 <[email protected]> AuthorDate: Thu, 23 Jul 2020 09:14:05 -07:00 Committer: Thomas Gleixner <[email protected]> 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 <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Tony Luck <[email protected]>
--- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/cpu/mce/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/alternative.c +1 -1
@@ -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
@@ -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 );