From 7885b6a9da371d831baaf9a9bc43b67a49f3d77b Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 30 Sep 2006 01:47:55 +0200 Subject: [PATCH] --- yaml --- r: 37227 b: refs/heads/master c: b885808e185a4ec2dfe16c84434f79e95f0245b0 h: refs/heads/master i: 37225: fc33709462c9f41e75c9e00a2a9842bec06ae5ef 37223: 92ac33c85843fff877d58f378915c5cf7c08f08d v: v3 --- [refs] | 2 +- trunk/include/asm-x86_64/uaccess.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0108cdb9a72..4ee5c74dcd3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae853e79faa27ca1a08c8ae3b5aee71ea98482f9 +refs/heads/master: b885808e185a4ec2dfe16c84434f79e95f0245b0 diff --git a/trunk/include/asm-x86_64/uaccess.h b/trunk/include/asm-x86_64/uaccess.h index e856570c0689..19f99178fe83 100644 --- a/trunk/include/asm-x86_64/uaccess.h +++ b/trunk/include/asm-x86_64/uaccess.h @@ -361,6 +361,11 @@ __must_check unsigned long clear_user(void __user *mem, unsigned long len); __must_check unsigned long __clear_user(void __user *mem, unsigned long len); __must_check long __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size); -#define __copy_to_user_inatomic copy_user_generic + +static __must_check __always_inline int +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) +{ + return copy_user_generic((__force void *)dst, src, size); +} #endif /* __X86_64_UACCESS_H */