Skip to content

Commit

Permalink
x86_32: apic/summit_32, fix section mismatch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and Ingo Molnar committed Mar 2, 2009
1 parent 871d78c commit 2fcb1f1
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions arch/x86/kernel/apic/summit_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2fcb1f1

Please sign in to comment.