aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2009-01-03 00:32:34 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-03 00:32:34 -0500
commit220483fec0cbc3710c828a236c9f1099d5de537a (patch)
tree9ae351fa613c6446414ecb9dcc8efe262958329a
parentfffeeb413704b742dd1d08a3b5a0070a72ab52e1 (diff)
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>
-rw-r--r--arch/sparc/include/asm/traps.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
index bebdbf8f43a8..4becd66e04f2 100644
--- a/arch/sparc/include/asm/traps.h
+++ b/arch/sparc/include/asm/traps.h
@@ -10,7 +10,7 @@
10#define NUM_SPARC_TRAPS 255 10#define NUM_SPARC_TRAPS 255
11 11
12#ifndef __ASSEMBLY__ 12#ifndef __ASSEMBLY__
13 13#ifdef __KERNEL__
14/* This is for V8 compliant Sparc CPUS */ 14/* This is for V8 compliant Sparc CPUS */
15struct tt_entry { 15struct tt_entry {
16 unsigned long inst_one; 16 unsigned long inst_one;
@@ -29,7 +29,7 @@ static inline unsigned long get_tbr(void)
29 __asm__ __volatile__("rd %%tbr, %0\n\t" : "=r" (tbr)); 29 __asm__ __volatile__("rd %%tbr, %0\n\t" : "=r" (tbr));
30 return tbr; 30 return tbr;
31} 31}
32 32#endif /* (__KERNEL__) */
33#endif /* !(__ASSEMBLY__) */ 33#endif /* !(__ASSEMBLY__) */
34 34
35/* For patching the trap table at boot time, we need to know how to 35/* For patching the trap table at boot time, we need to know how to