Skip to contentSkip to conversation

sparc: fix sparse warnings in cpu_*.c

PATCH In review Sam Ravnborg 2 participants 2 messages Dec 6, 2008 – Dec 7, 2008 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

Sam Ravnborg

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

Just a quick sample where kernel.h is introduced. With this I could get rid of a few sparse warnings and the code is better.

Sam

 arch/sparc/kernel/cpu_32.c   |    6 ++++--
 arch/sparc/kernel/cpu_64.c   |    1 +
 arch/sparc/kernel/entry.h    |    3 ---
 arch/sparc/kernel/kernel.h   |    8 ++++++++
 arch/sparc/kernel/setup_32.c |    5 ++---
 arch/sparc/kernel/setup_64.c |    1 +
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 arch/sparc/kernel/kernel.h
arch/sparc/kernel/cpu_32.c +4 -2
index cdaf763..4e14240 100644
@@ -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;
arch/sparc/kernel/cpu_64.c +1 -0
index 0c9ac83..4a81ed7 100644
@@ -16,6 +16,7 @@
 #include <asm/oplib.h>
 
 #include "entry.h"
+#include "kernel.h"
 
 DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
arch/sparc/kernel/entry.h +0 -3
index 34d7ab5..a9ab19a 100644
@@ -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);
arch/sparc/kernel/kernel.h new file +8 -0
new file mode 100644
index 0000000..7f02aad
@@ -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);
+
arch/sparc/kernel/setup_32.c +2 -3
index d21abbe..c96c65d 100644
@@ -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)
arch/sparc/kernel/setup_64.c +1 -0
index c8b03a4..555db74 100644
@@ -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
Signature · 1 line
1.5.6.GIT
maintainer
#1 lore raw

From: Sam Ravnborg <[email protected]>
Date: Sat, 6 Dec 2008 21:11:55 +0100

Quoted 11 lines

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 <[email protected]>

---

Just a quick sample where kernel.h is introduced. With this I could get rid of a few sparse warnings and the code is better.

Looks good, applied.