diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-07 09:47:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-07 09:47:43 -0800 |
| commit | 87bc610730a944b49f1c53ab9f4230d85f35df0c (patch) | |
| tree | 360902b579dcb09201705fa3bd3132ad4939655a | |
| parent | 308c470bc482c46b5acbb2c2072df303d6526250 (diff) | |
| parent | c7858bf16c0b2cc62f475f31e6df28c3a68da1d6 (diff) | |
| download | linux-87bc610730a944b49f1c53ab9f4230d85f35df0c.tar.bz2 | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fix from Michal Marek:
"The asm-prototypes.h file added in the last merge window results in
invalid code with CONFIG_KMEMCHECK=y. The net result is that genksyms
segfaults.
This pull request fixes the header, the genksyms fix is in my kbuild
branch for 4.11"
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
asm-prototypes: Clear any CPP defines before declaring the functions
| -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 df13637e4017..939869c772b1 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); +#undef __memmove extern void *__memmove(void *, const void *, __kernel_size_t); +#undef memset extern void *memset(void *, int, __kernel_size_t); +#undef memcpy extern void *memcpy(void *, const void *, __kernel_size_t); +#undef memmove extern void *memmove(void *, const void *, __kernel_size_t); |