Merge branch 'core/core' into x86/build, to prevent conflicts
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- arch/Kconfig 3 additions, 0 deletionsarch/Kconfig
- arch/arm64/Kconfig 1 addition, 0 deletionsarch/arm64/Kconfig
- arch/arm64/include/asm/jump_label.h 18 additions, 20 deletionsarch/arm64/include/asm/jump_label.h
- arch/arm64/kernel/jump_label.c 3 additions, 3 deletionsarch/arm64/kernel/jump_label.c
- arch/s390/Kconfig 1 addition, 0 deletionsarch/s390/Kconfig
- arch/s390/include/asm/jump_label.h 16 additions, 24 deletionsarch/s390/include/asm/jump_label.h
- arch/s390/kernel/jump_label.c 6 additions, 5 deletionsarch/s390/kernel/jump_label.c
- arch/s390/kernel/vmlinux.lds.S 1 addition, 0 deletionsarch/s390/kernel/vmlinux.lds.S
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/elf.h 1 addition, 2 deletionsarch/x86/include/asm/elf.h
- arch/x86/include/asm/jump_label.h 8 additions, 16 deletionsarch/x86/include/asm/jump_label.h
- arch/x86/kernel/jump_label.c 25 additions, 37 deletionsarch/x86/kernel/jump_label.c
- arch/x86/kernel/module.c 6 additions, 0 deletionsarch/x86/kernel/module.c
- arch/x86/tools/relocs.c 10 additions, 0 deletionsarch/x86/tools/relocs.c
- arch/x86/um/asm/elf.h 1 addition, 2 deletionsarch/x86/um/asm/elf.h
- include/asm-generic/vmlinux.lds.h 7 additions, 4 deletionsinclude/asm-generic/vmlinux.lds.h
- include/linux/jump_label.h 62 additions, 3 deletionsinclude/linux/jump_label.h
- init/main.c 0 additions, 1 deletioninit/main.c
- kernel/jump_label.c 45 additions, 55 deletionskernel/jump_label.c
- kernel/module.c 9 additions, 0 deletionskernel/module.c
Loading
Please register or sign in to comment