---

yaml --- r: 37227 b: refs/heads/master c: b885808 h: refs/heads/master i: 37225: fc33709 37223: 92ac33c v: v3
git-mirror · Sep 29, 2006 · 7885b6a · 7885b6a
1 parent 97231c9
commit 7885b6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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 */