From 9fb4aa8723f6b332ee3089dc59c9ff7dcf2c0d47 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Wed, 13 Feb 2013 12:19:03 +0000
Subject: [PATCH] metag: move traps.c exports out of metag_ksyms.c

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 63606f8..138317c 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 202be40..5cad156 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)
 {
-- 
2.7.4