diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/mips/kernel/gdb-low.S | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
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 |