diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-sparc/head.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/head.h')
| -rw-r--r-- | include/asm-sparc/head.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-sparc/head.h b/include/asm-sparc/head.h index fcdba5116339..e6532c3e09c9 100644 --- a/include/asm-sparc/head.h +++ b/include/asm-sparc/head.h | |||
| @@ -52,6 +52,17 @@ | |||
| 52 | nop; \ | 52 | nop; \ |
| 53 | nop; | 53 | nop; |
| 54 | 54 | ||
| 55 | #ifdef CONFIG_KGDB | ||
| 56 | #define KGDB_TRAP(num) \ | ||
| 57 | b kgdb_trap_low; \ | ||
| 58 | rd %psr,%l0; \ | ||
| 59 | nop; \ | ||
| 60 | nop; | ||
| 61 | #else | ||
| 62 | #define KGDB_TRAP(num) \ | ||
| 63 | BAD_TRAP(num) | ||
| 64 | #endif | ||
| 65 | |||
| 55 | /* The Get Condition Codes software trap for userland. */ | 66 | /* The Get Condition Codes software trap for userland. */ |
| 56 | #define GETCC_TRAP \ | 67 | #define GETCC_TRAP \ |
| 57 | b getcc_trap_handler; mov %psr, %l0; nop; nop; | 68 | b getcc_trap_handler; mov %psr, %l0; nop; nop; |