diff options
| author | Robert Reif <reif@earthlink.net> | 2007-05-14 12:22:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-05-14 12:22:08 +0200 |
| commit | 19fce2b96655d2b3b758e0f783314678d89b47c5 (patch) | |
| tree | 96378e99346006bff7a823ec1cbcb06e54dc2d0d | |
| parent | [SPARC64]: Accept ebus_bus_type for generic DMA ops. (diff) | |
| download | linux-19fce2b96655d2b3b758e0f783314678d89b47c5.tar.xz linux-19fce2b96655d2b3b758e0f783314678d89b47c5.zip | |
[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.S | 2 | ||||
| -rw-r--r-- | include/asm-sparc/kdebug.h | 8 |
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 @@ #include <asm/ptrace.h> #include <asm/psr.h> #include <asm/page.h> -#include <linux/kdebug.h> +#include <asm/kdebug.h> #include <asm/winmacro.h> #include <asm/thread_info.h> /* TI_UWINMASK */ #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) sp_enter_debugger(); \ } while(0) +enum die_val { + DIE_UNUSED, +}; + #endif /* !(__ASSEMBLY__) */ /* Some nice offset defines for assembler code. */ @@ -66,8 +70,4 @@ static inline void sp_enter_debugger(void) #define KDEBUG_DUNNO2_OFF 0x8 #define KDEBUG_TEACH_OFF 0xc -enum die_val { - DIE_UNUSED, -}; - #endif /* !(_SPARC_KDEBUG_H) */ |