From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 3 Jan 2009 05:32:34 +0000 (-0800)
Subject: sparc: fix warning in userspace header traps.h
X-Git-Tag: v2.6.29-rc1~501^2~10
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=220483fec0cbc3710c828a236c9f1099d5de537a;p=net-next-2.6.git

sparc: fix warning in userspace header traps.h

Fix following warning:
traps.h:23: extern's make no sense in userspace

Add an ifdef __KERNEL__ block that cover the
extern definition and a few related things that neither
is for userspace.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
index bebdbf8f43a..4becd66e04f 100644
--- a/arch/sparc/include/asm/traps.h
+++ b/arch/sparc/include/asm/traps.h
@@ -10,7 +10,7 @@
 #define NUM_SPARC_TRAPS  255
 
 #ifndef __ASSEMBLY__
-
+#ifdef __KERNEL__
 /* This is for V8 compliant Sparc CPUS */
 struct tt_entry {
 	unsigned long inst_one;
@@ -29,7 +29,7 @@ static inline unsigned long get_tbr(void)
 	__asm__ __volatile__("rd %%tbr, %0\n\t" : "=r" (tbr));
 	return tbr;
 }
-
+#endif /* (__KERNEL__) */
 #endif /* !(__ASSEMBLY__) */
 
 /* For patching the trap table at boot time, we need to know how to