From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Jul 2013 18:01:19 +0000 (-0700)
Subject: Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg... 
X-Git-Tag: v3.11-rc1~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dce5f3dee21bf976193ddb06426b9727cf5d1a2;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'cpuinit-delete' of git://git./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
---

8dce5f3dee21bf976193ddb06426b9727cf5d1a2
diff --cc include/asm-generic/vmlinux.lds.h
index c74d88b,5e01bee..69732d2
--- a/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 3d155dd,3acbf080..6216434
--- a/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.*"