diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-07 14:01:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-07 14:01:19 -0400 |
| commit | 8dce5f3dee21bf976193ddb06426b9727cf5d1a2 (patch) | |
| tree | a2e44ee8cc3283b258ff05ad9a5065a5fc2b39ac /include/linux | |
| parent | 21884a83b2192a00885d7244a1dda32debd2fbc7 (diff) | |
| parent | e24f6628811e2d4531b443684b598f7050932012 (diff) | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/init.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 861814710d52..e73f2b708525 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -93,13 +93,13 @@ | |||
| 93 | 93 | ||
| 94 | #define __exit __section(.exit.text) __exitused __cold notrace | 94 | #define __exit __section(.exit.text) __exitused __cold notrace |
| 95 | 95 | ||
| 96 | /* Used for HOTPLUG_CPU */ | 96 | /* temporary, until all users are removed */ |
| 97 | #define __cpuinit __section(.cpuinit.text) __cold notrace | 97 | #define __cpuinit |
| 98 | #define __cpuinitdata __section(.cpuinit.data) | 98 | #define __cpuinitdata |
| 99 | #define __cpuinitconst __constsection(.cpuinit.rodata) | 99 | #define __cpuinitconst |
| 100 | #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace | 100 | #define __cpuexit |
| 101 | #define __cpuexitdata __section(.cpuexit.data) | 101 | #define __cpuexitdata |
| 102 | #define __cpuexitconst __constsection(.cpuexit.rodata) | 102 | #define __cpuexitconst |
| 103 | 103 | ||
| 104 | /* Used for MEMORY_HOTPLUG */ | 104 | /* Used for MEMORY_HOTPLUG */ |
| 105 | #define __meminit __section(.meminit.text) __cold notrace | 105 | #define __meminit __section(.meminit.text) __cold notrace |
| @@ -118,9 +118,8 @@ | |||
| 118 | #define __INITRODATA .section ".init.rodata","a",%progbits | 118 | #define __INITRODATA .section ".init.rodata","a",%progbits |
| 119 | #define __FINITDATA .previous | 119 | #define __FINITDATA .previous |
| 120 | 120 | ||
| 121 | #define __CPUINIT .section ".cpuinit.text", "ax" | 121 | /* temporary, until all users are removed */ |
| 122 | #define __CPUINITDATA .section ".cpuinit.data", "aw" | 122 | #define __CPUINIT |
| 123 | #define __CPUINITRODATA .section ".cpuinit.rodata", "a" | ||
| 124 | 123 | ||
| 125 | #define __MEMINIT .section ".meminit.text", "ax" | 124 | #define __MEMINIT .section ".meminit.text", "ax" |
| 126 | #define __MEMINITDATA .section ".meminit.data", "aw" | 125 | #define __MEMINITDATA .section ".meminit.data", "aw" |