From 162f82a8a65760ad73a8aeb4d2ef512ed8f19e39 Mon Sep 17 00:00:00 2001
From: Andre Draszik <andre.draszik@st.com>
Date: Mon, 24 Aug 2009 15:01:10 +0900
Subject: [PATCH] --- yaml --- r: 163520 b: refs/heads/master c:
 5a0ab35e43a6e3c69893c0091fe6a78ea8b3e443 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 262c56a98be4..5fdab87f6024 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7436cde6b2ca71049051620c68c26522bb3403bf
+refs/heads/master: 5a0ab35e43a6e3c69893c0091fe6a78ea8b3e443
diff --git a/trunk/arch/sh/kernel/traps_32.c b/trunk/arch/sh/kernel/traps_32.c
index 0ad356d00ac8..c581dc31d92a 100644
--- a/trunk/arch/sh/kernel/traps_32.c
+++ b/trunk/arch/sh/kernel/traps_32.c
@@ -621,12 +621,21 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 
 		se_user += 1;
 
+#ifndef CONFIG_CPU_SH2A
+		set_fs(USER_DS);
+		if (copy_from_user(&instruction, (u16 *)(regs->pc & ~1), 2)) {
+			set_fs(oldfs);
+			goto uspace_segv;
+		}
+		set_fs(oldfs);
+
 		/* shout about userspace fixups */
 		if (se_usermode & 1)
 			printk(KERN_NOTICE "Unaligned userspace access "
 			       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
 			       current->comm, current->pid, (void *)regs->pc,
 			       instruction);
+#endif
 
 		if (se_usermode & 2)
 			goto fixup;
@@ -635,7 +644,7 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 			goto uspace_segv;
 		else {
 			/* ignore */
-			trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
+			regs->pc += instruction_size(instruction);
 			return;
 		}
 
@@ -647,15 +656,6 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 		}
 
 		set_fs(USER_DS);
-		if (copy_from_user(&instruction, (void __user *)(regs->pc),
-				   sizeof(instruction))) {
-			/* Argh. Fault on the instruction itself.
-			   This should never happen non-SMP
-			*/
-			set_fs(oldfs);
-			goto uspace_segv;
-		}
-
 		tmp = handle_unaligned_access(instruction, regs,
 					      &user_mem_access);
 		set_fs(oldfs);