Home » Mailing list archives » linux-kernel » 2007 » April » 28

[PATCH] [30/35] i386: clean up mach_reboot_fixups

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andi Kleen
Subject: [PATCH] [30/35] i386: clean up mach_reboot_fixups
Date: Saturday, April 28, 2007 - 10:52 am

From: Jeremy Fitzhardinge <jeremy@goop.org>
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>

---
 arch/i386/kernel/reboot.c        |    6 +++++-
 arch/i386/kernel/reboot_fixups.c |    2 +-
 include/asm-i386/reboot_fixups.h |    6 ++++++
 include/linux/reboot_fixups.h    |   10 ----------
 4 files changed, 12 insertions(+), 12 deletions(-)

===================================================================
Index: linux/arch/i386/kernel/reboot.c
===================================================================
--- linux.orig/arch/i386/kernel/reboot.c
+++ linux/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) {
Index: linux/arch/i386/kernel/reboot_fixups.c
===================================================================
--- linux.orig/arch/i386/kernel/reboot_fixups.c
+++ linux/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)
 {
Index: linux/include/asm-i386/reboot_fixups.h
===================================================================
--- /dev/null
+++ linux/include/asm-i386/reboot_fixups.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_REBOOT_FIXUPS_H
+#define _LINUX_REBOOT_FIXUPS_H
+
+extern void mach_reboot_fixups(void);
+
+#endif /* _LINUX_REBOOT_FIXUPS_H */
Index: linux/include/linux/reboot_fixups.h
===================================================================
--- linux.orig/include/linux/reboot_fixups.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#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 */
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [0/35] Some x86 2.6.22 candidate patches for review, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [1/35] i386: revert i386-fix-the-verify_quirk_inte ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [2/35] x86_64: revert x86_64-mm-add-genapic_force, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [3/35] x86: revert x86_64-mm-fix-the-irqbalance-qu ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [4/35] x86_64: optimize &amp; fix APIC mode setup, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [5/35] x86_64: always use physical delivery mode o ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [6/35] x86_64: remove clustered APIC mode, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [7/35] x86: default to physical mode on hotplug CP ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [8/35] x86_64: a memcpy that tries to reduce cache ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [9/35] i386: adjustments to page table dump during ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [10/35] x86: adjust inclusion of asm/fixmap.h, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [11/35] x86_64: adjust inclusion of asm/vsyscall32.h, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [12/35] x86: consolidate smp_send_stop(), Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [13/35] i386: No need to use -traditional for proc ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [14/35] i386: mtrr range check correction, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [15/35] i386: pit_latch_buggy has no effect, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [16/35] i386: Add an option for the VIA C7 which s ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [17/35] i386: probe_roms() cleanup, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [18/35] x86_64: a few missing entry.S annotations, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [19/35] i386: Add dwarf2 annotations to *_user and ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [20/35] x86: Fix i386 and x86_64 fault information ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [21/35] x86_64: Some cleanup in time.c, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [22/35] i386: i386 make NMI use PERFCTR1 for archi ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [23/35] x86_64: x86_64 make NMI use PERFCTR1 for a ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [24/35] i386: Add __init to probe_bigsmp, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [25/35] i386: Change sysenter_setup to __cpuinit &amp; ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [26/35] x86_64: Correct max number of CPUs in Kconfig, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [27/35] i386: Support Oprofile for AMD Family 10 CPUs, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [28/35] x86: Drop cc-options call for all options ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [29/35] i386: Update __copy_to_user_inatomic linu ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [30/35] i386: clean up mach_reboot_fixups, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [31/35] i386: Fix usage of -mtune when X86_GENERIC ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [32/35] x86_64: Remove unused set_seg_base, Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [33/35] x86_64: Remove duplicated code for reading ..., Andi Kleen, (Sat Apr 28, 10:52 am)
[PATCH] [34/35] x86_64: fix cpu MHz reporting on constant_ ..., Andi Kleen, (Sat Apr 28, 10:53 am)
[PATCH] [35/35] i386: Simplify smp_call_function*() by usi ..., Andi Kleen, (Sat Apr 28, 10:53 am)
Re: [PATCH] [16/35] i386: Add an option for the VIA C7 whi ..., Jeff Garzik, (Sat Apr 28, 11:08 am)
Re: [PATCH] [16/35] i386: Add an option for the VIA C7 whi ..., Dave Jones, (Sat Apr 28, 11:28 am)
Re: [patches] [PATCH] [8/35] x86_64: a memcpy that tries t ..., Jan Beulich, (Mon Apr 30, 12:26 am)
Re: [patches] [PATCH] [8/35] x86_64: a memcpy that tries t ..., Andi Kleen, (Mon Apr 30, 2:04 am)
Re: [patches] [PATCH] [8/35] x86_64: a memcpy that tries t ..., Bryan O'Sullivan, (Mon Apr 30, 9:14 am)