diff options
| author | James Morris <jmorris@namei.org> | 2009-08-06 02:55:03 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-06 02:55:03 +0400 |
| commit | 012a5299a29672039f42944a37984558393ef769 (patch) | |
| tree | de0815c67cf4156c32c8b552cd7448387cc391b0 /arch/microblaze/include/asm/uaccess.h | |
| parent | da34d4248bd2013ee64ce51e63ec0ebd1f32b46c (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
| download | linux-012a5299a29672039f42944a37984558393ef769.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/microblaze/include/asm/uaccess.h')
| -rw-r--r-- | arch/microblaze/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h index 65adad61e7e9..5431b4631a7a 100644 --- a/arch/microblaze/include/asm/uaccess.h +++ b/arch/microblaze/include/asm/uaccess.h @@ -189,7 +189,7 @@ extern long strnlen_user(const char *src, long count); #define __put_user(x, ptr) \ ({ \ - __typeof__(*(ptr)) __gu_val = x; \ + __typeof__(*(ptr)) volatile __gu_val = (x); \ long __gu_err = 0; \ switch (sizeof(__gu_val)) { \ case 1: \ |