aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 04:37:51 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:08 -0500
commit6c81c32f9616fd6f2795dceae2f70943cb4d8609 (patch)
treefcafa4b8b071fc9d3a8ea87fd7a1fefca965a5a4 /arch/sparc
parenteb38a996ebacefe4ce2274de901138505d9cc96b (diff)
calibrate_delay() must be __cpuinit
calibrate_delay() must be __cpuinit, not __{dev,}init. I've verified that this is correct for all users. While doing the latter, I also did the following cleanups: - remove pointless additional prototypes in C files - ensure all users #include <linux/delay.h> This fixes the following section mismatches with CONFIG_HOTPLUG=n, CONFIG_HOTPLUG_CPU=y: WARNING: vmlinux.o(.text+0x1128d): Section mismatch: reference to .init.text.1:calibrate_delay (between 'check_cx686_slop' and 'set_cx86_reorder') WARNING: vmlinux.o(.text+0x25102): Section mismatch: reference to .init.text.1:calibrate_delay (between 'smp_callin' and 'cpu_coregroup_map') Signed-off-by: Adrian Bunk <bunk@kernel.org> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Christian Zankel <chris@zankel.net> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/sun4d_smp.c4
-rw-r--r--arch/sparc/kernel/sun4m_smp.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 89a6de95070c..0def48158c7d 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -19,12 +19,12 @@
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/swap.h> 20#include <linux/swap.h>
21#include <linux/profile.h> 21#include <linux/profile.h>
22#include <linux/delay.h>
22 23
23#include <asm/ptrace.h> 24#include <asm/ptrace.h>
24#include <asm/atomic.h> 25#include <asm/atomic.h>
25#include <asm/irq_regs.h> 26#include <asm/irq_regs.h>
26 27
27#include <asm/delay.h>
28#include <asm/irq.h> 28#include <asm/irq.h>
29#include <asm/page.h> 29#include <asm/page.h>
30#include <asm/pgalloc.h> 30#include <asm/pgalloc.h>
@@ -41,8 +41,6 @@
41 41
42extern ctxd_t *srmmu_ctx_table_phys; 42extern ctxd_t *srmmu_ctx_table_phys;
43 43
44extern void calibrate_delay(void);
45
46static volatile int smp_processors_ready = 0; 44static volatile int smp_processors_ready = 0;
47static int smp_highest_cpu; 45static int smp_highest_cpu;
48extern volatile unsigned long cpu_callin_map[NR_CPUS]; 46extern volatile unsigned long cpu_callin_map[NR_CPUS];
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 730eb5796f8e..0b9407267162 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -16,6 +16,8 @@
16#include <linux/mm.h> 16#include <linux/mm.h>
17#include <linux/swap.h> 17#include <linux/swap.h>
18#include <linux/profile.h> 18#include <linux/profile.h>
19#include <linux/delay.h>
20
19#include <asm/cacheflush.h> 21#include <asm/cacheflush.h>
20#include <asm/tlbflush.h> 22#include <asm/tlbflush.h>
21#include <asm/irq_regs.h> 23#include <asm/irq_regs.h>
@@ -23,7 +25,6 @@
23#include <asm/ptrace.h> 25#include <asm/ptrace.h>
24#include <asm/atomic.h> 26#include <asm/atomic.h>
25 27
26#include <asm/delay.h>
27#include <asm/irq.h> 28#include <asm/irq.h>
28#include <asm/page.h> 29#include <asm/page.h>
29#include <asm/pgalloc.h> 30#include <asm/pgalloc.h>
@@ -39,8 +40,6 @@
39 40
40extern ctxd_t *srmmu_ctx_table_phys; 41extern ctxd_t *srmmu_ctx_table_phys;
41 42
42extern void calibrate_delay(void);
43
44extern volatile unsigned long cpu_callin_map[NR_CPUS]; 43extern volatile unsigned long cpu_callin_map[NR_CPUS];
45extern unsigned char boot_cpu_id; 44extern unsigned char boot_cpu_id;
46 45