Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar: "The biggest changes in this cycle were: - reworking of the e820 code: separate in-kernel and boot-ABI data structures and apply a whole range of cleanups to the kernel side. No change in functionality. - enable KASLR by default: it's used by all major distros and it's out of the experimental stage as well. - ... misc fixes and cleanups" * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (63 commits) x86/KASLR: Fix kexec kernel boot crash when KASLR randomization fails x86/reboot: Turn off KVM when halting a CPU x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup x86: Enable KASLR by default boot/param: Move next_arg() function to lib/cmdline.c for later reuse x86/boot: Fix Sparse warning by including required header file x86/boot/64: Rename start_cpu() x86/xen: Update e820 table handling to the new core x86 E820 code x86/boot: Fix pr_debug() API braindamage xen, x86/headers: Add <linux/device.h> dependency to <asm/xen/page.h> x86/boot/e820: Simplify e820__update_table() x86/boot/e820: Separate the E820 ABI structures from the in-kernel structures x86/boot/e820: Fix and clean up e820_type switch() statements x86/boot/e820: Rename the remaining E820 APIs to the e820__*() prefix x86/boot/e820: Remove unnecessary #include's x86/boot/e820: Rename e820_mark_nosave_regions() to e820__register_nosave_regions() x86/boot/e820: Rename e820_reserve_resources*() to e820__reserve_resources*() x86/boot/e820: Use bool in query APIs x86/boot/e820: Document e820__reserve_setup_data() x86/boot/e820: Clean up __e820__update_table() et al ...
Showing
- Documentation/x86/zero-page.txt 3 additions, 3 deletionsDocumentation/x86/zero-page.txt
- arch/x86/Kconfig 3 additions, 3 deletionsarch/x86/Kconfig
- arch/x86/boot/boot.h 1 addition, 1 deletionarch/x86/boot/boot.h
- arch/x86/boot/compressed/eboot.c 23 additions, 21 deletionsarch/x86/boot/compressed/eboot.c
- arch/x86/boot/compressed/kaslr.c 12 additions, 5 deletionsarch/x86/boot/compressed/kaslr.c
- arch/x86/boot/header.S 0 additions, 1 deletionarch/x86/boot/header.S
- arch/x86/boot/memory.c 3 additions, 3 deletionsarch/x86/boot/memory.c
- arch/x86/configs/i386_defconfig 2 additions, 0 deletionsarch/x86/configs/i386_defconfig
- arch/x86/configs/x86_64_defconfig 2 additions, 0 deletionsarch/x86/configs/x86_64_defconfig
- arch/x86/include/asm/acpi.h 2 additions, 0 deletionsarch/x86/include/asm/acpi.h
- arch/x86/include/asm/e820.h 0 additions, 73 deletionsarch/x86/include/asm/e820.h
- arch/x86/include/asm/e820/api.h 50 additions, 0 deletionsarch/x86/include/asm/e820/api.h
- arch/x86/include/asm/e820/types.h 104 additions, 0 deletionsarch/x86/include/asm/e820/types.h
- arch/x86/include/asm/gart.h 2 additions, 2 deletionsarch/x86/include/asm/gart.h
- arch/x86/include/asm/mpspec.h 2 additions, 2 deletionsarch/x86/include/asm/mpspec.h
- arch/x86/include/asm/pci_x86.h 2 additions, 0 deletionsarch/x86/include/asm/pci_x86.h
- arch/x86/include/asm/pgtable.h 1 addition, 2 deletionsarch/x86/include/asm/pgtable.h
- arch/x86/include/asm/xen/page.h 1 addition, 0 deletionsarch/x86/include/asm/xen/page.h
- arch/x86/include/uapi/asm/bootparam.h 16 additions, 2 deletionsarch/x86/include/uapi/asm/bootparam.h
- arch/x86/kernel/acpi/boot.c 3 additions, 2 deletionsarch/x86/kernel/acpi/boot.c
Please register or sign in to comment