Ingo, This is the second round with the suggestions made by Peter and Andrew incorporated (and tested). We can still let this code sit on LKML for a little bit, to give time for anyone else that wants to complain about them ;-) Changes for v2: Used GENERIC_NOP5_ATOMIC instead of open coding the nop. (suggested by H. Peter Anvin) I also added a comment to the code that explains that the JUMP_LABEL_INIT_NOP must match the update_jump_label.c code. Used const pointers for default_nop and short_nop. (suggested by Andrew Morton) Please pull (again, if everyone is OK with them) the latest tip/perf/jump-label-2 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git tip/perf/jump-label-2 Head SHA1: 78498e6a36ca3d192ee6a151d8c081525e6c9abe Steven Rostedt (5): x86/jump-label: Use best default nops for inital jump label calls x86/jump-label: Do not bother updating nops if they are correct x86/jump-label: Add safety checks to jump label conversions jump labels: Add infrastructure to update jump labels at compile time x86/jump labels: Use etiher 5 byte or 2 byte jumps ---- Makefile | 7 + arch/Kconfig | 6 + arch/x86/Kconfig | 1 + arch/x86/include/asm/jump_label.h | 14 ++- arch/x86/kernel/jump_label.c | 109 +++++++++++- scripts/Makefile | 1 + scripts/Makefile.build | 15 ++- scripts/update_jump_label.c | 341 +++++++++++++++++++++++++++++++++++++ scripts/update_jump_label.h | 208 ++++++++++++++++++++++ 9 files changed, 688 insertions(+), 14 deletions(-)