Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

Pull first stage of __cpuinit removal from Paul Gortmaker:
 "The two commits here 1) dummy out all the __cpuinit macros so that we
  no longer generate such sections, and then 2) remove all the section
  processing that we used to do for those sections.

  This makes all the __cpuinit and friends no-ops, so that we can remove
  the use cases of it at our leisure.  Expect stage 2, which does the
  tree wide removal sweep at the end of the merge window."

* 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  modpost: remove all traces of cpuinit/cpuexit sections
  init.h: remove __cpuinit sections from the kernel

diff --cc include/asm-generic/vmlinux.lds.h
index c74d88baea60edd077a22be9c909790fe51fb60a,5e01bee9d1d351612bb40450a1c8b86eed943d28..69732d279e8b2d4d99dc6e5d6e6d8de947a56e5c
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -174,8 -182,8 +174,6 @@@
        *(.data)                                                        \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
-       CPU_KEEP(init.data)                                             \
-       CPU_KEEP(exit.data)                                             \
 -      DEV_KEEP(init.data)                                             \
 -      DEV_KEEP(exit.data)                                             \
        MEM_KEEP(init.data)                                             \
        MEM_KEEP(exit.data)                                             \
        *(.data.unlikely)                                               \
@@@ -355,8 -370,8 +353,6 @@@
        /* __*init sections */                                          \
        __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {         \
                *(.ref.rodata)                                          \
-               CPU_KEEP(init.rodata)                                   \
-               CPU_KEEP(exit.rodata)                                   \
 -              DEV_KEEP(init.rodata)                                   \
 -              DEV_KEEP(exit.rodata)                                   \
                MEM_KEEP(init.rodata)                                   \
                MEM_KEEP(exit.rodata)                                   \
        }                                                               \
@@@ -397,8 -412,8 +393,6 @@@
                *(.text.hot)                                            \
                *(.text)                                                \
                *(.ref.text)                                            \
-       CPU_KEEP(init.text)                                             \
-       CPU_KEEP(exit.text)                                             \
 -      DEV_KEEP(init.text)                                             \
 -      DEV_KEEP(exit.text)                                             \
        MEM_KEEP(init.text)                                             \
        MEM_KEEP(exit.text)                                             \
                *(.text.unlikely)
@@@ -482,14 -497,14 +476,12 @@@
  /* init and exit section handling */
  #define INIT_DATA                                                     \
        *(.init.data)                                                   \
-       CPU_DISCARD(init.data)                                          \
 -      DEV_DISCARD(init.data)                                          \
        MEM_DISCARD(init.data)                                          \
        KERNEL_CTORS()                                                  \
        MCOUNT_REC()                                                    \
        *(.init.rodata)                                                 \
        FTRACE_EVENTS()                                                 \
        TRACE_SYSCALLS()                                                \
-       CPU_DISCARD(init.rodata)                                        \
 -      DEV_DISCARD(init.rodata)                                        \
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
        CLKSRC_OF_TABLES()                                              \
@@@ -498,19 -513,19 +490,15 @@@
  
  #define INIT_TEXT                                                     \
        *(.init.text)                                                   \
-       CPU_DISCARD(init.text)                                          \
 -      DEV_DISCARD(init.text)                                          \
        MEM_DISCARD(init.text)
  
  #define EXIT_DATA                                                     \
        *(.exit.data)                                                   \
-       CPU_DISCARD(exit.data)                                          \
-       CPU_DISCARD(exit.rodata)                                        \
 -      DEV_DISCARD(exit.data)                                          \
 -      DEV_DISCARD(exit.rodata)                                        \
        MEM_DISCARD(exit.data)                                          \
        MEM_DISCARD(exit.rodata)
  
  #define EXIT_TEXT                                                     \
        *(.exit.text)                                                   \
-       CPU_DISCARD(exit.text)                                          \
 -      DEV_DISCARD(exit.text)                                          \
        MEM_DISCARD(exit.text)
  
  #define EXIT_CALL                                                     \

diff --cc scripts/mod/modpost.c
index 3d155dd27eb6da8eab9a81767fe30796be1cf4d3,3acbf0803a9bdce534ffb7c8d8d0a6a8ed72f3dd..62164348ecf7104e0a91671430702efbfb5fd610
--- 1/scripts/mod/modpost.c
--- 2/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -884,10 -883,9 +883,9 @@@ static void check_section(const char *m
  #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
  
  #define DATA_SECTIONS ".data$", ".data.rel$"
 -#define TEXT_SECTIONS ".text$"
 +#define TEXT_SECTIONS ".text$", ".text.unlikely$"
  
  #define INIT_SECTIONS      ".init.*"
- #define CPU_INIT_SECTIONS  ".cpuinit.*"
  #define MEM_INIT_SECTIONS  ".meminit.*"
  
  #define EXIT_SECTIONS      ".exit.*"