• Linus Torvalds's avatar
    Merge branch 'upstream/jump-label-noearly' of... · b32fc0a0
    Linus Torvalds authored
    Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
    
    * 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
      jump-label: initialize jump-label subsystem much earlier
      x86/jump_label: add arch_jump_label_transform_static()
      s390/jump-label: add arch_jump_label_transform_static()
      jump_label: add arch_jump_label_transform_static() to optimise non-live code updates
      sparc/jump_label: drop arch_jump_label_text_poke_early()
      x86/jump_label: drop arch_jump_label_text_poke_early()
      jump_label: if a key has already been initialized, don't nop it out
      stop_machine: make stop_machine safe and efficient to call early
      jump_label: use proper atomic_t initializer
    
    Conflicts:
     - arch/x86/kernel/jump_label.c
    	Added __init_or_module to arch_jump_label_text_poke_early vs
    	removal of that function entirely
     - kernel/stop_machine.c
    	same patch ("stop_machine: make stop_machine safe and efficient
    	to call early") merged twice, with whitespace fix in one version
    b32fc0a0
main.c 20.3 KB