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

Commit 973efae2 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Andi Kleen
Browse files

[PATCH] i386: clean up mach_reboot_fixups 



The reboot_fixups stuff seems to be a bit of a mess, specifically the
header is in linux/ when its a purely i386-specific piece of code.  I'm
not sure why it has its config option; its only currently needed for
"geode-gx1/cs5530a", so perhaps whatever config option controls that
hardware should enable this?

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 6d1c4261

arch/i386/kernel/reboot.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/desc.h>

#include <asm/desc.h>

#include "mach_reboot.h"

#include "mach_reboot.h"

#include <linux/reboot_fixups.h>

#include <asm/reboot_fixups.h>





/*

/*

 * Power off function, if any

 * Power off function, if any
@@ -316,6 +316,10 @@ void machine_shutdown(void) 
#endif

#endif

}

}





void __attribute__((weak)) mach_reboot_fixups(void)

{

}



void machine_emergency_restart(void)

void machine_emergency_restart(void)

{

{

	if (!reboot_thru_bios) {

	if (!reboot_thru_bios) {

arch/i386/kernel/reboot_fixups.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 




#include <asm/delay.h>

#include <asm/delay.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/reboot_fixups.h>

#include <asm/reboot_fixups.h>





static void cs5530a_warm_reset(struct pci_dev *dev)

static void cs5530a_warm_reset(struct pci_dev *dev)

{

{

include/linux/reboot_fixups.h→include/asm-i386/reboot_fixups.h

+0 −4
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_REBOOT_FIXUPS_H

#ifndef _LINUX_REBOOT_FIXUPS_H

#define _LINUX_REBOOT_FIXUPS_H

#define _LINUX_REBOOT_FIXUPS_H





#ifdef CONFIG_X86_REBOOTFIXUPS

extern void mach_reboot_fixups(void);

extern void mach_reboot_fixups(void);

#else

#define mach_reboot_fixups() ((void)(0))

#endif





#endif /* _LINUX_REBOOT_FIXUPS_H */
 
#endif /* _LINUX_REBOOT_FIXUPS_H */