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
This commit is contained in:
@ -37,15 +37,14 @@ __kernel_size_t __clear_user_hexagon(void __user *dest, unsigned long count)
|
|||||||
long uncleared;
|
long uncleared;
|
||||||
|
|
||||||
while (count > PAGE_SIZE) {
|
while (count > PAGE_SIZE) {
|
||||||
uncleared = __copy_to_user_hexagon(dest, &empty_zero_page,
|
uncleared = raw_copy_to_user(dest, &empty_zero_page, PAGE_SIZE);
|
||||||
PAGE_SIZE);
|
|
||||||
if (uncleared)
|
if (uncleared)
|
||||||
return count - (PAGE_SIZE - uncleared);
|
return count - (PAGE_SIZE - uncleared);
|
||||||
count -= PAGE_SIZE;
|
count -= PAGE_SIZE;
|
||||||
dest += PAGE_SIZE;
|
dest += PAGE_SIZE;
|
||||||
}
|
}
|
||||||
if (count)
|
if (count)
|
||||||
count = __copy_to_user_hexagon(dest, &empty_zero_page, count);
|
count = raw_copy_to_user(dest, &empty_zero_page, count);
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user