diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-06 22:40:03 -0400 |
| commit | f3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch) | |
| tree | b4702cbdbf2c4517a5986bbaa971495b0f92a877 /arch/mips/kernel/gdb-low.S | |
| parent | 5bafd76593f060540acbea3b61e3087e009aa269 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/kernel/gdb-low.S')
| -rw-r--r-- | arch/mips/kernel/gdb-low.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S index 10f28fb9f008..5fd7a8af0c62 100644 --- a/arch/mips/kernel/gdb-low.S +++ b/arch/mips/kernel/gdb-low.S | |||
| @@ -54,9 +54,11 @@ | |||
| 54 | */ | 54 | */ |
| 55 | mfc0 k0, CP0_CAUSE | 55 | mfc0 k0, CP0_CAUSE |
| 56 | andi k0, k0, 0x7c | 56 | andi k0, k0, 0x7c |
| 57 | add k1, k1, k0 | 57 | #ifdef CONFIG_64BIT |
| 58 | PTR_L k0, saved_vectors(k1) | 58 | dsll k0, k0, 1 |
| 59 | jr k0 | 59 | #endif |
| 60 | PTR_L k1, saved_vectors(k0) | ||
| 61 | jr k1 | ||
| 60 | nop | 62 | nop |
| 61 | 1: | 63 | 1: |
| 62 | move k0, sp | 64 | move k0, sp |