[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: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
parent
6d1c426158
commit
973efae21b
|
@ -17,7 +17,7 @@
|
|||
#include <asm/apic.h>
|
||||
#include <asm/desc.h>
|
||||
#include "mach_reboot.h"
|
||||
#include <linux/reboot_fixups.h>
|
||||
#include <asm/reboot_fixups.h>
|
||||
|
||||
/*
|
||||
* Power off function, if any
|
||||
|
@ -316,6 +316,10 @@ void machine_shutdown(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
void __attribute__((weak)) mach_reboot_fixups(void)
|
||||
{
|
||||
}
|
||||
|
||||
void machine_emergency_restart(void)
|
||||
{
|
||||
if (!reboot_thru_bios) {
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <asm/delay.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/reboot_fixups.h>
|
||||
#include <asm/reboot_fixups.h>
|
||||
|
||||
static void cs5530a_warm_reset(struct pci_dev *dev)
|
||||
{
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
#ifndef _LINUX_REBOOT_FIXUPS_H
|
||||
#define _LINUX_REBOOT_FIXUPS_H
|
||||
|
||||
#ifdef CONFIG_X86_REBOOTFIXUPS
|
||||
extern void mach_reboot_fixups(void);
|
||||
#else
|
||||
#define mach_reboot_fixups() ((void)(0))
|
||||
#endif
|
||||
|
||||
#endif /* _LINUX_REBOOT_FIXUPS_H */
|
Loading…
Reference in a new issue