From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 12 Apr 2021 08:27:03 +0000 (+0200)
Subject: Merge branch 'x86/core'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9d39745889fbb346c9eae4c61d1365bedb36d23;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'x86/core'
---

e9d39745889fbb346c9eae4c61d1365bedb36d23
diff --cc arch/x86/include/asm/jump_label.h
index 7f2006645d84,5ce342b91ff3..610a05374c02
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@@ -20,10 -14,10 +14,10 @@@
  #include <linux/stringify.h>
  #include <linux/types.h>
  
 -static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 +static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch)
  {
  	asm_volatile_goto("1:"
- 		".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
+ 		".byte " __stringify(BYTES_NOP5) "\n\t"
  		".pushsection __jump_table,  \"aw\" \n\t"
  		_ASM_ALIGN "\n\t"
  		".long 1b - ., %l[l_yes] - . \n\t"