diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-03-04 00:05:42 -0500 |
| commit | 2e22ea7cea0f7de86fd30df867fbf5b7e8eee0fd (patch) | |
| tree | 8b8e5583fb2787ff7107a6f59b114ddcd2c2f691 /include/linux/uaccess.h | |
| parent | 638bee71c83a2837b48062fdc5b222163cf53d79 (diff) | |
| parent | 645af4e9e0e32481e3336dda813688732c7e5f0f (diff) | |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'include/linux/uaccess.h')
| -rw-r--r-- | include/linux/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 6b58367d145e..6f3c603b0d67 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h | |||
| @@ -41,13 +41,13 @@ static inline void pagefault_enable(void) | |||
| 41 | #ifndef ARCH_HAS_NOCACHE_UACCESS | 41 | #ifndef ARCH_HAS_NOCACHE_UACCESS |
| 42 | 42 | ||
| 43 | static inline unsigned long __copy_from_user_inatomic_nocache(void *to, | 43 | static inline unsigned long __copy_from_user_inatomic_nocache(void *to, |
| 44 | const void __user *from, unsigned long n) | 44 | const void __user *from, unsigned long n, unsigned long total) |
| 45 | { | 45 | { |
| 46 | return __copy_from_user_inatomic(to, from, n); | 46 | return __copy_from_user_inatomic(to, from, n); |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | static inline unsigned long __copy_from_user_nocache(void *to, | 49 | static inline unsigned long __copy_from_user_nocache(void *to, |
| 50 | const void __user *from, unsigned long n) | 50 | const void __user *from, unsigned long n, unsigned long total) |
| 51 | { | 51 | { |
| 52 | return __copy_from_user(to, from, n); | 52 | return __copy_from_user(to, from, n); |
| 53 | } | 53 | } |