|
@@ -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;
|