Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sh / kernel / io_trapped.c

diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 2947d2bd12919e5d19117839a9d180ff918a93f3..32c385ef1011778cb172ddd33392343418b939b5 100644 (file)
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -291,7 +291,7 @@ int handle_trapped_io(struct pt_regs *regs, unsigned long address)
        }
 
        tmp = handle_unaligned_access(instruction, regs,
-                                     &trapped_io_access, 1);
+                                     &trapped_io_access, 1, address);
        set_fs(oldfs);
        return tmp == 0;
 }