diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2011-01-28 17:08:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:08 -0400 |
commit | b7afdb7e85d97294efa24fbfef7b1fa196ca808c (patch) | |
tree | 2e7e8c1ceb01e11cb5c5150c6b2f69b4eb66a6eb /arch/sparc/kernel/setup_32.c | |
parent | e046b1e978f82e29da7670d6d680567e30dec69a (diff) |
sparc32: add irq + smp declarations to headers
In preparation for cleaning up a number of files add
declarations for irq and smp related data/functions to
the relevant headers.
This showed that the extern declaration of cputypval differed
in the two files where it was used.
As cputypval is defined like this:
cputypval:
.asciz "sun4c"
the correct representation is a char array.
Fix users to use the new declaration.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/setup_32.c')
-rw-r--r-- | arch/sparc/kernel/setup_32.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 648f2161b851..7b8b76c9557f 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c | |||
@@ -184,7 +184,6 @@ static void __init boot_flags_init(char *commands) | |||
184 | */ | 184 | */ |
185 | 185 | ||
186 | extern void sun4c_probe_vac(void); | 186 | extern void sun4c_probe_vac(void); |
187 | extern char cputypval; | ||
188 | 187 | ||
189 | extern unsigned short root_flags; | 188 | extern unsigned short root_flags; |
190 | extern unsigned short root_dev; | 189 | extern unsigned short root_dev; |
@@ -218,21 +217,21 @@ void __init setup_arch(char **cmdline_p) | |||
218 | 217 | ||
219 | /* Set sparc_cpu_model */ | 218 | /* Set sparc_cpu_model */ |
220 | sparc_cpu_model = sun_unknown; | 219 | sparc_cpu_model = sun_unknown; |
221 | if (!strcmp(&cputypval,"sun4 ")) | 220 | if (!strcmp(&cputypval[0], "sun4 ")) |
222 | sparc_cpu_model = sun4; | 221 | sparc_cpu_model = sun4; |
223 | if (!strcmp(&cputypval,"sun4c")) | 222 | if (!strcmp(&cputypval[0], "sun4c")) |
224 | sparc_cpu_model = sun4c; | 223 | sparc_cpu_model = sun4c; |
225 | if (!strcmp(&cputypval,"sun4m")) | 224 | if (!strcmp(&cputypval[0], "sun4m")) |
226 | sparc_cpu_model = sun4m; | 225 | sparc_cpu_model = sun4m; |
227 | if (!strcmp(&cputypval,"sun4s")) | 226 | if (!strcmp(&cputypval[0], "sun4s")) |
228 | sparc_cpu_model = sun4m; /* CP-1200 with PROM 2.30 -E */ | 227 | sparc_cpu_model = sun4m; /* CP-1200 with PROM 2.30 -E */ |
229 | if (!strcmp(&cputypval,"sun4d")) | 228 | if (!strcmp(&cputypval[0], "sun4d")) |
230 | sparc_cpu_model = sun4d; | 229 | sparc_cpu_model = sun4d; |
231 | if (!strcmp(&cputypval,"sun4e")) | 230 | if (!strcmp(&cputypval[0], "sun4e")) |
232 | sparc_cpu_model = sun4e; | 231 | sparc_cpu_model = sun4e; |
233 | if (!strcmp(&cputypval,"sun4u")) | 232 | if (!strcmp(&cputypval[0], "sun4u")) |
234 | sparc_cpu_model = sun4u; | 233 | sparc_cpu_model = sun4u; |
235 | if (!strncmp(&cputypval, "leon" , 4)) | 234 | if (!strncmp(&cputypval[0], "leon" , 4)) |
236 | sparc_cpu_model = sparc_leon; | 235 | sparc_cpu_model = sparc_leon; |
237 | 236 | ||
238 | printk("ARCH: "); | 237 | printk("ARCH: "); |
@@ -335,7 +334,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) | |||
335 | prom_rev, | 334 | prom_rev, |
336 | romvec->pv_printrev >> 16, | 335 | romvec->pv_printrev >> 16, |
337 | romvec->pv_printrev & 0xffff, | 336 | romvec->pv_printrev & 0xffff, |
338 | &cputypval, | 337 | &cputypval[0], |
339 | ncpus_probed, | 338 | ncpus_probed, |
340 | num_online_cpus() | 339 | num_online_cpus() |
341 | #ifndef CONFIG_SMP | 340 | #ifndef CONFIG_SMP |