src/patches/suse-2.6.27.39/patches.arch/x2APIC_fix_section_mismatch.patch

   1 From: Thomas Renninger <trenn@suse.de>
   2 Subject: Fix several section mismatches
   3 References: none
   4 Patch-Mainline: not yet
   5
   6 Signed-off-by: Thomas Renninger <trenn@suse.de>
   7
   8 ---
   9  arch/x86/kernel/apic_64.c           |    2 +-
  10  arch/x86/kernel/genapic_64.c        |    4 ++--
  11  arch/x86/kernel/genapic_flat_64.c   |    4 ++--
  12  arch/x86/kernel/genx2apic_cluster.c |    2 +-
  13  arch/x86/kernel/genx2apic_phys.c    |    2 +-
  14  arch/x86/kernel/genx2apic_uv_x.c    |    2 +-
  15  6 files changed, 8 insertions(+), 8 deletions(-)
  16
  17 --- a/arch/x86/kernel/apic_64.c
  18 +++ b/arch/x86/kernel/apic_64.c
  19 @@ -955,7 +955,7 @@ void enable_x2apic(void)
  20         }
  21  }
  22
  23 -void enable_IR_x2apic(void)
  24 +void __init enable_IR_x2apic(void)
  25  {
  26  #ifdef CONFIG_INTR_REMAP
  27         int ret;
  28 --- a/arch/x86/kernel/genapic_64.c
  29 +++ b/arch/x86/kernel/genapic_64.c
  30 @@ -30,7 +30,7 @@ extern struct genapic apic_x2apic_cluste
  31
  32  struct genapic __read_mostly *genapic = &apic_flat;
  33
  34 -static struct genapic *apic_probe[] __initdata = {
  35 +static struct genapic *apic_probe[] = {
  36         &apic_x2apic_uv_x,
  37         &apic_x2apic_phys,
  38         &apic_x2apic_cluster,
  39 @@ -62,7 +62,7 @@ void apic_send_IPI_self(int vector)
  40         __send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
  41  }
  42
  43 -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  44 +int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  45  {
  46         int i;
  47
  48 --- a/arch/x86/kernel/genapic_flat_64.c
  49 +++ b/arch/x86/kernel/genapic_flat_64.c
  50 @@ -25,7 +25,7 @@
  51  #include <acpi/acpi_bus.h>
  52  #endif
  53
  54 -static int __init flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  55 +static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  56  {
  57         return 1;
  58  }
  59 @@ -170,7 +170,7 @@ struct genapic apic_flat =  {
  60   * We cannot use logical delivery in this case because the mask
  61   * overflows, so use physical mode.
  62   */
  63 -static int __init physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  64 +static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  65  {
  66  #ifdef CONFIG_ACPI
  67         /*
  68 --- a/arch/x86/kernel/genx2apic_cluster.c
  69 +++ b/arch/x86/kernel/genx2apic_cluster.c
  70 @@ -12,7 +12,7 @@
  71
  72  DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid);
  73
  74 -static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  75 +static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  76  {
  77         if (cpu_has_x2apic)
  78                 return 1;
  79 --- a/arch/x86/kernel/genx2apic_phys.c
  80 +++ b/arch/x86/kernel/genx2apic_phys.c
  81 @@ -21,7 +21,7 @@ static int set_x2apic_phys_mode(char *ar
  82  }
  83  early_param("x2apic_phys", set_x2apic_phys_mode);
  84
  85 -static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  86 +static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  87  {
  88         if (cpu_has_x2apic && x2apic_phys)
  89                 return 1;
  90 --- a/arch/x86/kernel/genx2apic_uv_x.c
  91 +++ b/arch/x86/kernel/genx2apic_uv_x.c
  92 @@ -29,7 +29,7 @@
  93
  94  static enum uv_system_type uv_system_type;
  95
  96 -static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  97 +static int uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
  98  {
  99         if (!strcmp(oem_id, "SGI")) {
 100                 if (!strcmp(oem_table_id, "UVL"))