lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC]: Mark smp init functions as cpuinit

Browse Source 
Fix the smp related section mismatch warnings by marking the smp init
functions as cpuinit.

Signed-off-by: Bob Breuer <breuerr@mc.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bob Breuer
2006-06-20 00:36:10 -07:00
committed by David S. Miller
parent 61fc12d8e5
commit 92d452f0eb
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/kernel/smp.c
View File

@@ -58,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;
/* Used to make bitops atomic */ /* Used to make bitops atomic */
unsigned char bitops_spinlock = 0; unsigned char bitops_spinlock = 0;
void __init smp_store_cpu_info(int id) void __cpuinit smp_store_cpu_info(int id)
{ {
int cpu_node; int cpu_node;
@@ -304,7 +304,7 @@ void __init smp_setup_cpu_possible_map(void)
} }
} }
void __devinit smp_prepare_boot_cpu(void) void __init smp_prepare_boot_cpu(void)
{ {
int cpuid = hard_smp_processor_id(); int cpuid = hard_smp_processor_id();
@@ -320,7 +320,7 @@ void __devinit smp_prepare_boot_cpu(void)
cpu_set(cpuid, phys_cpu_present_map); cpu_set(cpuid, phys_cpu_present_map);
} }
int __devinit __cpu_up(unsigned int cpu) int __cpuinit __cpu_up(unsigned int cpu)
{ {
extern int smp4m_boot_one_cpu(int); extern int smp4m_boot_one_cpu(int);
int ret; int ret;

9
arch/sparc/kernel/sun4m_smp.c
View File

@@ -66,7 +66,7 @@ static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)
static void smp_setup_percpu_timer(void); static void smp_setup_percpu_timer(void);
extern void cpu_probe(void); extern void cpu_probe(void);
void __init smp4m_callin(void) void __cpuinit smp4m_callin(void)
{ {
int cpuid = hard_smp_processor_id(); int cpuid = hard_smp_processor_id();
@@ -112,13 +112,8 @@ void __init smp4m_callin(void)
local_irq_enable(); local_irq_enable();
cpu_set(cpuid, cpu_online_map); cpu_set(cpuid, cpu_online_map);
/* last one in gets all the interrupts (for testing) */
set_irq_udt(boot_cpu_id);
} }
extern void init_IRQ(void);
extern void cpu_panic(void);
/* /*
* Cycle through the processors asking the PROM to start each one. * Cycle through the processors asking the PROM to start each one.
*/ */
@@ -134,7 +129,7 @@ void __init smp4m_boot_cpus(void)
local_flush_cache_all(); local_flush_cache_all();
} }
int smp4m_boot_one_cpu(int i) int __cpuinit smp4m_boot_one_cpu(int i)
{ {
extern unsigned long sun4m_cpu_startup; extern unsigned long sun4m_cpu_startup;
unsigned long *entry = &sun4m_cpu_startup; unsigned long *entry = &sun4m_cpu_startup;