| commit | 87bc610730a944b49f1c53ab9f4230d85f35df0c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 7 Jan 2017 17:47:43 +0000 (7 09:47 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 7 Jan 2017 17:47:43 +0000 (7 09:47 -0800) | ||
| tree | 360902b579dcb09201705fa3bd3132ad4939655a | treesnapshot (tar.gz zip) |
| parent | 308c470bc482c46b5acbb2c2072df303d6526250 | commitdiff |
| parent | c7858bf16c0b2cc62f475f31e6df28c3a68da1d6 | commitdiff |
Merge branch 'rc-fixes' of git://git./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
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