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

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

1 files changed, 0 insertions, 12 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c74d88baea60..69732d279e8b 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -174,8 +174,6 @@
         *(.data)                                                        \
         *(.ref.data)                                                    \
         *(.data..shared_aligned) /* percpu related */                   \
-        CPU_KEEP(init.data)                                             \
-        CPU_KEEP(exit.data)                                             \
         MEM_KEEP(init.data)                                             \
         MEM_KEEP(exit.data)                                             \
         *(.data.unlikely)                                               \
@@ -355,8 +353,6 @@
         /* __*init sections */                                          \
         __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) {         \
                 *(.ref.rodata)                                          \
-                CPU_KEEP(init.rodata)                                   \
-                CPU_KEEP(exit.rodata)                                   \
                 MEM_KEEP(init.rodata)                                   \
                 MEM_KEEP(exit.rodata)                                   \
         }                                                               \
@@ -397,8 +393,6 @@
                 *(.text.hot)                                            \
                 *(.text)                                                \
                 *(.ref.text)                                            \
-        CPU_KEEP(init.text)                                             \
-        CPU_KEEP(exit.text)                                             \
         MEM_KEEP(init.text)                                             \
         MEM_KEEP(exit.text)                                             \
                 *(.text.unlikely)
@@ -482,14 +476,12 @@
 /* init and exit section handling */
 #define INIT_DATA                                                       \
         *(.init.data)                                                   \
-        CPU_DISCARD(init.data)                                          \
         MEM_DISCARD(init.data)                                          \
         KERNEL_CTORS()                                                  \
         MCOUNT_REC()                                                    \
         *(.init.rodata)                                                 \
         FTRACE_EVENTS()                                                 \
         TRACE_SYSCALLS()                                                \
-        CPU_DISCARD(init.rodata)                                        \
         MEM_DISCARD(init.rodata)                                        \
         CLK_OF_TABLES()                                                 \
         CLKSRC_OF_TABLES()                                              \
@@ -498,19 +490,15 @@
 
 #define INIT_TEXT                                                       \
         *(.init.text)                                                   \
-        CPU_DISCARD(init.text)                                          \
         MEM_DISCARD(init.text)
 
 #define EXIT_DATA                                                       \
         *(.exit.data)                                                   \
-        CPU_DISCARD(exit.data)                                          \
-        CPU_DISCARD(exit.rodata)                                        \
         MEM_DISCARD(exit.data)                                          \
         MEM_DISCARD(exit.rodata)
 
 #define EXIT_TEXT                                                       \
         *(.exit.text)                                                   \
-        CPU_DISCARD(exit.text)                                          \
         MEM_DISCARD(exit.text)
 
 #define EXIT_CALL                                                       \