Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 818987e9 authored by Cliff Wickman's avatar Cliff Wickman Committed by Ingo Molnar
Browse files

x86, UV: Fix kdump reboot 



After a crash dump on an SGI Altix UV system the crash kernel
fails to cause a reboot.  EFI mode is disabled in the kdump
kernel, so only the reboot_type of BOOT_ACPI works.

Signed-off-by: default avatarCliff Wickman <cpw@sgi.com>
Cc: rja@sgi.com
LKML-Reference: <E1Q5Iuo-00013b-UK@eag09.americas.sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cb6c8520

arch/x86/kernel/apic/x2apic_uv_x.c

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/pci.h>

#include <linux/kdebug.h>

#include <linux/delay.h>

#include <linux/crash_dump.h>



#include <asm/uv/uv_mmrs.h>

#include <asm/uv/uv_hub.h>
@@ -35,6 +36,7 @@ 
#include <asm/ipi.h>

#include <asm/smp.h>

#include <asm/x86_init.h>

#include <asm/emergency-restart.h>



DEFINE_PER_CPU(int, x2apic_extra_bits);
@@ -811,4 +813,11 @@ void __init uv_system_init(void) 


	/* register Legacy VGA I/O redirection handler */

	pci_register_set_vga_state(uv_set_vga_state);



	/*

	 * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as

	 * EFI is not enabled in the kdump kernel.

	 */

	if (is_kdump_kernel())

		reboot_type = BOOT_ACPI;

}