1 From: Thomas Renninger <trenn@suse.de>
2 Subject: Fix several section mismatches
4 Patch-Mainline: not yet
6 Signed-off-by: Thomas Renninger <trenn@suse.de>
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(-)
17 Index: linux-2.6.26/arch/x86/kernel/genapic_64.c
18 ===================================================================
19 --- linux-2.6.26.orig/arch/x86/kernel/genapic_64.c
20 +++ linux-2.6.26/arch/x86/kernel/genapic_64.c
21 @@ -30,7 +30,7 @@ extern struct genapic apic_x2apic_cluste
23 struct genapic __read_mostly *genapic = &apic_flat;
25 -static struct genapic *apic_probe[] __initdata = {
26 +static struct genapic *apic_probe[] = {
30 @@ -62,7 +62,7 @@ void apic_send_IPI_self(int vector)
31 __send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
34 -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
35 +int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
39 Index: linux-2.6.26/arch/x86/kernel/genapic_flat_64.c
40 ===================================================================
41 --- linux-2.6.26.orig/arch/x86/kernel/genapic_flat_64.c
42 +++ linux-2.6.26/arch/x86/kernel/genapic_flat_64.c
44 #include <acpi/acpi_bus.h>
47 -static int __init flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
48 +static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
52 @@ -170,7 +170,7 @@ struct genapic apic_flat = {
53 * We cannot use logical delivery in this case because the mask
54 * overflows, so use physical mode.
56 -static int __init physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
57 +static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
61 Index: linux-2.6.26/arch/x86/kernel/genx2apic_cluster.c
62 ===================================================================
63 --- linux-2.6.26.orig/arch/x86/kernel/genx2apic_cluster.c
64 +++ linux-2.6.26/arch/x86/kernel/genx2apic_cluster.c
67 DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid);
69 -static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
70 +static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
74 Index: linux-2.6.26/arch/x86/kernel/genx2apic_phys.c
75 ===================================================================
76 --- linux-2.6.26.orig/arch/x86/kernel/genx2apic_phys.c
77 +++ linux-2.6.26/arch/x86/kernel/genx2apic_phys.c
78 @@ -21,7 +21,7 @@ static int set_x2apic_phys_mode(char *ar
80 early_param("x2apic_phys", set_x2apic_phys_mode);
82 -static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
83 +static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
85 if (cpu_has_x2apic && x2apic_phys)
87 Index: linux-2.6.26/arch/x86/kernel/genx2apic_uv_x.c
88 ===================================================================
89 --- linux-2.6.26.orig/arch/x86/kernel/genx2apic_uv_x.c
90 +++ linux-2.6.26/arch/x86/kernel/genx2apic_uv_x.c
93 static enum uv_system_type uv_system_type;
95 -static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
96 +static int uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
98 if (!strcmp(oem_id, "SGI")) {
99 if (!strcmp(oem_table_id, "UVL"))
100 Index: linux-2.6.26/arch/x86/kernel/apic_64.c
101 ===================================================================
102 --- linux-2.6.26.orig/arch/x86/kernel/apic_64.c
103 +++ linux-2.6.26/arch/x86/kernel/apic_64.c
104 @@ -928,7 +928,7 @@ void enable_x2apic(void)
108 -void enable_IR_x2apic(void)
109 +void __init enable_IR_x2apic(void)
111 #ifdef CONFIG_INTR_REMAP