diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-18 09:14:51 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-18 09:14:51 +0000 |
| commit | 2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch) | |
| tree | 42cc821174a3f3f410895fce16741948a1103e66 /include/linux/init.h | |
| parent | cd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff) | |
| parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) | |
Merge branch 'master'
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 59008c3826c..ff8d8b8632f 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -241,6 +241,18 @@ void __init parse_early_param(void); #define __cpuexitdata __exitdata #endif +#ifdef CONFIG_MEMORY_HOTPLUG +#define __meminit +#define __meminitdata +#define __memexit +#define __memexitdata +#else +#define __meminit __init +#define __meminitdata __initdata +#define __memexit __exit +#define __memexitdata __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 |