diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-07 00:02:08 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-07 00:02:08 -0800 |
commit | 53ae341926b1238af3170f2f306f52a22430776c (patch) | |
tree | 6880ddd6b7e0e6bb317f05c1c2700c8f7ed0a445 /arch | |
parent | 7e7e93a22851f7bf0cbb7cd70878ebd811e4a044 (diff) | |
download | linux-53ae341926b1238af3170f2f306f52a22430776c.tar.gz linux-53ae341926b1238af3170f2f306f52a22430776c.tar.bz2 linux-53ae341926b1238af3170f2f306f52a22430776c.zip |
sparc: fix sparse warnings in cpu_*.c
o declare variables from cpu_*.c
o declare function from cpu_32.c
To do this introduce a new header "kernel.h" which is local to kernel/
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/cpu_32.c | 6 | ||||
-rw-r--r-- | arch/sparc/kernel/cpu_64.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/entry.h | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/kernel.h | 8 | ||||
-rw-r--r-- | arch/sparc/kernel/setup_32.c | 5 | ||||
-rw-r--r-- | arch/sparc/kernel/setup_64.c | 1 |
6 files changed, 16 insertions, 8 deletions
diff --git a/arch/sparc/kernel/cpu_32.c b/arch/sparc/kernel/cpu_32.c index cdaf7630df81..4e14240f9ce3 100644 --- a/arch/sparc/kernel/cpu_32.c +++ b/arch/sparc/kernel/cpu_32.c @@ -15,6 +15,8 @@ #include <asm/mbus.h> #include <asm/cpudata.h> +#include "kernel.h" + DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 }; struct cpu_iu_info { @@ -125,8 +127,8 @@ static struct cpu_iu_info linux_sparc_chips[] = { #define NSPARCCHIPS ARRAY_SIZE(linux_sparc_chips) -char *sparc_cpu_type; -char *sparc_fpu_type; +const char *sparc_cpu_type; +const char *sparc_fpu_type; unsigned int fsr_storage; diff --git a/arch/sparc/kernel/cpu_64.c b/arch/sparc/kernel/cpu_64.c index 0c9ac83ed0a8..4a81ed744477 100644 --- a/arch/sparc/kernel/cpu_64.c +++ b/arch/sparc/kernel/cpu_64.c @@ -16,6 +16,7 @@ #include <asm/oplib.h> #include "entry.h" +#include "kernel.h" DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 }; diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h index 34d7ab5e10d2..a9ab19aa0411 100644 --- a/arch/sparc/kernel/entry.h +++ b/arch/sparc/kernel/entry.h @@ -5,9 +5,6 @@ #include <linux/types.h> #include <linux/init.h> -extern const char *sparc_cpu_type; -extern const char *sparc_fpu_type; - extern void __init per_cpu_patch(void); extern void __init sun4v_patch(void); extern void __init boot_cpu_id_too_large(int cpu); diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h new file mode 100644 index 000000000000..7f02aad2e1ab --- /dev/null +++ b/arch/sparc/kernel/kernel.h @@ -0,0 +1,8 @@ +/* cpu.c */ +extern const char *sparc_cpu_type; +extern const char *sparc_fpu_type; + +extern unsigned int fsr_storage; + +extern void cpu_probe(void); + diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index d21abbe26360..c96c65d1b58b 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -46,6 +46,8 @@ #include <asm/cpudata.h> #include <asm/setup.h> +#include "kernel.h" + struct screen_info screen_info = { 0, 0, /* orig-x, orig-y */ 0, /* unused */ @@ -308,9 +310,6 @@ void __init setup_arch(char **cmdline_p) smp_setup_cpu_possible_map(); } -extern char *sparc_cpu_type; -extern char *sparc_fpu_type; - static int ncpus_probed; static int show_cpuinfo(struct seq_file *m, void *__unused) diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index c8b03a4f68bf..555db7452ebe 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -52,6 +52,7 @@ #endif #include "entry.h" +#include "kernel.h" /* Used to synchronize accesses to NatSemi SUPER I/O chip configure * operations in asm/ns87303.h |