diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/linux/init.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 05c83e0521ca..59008c3826cf 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -229,6 +229,18 @@ void __init parse_early_param(void); | |||
| 229 | #define __devexitdata __exitdata | 229 | #define __devexitdata __exitdata |
| 230 | #endif | 230 | #endif |
| 231 | 231 | ||
| 232 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 233 | #define __cpuinit | ||
| 234 | #define __cpuinitdata | ||
| 235 | #define __cpuexit | ||
| 236 | #define __cpuexitdata | ||
| 237 | #else | ||
| 238 | #define __cpuinit __init | ||
| 239 | #define __cpuinitdata __initdata | ||
| 240 | #define __cpuexit __exit | ||
| 241 | #define __cpuexitdata __exitdata | ||
| 242 | #endif | ||
| 243 | |||
| 232 | /* Functions marked as __devexit may be discarded at kernel link time, depending | 244 | /* Functions marked as __devexit may be discarded at kernel link time, depending |
| 233 | on config options. Newer versions of binutils detect references from | 245 | on config options. Newer versions of binutils detect references from |
| 234 | retained sections to discarded sections and flag an error. Pointers to | 246 | retained sections to discarded sections and flag an error. Pointers to |