diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 13:20:14 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 13:20:14 -0300 |
| commit | 08a7c7772b4db0be06e3b27239147c0a36e2a507 (patch) | |
| tree | af653cb85a263ac19334cdaa74ecd58f909c5cef /include/linux/regset.h | |
| parent | b13b04d9382113f787e21c9567a4022fef8697b9 (diff) | |
| parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To get some newer headers that got out of sync with the copies in tools/
so that we can try to have the tools/perf/ build clean for v5.8 with
fewer pull requests.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/regset.h')
| -rw-r--r-- | include/linux/regset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regset.h b/include/linux/regset.h index bf0243779738..46d6ae68c455 100644 --- a/include/linux/regset.h +++ b/include/linux/regset.h @@ -320,7 +320,7 @@ static inline int user_regset_copyout_zero(unsigned int *pos, if (*kbuf) { memset(*kbuf, 0, copy); *kbuf += copy; - } else if (__clear_user(*ubuf, copy)) + } else if (clear_user(*ubuf, copy)) return -EFAULT; else *ubuf += copy; |