diff options
| author | Kees Cook <keescook@chromium.org> | 2017-02-16 16:32:34 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-02-16 16:32:34 -0800 |
| commit | 5988b5db7be58878cbbf1f8251968c8b89327d21 (patch) | |
| tree | d79c1d5c062b13cd5fd0e003797800b3311e2741 /include/asm-generic | |
| parent | 6443481515b86bc92f08953d46a2f8fba4526fa7 (diff) | |
| parent | a121103c922847ba5010819a3f250f1f7fc84ab8 (diff) | |
Merge commit 'v4.10-rc3^{}' into for-next/gcc-plugins
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/asm-prototypes.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-generic/asm-prototypes.h b/include/asm-generic/asm-prototypes.h index ea784e02b28e..ffc0dd7e8ed2 100644 --- a/include/asm-generic/asm-prototypes.h +++ b/include/asm-generic/asm-prototypes.h @@ -1,7 +1,13 @@ #include <linux/bitops.h> +#undef __memset extern void *__memset(void *, int, __kernel_size_t); +#undef __memcpy extern void *__memcpy(void *, const void *, __kernel_size_t) __nocapture(2); +#undef __memmove extern void *__memmove(void *, const void *, __kernel_size_t) __nocapture(2); +#undef memset extern void *memset(void *, int, __kernel_size_t); +#undef memcpy extern void *memcpy(void *, const void *, __kernel_size_t) __nocapture(2); +#undef memmove extern void *memmove(void *, const void *, __kernel_size_t) __nocapture(2); |