summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2013-02-13 12:19:03 +0000
committerJames Hogan <james.hogan@imgtec.com>2013-03-02 20:11:14 +0000
commit9fb4aa8723f6b332ee3089dc59c9ff7dcf2c0d47 (patch)
tree2c69f2ed034ca57ab8f172f75fe6c8659f9cdf62
parentfa771d029af8f8a23089c97b6ab6a5745e98ad7e (diff)
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>
-rw-r--r--arch/metag/kernel/metag_ksyms.c5
-rw-r--r--arch/metag/kernel/traps.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/metag/kernel/metag_ksyms.c b/arch/metag/kernel/metag_ksyms.c
index 63606f8aa86..138317cfb51 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 202be405771..5cad15601cf 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)
{