patch-2.3.16 linux/arch/sparc/kernel/sun4m_smp.c

Next file: linux/arch/sparc/kernel/sun4setup.c
Previous file: linux/arch/sparc/kernel/sun4m_irq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/arch/sparc/kernel/sun4m_smp.c linux/arch/sparc/kernel/sun4m_smp.c
@@ -77,7 +77,7 @@
 static void smp_setup_percpu_timer(void);
 extern void cpu_probe(void);
 
-__initfunc(void smp4m_callin(void))
+void __init smp4m_callin(void)
 {
 	int cpuid = hard_smp_processor_id();
 
@@ -135,7 +135,7 @@
 extern unsigned long trapbase_cpu2[];
 extern unsigned long trapbase_cpu3[];
 
-__initfunc(void smp4m_boot_cpus(void))
+void __init smp4m_boot_cpus(void)
 {
 	int cpucount = 0;
 	int i = 0;
@@ -479,7 +479,7 @@
 
 extern unsigned int lvl14_resolution;
 
-__initfunc(static void smp_setup_percpu_timer(void))
+static void __init smp_setup_percpu_timer(void)
 {
 	int cpu = smp_processor_id();
 
@@ -490,7 +490,7 @@
 		enable_pil_irq(14);
 }
 
-__initfunc(void smp4m_blackbox_id(unsigned *addr))
+void __init smp4m_blackbox_id(unsigned *addr)
 {
 	int rd = *addr & 0x3e000000;
 	int rs1 = rd >> 11;
@@ -500,7 +500,7 @@
 	addr[2] = 0x80082003 | rd | rs1;	/* and reg, 3, reg */
 }
 
-__initfunc(void smp4m_blackbox_current(unsigned *addr))
+void __init smp4m_blackbox_current(unsigned *addr)
 {
 	int rd = *addr & 0x3e000000;
 	int rs1 = rd >> 11;
@@ -510,7 +510,7 @@
 	addr[4] = 0x8008200c | rd | rs1;	/* and reg, 3, reg */
 }
 
-__initfunc(void sun4m_init_smp(void))
+void __init sun4m_init_smp(void)
 {
 	BTFIXUPSET_BLACKBOX(smp_processor_id, smp4m_blackbox_id);
 	BTFIXUPSET_BLACKBOX(load_current, smp4m_blackbox_current);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)