From d6337892951334e7aa076e944f5e75932ee90a8d 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] --- yaml --- r: 360678 b: refs/heads/master c:
 9fb4aa8723f6b332ee3089dc59c9ff7dcf2c0d47 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/metag/kernel/metag_ksyms.c | 5 -----
 trunk/arch/metag/kernel/traps.c       | 3 +++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b4c2497054a8..e9e59a6a40a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa771d029af8f8a23089c97b6ab6a5745e98ad7e
+refs/heads/master: 9fb4aa8723f6b332ee3089dc59c9ff7dcf2c0d47
diff --git a/trunk/arch/metag/kernel/metag_ksyms.c b/trunk/arch/metag/kernel/metag_ksyms.c
index 63606f8aa86a..138317cfb518 100644
--- a/trunk/arch/metag/kernel/metag_ksyms.c
+++ b/trunk/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/trunk/arch/metag/kernel/traps.c b/trunk/arch/metag/kernel/traps.c
index 202be405771e..5cad15601cff 100644
--- a/trunk/arch/metag/kernel/traps.c
+++ b/trunk/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)
 {