diff --git a/[refs] b/[refs] index 0b4cc5ba129f..3a28044bd03f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 078c04545ba56da21567728a909a496df5ff730d +refs/heads/master: 708e5978dfee0090a27c5531ce3b017dd6d190a2 diff --git a/trunk/arch/arm/include/asm/jump_label.h b/trunk/arch/arm/include/asm/jump_label.h index 5c5ca2ea62b0..bfc198c75913 100644 --- a/trunk/arch/arm/include/asm/jump_label.h +++ b/trunk/arch/arm/include/asm/jump_label.h @@ -14,7 +14,7 @@ #define JUMP_LABEL_NOP "nop" #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" JUMP_LABEL_NOP "\n\t"