aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-03-02 05:34:28 -0500
committerIngo Molnar <mingo@elte.hu>2009-03-02 06:00:25 -0500
commit2fcb1f1f38e9b10ee5f339be4e17ba5cad9b4421 (patch)
treeb739fdad46ed9d65b4d936282a8699c810ac7b47 /arch/x86
parent871d78c6d9fc83b2ad584788a175fcfca07a3666 (diff)
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. [v2] One of them was not caught by DEBUG_SECTION_MISMATCH=y magic. Fix it. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic/summit_32.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index beda620bee86..aac52fa873ff 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -77,9 +77,9 @@ static void summit_send_IPI_all(int vector)
77extern int use_cyclone; 77extern int use_cyclone;
78 78
79#ifdef CONFIG_X86_SUMMIT_NUMA 79#ifdef CONFIG_X86_SUMMIT_NUMA
80extern void setup_summit(void); 80static void setup_summit(void);
81#else 81#else
82#define setup_summit() {} 82static inline void setup_summit(void) {}
83#endif 83#endif
84 84
85static int summit_mps_oem_check(struct mpc_table *mpc, char *oem, 85static 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)
360} 360}
361 361
362#ifdef CONFIG_X86_SUMMIT_NUMA 362#ifdef CONFIG_X86_SUMMIT_NUMA
363static struct rio_table_hdr *rio_table_hdr __initdata; 363static struct rio_table_hdr *rio_table_hdr;
364static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; 364static struct scal_detail *scal_devs[MAX_NUMNODES];
365static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; 365static struct rio_detail *rio_devs[MAX_NUMNODES*4];
366 366
367#ifndef CONFIG_X86_NUMAQ 367#ifndef CONFIG_X86_NUMAQ
368static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata; 368static int mp_bus_id_to_node[MAX_MP_BUSSES];
369#endif 369#endif
370 370
371static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus) 371static int setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
372{ 372{
373 int twister = 0, node = 0; 373 int twister = 0, node = 0;
374 int i, bus, num_buses; 374 int i, bus, num_buses;
@@ -430,7 +430,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
430 return bus; 430 return bus;
431} 431}
432 432
433static int __init build_detail_arrays(void) 433static int build_detail_arrays(void)
434{ 434{
435 unsigned long ptr; 435 unsigned long ptr;
436 int i, scal_detail_size, rio_detail_size; 436 int i, scal_detail_size, rio_detail_size;
@@ -464,7 +464,7 @@ static int __init build_detail_arrays(void)
464 return 1; 464 return 1;
465} 465}
466 466
467void __init setup_summit(void) 467void setup_summit(void)
468{ 468{
469 unsigned long ptr; 469 unsigned long ptr;
470 unsigned short offset; 470 unsigned short offset;