From 04c3144869ed1640b41a5d6895db22bb9b029b65 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Fri, 28 Aug 2009 21:37:20 +0000
Subject: [PATCH] --- yaml --- r: 163549 b: refs/heads/master c:
 4aa5ac4ef44dd8c986241c54298abd7910b78b3f h: refs/heads/master i:   163547:
 c0d29b4f59243a2869636acd3fbc2f470be3b6d9 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sh/include/asm/system_32.h | 2 +-
 trunk/arch/sh/kernel/io_trapped.c     | 3 ++-
 trunk/arch/sh/kernel/traps_32.c       | 9 +++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 59f0e1cb50b7..dfa39d9aef20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e79d57479c86e388051244e1f17851a0e63d1ff0
+refs/heads/master: 4aa5ac4ef44dd8c986241c54298abd7910b78b3f
diff --git a/trunk/arch/sh/include/asm/system_32.h b/trunk/arch/sh/include/asm/system_32.h
index 81e0d668eefd..d3ab269386bb 100644
--- a/trunk/arch/sh/include/asm/system_32.h
+++ b/trunk/arch/sh/include/asm/system_32.h
@@ -199,7 +199,7 @@ do {							\
 #endif
 
 int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
-			    struct mem_access *ma);
+			    struct mem_access *ma, int);
 
 asmlinkage void do_address_error(struct pt_regs *regs,
 				 unsigned long writeaccess,
diff --git a/trunk/arch/sh/kernel/io_trapped.c b/trunk/arch/sh/kernel/io_trapped.c
index e27a19e1f46e..69be603aa2d7 100644
--- a/trunk/arch/sh/kernel/io_trapped.c
+++ b/trunk/arch/sh/kernel/io_trapped.c
@@ -284,7 +284,8 @@ int handle_trapped_io(struct pt_regs *regs, unsigned long address)
 		return 0;
 	}
 
-	tmp = handle_unaligned_access(instruction, regs, &trapped_io_access);
+	tmp = handle_unaligned_access(instruction, regs,
+				      &trapped_io_access, 1);
 	set_fs(oldfs);
 	return tmp == 0;
 }
diff --git a/trunk/arch/sh/kernel/traps_32.c b/trunk/arch/sh/kernel/traps_32.c
index c581dc31d92a..583ace55b0dc 100644
--- a/trunk/arch/sh/kernel/traps_32.c
+++ b/trunk/arch/sh/kernel/traps_32.c
@@ -449,7 +449,7 @@ static inline int handle_delayslot(struct pt_regs *regs,
 #define SH_PC_12BIT_OFFSET(instr) ((((signed short)(instr<<4))>>3) + 4)
 
 int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
-			    struct mem_access *ma)
+			    struct mem_access *ma, int expected)
 {
 	u_int rm;
 	int ret, index;
@@ -458,7 +458,7 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs,
 	rm = regs->regs[index];
 
 	/* shout about fixups */
-	if (printk_ratelimit())
+	if (!expected && printk_ratelimit())
 		printk(KERN_NOTICE "Fixing up unaligned %s access "
 		       "in \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",
 		       user_mode(regs) ? "userspace" : "kernel",
@@ -657,7 +657,7 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 
 		set_fs(USER_DS);
 		tmp = handle_unaligned_access(instruction, regs,
-					      &user_mem_access);
+					      &user_mem_access, 0);
 		set_fs(oldfs);
 
 		if (tmp==0)
@@ -694,7 +694,8 @@ asmlinkage void do_address_error(struct pt_regs *regs,
 			die("insn faulting in do_address_error", regs, 0);
 		}
 
-		handle_unaligned_access(instruction, regs, &user_mem_access);
+		handle_unaligned_access(instruction, regs,
+					&user_mem_access, 0);
 		set_fs(oldfs);
 	}
 }