|
@@ -1251,7 +1251,7 @@ static inline void map_kernel(void)
|
|
/* Paging initialization on the Sparc Reference MMU. */
|
|
/* Paging initialization on the Sparc Reference MMU. */
|
|
extern void sparc_context_init(int);
|
|
extern void sparc_context_init(int);
|
|
|
|
|
|
-void (*poke_srmmu)(void) __initdata = NULL;
|
|
|
|
|
|
+void (*poke_srmmu)(void) __cpuinitdata = NULL;
|
|
|
|
|
|
extern unsigned long bootmem_init(unsigned long *pages_avail);
|
|
extern unsigned long bootmem_init(unsigned long *pages_avail);
|
|
|
|
|
|
@@ -1446,7 +1446,7 @@ static void __init init_vac_layout(void)
|
|
(int)vac_cache_size, (int)vac_line_size);
|
|
(int)vac_cache_size, (int)vac_line_size);
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init poke_hypersparc(void)
|
|
|
|
|
|
+static void __cpuinit poke_hypersparc(void)
|
|
{
|
|
{
|
|
volatile unsigned long clear;
|
|
volatile unsigned long clear;
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
@@ -1501,7 +1501,7 @@ static void __init init_hypersparc(void)
|
|
hypersparc_setup_blockops();
|
|
hypersparc_setup_blockops();
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init poke_cypress(void)
|
|
|
|
|
|
+static void __cpuinit poke_cypress(void)
|
|
{
|
|
{
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long faddr, tagval;
|
|
unsigned long faddr, tagval;
|
|
@@ -1589,7 +1589,7 @@ static void __init init_cypress_605(unsigned long mrev)
|
|
init_cypress_common();
|
|
init_cypress_common();
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init poke_swift(void)
|
|
|
|
|
|
+static void __cpuinit poke_swift(void)
|
|
{
|
|
{
|
|
unsigned long mreg;
|
|
unsigned long mreg;
|
|
|
|
|
|
@@ -1771,7 +1771,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-static void __init poke_turbosparc(void)
|
|
|
|
|
|
+static void __cpuinit poke_turbosparc(void)
|
|
{
|
|
{
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long ccreg;
|
|
unsigned long ccreg;
|
|
@@ -1834,7 +1834,7 @@ static void __init init_turbosparc(void)
|
|
poke_srmmu = poke_turbosparc;
|
|
poke_srmmu = poke_turbosparc;
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init poke_tsunami(void)
|
|
|
|
|
|
+static void __cpuinit poke_tsunami(void)
|
|
{
|
|
{
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
|
|
|
|
@@ -1876,7 +1876,7 @@ static void __init init_tsunami(void)
|
|
tsunami_setup_blockops();
|
|
tsunami_setup_blockops();
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init poke_viking(void)
|
|
|
|
|
|
+static void __cpuinit poke_viking(void)
|
|
{
|
|
{
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
unsigned long mreg = srmmu_get_mmureg();
|
|
static int smp_catch;
|
|
static int smp_catch;
|