diff --git a/[refs] b/[refs] index 2c2afd15a0ed..60654de87932 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c5f8f85df96dd7c17d63eed2d7da18b3ad00b6d +refs/heads/master: 6ae5e8d7598ce01ac0e7dab1b89894c7386a2e61 diff --git a/trunk/arch/sh/kernel/entry.S b/trunk/arch/sh/kernel/entry.S index a3a717adbf43..1a05804caf37 100644 --- a/trunk/arch/sh/kernel/entry.S +++ b/trunk/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