Merge branch 'x86/asm' into x86/apic

Pick up dependent changes to avoid merge conflicts
2026-09-26 18:16:26 +00:00 · 2017-08-25 08:56:22 +02:00 · 2017-08-25 08:56:22 +02:00 · c0bb80cfa3
commit c0bb80cfa3
parent adfaf18334 ecda85e702
108 changed files with 3123 additions and 11150 deletions
--- a/Documentation/x86/orc-unwinder.txt
+++ b/Documentation/x86/orc-unwinder.txt
--- a/11
+++ b/11
--- a/arch/um/include/asm/unwind.h
+++ b/arch/um/include/asm/unwind.h
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/configs/tiny.config
+++ b/arch/x86/configs/tiny.config
--- a/arch/x86/entry/Makefile
+++ b/arch/x86/entry/Makefile
--- a/arch/x86/entry/calling.h
+++ b/arch/x86/entry/calling.h
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
--- a/arch/x86/include/asm/lguest.h
+++ b/arch/x86/include/asm/lguest.h
--- a/arch/x86/include/asm/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
--- a/arch/x86/include/asm/module.h
+++ b/arch/x86/include/asm/module.h
--- a/arch/x86/include/asm/orc_lookup.h
+++ b/arch/x86/include/asm/orc_lookup.h
--- a/arch/x86/include/asm/orc_types.h
+++ b/arch/x86/include/asm/orc_types.h
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
--- a/arch/x86/include/asm/rmwcc.h
+++ b/arch/x86/include/asm/rmwcc.h
--- a/arch/x86/include/asm/unwind.h
+++ b/arch/x86/include/asm/unwind.h
--- a/arch/x86/include/asm/unwind_hints.h
+++ b/arch/x86/include/asm/unwind_hints.h
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
--- a/arch/x86/kernel/platform-quirks.c
+++ b/arch/x86/kernel/platform-quirks.c
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
--- a/arch/x86/kernel/step.c
+++ b/arch/x86/kernel/step.c
--- a/arch/x86/kernel/unwind_frame.c
+++ b/arch/x86/kernel/unwind_frame.c
--- a/arch/x86/kernel/unwind_guess.c
+++ b/arch/x86/kernel/unwind_guess.c
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
--- a/arch/x86/lguest/Makefile
+++ b/arch/x86/lguest/Makefile
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
--- a/arch/x86/lguest/head_32.S
+++ b/arch/x86/lguest/head_32.S
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
--- a/arch/x86/xen/xen-asm.S
+++ b/arch/x86/xen/xen-asm.S
--- a/arch/x86/xen/xen-asm.h
+++ b/arch/x86/xen/xen-asm.h
--- a/arch/x86/xen/xen-asm_32.S
+++ b/arch/x86/xen/xen-asm_32.S
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
--- a/drivers/Makefile
+++ b/drivers/Makefile
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
--- a/drivers/lguest/Makefile
+++ b/drivers/lguest/Makefile
--- a/drivers/lguest/README
+++ b/drivers/lguest/README
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
--- a/drivers/lguest/hypercalls.c
+++ b/drivers/lguest/hypercalls.c
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
--- a/drivers/lguest/segments.c
+++ b/drivers/lguest/segments.c
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
--- a/drivers/lguest/x86/switcher_32.S
+++ b/drivers/lguest/x86/switcher_32.S
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/lguest.h
+++ b/include/linux/lguest.h
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
--- a/include/uapi/linux/virtio_ring.h
+++ b/include/uapi/linux/virtio_ring.h
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
--- a/tools/Makefile
+++ b/tools/Makefile
--- a/tools/lguest/.gitignore
+++ b/tools/lguest/.gitignore
--- a/tools/lguest/Makefile
+++ b/tools/lguest/Makefile
--- a/tools/lguest/extract
+++ b/tools/lguest/extract
--- a/tools/lguest/lguest.c
+++ b/tools/lguest/lguest.c
--- a/tools/lguest/lguest.txt
+++ b/tools/lguest/lguest.txt
--- a/tools/objtool/Build
+++ b/tools/objtool/Build
--- a/tools/objtool/Documentation/stack-validation.txt
+++ b/tools/objtool/Documentation/stack-validation.txt
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
--- a/tools/objtool/arch.h
+++ b/tools/objtool/arch.h
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
--- a/tools/objtool/builtin-orc.c
+++ b/tools/objtool/builtin-orc.c
--- a/tools/objtool/builtin.h
+++ b/tools/objtool/builtin.h
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
--- a/tools/objtool/check.h
+++ b/tools/objtool/check.h
--- a/Show more
+++ b/Show more