src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_x86-mach_apicdef.h-need-to-include-before-smp.h.patch

   1 From: Yinghai Lu <yhlu.kernel@gmail.com>
   2 Subject: x86: mach_apicdef.h need to include before smp.h
   3 Patch-mainline: 2.6.28
   4
   5
   6 commit 4696ca5bfd2697f5686f96d59cf0b6de14869b4e
   7 Author: Yinghai Lu <yhlu.kernel@gmail.com>
   8 Date:   Fri Jul 11 18:43:10 2008 -0700
   9
  10 x86: mach_apicdef.h need to include before smp.h
  11
  12 smp.h internal has include, so need to include that at first
  13 when genericarch use them need to have different apicdef.h
  14
  15 Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
  16 Cc: Suresh Siddha <suresh.b.siddha@intel.com>
  17 Signed-off-by: Ingo Molnar <mingo@elte.hu>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 --- a/arch/x86/mach-generic/bigsmp.c
  21 +++ b/arch/x86/mach-generic/bigsmp.c
  22 @@ -5,17 +5,16 @@
  23  #define APIC_DEFINITION 1
  24  #include <linux/threads.h>
  25  #include <linux/cpumask.h>
  26 -#include <asm/smp.h>
  27  #include <asm/mpspec.h>
  28  #include <asm/genapic.h>
  29  #include <asm/fixmap.h>
  30  #include <asm/apicdef.h>
  31  #include <linux/kernel.h>
  32 -#include <linux/smp.h>
  33  #include <linux/init.h>
  34  #include <linux/dmi.h>
  35 -#include <asm/mach-bigsmp/mach_apic.h>
  36  #include <asm/mach-bigsmp/mach_apicdef.h>
  37 +#include <linux/smp.h>
  38 +#include <asm/mach-bigsmp/mach_apic.h>
  39  #include <asm/mach-bigsmp/mach_ipi.h>
  40  #include <asm/mach-default/mach_mpparse.h>
  41
  42 diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
  43 index 4742626..9b30547 100644
  44 --- a/arch/x86/mach-generic/es7000.c
  45 +++ b/arch/x86/mach-generic/es7000.c
  46 @@ -4,16 +4,15 @@
  47  #define APIC_DEFINITION 1
  48  #include <linux/threads.h>
  49  #include <linux/cpumask.h>
  50 -#include <asm/smp.h>
  51  #include <asm/mpspec.h>
  52  #include <asm/genapic.h>
  53  #include <asm/fixmap.h>
  54  #include <asm/apicdef.h>
  55  #include <linux/kernel.h>
  56  #include <linux/string.h>
  57 -#include <linux/smp.h>
  58  #include <linux/init.h>
  59  #include <asm/mach-es7000/mach_apicdef.h>
  60 +#include <linux/smp.h>
  61  #include <asm/mach-es7000/mach_apic.h>
  62  #include <asm/mach-es7000/mach_ipi.h>
  63  #include <asm/mach-es7000/mach_mpparse.h>
  64 diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
  65 index 8091e68..95c07ef 100644
  66 --- a/arch/x86/mach-generic/numaq.c
  67 +++ b/arch/x86/mach-generic/numaq.c
  68 @@ -4,7 +4,6 @@
  69  #define APIC_DEFINITION 1
  70  #include <linux/threads.h>
  71  #include <linux/cpumask.h>
  72 -#include <linux/smp.h>
  73  #include <asm/mpspec.h>
  74  #include <asm/genapic.h>
  75  #include <asm/fixmap.h>
  76 @@ -12,8 +11,9 @@
  77  #include <linux/kernel.h>
  78  #include <linux/string.h>
  79  #include <linux/init.h>
  80 -#include <asm/mach-numaq/mach_apic.h>
  81  #include <asm/mach-numaq/mach_apicdef.h>
  82 +#include <linux/smp.h>
  83 +#include <asm/mach-numaq/mach_apic.h>
  84  #include <asm/mach-numaq/mach_ipi.h>
  85  #include <asm/mach-numaq/mach_mpparse.h>
  86  #include <asm/mach-numaq/mach_wakecpu.h>
  87 diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
  88 index a97ea0f..752edd9 100644
  89 --- a/arch/x86/mach-generic/summit.c
  90 +++ b/arch/x86/mach-generic/summit.c
  91 @@ -4,17 +4,16 @@
  92  #define APIC_DEFINITION 1
  93  #include <linux/threads.h>
  94  #include <linux/cpumask.h>
  95 -#include <asm/smp.h>
  96  #include <asm/mpspec.h>
  97  #include <asm/genapic.h>
  98  #include <asm/fixmap.h>
  99  #include <asm/apicdef.h>
 100  #include <linux/kernel.h>
 101  #include <linux/string.h>
 102 -#include <linux/smp.h>
 103  #include <linux/init.h>
 104 -#include <asm/mach-summit/mach_apic.h>
 105  #include <asm/mach-summit/mach_apicdef.h>
 106 +#include <linux/smp.h>
 107 +#include <asm/mach-summit/mach_apic.h>
 108  #include <asm/mach-summit/mach_ipi.h>
 109  #include <asm/mach-summit/mach_mpparse.h>
 110