diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-09-29 06:43:44 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-09-29 06:43:44 -0400 |
| commit | 88856d67cf6b787447889915bafd541be20b8630 (patch) | |
| tree | 35bc8503dd699b99bb53f5be00a22f716c976dba | |
| parent | 1bec157a1f747d038026efabebdee4c929147b63 (diff) | |
sh: Fix up uaccess_64 put/get_user() cast warnings.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/asm/uaccess_64.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h index 5580fd47100..0042c9054b2 100644 --- a/arch/sh/include/asm/uaccess_64.h +++ b/arch/sh/include/asm/uaccess_64.h | |||
| @@ -26,16 +26,20 @@ do { \ | |||
| 26 | retval = 0; \ | 26 | retval = 0; \ |
| 27 | switch (size) { \ | 27 | switch (size) { \ |
| 28 | case 1: \ | 28 | case 1: \ |
| 29 | retval = __get_user_asm_b(x, ptr); \ | 29 | retval = __get_user_asm_b((void *)&x, \ |
| 30 | (long)ptr); \ | ||
| 30 | break; \ | 31 | break; \ |
| 31 | case 2: \ | 32 | case 2: \ |
| 32 | retval = __get_user_asm_w(x, ptr); \ | 33 | retval = __get_user_asm_w((void *)&x, \ |
| 34 | (long)ptr); \ | ||
| 33 | break; \ | 35 | break; \ |
| 34 | case 4: \ | 36 | case 4: \ |
| 35 | retval = __get_user_asm_l(x, ptr); \ | 37 | retval = __get_user_asm_l((void *)&x, \ |
| 38 | (long)ptr); \ | ||
| 36 | break; \ | 39 | break; \ |
| 37 | case 8: \ | 40 | case 8: \ |
| 38 | retval = __get_user_asm_q(x, ptr); \ | 41 | retval = __get_user_asm_q((void *)&x, \ |
| 42 | (long)ptr); \ | ||
| 39 | break; \ | 43 | break; \ |
| 40 | default: \ | 44 | default: \ |
| 41 | __get_user_unknown(); \ | 45 | __get_user_unknown(); \ |
| @@ -54,16 +58,20 @@ do { \ | |||
| 54 | retval = 0; \ | 58 | retval = 0; \ |
| 55 | switch (size) { \ | 59 | switch (size) { \ |
| 56 | case 1: \ | 60 | case 1: \ |
| 57 | retval = __put_user_asm_b(x, ptr); \ | 61 | retval = __put_user_asm_b((void *)&x, \ |
| 62 | (long)ptr); \ | ||
| 58 | break; \ | 63 | break; \ |
| 59 | case 2: \ | 64 | case 2: \ |
| 60 | retval = __put_user_asm_w(x, ptr); \ | 65 | retval = __put_user_asm_w((void *)&x, \ |
| 66 | (long)ptr); \ | ||
| 61 | break; \ | 67 | break; \ |
| 62 | case 4: \ | 68 | case 4: \ |
| 63 | retval = __put_user_asm_l(x, ptr); \ | 69 | retval = __put_user_asm_l((void *)&x, \ |
| 70 | (long)ptr); \ | ||
| 64 | break; \ | 71 | break; \ |
| 65 | case 8: \ | 72 | case 8: \ |
| 66 | retval = __put_user_asm_q(x, ptr); \ | 73 | retval = __put_user_asm_q((void *)&x, \ |
| 74 | (long)ptr); \ | ||
| 67 | break; \ | 75 | break; \ |
| 68 | default: \ | 76 | default: \ |
| 69 | __put_user_unknown(); \ | 77 | __put_user_unknown(); \ |