[PATCH 0/6] metag: metag_ksyms.c cleanup

[PATCH 0/6] metag: metag_ksyms.c cleanup

[James Hogan]

Here are some fairly trivial metag_ksyms.c/EXPORT_SYMBOL cleanups which
I'll add to the arch/metag tree for v3.9-rc1.

Basically they move EXPORT_SYMBOLs to after the actual definitions for
those symbols defined in C files, and clean up the includes in
metag_ksyms.c.

James Hogan (6):
  metag: move traps.c exports out of metag_ksyms.c
  metag: move kick.c exports out of metag_ksyms.c
  metag: move setup.c exports out of metag_ksyms.c
  metag: move usercopy.c exports out of metag_ksyms.c
  metag: move mm/init.c exports out of metag_ksyms.c
  metag: cleanup metag_ksyms.c includes

 arch/metag/kernel/kick.c        |    3 +++
 arch/metag/kernel/metag_ksyms.c |   39 +++------------------------------------
 arch/metag/kernel/setup.c       |    3 +++
 arch/metag/kernel/traps.c       |    3 +++
 arch/metag/lib/usercopy.c       |   13 +++++++++++++
 arch/metag/mm/init.c            |    3 +++
 6 files changed, 28 insertions(+), 36 deletions(-)

-- 
1.7.7.6

[PATCH 1/6] metag: move traps.c exports out of metag_ksyms.c

[James Hogan]

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in traps.c into traps.c

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/metag_ksyms.c |    5 -----
 arch/metag/kernel/traps.c       |    3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 1b27bea..12914a4 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -31,11 +31,6 @@ EXPORT_SYMBOL(pTBI_get);
 EXPORT_SYMBOL(meta_memoffset);
 EXPORT_SYMBOL(kick_register_func);
 EXPORT_SYMBOL(kick_unregister_func);
-#ifdef CONFIG_SMP
-EXPORT_SYMBOL(get_trigger_mask);
-#else
-EXPORT_SYMBOL(global_trigger_mask);
-#endif
 
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index d7db772..8961f24 100644
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -8,6 +8,7 @@
  * for more details.
  */
 
+#include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/kernel.h>
@@ -59,6 +60,7 @@ DECLARE_PER_CPU(PTBI, pTBI);
 static DEFINE_PER_CPU(unsigned int, trigger_mask);
 #else
 unsigned int global_trigger_mask;
+EXPORT_SYMBOL(global_trigger_mask);
 #endif
 
 unsigned long per_cpu__stack_save[NR_CPUS];
@@ -787,6 +789,7 @@ unsigned int get_trigger_mask(void)
 {
 	return _get_trigger_mask();
 }
+EXPORT_SYMBOL(get_trigger_mask);
 
 static void set_trigger_mask(unsigned int mask)
 {
-- 
1.7.7.6

[PATCH 2/6] metag: move kick.c exports out of metag_ksyms.c

[James Hogan]

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in kick.c into kick.c

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/kick.c        |    3 +++
 arch/metag/kernel/metag_ksyms.c |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/metag/kernel/kick.c b/arch/metag/kernel/kick.c
index c309096..50fcbec 100644
--- a/arch/metag/kernel/kick.c
+++ b/arch/metag/kernel/kick.c
@@ -25,6 +25,7 @@
  * the KICK handlers require access to a CPU's pTBI structure. So we
  * pass it as an argument.
  */
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/types.h>
@@ -48,6 +49,7 @@ void kick_register_func(struct kick_irq_handler *kh)
 
 	spin_unlock_irqrestore(&kick_handlers_lock, flags);
 }
+EXPORT_SYMBOL(kick_register_func);
 
 void kick_unregister_func(struct kick_irq_handler *kh)
 {
@@ -59,6 +61,7 @@ void kick_unregister_func(struct kick_irq_handler *kh)
 
 	spin_unlock_irqrestore(&kick_handlers_lock, flags);
 }
+EXPORT_SYMBOL(kick_unregister_func);
 
 TBIRES
 kick_handler(TBIRES State, int SigNum, int Triggers, int Inst, PTBI pTBI)
diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 12914a4..53d437f 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__do_clear_user);
 
 EXPORT_SYMBOL(pTBI_get);
 EXPORT_SYMBOL(meta_memoffset);
-EXPORT_SYMBOL(kick_register_func);
-EXPORT_SYMBOL(kick_unregister_func);
 
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
-- 
1.7.7.6

[PATCH 3/6] metag: move setup.c exports out of metag_ksyms.c

[James Hogan]

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in setup.c into setup.c

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/metag_ksyms.c |    5 -----
 arch/metag/kernel/setup.c       |    3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 53d437f..1004e26 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -6,10 +6,8 @@
 #include <linux/interrupt.h>
 #include <linux/hardirq.h>
 
-#include <asm/setup.h>
 #include <asm/checksum.h>
 #include <asm/uaccess.h>
-#include <asm/traps.h>
 #include <asm/ftrace.h>
 #include <asm/tbx.h>
 
@@ -27,9 +25,6 @@ EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(strnlen_user);
 EXPORT_SYMBOL(__do_clear_user);
 
-EXPORT_SYMBOL(pTBI_get);
-EXPORT_SYMBOL(meta_memoffset);
-
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
index 9803ca4..dd6c5ad 100644
--- a/arch/metag/kernel/setup.c
+++ b/arch/metag/kernel/setup.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/export.h>
 #include <linux/bootmem.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
@@ -141,6 +142,7 @@ u8 hwthread_id_2_cpu[4] __read_mostly = {
  * probably only be used via them.
  */
 unsigned int meta_memoffset;
+EXPORT_SYMBOL(meta_memoffset);
 
 static char __initdata *original_cmd_line;
 
@@ -579,6 +581,7 @@ PTBI pTBI_get(unsigned int cpu)
 {
 	return per_cpu(pTBI, cpu);
 }
+EXPORT_SYMBOL(pTBI_get);
 
 #if defined(CONFIG_METAG_DSP) && defined(CONFIG_METAG_FPU)
 char capabilites[] = "dsp fpu";
-- 
1.7.7.6

[PATCH 4/6] metag: move usercopy.c exports out of metag_ksyms.c

[James Hogan]

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in usercopy.c into usercopy.c

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/metag_ksyms.c |   16 ----------------
 arch/metag/lib/usercopy.c       |   13 +++++++++++++
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 1004e26..d3260c6 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -2,29 +2,13 @@
 #include <linux/linkage.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/user.h>
 #include <linux/interrupt.h>
 #include <linux/hardirq.h>
 
 #include <asm/checksum.h>
-#include <asm/uaccess.h>
 #include <asm/ftrace.h>
 #include <asm/tbx.h>
 
-/* uaccess symbols */
-EXPORT_SYMBOL(__copy_user_zeroing);
-EXPORT_SYMBOL(__copy_user);
-EXPORT_SYMBOL(__get_user_asm_b);
-EXPORT_SYMBOL(__get_user_asm_w);
-EXPORT_SYMBOL(__get_user_asm_d);
-EXPORT_SYMBOL(__put_user_asm_b);
-EXPORT_SYMBOL(__put_user_asm_w);
-EXPORT_SYMBOL(__put_user_asm_d);
-EXPORT_SYMBOL(__put_user_asm_l);
-EXPORT_SYMBOL(__strncpy_from_user);
-EXPORT_SYMBOL(strnlen_user);
-EXPORT_SYMBOL(__do_clear_user);
-
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c
index 92f6dbb..b3ebfe9 100644
--- a/arch/metag/lib/usercopy.c
+++ b/arch/metag/lib/usercopy.c
@@ -10,6 +10,7 @@
  * Modified for Meta by Will Newton.
  */
 
+#include <linux/export.h>
 #include <linux/uaccess.h>
 #include <asm/cache.h>			/* def of L1_CACHE_BYTES */
 
@@ -610,6 +611,7 @@ unsigned long __copy_user(void __user *pdst, const void *psrc,
 
 	return retn;
 }
+EXPORT_SYMBOL(__copy_user);
 
 #define __asm_copy_from_user_1(to, from, ret) \
 	__asm_copy_user_cont(to, from, ret,	\
@@ -936,6 +938,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,
 
 	return retn + n;
 }
+EXPORT_SYMBOL(__copy_user_zeroing);
 
 #define __asm_clear_8x64(to, ret) \
 	asm volatile (					\
@@ -1089,6 +1092,7 @@ unsigned long __do_clear_user(void __user *pto, unsigned long pn)
 
 	return retn;
 }
+EXPORT_SYMBOL(__do_clear_user);
 
 unsigned char __get_user_asm_b(const void __user *addr, long *err)
 {
@@ -1112,6 +1116,7 @@ unsigned char __get_user_asm_b(const void __user *addr, long *err)
 		: "D0FrT");
 	return x;
 }
+EXPORT_SYMBOL(__get_user_asm_b);
 
 unsigned short __get_user_asm_w(const void __user *addr, long *err)
 {
@@ -1135,6 +1140,7 @@ unsigned short __get_user_asm_w(const void __user *addr, long *err)
 		: "D0FrT");
 	return x;
 }
+EXPORT_SYMBOL(__get_user_asm_w);
 
 unsigned int __get_user_asm_d(const void __user *addr, long *err)
 {
@@ -1158,6 +1164,7 @@ unsigned int __get_user_asm_d(const void __user *addr, long *err)
 		: "D0FrT");
 	return x;
 }
+EXPORT_SYMBOL(__get_user_asm_d);
 
 long __put_user_asm_b(unsigned int x, void __user *addr)
 {
@@ -1181,6 +1188,7 @@ long __put_user_asm_b(unsigned int x, void __user *addr)
 		: "D0FrT");
 	return err;
 }
+EXPORT_SYMBOL(__put_user_asm_b);
 
 long __put_user_asm_w(unsigned int x, void __user *addr)
 {
@@ -1204,6 +1212,7 @@ long __put_user_asm_w(unsigned int x, void __user *addr)
 		: "D0FrT");
 	return err;
 }
+EXPORT_SYMBOL(__put_user_asm_w);
 
 long __put_user_asm_d(unsigned int x, void __user *addr)
 {
@@ -1227,6 +1236,7 @@ long __put_user_asm_d(unsigned int x, void __user *addr)
 		: "D0FrT");
 	return err;
 }
+EXPORT_SYMBOL(__put_user_asm_d);
 
 long __put_user_asm_l(unsigned long long x, void __user *addr)
 {
@@ -1250,6 +1260,7 @@ long __put_user_asm_l(unsigned long long x, void __user *addr)
 		: "D0FrT");
 	return err;
 }
+EXPORT_SYMBOL(__put_user_asm_l);
 
 long strnlen_user(const char __user *src, long count)
 {
@@ -1286,6 +1297,7 @@ long strnlen_user(const char __user *src, long count)
 
 	return res;
 }
+EXPORT_SYMBOL(strnlen_user);
 
 long __strncpy_from_user(char *dst, const char __user *src, long count)
 {
@@ -1339,3 +1351,4 @@ long __strncpy_from_user(char *dst, const char __user *src, long count)
 
 	return res;
 }
+EXPORT_SYMBOL(__strncpy_from_user);
-- 
1.7.7.6

[PATCH 5/6] metag: move mm/init.c exports out of metag_ksyms.c

[James Hogan]

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in mm/init.c into mm/init.c.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/metag_ksyms.c |    2 --
 arch/metag/mm/init.c            |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index d3260c6..559ea6f 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -11,9 +11,7 @@
 
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
-EXPORT_SYMBOL(empty_zero_page);
 
-EXPORT_SYMBOL(pfn_base);
 #ifdef CONFIG_FLATMEM
 /* needed for the pfn_valid macro */
 EXPORT_SYMBOL(max_pfn);
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index 514376d..504a398 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -3,6 +3,7 @@
  *
  */
 
+#include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
 #include <linux/init.h>
@@ -25,10 +26,12 @@
 #include <asm/fixmap.h>
 
 unsigned long pfn_base;
+EXPORT_SYMBOL(pfn_base);
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;
 
 unsigned long empty_zero_page;
+EXPORT_SYMBOL(empty_zero_page);
 
 extern char __user_gateway_start;
 extern char __user_gateway_end;
-- 
1.7.7.6

[PATCH 6/6] metag: cleanup metag_ksyms.c includes

[James Hogan]

Minimise metag_ksyms.c includes to directly include the <asm/*.h> files
that declare a particular symbol, and not include any unnecessary ones.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
 arch/metag/kernel/metag_ksyms.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 559ea6f..08e9b6f 100644
--- a/arch/metag/kernel/metag_ksyms.c
+++ b/arch/metag/kernel/metag_ksyms.c
@@ -1,12 +1,9 @@
 #include <linux/export.h>
-#include <linux/linkage.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/hardirq.h>
 
-#include <asm/checksum.h>
+#include <asm/div64.h>
 #include <asm/ftrace.h>
+#include <asm/page.h>
+#include <asm/string.h>
 #include <asm/tbx.h>
 
 EXPORT_SYMBOL(clear_page);
-- 
1.7.7.6