aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Reif <reif@earthlink.net>2007-05-14 06:22:08 -0400
committerDavid S. Miller <davem@davemloft.net>2007-05-14 06:22:08 -0400
commit19fce2b96655d2b3b758e0f783314678d89b47c5 (patch)
tree96378e99346006bff7a823ec1cbcb06e54dc2d0d
parent9ac6d4a4b85004dbb907f1d3b34412afe16f3758 (diff)
[SPARC32]: Fix sparc32 kdebug changes.
Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/kernel/head.S2
-rw-r--r--include/asm-sparc/kdebug.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index 97da13c52563..9a219e8b5ddb 100644
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -19,7 +19,7 @@
19#include <asm/ptrace.h> 19#include <asm/ptrace.h>
20#include <asm/psr.h> 20#include <asm/psr.h>
21#include <asm/page.h> 21#include <asm/page.h>
22#include <linux/kdebug.h> 22#include <asm/kdebug.h>
23#include <asm/winmacro.h> 23#include <asm/winmacro.h>
24#include <asm/thread_info.h> /* TI_UWINMASK */ 24#include <asm/thread_info.h> /* TI_UWINMASK */
25#include <asm/errno.h> 25#include <asm/errno.h>
diff --git a/include/asm-sparc/kdebug.h b/include/asm-sparc/kdebug.h
index 404d80767323..631f15ffef73 100644
--- a/include/asm-sparc/kdebug.h
+++ b/include/asm-sparc/kdebug.h
@@ -58,6 +58,10 @@ static inline void sp_enter_debugger(void)
58 sp_enter_debugger(); \ 58 sp_enter_debugger(); \
59 } while(0) 59 } while(0)
60 60
61enum die_val {
62 DIE_UNUSED,
63};
64
61#endif /* !(__ASSEMBLY__) */ 65#endif /* !(__ASSEMBLY__) */
62 66
63/* Some nice offset defines for assembler code. */ 67/* Some nice offset defines for assembler code. */
@@ -66,8 +70,4 @@ static inline void sp_enter_debugger(void)
66#define KDEBUG_DUNNO2_OFF 0x8 70#define KDEBUG_DUNNO2_OFF 0x8
67#define KDEBUG_TEACH_OFF 0xc 71#define KDEBUG_TEACH_OFF 0xc
68 72
69enum die_val {
70 DIE_UNUSED,
71};
72
73#endif /* !(_SPARC_KDEBUG_H) */ 73#endif /* !(_SPARC_KDEBUG_H) */