From: Andrew Morton Repair some of the damage against various things. Your arch/x86/kernel/traps_64.c:__die() change needs a checkpatch run. Cc: Ingo Molnar Signed-off-by: Andrew Morton --- arch/x86/kernel/traps_64.c | 8 +++++--- drivers/acpi/bus.c | 1 + x86/pci/fixup.c | 0 3 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/x86/kernel/traps_64.c~git-x86-fixup arch/x86/kernel/traps_64.c --- a/arch/x86/kernel/traps_64.c~git-x86-fixup +++ a/arch/x86/kernel/traps_64.c @@ -522,15 +522,17 @@ int __kprobes __die(const char * str, st #endif printk("\n"); sysfs_printk_last_file(); - notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); + if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) + return 1; show_registers(regs); add_taint(TAINT_DIE); /* Executive summary in case the oops scrolled away */ printk(KERN_ALERT "RIP "); - printk_address(regs->rip); - printk(" RSP <%016lx>\n", regs->rsp); + printk_address(regs->ip); + printk(" RSP <%016lx>\n", regs->sp); if (kexec_should_crash(current)) crash_kexec(regs); + return 0; } void die(const char * str, struct pt_regs * regs, long err) diff -puN drivers/acpi/bus.c~git-x86-fixup drivers/acpi/bus.c --- a/drivers/acpi/bus.c~git-x86-fixup +++ a/drivers/acpi/bus.c @@ -763,6 +763,7 @@ static int __init acpi_init(void) result = acpi_bus_init(); if (!result) { + pci_mmcfg_late_init(); if (!(pm_flags & PM_APM)) pm_flags |= PM_ACPI; else { diff -puN arch/x86/kernel/acpi/boot.c~git-x86-fixup arch/x86/kernel/acpi/boot.c diff -puN arch/x86/pci/common.c~git-x86-fixup arch/x86/pci/common.c diff -puN arch/x86/kernel/quirks.c~git-x86-fixup arch/x86/kernel/quirks.c diff -puN arch/x86/pci/fixup.c~git-x86-fixup arch/x86/pci/fixup.c _