diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-31 04:40:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-31 04:40:12 -0400 |
commit | 10d29ff9070caf5810d37ab06e30f7acad278f1e (patch) | |
tree | d958e32d597cae496a541a5e582460b886ff32a4 /arch | |
parent | d7472c389ee1044d04af8a5b7c51aa7af96ed2db (diff) |
sparc64: Delete starfire_cpu_setup().
It does nothing.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/include/asm/starfire.h | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/central.c | 5 | ||||
-rw-r--r-- | arch/sparc64/kernel/starfire.c | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h index 07bafd31e33c..d56ce60a5992 100644 --- a/arch/sparc/include/asm/starfire.h +++ b/arch/sparc/include/asm/starfire.h | |||
@@ -12,7 +12,6 @@ | |||
12 | extern int this_is_starfire; | 12 | extern int this_is_starfire; |
13 | 13 | ||
14 | extern void check_if_starfire(void); | 14 | extern void check_if_starfire(void); |
15 | extern void starfire_cpu_setup(void); | ||
16 | extern int starfire_hard_smp_processor_id(void); | 15 | extern int starfire_hard_smp_processor_id(void); |
17 | extern void starfire_hookup(int); | 16 | extern void starfire_hookup(int); |
18 | extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid); | 17 | extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid); |
diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c index f2e87d0d7e1d..68c91b232bec 100644 --- a/arch/sparc64/kernel/central.c +++ b/arch/sparc64/kernel/central.c | |||
@@ -306,11 +306,8 @@ void __init central_probe(void) | |||
306 | int err; | 306 | int err; |
307 | 307 | ||
308 | dp = of_find_node_by_name(NULL, "central"); | 308 | dp = of_find_node_by_name(NULL, "central"); |
309 | if (!dp) { | 309 | if (!dp) |
310 | if (this_is_starfire) | ||
311 | starfire_cpu_setup(); | ||
312 | return; | 310 | return; |
313 | } | ||
314 | 311 | ||
315 | /* Ok we got one, grab some memory for software state. */ | 312 | /* Ok we got one, grab some memory for software state. */ |
316 | central_bus = (struct linux_central *) | 313 | central_bus = (struct linux_central *) |
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index 7461581b3bb9..060d0f3a6151 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c | |||
@@ -28,11 +28,6 @@ void check_if_starfire(void) | |||
28 | this_is_starfire = 1; | 28 | this_is_starfire = 1; |
29 | } | 29 | } |
30 | 30 | ||
31 | void starfire_cpu_setup(void) | ||
32 | { | ||
33 | /* Currently, nothing to do. */ | ||
34 | } | ||
35 | |||
36 | int starfire_hard_smp_processor_id(void) | 31 | int starfire_hard_smp_processor_id(void) |
37 | { | 32 | { |
38 | return upa_readl(0x1fff40000d0UL); | 33 | return upa_readl(0x1fff40000d0UL); |