diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sh/kernel/io_trapped.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sh/kernel/io_trapped.c')
| -rw-r--r-- | arch/sh/kernel/io_trapped.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c index 2947d2bd1291..32c385ef1011 100644 --- 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) | |||
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | tmp = handle_unaligned_access(instruction, regs, | 293 | tmp = handle_unaligned_access(instruction, regs, |
| 294 | &trapped_io_access, 1); | 294 | &trapped_io_access, 1, address); |
| 295 | set_fs(oldfs); | 295 | set_fs(oldfs); |
| 296 | return tmp == 0; | 296 | return tmp == 0; |
| 297 | } | 297 | } |