diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-04-27 08:21:47 -0400 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-04-27 08:21:47 -0400 |
commit | 8224ca195874525533665bbcd23b6da1e575aa4d (patch) | |
tree | 2d3e170f3fd58c2ec39d33136059eaf12a94e53f /include | |
parent | a4022b0d6005b117a985cec64559e048981a4244 (diff) |
[AVR32] Fix compile error with gcc 4.1
gcc 4.1 doesn't seem to like const variables as inline assembly
outputs. Drop support for reading 64-bit values using get_user() so
that we can use an unsigned long to hold the result regardless of the
actual size. This should be safe since many architectures, including
i386, doesn't support reading 64-bit values with get_user().
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-avr32/uaccess.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/asm-avr32/uaccess.h b/include/asm-avr32/uaccess.h index 74a679e9098c..ed092395215e 100644 --- a/include/asm-avr32/uaccess.h +++ b/include/asm-avr32/uaccess.h | |||
@@ -181,24 +181,23 @@ extern int __put_user_bad(void); | |||
181 | 181 | ||
182 | #define __get_user_nocheck(x, ptr, size) \ | 182 | #define __get_user_nocheck(x, ptr, size) \ |
183 | ({ \ | 183 | ({ \ |
184 | typeof(*(ptr)) __gu_val = (typeof(*(ptr)) __force)0; \ | 184 | unsigned long __gu_val = 0; \ |
185 | int __gu_err = 0; \ | 185 | int __gu_err = 0; \ |
186 | \ | 186 | \ |
187 | switch (size) { \ | 187 | switch (size) { \ |
188 | case 1: __get_user_asm("ub", __gu_val, ptr, __gu_err); break; \ | 188 | case 1: __get_user_asm("ub", __gu_val, ptr, __gu_err); break; \ |
189 | case 2: __get_user_asm("uh", __gu_val, ptr, __gu_err); break; \ | 189 | case 2: __get_user_asm("uh", __gu_val, ptr, __gu_err); break; \ |
190 | case 4: __get_user_asm("w", __gu_val, ptr, __gu_err); break; \ | 190 | case 4: __get_user_asm("w", __gu_val, ptr, __gu_err); break; \ |
191 | case 8: __get_user_asm("d", __gu_val, ptr, __gu_err); break; \ | ||
192 | default: __gu_err = __get_user_bad(); break; \ | 191 | default: __gu_err = __get_user_bad(); break; \ |
193 | } \ | 192 | } \ |
194 | \ | 193 | \ |
195 | x = __gu_val; \ | 194 | x = (typeof(*(ptr)))__gu_val; \ |
196 | __gu_err; \ | 195 | __gu_err; \ |
197 | }) | 196 | }) |
198 | 197 | ||
199 | #define __get_user_check(x, ptr, size) \ | 198 | #define __get_user_check(x, ptr, size) \ |
200 | ({ \ | 199 | ({ \ |
201 | typeof(*(ptr)) __gu_val = (typeof(*(ptr)) __force)0; \ | 200 | unsigned long __gu_val = 0; \ |
202 | const typeof(*(ptr)) __user * __gu_addr = (ptr); \ | 201 | const typeof(*(ptr)) __user * __gu_addr = (ptr); \ |
203 | int __gu_err = 0; \ | 202 | int __gu_err = 0; \ |
204 | \ | 203 | \ |
@@ -216,10 +215,6 @@ extern int __put_user_bad(void); | |||
216 | __get_user_asm("w", __gu_val, __gu_addr, \ | 215 | __get_user_asm("w", __gu_val, __gu_addr, \ |
217 | __gu_err); \ | 216 | __gu_err); \ |
218 | break; \ | 217 | break; \ |
219 | case 8: \ | ||
220 | __get_user_asm("d", __gu_val, __gu_addr, \ | ||
221 | __gu_err); \ | ||
222 | break; \ | ||
223 | default: \ | 218 | default: \ |
224 | __gu_err = __get_user_bad(); \ | 219 | __gu_err = __get_user_bad(); \ |
225 | break; \ | 220 | break; \ |
@@ -227,7 +222,7 @@ extern int __put_user_bad(void); | |||
227 | } else { \ | 222 | } else { \ |
228 | __gu_err = -EFAULT; \ | 223 | __gu_err = -EFAULT; \ |
229 | } \ | 224 | } \ |
230 | x = __gu_val; \ | 225 | x = (typeof(*(ptr)))__gu_val; \ |
231 | __gu_err; \ | 226 | __gu_err; \ |
232 | }) | 227 | }) |
233 | 228 | ||