diff options
| author | Linus Torvalds | 2017-06-11 11:09:15 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-06-11 11:09:15 -0700 |
| commit | 9d66af6bbf94d520e65e58a98543f67693ea4145 (patch) | |
| tree | b0baae3f7e2ee015a7a141455e2af0bc102b7914 | |
| parent | 9d0eb4624601ac978b9e89be4aeadbd51ab2c830 (diff) | |
| parent | 4d801cca0bb7011699c2d29f0139902dcfb3482d (diff) | |
Merge tag 'hexagon-for-linus-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hexagon fix from Guenter Roeck:
"This fixes a build error seen when building hexagon images.
Richard sent me an Ack, but didn't reply when asked if he wants me to
send the patch to you directly, so I figured I'd just do it"
* tag 'hexagon-for-linus-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hexagon: Use raw_copy_to_user
| -rw-r--r-- | arch/hexagon/mm/uaccess.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/hexagon/mm/uaccess.c b/arch/hexagon/mm/uaccess.c index ec90afdb3ad0..c599eb126c9e 100644 --- a/arch/hexagon/mm/uaccess.c +++ b/arch/hexagon/mm/uaccess.c @@ -37,15 +37,14 @@ __kernel_size_t __clear_user_hexagon(void __user *dest, unsigned long count) long uncleared; while (count > PAGE_SIZE) { - uncleared = __copy_to_user_hexagon(dest, &empty_zero_page, - PAGE_SIZE); + uncleared = raw_copy_to_user(dest, &empty_zero_page, PAGE_SIZE); if (uncleared) return count - (PAGE_SIZE - uncleared); count -= PAGE_SIZE; dest += PAGE_SIZE; } if (count) - count = __copy_to_user_hexagon(dest, &empty_zero_page, count); + count = raw_copy_to_user(dest, &empty_zero_page, count); return count; } |