From 040f7ce339dba89635488c60132624e2e1c580c6 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 27 Jan 2010 21:56:57 +0900
Subject: [PATCH] --- yaml --- r: 181144 b: refs/heads/master c:
 08b36c4a02b5a9db609fc6d93b9c41d7fa75713c h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sh/kernel/io_trapped.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4009159c25e5..c2343bb5dd38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485773f3e401fca31c112c1ff24797e42ff87afd
+refs/heads/master: 08b36c4a02b5a9db609fc6d93b9c41d7fa75713c
diff --git a/trunk/arch/sh/kernel/io_trapped.c b/trunk/arch/sh/kernel/io_trapped.c
index 16b83cc89a41..4a8bb4eeb8ad 100644
--- a/trunk/arch/sh/kernel/io_trapped.c
+++ b/trunk/arch/sh/kernel/io_trapped.c
@@ -271,6 +271,8 @@ int handle_trapped_io(struct pt_regs *regs, unsigned long address)
 	insn_size_t instruction;
 	int tmp;
 
+	if (trapped_io_disable)
+		return 0;
 	if (!lookup_tiop(address))
 		return 0;