From cb3cb0483a68cc0a7b2c0b2db2fc41975b75df6c Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Mon, 15 Sep 2008 18:04:26 -0700 Subject: [PATCH] --- yaml --- r: 123170 b: refs/heads/master c: fb71e45338453698bd7460f7e8f171ea0304d218 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/uaccess.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 75a5f8fcacf1..20fa063d62ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30742d5c2277c325fb0e9d2d817d55a19995fe8f +refs/heads/master: fb71e45338453698bd7460f7e8f171ea0304d218 diff --git a/trunk/include/linux/uaccess.h b/trunk/include/linux/uaccess.h index 2062293e57e6..6b58367d145e 100644 --- a/trunk/include/linux/uaccess.h +++ b/trunk/include/linux/uaccess.h @@ -78,7 +78,7 @@ static inline unsigned long __copy_from_user_nocache(void *to, \ set_fs(KERNEL_DS); \ pagefault_disable(); \ - ret = __copy_from_user_inatomic((__force typeof(retval) __user *)(addr), &(retval), sizeof(retval)); \ + ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \ pagefault_enable(); \ set_fs(old_fs); \ ret; \