diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-02 02:48:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-02 02:48:46 +0300 |
| commit | 577f12c07e4edd54730dc559a9c7bc44d22bf7dc (patch) | |
| tree | f2a91b62c5d4437c894a1337743131a8c98c636a /mm/page_alloc.c | |
| parent | 04659febcb074de61ae80dbb1fb62f56c08a2b91 (diff) | |
| parent | 58bea4144d235cee5bb51203b032ddafd6d1cf8d (diff) | |
| download | linux-577f12c07e4edd54730dc559a9c7bc44d22bf7dc.tar.xz | |
Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull gcc plugin fixes from Kees Cook:
- make sure required exports from gcc plugins are visible to gcc
- switch latent_entropy to unsigned long to avoid stack frame bloat
* tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
latent_entropy: Fix wrong gcc code generation with 64 bit variables
gcc-plugins: Export symbols needed by gcc
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8fd42aa7c4bd..072d791dce2d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -92,7 +92,7 @@ int _node_numa_mem_[MAX_NUMNODES]; #endif #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY -volatile u64 latent_entropy __latent_entropy; +volatile unsigned long latent_entropy __latent_entropy; EXPORT_SYMBOL(latent_entropy); #endif |