x86_32: apic/es7000_32, fix section mismatch
PATCH 1/3 x86_32: apic/es7000_32, fix section mismatch
Remove __init section placement for some functions, so that we don't get section mismatch warnings.
--- arch/x86/kernel/apic/es7000_32.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-)
arch/x86/kernel/apic/es7000_32.c +15 -17
@@ -173,7 +173,7 @@ static int __init es7000_apic_is_cluster(void)return 0 ; } -static void __init setup_unisys (void ) +static void setup_unisys (void ) {/* * Determine the generation of the ES7000 currently running.
@@ -192,7 +192,7 @@ static void __init setup_unisys(void)/* * Parse the OEM Table: */ -static int __init parse_unisys_oem (char *oemptr) +static int parse_unisys_oem (char *oemptr) {int i;int success =0 ;
@@ -254,7 +254,7 @@ static int __init parse_unisys_oem(char *oemptr) }#ifdef CONFIG_ACPI -static int __init find_unisys_acpi_oem_table (unsigned long *oem_addr) +static int find_unisys_acpi_oem_table (unsigned long *oem_addr) {struct acpi_table_header *header =NULL ;struct es7000_oem_table *table;
@@ -285,7 +285,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)return 0 ; } -static void __init unmap_unisys_acpi_oem_table (unsigned long oem_addr) +static void unmap_unisys_acpi_oem_table (unsigned long oem_addr) {if (!oem_addr)return ;
@@ -303,10 +303,10 @@ static int es7000_check_dsdt(void)return 0 ; } -static int __initdata es7000_acpi_ret; +static int es7000_acpi_ret;/* Hook from generic ACPI tables.c */ -static int __init es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {unsigned long oem_addr =0 ;int check_dsdt;
@@ -333,8 +333,7 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)return ret && !es7000_apic_is_cluster (); } -static int __init -es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) {int ret = es7000_acpi_ret;
@@ -342,13 +341,12 @@ es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id) }#else /* !CONFIG_ACPI: */ -static int __init es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {return 0 ; } -static int __init -es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) {return 0 ; }
@@ -396,7 +394,7 @@ es7000_mip_write(struct mip_reg *mip_reg)return status; } -static void __init es7000_enable_apic_mode (void ) +static void es7000_enable_apic_mode (void ) {struct mip_reg es7000_mip_reg;int mip_status;
@@ -627,9 +625,9 @@ static int probe_es7000(void)return 0 ; } -static int __initdata es7000_mps_ret; -static __init int -es7000_mps_oem_check (struct mpc_table *mpc,char *oem,char *productid) +static int es7000_mps_ret; +static int es7000_mps_oem_check (struct mpc_table *mpc,char *oem, +char *productid) {int ret =0 ;
@@ -646,8 +644,8 @@ es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)return ret && !es7000_apic_is_cluster (); } -static __init int -es7000_mps_oem_check_cluster (struct mpc_table *mpc,char *oem,char *productid) +static int es7000_mps_oem_check_cluster (struct mpc_table *mpc,char *oem, +char *productid) {int ret = es7000_mps_ret;
Signature · 1 line
1.6.1.3
PATCH 2/3 x86_32: apic/summit_32, fix section mismatch
Remove __init section placement for some functions/data, so that we don't get section mismatch warnings.
Also make inline function instead of empty setup_summit macro.
--- arch/x86/kernel/apic/summit_32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/apic/summit_32.c +7 -7
@@ -77,9 +77,9 @@ static void summit_send_IPI_all(int vector)extern int use_cyclone;#ifdef CONFIG_X86_SUMMIT_NUMA -extern void setup_summit (void ); +static void setup_summit (void );#else -#define setup_summit () {} +static inline void setup_summit (void ) {}#endif static int summit_mps_oem_check(struct mpc_table *mpc, char *oem,
@@ -360,15 +360,15 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask) }#ifdef CONFIG_X86_SUMMIT_NUMA -static struct rio_table_hdr *rio_table_hdr__initdata ; -static struct scal_detail *scal_devs[MAX_NUMNODES ]__initdata ; -static struct rio_detail *rio_devs[MAX_NUMNODES *4 ]__initdata ; +static struct rio_table_hdr *rio_table_hdr; +static struct scal_detail *scal_devs[MAX_NUMNODES ]; +static struct rio_detail *rio_devs[MAX_NUMNODES *4 ];#ifndef CONFIG_X86_NUMAQ static int mp_bus_id_to_node[MAX_MP_BUSSES ]__initdata ;#endif -static int __init setup_pci_node_map_for_wpeg (int wpeg_num,int last_bus) +static int setup_pci_node_map_for_wpeg (int wpeg_num,int last_bus) {int twister =0 , node =0 ;int i, bus, num_buses;
@@ -464,7 +464,7 @@ static int __init build_detail_arrays(void)return 1 ; } -void __init setup_summit (void ) +void setup_summit (void ) {unsigned long ptr;unsigned short offset;
Signature · 1 line
1.6.1.3
PATCH 3/3 x86_32: apic/numaq_32, fix section mismatch
In reply to Jiri SlabyRemove __cpuinitdata section placement for translation_table structure, since it is referenced from a functions within .text.
--- arch/x86/kernel/apic/numaq_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apic/numaq_32.c +1 -1
@@ -69,7 +69,7 @@ struct mpc_trans {/* x86_quirks member */ static int mpc_record; -static __cpuinitdata struct mpc_trans *translation_table[MAX_MPC_ENTRY ]; +static struct mpc_trans *translation_table[MAX_MPC_ENTRY ];int mp_bus_id_to_node[MAX_MP_BUSSES ];int mp_bus_id_to_local[MAX_MP_BUSSES ];
Signature · 1 line
1.6.1.3
Quoted 2 lines · Jiri Slaby
Remove
__initsection placement for some functions, so that we don't get section mismatch warnings.
Oops, just ignore these. DEBUG_SECTION_MISMATCH has some false negatives.
PATCH v2 1/3 x86_32: apic/es7000_32, fix section mismatch
In reply to Jiri SlabyRemove __init section placement for some functions, so that we don't get section mismatch warnings.
[v2]:
2 of them were not caught by
DEBUG_SECTION_MISMATCH=y
magic. Fix it.
--- arch/x86/kernel/apic/es7000_32.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-)
arch/x86/kernel/apic/es7000_32.c +17 -20
@@ -163,7 +163,7 @@ static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip)return 0 ; } -static int __init es7000_apic_is_cluster (void ) +static int es7000_apic_is_cluster (void ) {/* MPENTIUMIII */ if (boot_cpu_data.x86 == 6 &&
@@ -173,7 +173,7 @@ static int __init es7000_apic_is_cluster(void)return 0 ; } -static void __init setup_unisys (void ) +static void setup_unisys (void ) {/* * Determine the generation of the ES7000 currently running.
@@ -192,7 +192,7 @@ static void __init setup_unisys(void)/* * Parse the OEM Table: */ -static int __init parse_unisys_oem (char *oemptr) +static int parse_unisys_oem (char *oemptr) {int i;int success =0 ;
@@ -254,7 +254,7 @@ static int __init parse_unisys_oem(char *oemptr) }#ifdef CONFIG_ACPI -static int __init find_unisys_acpi_oem_table (unsigned long *oem_addr) +static int find_unisys_acpi_oem_table (unsigned long *oem_addr) {struct acpi_table_header *header =NULL ;struct es7000_oem_table *table;
@@ -285,7 +285,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)return 0 ; } -static void __init unmap_unisys_acpi_oem_table (unsigned long oem_addr) +static void unmap_unisys_acpi_oem_table (unsigned long oem_addr) {if (!oem_addr)return ;
@@ -303,10 +303,10 @@ static int es7000_check_dsdt(void)return 0 ; } -static int __initdata es7000_acpi_ret; +static int es7000_acpi_ret;/* Hook from generic ACPI tables.c */ -static int __init es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {unsigned long oem_addr =0 ;int check_dsdt;
@@ -333,8 +333,7 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)return ret && !es7000_apic_is_cluster (); } -static int __init -es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) {int ret = es7000_acpi_ret;
@@ -342,13 +341,12 @@ es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id) }#else /* !CONFIG_ACPI: */ -static int __init es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {return 0 ; } -static int __init -es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) +static int es7000_acpi_madt_oem_check_cluster (char *oem_id,char *oem_table_id) {return 0 ; }
@@ -362,8 +360,7 @@ static void es7000_spin(int n)rep_nop (); } -static int __init -es7000_mip_write (struct mip_reg *mip_reg) +static int es7000_mip_write (struct mip_reg *mip_reg) {int status =0 ;int spin;
@@ -396,7 +393,7 @@ es7000_mip_write(struct mip_reg *mip_reg)return status; } -static void __init es7000_enable_apic_mode (void ) +static void es7000_enable_apic_mode (void ) {struct mip_reg es7000_mip_reg;int mip_status;
@@ -627,9 +624,9 @@ static int probe_es7000(void)return 0 ; } -static int __initdata es7000_mps_ret; -static __init int -es7000_mps_oem_check (struct mpc_table *mpc,char *oem,char *productid) +static int es7000_mps_ret; +static int es7000_mps_oem_check (struct mpc_table *mpc,char *oem, +char *productid) {int ret =0 ;
@@ -646,8 +643,8 @@ es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)return ret && !es7000_apic_is_cluster (); } -static __init int -es7000_mps_oem_check_cluster (struct mpc_table *mpc,char *oem,char *productid) +static int es7000_mps_oem_check_cluster (struct mpc_table *mpc,char *oem, +char *productid) {int ret = es7000_mps_ret;
Signature · 1 line
1.6.1.3
PATCH v2 2/3 x86_32: apic/summit_32, fix section mismatch
In reply to Jiri SlabyRemove __init section placement for some functions/data, so that we don't get section mismatch warnings.
Also make inline function instead of empty setup_summit macro.
[v2]
One of them was not caught by
DEBUG_SECTION_MISMATCH=y
magic. Fix it.
--- arch/x86/kernel/apic/summit_32.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
arch/x86/kernel/apic/summit_32.c +9 -9
@@ -77,9 +77,9 @@ static void summit_send_IPI_all(int vector)extern int use_cyclone;#ifdef CONFIG_X86_SUMMIT_NUMA -extern void setup_summit (void ); +static void setup_summit (void );#else -#define setup_summit () {} +static inline void setup_summit (void ) {}#endif static int summit_mps_oem_check(struct mpc_table *mpc, char *oem,
@@ -360,15 +360,15 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask) }#ifdef CONFIG_X86_SUMMIT_NUMA -static struct rio_table_hdr *rio_table_hdr__initdata ; -static struct scal_detail *scal_devs[MAX_NUMNODES ]__initdata ; -static struct rio_detail *rio_devs[MAX_NUMNODES *4 ]__initdata ; +static struct rio_table_hdr *rio_table_hdr; +static struct scal_detail *scal_devs[MAX_NUMNODES ]; +static struct rio_detail *rio_devs[MAX_NUMNODES *4 ];#ifndef CONFIG_X86_NUMAQ -static int mp_bus_id_to_node[MAX_MP_BUSSES ]__initdata ; +static int mp_bus_id_to_node[MAX_MP_BUSSES ];#endif -static int __init setup_pci_node_map_for_wpeg (int wpeg_num,int last_bus) +static int setup_pci_node_map_for_wpeg (int wpeg_num,int last_bus) {int twister =0 , node =0 ;int i, bus, num_buses;
@@ -430,7 +430,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)return bus; } -static int __init build_detail_arrays (void ) +static int build_detail_arrays (void ) {unsigned long ptr;int i, scal_detail_size, rio_detail_size;
@@ -464,7 +464,7 @@ static int __init build_detail_arrays(void)return 1 ; } -void __init setup_summit (void ) +void setup_summit (void ) {unsigned long ptr;unsigned short offset;
Signature · 1 line
1.6.1.3
PATCH v2 3/3 x86_32: apic/numaq_32, fix section mismatch
In reply to Jiri SlabyRemove __cpuinitdata section placement for translation_table structure, since it is referenced from a functions within .text.
--- arch/x86/kernel/apic/numaq_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apic/numaq_32.c +1 -1
@@ -69,7 +69,7 @@ struct mpc_trans {/* x86_quirks member */ static int mpc_record; -static __cpuinitdata struct mpc_trans *translation_table[MAX_MPC_ENTRY ]; +static struct mpc_trans *translation_table[MAX_MPC_ENTRY ];int mp_bus_id_to_node[MAX_MP_BUSSES ];int mp_bus_id_to_local[MAX_MP_BUSSES ];
Signature · 1 line
1.6.1.3