Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH] x86: mach_apicdef.h need to include before smp.h | Date | Fri, 11 Jul 2008 18:43:10 -0700 |
| |
smp.h internal has include, so need to include that at first when genericarch use them need to have different apicdef.h
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
--- arch/x86/mach-generic/bigsmp.c | 5 ++--- arch/x86/mach-generic/es7000.c | 3 +-- arch/x86/mach-generic/numaq.c | 4 ++-- arch/x86/mach-generic/summit.c | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-)
Index: linux-2.6/arch/x86/mach-generic/bigsmp.c =================================================================== --- linux-2.6.orig/arch/x86/mach-generic/bigsmp.c +++ linux-2.6/arch/x86/mach-generic/bigsmp.c @@ -5,17 +5,16 @@ #define APIC_DEFINITION 1 #include <linux/threads.h> #include <linux/cpumask.h> -#include <asm/smp.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <linux/kernel.h> -#include <linux/smp.h> #include <linux/init.h> #include <linux/dmi.h> -#include <asm/mach-bigsmp/mach_apic.h> #include <asm/mach-bigsmp/mach_apicdef.h> +#include <linux/smp.h> +#include <asm/mach-bigsmp/mach_apic.h> #include <asm/mach-bigsmp/mach_ipi.h> #include <asm/mach-default/mach_mpparse.h> Index: linux-2.6/arch/x86/mach-generic/es7000.c =================================================================== --- linux-2.6.orig/arch/x86/mach-generic/es7000.c +++ linux-2.6/arch/x86/mach-generic/es7000.c @@ -4,16 +4,15 @@ #define APIC_DEFINITION 1 #include <linux/threads.h> #include <linux/cpumask.h> -#include <asm/smp.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/smp.h> #include <linux/init.h> #include <asm/mach-es7000/mach_apicdef.h> +#include <linux/smp.h> #include <asm/mach-es7000/mach_apic.h> #include <asm/mach-es7000/mach_ipi.h> #include <asm/mach-es7000/mach_mpparse.h> Index: linux-2.6/arch/x86/mach-generic/numaq.c =================================================================== --- linux-2.6.orig/arch/x86/mach-generic/numaq.c +++ linux-2.6/arch/x86/mach-generic/numaq.c @@ -4,7 +4,6 @@ #define APIC_DEFINITION 1 #include <linux/threads.h> #include <linux/cpumask.h> -#include <linux/smp.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> @@ -12,8 +11,9 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> -#include <asm/mach-numaq/mach_apic.h> #include <asm/mach-numaq/mach_apicdef.h> +#include <linux/smp.h> +#include <asm/mach-numaq/mach_apic.h> #include <asm/mach-numaq/mach_ipi.h> #include <asm/mach-numaq/mach_mpparse.h> #include <asm/mach-numaq/mach_wakecpu.h> Index: linux-2.6/arch/x86/mach-generic/summit.c =================================================================== --- linux-2.6.orig/arch/x86/mach-generic/summit.c +++ linux-2.6/arch/x86/mach-generic/summit.c @@ -4,17 +4,16 @@ #define APIC_DEFINITION 1 #include <linux/threads.h> #include <linux/cpumask.h> -#include <asm/smp.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <linux/kernel.h> #include <linux/string.h> -#include <linux/smp.h> #include <linux/init.h> -#include <asm/mach-summit/mach_apic.h> #include <asm/mach-summit/mach_apicdef.h> +#include <linux/smp.h> +#include <asm/mach-summit/mach_apic.h> #include <asm/mach-summit/mach_ipi.h> #include <asm/mach-summit/mach_mpparse.h>
| |