diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2009-09-08 13:38:52 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-09-10 21:27:57 -0400 |
commit | 757cbd46d11cfa7506b7dd5dd6657ae645bf6a17 (patch) | |
tree | e8d13af7e6fcf5ef34f24dc4f2538b9f1f31d4c1 /arch/powerpc/platforms/85xx | |
parent | 8708d002c416b8bf87351bc626d15d7407896edb (diff) |
powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
The following commit introduced a compile error since it removed
the implementation of smp_85xx_basic_setup:
commit 77c0a700c1c292edafa11c1e52821ce4636f81b0
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri Aug 28 14:25:04 2009 +1000
powerpc: Properly start decrementer on BookE secondary CPUs
Make it so that smp_ops probe() and setup_cpu() can be set to NULL.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 94f901da4918..04160a4cc699 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c | |||
@@ -88,25 +88,15 @@ struct smp_ops_t smp_85xx_ops = { | |||
88 | .kick_cpu = smp_85xx_kick_cpu, | 88 | .kick_cpu = smp_85xx_kick_cpu, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static int __init smp_dummy_probe(void) | ||
92 | { | ||
93 | return NR_CPUS; | ||
94 | } | ||
95 | |||
96 | void __init mpc85xx_smp_init(void) | 91 | void __init mpc85xx_smp_init(void) |
97 | { | 92 | { |
98 | struct device_node *np; | 93 | struct device_node *np; |
99 | 94 | ||
100 | smp_85xx_ops.message_pass = NULL; | ||
101 | |||
102 | np = of_find_node_by_type(NULL, "open-pic"); | 95 | np = of_find_node_by_type(NULL, "open-pic"); |
103 | if (np) { | 96 | if (np) { |
104 | smp_85xx_ops.probe = smp_mpic_probe; | 97 | smp_85xx_ops.probe = smp_mpic_probe; |
105 | smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu; | 98 | smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu; |
106 | smp_85xx_ops.message_pass = smp_mpic_message_pass; | 99 | smp_85xx_ops.message_pass = smp_mpic_message_pass; |
107 | } else { | ||
108 | smp_85xx_ops.probe = smp_dummy_probe; | ||
109 | smp_85xx_ops.setup_cpu = smp_85xx_basic_setup; | ||
110 | } | 100 | } |
111 | 101 | ||
112 | if (cpu_has_feature(CPU_FTR_DBELL)) | 102 | if (cpu_has_feature(CPU_FTR_DBELL)) |