diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/mips/kernel/gdb-low.S | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/mips/kernel/gdb-low.S')
| -rw-r--r-- | arch/mips/kernel/gdb-low.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S index 83b8986f9401..235ad9f6bd35 100644 --- a/arch/mips/kernel/gdb-low.S +++ b/arch/mips/kernel/gdb-low.S | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | */ | 41 | */ |
| 42 | .align 5 | 42 | .align 5 |
| 43 | NESTED(trap_low, GDB_FR_SIZE, sp) | 43 | NESTED(trap_low, GDB_FR_SIZE, sp) |
| 44 | .set noat | 44 | .set noat |
| 45 | .set noreorder | 45 | .set noreorder |
| 46 | 46 | ||
| 47 | mfc0 k0, CP0_STATUS | 47 | mfc0 k0, CP0_STATUS |