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

Commit 7432d149 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: re-add reboot fixups 



Jan Beulich noticed that the reboot fixups went missing during
reboot.c unification.

(commit 4d022e35)

Geode and a few other rare boards with special reboot quirks are
affected.

Reported-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d032b31a

arch/x86/kernel/reboot.c

+6 −0
Original line number Diff line number Diff line
@@ -326,6 +326,10 @@ static inline void kb_wait(void) 
	}

}



void __attribute__((weak)) mach_reboot_fixups(void)

{

}



static void native_machine_emergency_restart(void)

{

	int i;
@@ -337,6 +341,8 @@ static void native_machine_emergency_restart(void) 
		/* Could also try the reset bit in the Hammer NB */

		switch (reboot_type) {

		case BOOT_KBD:

			mach_reboot_fixups(); /* for board specific fixups */



			for (i = 0; i < 10; i++) {

				kb_wait();

				udelay(50);