]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
sh: Fix up uaccess_64 put/get_user() cast warnings.
authorPaul Mundt <lethal@linux-sh.org>
Mon, 29 Sep 2008 10:43:44 +0000 (19:43 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 29 Sep 2008 10:43:44 +0000 (19:43 +0900)
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/include/asm/uaccess_64.h

index 5580fd471003e156b843df49f3eec236471e7335..0042c9054b2067351707f6b39325ce7e298a76c8 100644 (file)
@@ -26,16 +26,20 @@ do {                                                                \
        retval = 0;                                             \
        switch (size) {                                         \
        case 1:                                                 \
-               retval = __get_user_asm_b(x, ptr);              \
+               retval = __get_user_asm_b((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 2:                                                 \
-               retval = __get_user_asm_w(x, ptr);              \
+               retval = __get_user_asm_w((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 4:                                                 \
-               retval = __get_user_asm_l(x, ptr);              \
+               retval = __get_user_asm_l((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 8:                                                 \
-               retval = __get_user_asm_q(x, ptr);              \
+               retval = __get_user_asm_q((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        default:                                                \
                __get_user_unknown();                           \
@@ -54,16 +58,20 @@ do {                                                                \
        retval = 0;                                             \
        switch (size) {                                         \
        case 1:                                                 \
-               retval = __put_user_asm_b(x, ptr);              \
+               retval = __put_user_asm_b((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 2:                                                 \
-               retval = __put_user_asm_w(x, ptr);              \
+               retval = __put_user_asm_w((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 4:                                                 \
-               retval = __put_user_asm_l(x, ptr);              \
+               retval = __put_user_asm_l((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        case 8:                                                 \
-               retval = __put_user_asm_q(x, ptr);              \
+               retval = __put_user_asm_q((void *)&x,           \
+                                         (long)ptr);           \
                break;                                          \
        default:                                                \
                __put_user_unknown();                           \