From bbec9193a2cf5083ec10a7029f33ce009af3ffc4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 26 Jul 2007 17:35:39 +0100 Subject: [PATCH] --- yaml --- r: 62959 b: refs/heads/master c: fdd33961e983dd5b1983c54ef39d243c88a4bffc h: refs/heads/master i: 62957: 1d55c537b488516857ea75b2fe6d679180f078de 62955: 5f2078049774f3254ecd28e938620cac293ff75b 62951: 84df4c8edb09b5b0eb57b695dbde51fe9bc464b5 62943: a4258d4c89f41d8c65a0eb4653c73c95f07fed32 v: v3 --- [refs] | 2 +- trunk/include/asm-x86_64/uaccess.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a68f91762447..4971e373906e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c47ffe3d3d841986108a8316f6e01792cb45d0d2 +refs/heads/master: fdd33961e983dd5b1983c54ef39d243c88a4bffc diff --git a/trunk/include/asm-x86_64/uaccess.h b/trunk/include/asm-x86_64/uaccess.h index 9df30b939c4e..f4ce8768ad44 100644 --- a/trunk/include/asm-x86_64/uaccess.h +++ b/trunk/include/asm-x86_64/uaccess.h @@ -100,7 +100,7 @@ struct exception_table_entry case 8: __get_user_x(8,__ret_gu,__val_gu,ptr); break; \ default: __get_user_bad(); break; \ } \ - (x) = (typeof(*(ptr)))__val_gu; \ + (x) = (__force typeof(*(ptr)))__val_gu; \ __ret_gu; \ }) @@ -192,7 +192,7 @@ struct __large_struct { unsigned long buf[100]; }; int __gu_err; \ unsigned long __gu_val; \ __get_user_size(__gu_val,(ptr),(size),__gu_err); \ - (x) = (typeof(*(ptr)))__gu_val; \ + (x) = (__force typeof(*(ptr)))__gu_val; \ __gu_err; \ })