diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-05-02 19:27:06 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:06 +0200 |
| commit | 973efae21beb2feda138f152ed06d4204774d93c (patch) | |
| tree | 72aea5fab6d059b35a79198bf09cc9163338b5c2 | |
| parent | 6d1c426158131b11d05d66e7dd6bf91e5b1b4fc7 (diff) | |
| download | kernel_samsung_espresso10-973efae21beb2feda138f152ed06d4204774d93c.zip kernel_samsung_espresso10-973efae21beb2feda138f152ed06d4204774d93c.tar.gz kernel_samsung_espresso10-973efae21beb2feda138f152ed06d4204774d93c.tar.bz2 | |
[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>
| -rw-r--r-- | arch/i386/kernel/reboot.c | 6 | ||||
| -rw-r--r-- | arch/i386/kernel/reboot_fixups.c | 2 | ||||
| -rw-r--r-- | include/asm-i386/reboot_fixups.h (renamed from include/linux/reboot_fixups.h) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 3514b41..8b5ff6e 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c @@ -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) { diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c index 99aab41..2d78d91 100644 --- a/arch/i386/kernel/reboot_fixups.c +++ b/arch/i386/kernel/reboot_fixups.c @@ -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) { diff --git a/include/linux/reboot_fixups.h b/include/asm-i386/reboot_fixups.h index 480ea2d..0cb7d87 100644 --- a/include/linux/reboot_fixups.h +++ b/include/asm-i386/reboot_fixups.h @@ -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 */ |