diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
| commit | 6684e323a236d40461f27d36b38c6b70aabc9e71 (patch) | |
| tree | 7eb6e0a22b7083c5e08f4f2cf3f15be7d938a572 /include/linux/init.h | |
| parent | 7531d692d4174789d583eb50fcb83cefa121b790 (diff) | |
| parent | 0560551dca0c02a4b23f95a9c339882ff291e1c7 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 8bc32bb2fce2..e007ae4dc41e 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -52,14 +52,9 @@ | |||
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | /* For assembly routines */ | 54 | /* For assembly routines */ |
| 55 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 56 | #define __INIT .section ".text","ax" | ||
| 57 | #define __INITDATA .section ".data","aw" | ||
| 58 | #else | ||
| 59 | #define __INIT .section ".init.text","ax" | 55 | #define __INIT .section ".init.text","ax" |
| 60 | #define __INITDATA .section ".init.data","aw" | ||
| 61 | #endif | ||
| 62 | #define __FINIT .previous | 56 | #define __FINIT .previous |
| 57 | #define __INITDATA .section ".init.data","aw" | ||
| 63 | 58 | ||
| 64 | #ifndef __ASSEMBLY__ | 59 | #ifndef __ASSEMBLY__ |
| 65 | /* | 60 | /* |