Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409832f5 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ea8fb9c

arch/sparc/kernel/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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: