提交 2fcb1f1f 编写于 作者: J Jiri Slaby 提交者: Ingo Molnar

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: NJiri Slaby <jirislaby@gmail.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@zytor.com>
上级 871d78c6
...@@ -77,9 +77,9 @@ static void summit_send_IPI_all(int vector) ...@@ -77,9 +77,9 @@ static void summit_send_IPI_all(int vector)
extern int use_cyclone; extern int use_cyclone;
#ifdef CONFIG_X86_SUMMIT_NUMA #ifdef CONFIG_X86_SUMMIT_NUMA
extern void setup_summit(void); static void setup_summit(void);
#else #else
#define setup_summit() {} static inline void setup_summit(void) {}
#endif #endif
static int summit_mps_oem_check(struct mpc_table *mpc, char *oem, 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) ...@@ -360,15 +360,15 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)
} }
#ifdef CONFIG_X86_SUMMIT_NUMA #ifdef CONFIG_X86_SUMMIT_NUMA
static struct rio_table_hdr *rio_table_hdr __initdata; static struct rio_table_hdr *rio_table_hdr;
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; static struct scal_detail *scal_devs[MAX_NUMNODES];
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; static struct rio_detail *rio_devs[MAX_NUMNODES*4];
#ifndef CONFIG_X86_NUMAQ #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 #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 twister = 0, node = 0;
int i, bus, num_buses; 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,7 +430,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
return bus; return bus;
} }
static int __init build_detail_arrays(void) static int build_detail_arrays(void)
{ {
unsigned long ptr; unsigned long ptr;
int i, scal_detail_size, rio_detail_size; int i, scal_detail_size, rio_detail_size;
...@@ -464,7 +464,7 @@ static int __init build_detail_arrays(void) ...@@ -464,7 +464,7 @@ static int __init build_detail_arrays(void)
return 1; return 1;
} }
void __init setup_summit(void) void setup_summit(void)
{ {
unsigned long ptr; unsigned long ptr;
unsigned short offset; unsigned short offset;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册