From 6819ee0dc32c1d8d0d74acc9a83d4787a6e133d6 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@imgtec.com>
Date: Wed, 13 Feb 2013 12:55:51 +0000
Subject: [PATCH] --- yaml --- r: 360680 b: refs/heads/master c:
 7293dbed9d8be1916034dbfcf2f203e96bd8fae1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8f71f143967..e3b26d8713bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa29ec5f79f61ad880771d53d37a341cc7f5dfa6
+refs/heads/master: 7293dbed9d8be1916034dbfcf2f203e96bd8fae1
diff --git a/trunk/arch/metag/kernel/metag_ksyms.c b/trunk/arch/metag/kernel/metag_ksyms.c
index eef6576ab4e2..8ce3c3df2028 100644
--- a/trunk/arch/metag/kernel/metag_ksyms.c
+++ b/trunk/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/trunk/arch/metag/kernel/setup.c b/trunk/arch/metag/kernel/setup.c
index 9803ca4f6510..dd6c5ad73917 100644
--- a/trunk/arch/metag/kernel/setup.c
+++ b/trunk/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";