提交 708e5978 编写于 作者: R Rabin Vincent 提交者: Russell King

ARM: 7386/1: jump_label: fixup for rename to static_key

c5905afb ("static keys: Introduce 'struct static_key'...") renamed
struct jump_label_key to struct static_key.  Fixup ARM for this to
eliminate these build warnings:

  include/linux/jump_label.h:113:2:
  warning: passing argument 1 of 'arch_static_branch' from incompatible pointer type
  include/asm/jump_label.h:17:82:
  note: expected 'struct jump_label_key *' but argument is of type 'struct static_key *'
Signed-off-by: NRabin Vincent <rabin@rab.in>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 078c0454
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define JUMP_LABEL_NOP "nop" #define JUMP_LABEL_NOP "nop"
#endif #endif
static __always_inline bool arch_static_branch(struct jump_label_key *key) static __always_inline bool arch_static_branch(struct static_key *key)
{ {
asm goto("1:\n\t" asm goto("1:\n\t"
JUMP_LABEL_NOP "\n\t" JUMP_LABEL_NOP "\n\t"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册