1 files changed, 2 insertions, 0 deletions

diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 16b83cc89a41..4a8bb4eeb8ad 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/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;