From 33205edb914fc9edf4533499893bcd6c40ed1bac Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 24 Sep 2009 17:48:15 +0900
Subject: [PATCH] --- yaml --- r: 166322 b: refs/heads/master c:
 40258ee97d0d5e5c30a3d4b7acaf294fe82cd23f h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/sh/kernel/traps_32.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 89c35833e910..94f0a53a7a52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23c4c82171008c8b18d8627c9741cdd577631cea
+refs/heads/master: 40258ee97d0d5e5c30a3d4b7acaf294fe82cd23f
diff --git a/trunk/arch/sh/kernel/traps_32.c b/trunk/arch/sh/kernel/traps_32.c
index f9760c5c234a..69bb1652eccd 100644
--- a/trunk/arch/sh/kernel/traps_32.c
+++ b/trunk/arch/sh/kernel/traps_32.c
@@ -678,12 +678,6 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 	} else {
 		se_sys += 1;
 
-		if (se_kernmode_warn)
-			printk(KERN_NOTICE "Unaligned kernel access "
-			       "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
-			       current->comm, current->pid, (void *)regs->pc,
-			       instruction);
-
 		if (regs->pc & 1)
 			die("unaligned program counter", regs, error_code);
 
@@ -697,6 +691,12 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 			die("insn faulting in do_address_error", regs, 0);
 		}
 
+		if (se_kernmode_warn)
+			printk(KERN_NOTICE "Unaligned kernel access "
+			       "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
+			       current->comm, current->pid, (void *)regs->pc,
+			       instruction);
+
 		handle_unaligned_access(instruction, regs,
 					&user_mem_access, 0);
 		set_fs(oldfs);