aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-11 14:09:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-11 14:09:15 -0400
commit9d66af6bbf94d520e65e58a98543f67693ea4145 (patch)
treeb0baae3f7e2ee015a7a141455e2af0bc102b7914
parent9d0eb4624601ac978b9e89be4aeadbd51ab2c830 (diff)
parent4d801cca0bb7011699c2d29f0139902dcfb3482d (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.c5
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)
37 long uncleared; 37 long uncleared;
38 38
39 while (count > PAGE_SIZE) { 39 while (count > PAGE_SIZE) {
40 uncleared = __copy_to_user_hexagon(dest, &empty_zero_page, 40 uncleared = raw_copy_to_user(dest, &empty_zero_page, PAGE_SIZE);
41 PAGE_SIZE);
42 if (uncleared) 41 if (uncleared)
43 return count - (PAGE_SIZE - uncleared); 42 return count - (PAGE_SIZE - uncleared);
44 count -= PAGE_SIZE; 43 count -= PAGE_SIZE;
45 dest += PAGE_SIZE; 44 dest += PAGE_SIZE;
46 } 45 }
47 if (count) 46 if (count)
48 count = __copy_to_user_hexagon(dest, &empty_zero_page, count); 47 count = raw_copy_to_user(dest, &empty_zero_page, count);
49 48
50 return count; 49 return count;
51} 50}