---

yaml
---
r: 335995
b: refs/heads/master
c: d795991
h: refs/heads/master
i:
  335993: 2269d74
  335991: 5df623f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f49f4ab95c301dbccad0efe85296d908b8ae7ad4
+refs/heads/master: d7959916026aaae60e1878ae33c7503b2cc4471d

trunk/arch/x86/platform/ce4100/ce4100.c

@@ -21,6 +21,7 @@
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/io_apic.h>
+#include <asm/emergency-restart.h>
 
 static int ce4100_i8042_detect(void)
 {
@@ -151,6 +152,15 @@ void __init x86_ce4100_early_setup(void)
 	x86_init.mpparse.find_smp_config = x86_init_noop;
 	x86_init.pci.init = ce4100_pci_init;
 
+	/*
+	 * By default, the reboot method is ACPI which is supported by the
+	 * CE4100 bootloader CEFDK using FADT.ResetReg Address and ResetValue
+	 * the bootloader will however issue a system power off instead of
+	 * reboot. By using BOOT_KBD we ensure proper system reboot as
+	 * expected.
+	 */
+	reboot_type = BOOT_KBD;
+
 #ifdef CONFIG_X86_IO_APIC
 	x86_init.pci.init_irq = sdv_pci_init;
 	x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;