summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 11:37:33 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 11:37:33 +0900
commit6ae5e8d7598ce01ac0e7dab1b89894c7386a2e61 (patch)
tree03061d388b9cee2dc8140afe3d9fca71f75c4268 /arch
parent1c5f8f85df96dd7c17d63eed2d7da18b3ad00b6d (diff)
downloadop-kernel-dev-6ae5e8d7598ce01ac0e7dab1b89894c7386a2e61.zip
op-kernel-dev-6ae5e8d7598ce01ac0e7dab1b89894c7386a2e61.tar.gz
sh: Fix kGDB NMI handling.
in_nmi shifted down a few labels, so we were inadvertently clearing the lower byte of do_syscall_trace, badness ensues. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S
index a3a717a..1a05804 100644
--- a/arch/sh/kernel/entry.S
+++ b/arch/sh/kernel/entry.S
@@ -644,7 +644,7 @@ skip_restore:
!
#if defined(CONFIG_KGDB_NMI)
! Clear in_nmi
- mov.l 4f, k0
+ mov.l 6f, k0
mov #0, k1
mov.b k1, @k0
#endif
OpenPOWER on IntegriCloud