Merge tag 'gcc-plugins-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull gcc plugins update from Kees Cook:
 "This adds a new gcc plugin named "latent_entropy". It is designed to
  extract as much possible uncertainty from a running system at boot
  time as possible, hoping to capitalize on any possible variation in
  CPU operation (due to runtime data differences, hardware differences,
  SMP ordering, thermal timing variation, cache behavior, etc).

  At the very least, this plugin is a much more comprehensive example
  for how to manipulate kernel code using the gcc plugin internals"

* tag 'gcc-plugins-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  latent_entropy: Mark functions with __latent_entropy
  gcc-plugins: Add latent_entropy plugin

diff --cc arch/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/Makefile
Simple merge

diff --cc block/blk-softirq.c
Simple merge

diff --cc drivers/char/random.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/fdtable.h
Simple merge

diff --cc include/linux/init.h
index 024a0b5,1e5c131..e30104c
--- 1/include/linux/init.h
--- 2/include/linux/init.h
+++ b/include/linux/init.h
@@@ -39,9 -39,9 +39,9 @@@
  
  /* These are for everybody (although not all archs will actually
     discard it in modules) */
- #define __init                __section(.init.text) __cold notrace
+ #define __init                __section(.init.text) __cold notrace __latent_entropy
  #define __initdata    __section(.init.data)
 -#define __initconst   __constsection(.init.rodata)
 +#define __initconst   __section(.init.rodata)
  #define __exitdata    __section(.exit.data)
  #define __exit_call   __used __section(.exitcall.exit)
  
@@@ -75,12 -86,13 +75,13 @@@
  #define __exit          __section(.exit.text) __exitused __cold notrace
  
  /* Used for MEMORY_HOTPLUG */
- #define __meminit        __section(.meminit.text) __cold notrace
+ #define __meminit        __section(.meminit.text) __cold notrace \
+                                                 __latent_entropy
  #define __meminitdata    __section(.meminit.data)
 -#define __meminitconst   __constsection(.meminit.rodata)
 +#define __meminitconst   __section(.meminit.rodata)
  #define __memexit        __section(.memexit.text) __exitused __cold notrace
  #define __memexitdata    __section(.memexit.data)
 -#define __memexitconst   __constsection(.memexit.rodata)
 +#define __memexitconst   __section(.memexit.rodata)
  
  /* For assembly routines */
  #define __HEAD                .section        ".head.text","ax"

diff --cc include/linux/random.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/softirq.c
Simple merge

diff --cc lib/irq_poll.c
Simple merge

diff --cc lib/random32.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/core/dev.c
Simple merge