cpuinfo_op: consolidate extern declaration
All the architectures supported by the kernel also support
/proc/cpuinfo. Only a couple actually declare the seq_operations
as extern. All the others will produce a sparse warning like:
warning: symbol 'cpuinfo_op' was not declared. Should it be static?
Fix all the warnings and consolidate the declaration by putting it
in <linux/seq_file.h>.
Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: H. Peter Anvin <[email protected]>
---
arch/microblaze/include/asm/processor.h | 2 --
arch/sh/include/asm/processor.h | 4 ----
arch/x86/include/asm/processor.h | 2 --
fs/proc/cpuinfo.c | 1 -
include/linux/seq_file.h | 6 ++++++
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 563c6b9..e2f8c73 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -19,8 +19,6 @@
#include <asm/current.h>
# ifndef __ASSEMBLY__
-/* from kernel/cpu/mb.c */
-extern const struct seq_operations cpuinfo_op;
# define cpu_relax() barrier()
# define cpu_sleep() do {} while (0)
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index 017e0c1..fb4f942 100644
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -96,14 +96,10 @@ extern struct sh_cpuinfo cpu_data[];
#define cpu_sleep() __asm__ __volatile__ ("sleep" : : : "memory")
#define cpu_relax() barrier()
-/* Forward decl */
-struct seq_operations;
-
extern struct pt_regs fake_swapper_regs;
/* arch/sh/kernel/setup.c */
const char *get_cpu_subtype(struct sh_cpuinfo *c);
-extern const struct seq_operations cpuinfo_op;
/* processor boot mode configuration */
#define MODE_PIN0 (1 << 0)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index fc801ba..5c17303 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -149,8 +149,6 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
#define current_cpu_data boot_cpu_data
#endif
-extern const struct seq_operations cpuinfo_op;
-
static inline int hlt_works(int cpu)
{
#ifdef CONFIG_X86_32
diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c
index 5a1e539..f8eea8e 100644
--- a/fs/proc/cpuinfo.c
+++ b/fs/proc/cpuinfo.c
@@ -3,7 +3,6 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-extern const struct seq_operations cpuinfo_op;
static int cpuinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &cpuinfo_op);
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 8366d8f..ab13819 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -33,6 +33,12 @@ struct seq_operations {
int (*show) (struct seq_file *m, void *v);
};
+/*
+ * All architectures support /proc/cpuinfo
+ * Define the seq_operations here to keep things clean.
+ */
+extern const struct seq_operations cpuinfo_op;
+
#define SEQ_SKIP 1
/**
On Thu, Jan 14, 2010 at 11:58:09AM -0700, H Hartley Sweeten wrote:
> cpuinfo_op: consolidate extern declaration
>
> All the architectures supported by the kernel also support
> /proc/cpuinfo. Only a couple actually declare the seq_operations
> as extern. All the others will produce a sparse warning like:
>
> warning: symbol 'cpuinfo_op' was not declared. Should it be static?
>
> Fix all the warnings and consolidate the declaration by putting it
> in <linux/seq_file.h>.
>
> Signed-off-by: H Hartley Sweeten <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Michal Simek <[email protected]>
> Cc: Paul Mundt <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
>
I guess we know from this list which architectures run sparse ;-)
Acked-by: Paul Mundt <[email protected]>
H Hartley Sweeten wrote:
> cpuinfo_op: consolidate extern declaration
>
> All the architectures supported by the kernel also support
> /proc/cpuinfo. Only a couple actually declare the seq_operations
> as extern. All the others will produce a sparse warning like:
>
> warning: symbol 'cpuinfo_op' was not declared. Should it be static?
>
> Fix all the warnings and consolidate the declaration by putting it
> in <linux/seq_file.h>.
>
> Signed-off-by: H Hartley Sweeten <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Michal Simek <[email protected]>
> Cc: Paul Mundt <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
>
Tested-by: Michal Simek <[email protected]>
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian