diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 +0000 |
commit | 8d5203ca62539c6ab36a5bc2402c2de1de460e30 (patch) | |
tree | dd0c5815cea7134904855bef8d81a9b31e45c06b /arch/mn10300/kernel/gdb-stub.c | |
parent | 8fd2685911cb6c140e6d0588ac04990ce65d4537 (diff) | |
parent | 63abf3edaf42d0b9f278df90fe41c7ed4796b6b1 (diff) |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/mn10300/kernel/gdb-stub.c')
-rw-r--r-- | arch/mn10300/kernel/gdb-stub.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c index a5fc3f05309b..b169d99d9f20 100644 --- a/arch/mn10300/kernel/gdb-stub.c +++ b/arch/mn10300/kernel/gdb-stub.c @@ -1194,7 +1194,8 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep) asm volatile("mov mdr,%0" : "=d"(mdr)); local_save_flags(epsw); - local_change_intr_mask_level(NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1)); + arch_local_change_intr_mask_level( + NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1)); gdbstub_store_fpu(); |