diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-05 04:50:27 +0200 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-05 04:50:27 +0200 |
commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
tree | f930d068a12a256fabef0864bcdf8e85f095369e /arch/mips/kernel/gdb-low.S | |
parent | Input: serio/gameport - check whether driver core calls succeeded (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.tar.xz linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/kernel/gdb-low.S')
-rw-r--r-- | arch/mips/kernel/gdb-low.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S index 666bc9014cbd..2c446063636a 100644 --- a/arch/mips/kernel/gdb-low.S +++ b/arch/mips/kernel/gdb-low.S @@ -7,6 +7,7 @@ #include <asm/asm.h> #include <asm/errno.h> +#include <asm/irqflags.h> #include <asm/mipsregs.h> #include <asm/regdef.h> #include <asm/stackframe.h> @@ -120,6 +121,7 @@ LONG_S $31, GDB_FR_REG31(sp) CLI /* disable interrupts */ + TRACE_IRQS_OFF /* * Followed by the floating point registers |