File tree Expand file tree Collapse file tree 1 file changed +12
-6
lines changed Expand file tree Collapse file tree 1 file changed +12
-6
lines changed Original file line number Diff line number Diff line change 15
15
#include <linux/export.h>
16
16
#include <linux/pci.h>
17
17
#include <linux/acpi.h>
18
+ #include <linux/efi.h>
18
19
19
20
#include <asm/e820/api.h>
20
21
#include <asm/uv/uv_mmrs.h>
@@ -1483,6 +1484,14 @@ static void __init build_socket_tables(void)
1483
1484
}
1484
1485
}
1485
1486
1487
+ /* Check which reboot to use */
1488
+ static void check_efi_reboot (void )
1489
+ {
1490
+ /* If EFI reboot not available, use ACPI reboot */
1491
+ if (!efi_enabled (EFI_BOOT ))
1492
+ reboot_type = BOOT_ACPI ;
1493
+ }
1494
+
1486
1495
/* Setup user proc fs files */
1487
1496
static int proc_hubbed_show (struct seq_file * file , void * data )
1488
1497
{
@@ -1567,6 +1576,8 @@ static __init int uv_system_init_hubless(void)
1567
1576
if (rc >= 0 )
1568
1577
uv_setup_proc_files (1 );
1569
1578
1579
+ check_efi_reboot ();
1580
+
1570
1581
return rc ;
1571
1582
}
1572
1583
@@ -1700,12 +1711,7 @@ static void __init uv_system_init_hub(void)
1700
1711
/* Register Legacy VGA I/O redirection handler: */
1701
1712
pci_register_set_vga_state (uv_set_vga_state );
1702
1713
1703
- /*
1704
- * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as
1705
- * EFI is not enabled in the kdump kernel:
1706
- */
1707
- if (is_kdump_kernel ())
1708
- reboot_type = BOOT_ACPI ;
1714
+ check_efi_reboot ();
1709
1715
}
1710
1716
1711
1717
/*
You can’t perform that action at this time.
0 commit comments