sparc32 cpuinit flase positives
PATCH 4/32 sparc32 cpuinit flase positives
All noise since we don't have CPU hotplug there. However, they did expose something very odd-looking in there - poke_viking() does a bunch of identical btfixup each time it's called (i.e. for each CPU). That one is left alone for now; just the trivial misannotation fixes.
--- arch/sparc/kernel/cpu.c | 2 +- arch/sparc/kernel/smp.c | 4 ++-- arch/sparc/kernel/sun4d_smp.c | 4 ++-- arch/sparc/kernel/sun4m_smp.c | 2 +- arch/sparc/kernel/trampoline.S | 4 ++-- arch/sparc/mm/srmmu.c | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-)
arch/sparc/kernel/cpu.c +1 -1
@@ -126,7 +126,7 @@ char *sparc_fpu_type;unsigned int fsr_storage; -void __init cpu_probe (void ) +void __cpuinit cpu_probe (void ) {int psr_impl, psr_vers, fpu_vers;int i, psr;
arch/sparc/kernel/smp.c +2 -2
@@ -35,7 +35,7 @@#include "irq.h" -volatile unsigned long cpu_callin_map[NR_CPUS ]__initdata = {0 ,}; +volatile unsigned long cpu_callin_map[NR_CPUS ]__cpuinitdata = {0 ,};unsigned char boot_cpu_id =0 ;unsigned char boot_cpu_id4 =0 ;/* boot_cpu_id << 2 */
@@ -120,7 +120,7 @@ void cpu_panic(void)panic ("SMP bolixed\n" ); } -struct linux_prom_registers smp_penguin_ctable__initdata = {0 }; +struct linux_prom_registers smp_penguin_ctable__cpuinitdata = {0 };void smp_send_reschedule (int cpu) {
arch/sparc/kernel/sun4d_smp.c +2 -2
@@ -83,7 +83,7 @@ static inline void show_leds(int cpuid) "i" (ASI_M_CTL)); } -void __init smp4d_callin (void ) +void __cpuinit smp4d_callin (void ) {int cpuid =hard_smp4d_processor_id ();extern spinlock_t sun4d_imsk_lock;
@@ -386,7 +386,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)extern unsigned int lvl14_resolution; -static void __init smp_setup_percpu_timer (void ) +static void __cpuinit smp_setup_percpu_timer (void ) {int cpu =hard_smp4d_processor_id ();
arch/sparc/kernel/sun4m_smp.c +1 -1
@@ -343,7 +343,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)extern unsigned int lvl14_resolution; -static void __init smp_setup_percpu_timer (void ) +static void __cpuinit smp_setup_percpu_timer (void ) {int cpu =smp_processor_id ();
arch/sparc/kernel/trampoline.S +2 -2
@@ -18,7 +18,7 @@ .globl sun4m_cpu_startup, __smp4m_processor_id .globl sun4d_cpu_startup, __smp4d_processor_id - __INIT + __CPUINIT .align 4 /* When we start up a cpu for the first time it enters this routine.
@@ -109,7 +109,7 @@ __smp4d_processor_id: /* CPUID in bootbus can be found at PA 0xff0140000 */ #define SUN4D_BOOTBUS_CPUID 0xf0140000 - __INIT + __CPUINIT .align 4 sun4d_cpu_startup:
arch/sparc/mm/srmmu.c +7 -7
@@ -1251,7 +1251,7 @@ static inline void map_kernel(void)/* Paging initialization on the Sparc Reference MMU. */ 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);
@@ -1446,7 +1446,7 @@ static void __init init_vac_layout(void) (int)vac_cache_size, (int)vac_line_size); } -static void __init poke_hypersparc (void ) +static void __cpuinit poke_hypersparc (void ) {volatile unsigned long clear;unsigned long mreg =srmmu_get_mmureg ();
@@ -1501,7 +1501,7 @@ static void __init init_hypersparc(void)hypersparc_setup_blockops (); } -static void __init poke_cypress (void ) +static void __cpuinit poke_cypress (void ) {unsigned long mreg =srmmu_get_mmureg ();unsigned long faddr, tagval;
@@ -1589,7 +1589,7 @@ static void __init init_cypress_605(unsigned long mrev)init_cypress_common (); } -static void __init poke_swift (void ) +static void __cpuinit poke_swift (void ) {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 ccreg;
@@ -1834,7 +1834,7 @@ static void __init init_turbosparc(void) poke_srmmu = poke_turbosparc; } -static void __init poke_tsunami (void ) +static void __cpuinit poke_tsunami (void ) {unsigned long mreg =srmmu_get_mmureg ();
@@ -1876,7 +1876,7 @@ static void __init init_tsunami(void)tsunami_setup_blockops (); } -static void __init poke_viking (void ) +static void __cpuinit poke_viking (void ) {unsigned long mreg =srmmu_get_mmureg ();static int smp_catch;
From: Al Viro <[email protected]>
Date: Sat, 22 Nov 2008 17:33:54 +0000
Quoted 8 lines
All noise since we don't have CPU hotplug there. However, they did expose something very odd-looking in there -
poke_viking()does a bunch of identical btfixup each time it's called (i.e. for each CPU). That one is left alone for now; just the trivial misannotation fixes.Signed-off-by Al Viro <[email protected]>
Applied, thanks Al.
The local MMU register inits do need to happen for all cpus, so what I'll do is move the btfixups to where we assign poke_srmmu to poke_viking, so that they occur only once.