Skip to contentSkip to conversation

x86: Correct noinstr qualifiers

PATCH Applied [email protected] 2 participants 2 messages Jul 23, 2020 – Jul 24, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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.

---
 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
index 20e07feb4064..4b7b980c87df 100644
@@ -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
index 1a0139d9a34b..c5204d7bca2b 100644
@@ -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
merge bot Applied
#1 lore raw
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.

---
 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
index 8fd39ff..069e77c 100644
@@ -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
index 14e4b4d..6d7aa56 100644
@@ -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);