From: David Daney For the forthcoming MIPS jump label support, arch_jump_label_text_poke_early() is unneeded as the MIPS NOP instruction is already optimal. Supply a default implementation that does nothing. Flag x86 and SPARC as having arch_jump_label_text_poke_early(). Cc: Jason Baron Cc: David Miller Signed-off-by: David Daney LKML-Reference: <1286218615-24011-2-git-send-email-ddaney@caviumnetworks.com> Signed-off-by: Steven Rostedt --- arch/sparc/include/asm/jump_label.h | 1 + arch/x86/include/asm/jump_label.h | 1 + include/linux/jump_label.h | 6 ++++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h index 62e66d7..9aa82d7 100644 --- a/arch/sparc/include/asm/jump_label.h +++ b/arch/sparc/include/asm/jump_label.h @@ -6,6 +6,7 @@ #include #include +#define HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY #define JUMP_LABEL_NOP_SIZE 4 #define JUMP_LABEL(key, label) \ diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h index f52d42e..169cfd8 100644 --- a/arch/x86/include/asm/jump_label.h +++ b/arch/x86/include/asm/jump_label.h @@ -6,6 +6,7 @@ #include #include +#define HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY #define JUMP_LABEL_NOP_SIZE 5 # define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t" diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 1947a12..b3835f6 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -22,7 +22,13 @@ extern void jump_label_lock(void); extern void jump_label_unlock(void); extern void arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type); + +#ifdef HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY extern void arch_jump_label_text_poke_early(jump_label_t addr); +#else +static inline void arch_jump_label_text_poke_early(jump_label_t addr) {} +#endif + extern void jump_label_update(unsigned long key, enum jump_label_type type); extern void jump_label_apply_nops(struct module *mod); extern int jump_label_text_reserved(void *start, void *end); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/