---

yaml --- r: 181144 b: refs/heads/master c: 08b36c4 h: refs/heads/master v: v3
git-mirror · Jan 27, 2010 · 040f7ce · 040f7ce
1 parent abefa78
commit 040f7ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;