diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2008-07-29 02:16:33 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-07-29 02:16:33 +0200 |
| commit | 6de9c6481d47c6da5f8b81f75a5c24c69c366f37 (patch) | |
| tree | b0f9643afdb5a470978ded04a3c5ce492a35a5da /arch/sh | |
| parent | sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation. (diff) | |
| download | linux-6de9c6481d47c6da5f8b81f75a5c24c69c366f37.tar.xz linux-6de9c6481d47c6da5f8b81f75a5c24c69c366f37.zip | |
sh: Proper __put_user_asm() size mismatch fix.
This fixes up the workaround in 2b4b2bb42137c779ef0084de5df66ff21b4cd86e
and cleans up __put_user_asm() to get the sizing right from the onset.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/uaccess.h | 6 | ||||
| -rw-r--r-- | arch/sh/include/asm/uaccess_32.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index 45c2c9b2993d..075848f43b6a 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h @@ -77,8 +77,9 @@ struct __large_struct { unsigned long buf[100]; }; ({ \ long __pu_err; \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ + __typeof__(*(ptr)) __pu_val = x; \ __chk_user_ptr(ptr); \ - __put_user_size((x), __pu_addr, (size), __pu_err); \ + __put_user_size(__pu_val, __pu_addr, (size), __pu_err); \ __pu_err; \ }) @@ -86,8 +87,9 @@ struct __large_struct { unsigned long buf[100]; }; ({ \ long __pu_err = -EFAULT; \ __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ + __typeof__(*(ptr)) __pu_val = x; \ if (likely(access_ok(VERIFY_WRITE, __pu_addr, size))) \ - __put_user_size((x), __pu_addr, (size), \ + __put_user_size(__pu_val, __pu_addr, (size), \ __pu_err); \ __pu_err; \ }) diff --git a/arch/sh/include/asm/uaccess_32.h b/arch/sh/include/asm/uaccess_32.h index 892fd6dea9db..ae0d24f6653f 100644 --- a/arch/sh/include/asm/uaccess_32.h +++ b/arch/sh/include/asm/uaccess_32.h @@ -76,8 +76,7 @@ do { \ __put_user_asm(x, ptr, retval, "w"); \ break; \ case 4: \ - __put_user_asm((u32)x, ptr, \ - retval, "l"); \ + __put_user_asm(x, ptr, retval, "l"); \ break; \ case 8: \ __put_user_u64(x, ptr, retval); \ |