diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /include/linux/init.h | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
| download | kernel_samsung_smdk4412-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.gz kernel_samsung_smdk4412-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.bz2 kernel_samsung_smdk4412-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.zip | |
Automatic merge with /usr/src/ntfs-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 05c83e0521c..59008c3826c 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -229,6 +229,18 @@ void __init parse_early_param(void); #define __devexitdata __exitdata #endif +#ifdef CONFIG_HOTPLUG_CPU +#define __cpuinit +#define __cpuinitdata +#define __cpuexit +#define __cpuexitdata +#else +#define __cpuinit __init +#define __cpuinitdata __initdata +#define __cpuexit __exit +#define __cpuexitdata __exitdata +#endif + /* Functions marked as __devexit may be discarded at kernel link time, depending on config options. Newer versions of binutils detect references from retained sections to discarded sections and flag an error. Pointers to |