mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
708e5978df
c5905afb0 ("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: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
42 lines
694 B
C
42 lines
694 B
C
#ifndef _ASM_ARM_JUMP_LABEL_H
|
|
#define _ASM_ARM_JUMP_LABEL_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/system.h>
|
|
|
|
#define JUMP_LABEL_NOP_SIZE 4
|
|
|
|
#ifdef CONFIG_THUMB2_KERNEL
|
|
#define JUMP_LABEL_NOP "nop.w"
|
|
#else
|
|
#define JUMP_LABEL_NOP "nop"
|
|
#endif
|
|
|
|
static __always_inline bool arch_static_branch(struct static_key *key)
|
|
{
|
|
asm goto("1:\n\t"
|
|
JUMP_LABEL_NOP "\n\t"
|
|
".pushsection __jump_table, \"aw\"\n\t"
|
|
".word 1b, %l[l_yes], %c0\n\t"
|
|
".popsection\n\t"
|
|
: : "i" (key) : : l_yes);
|
|
|
|
return false;
|
|
l_yes:
|
|
return true;
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
typedef u32 jump_label_t;
|
|
|
|
struct jump_entry {
|
|
jump_label_t code;
|
|
jump_label_t target;
|
|
jump_label_t key;
|
|
};
|
|
|
|
#endif
|