diff options
| author | Linus Torvalds | 2005-09-21 14:30:37 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-21 14:30:37 -0700 |
| commit | f62378fcfc9c13a57b0b69dbd43336a4df8155a5 (patch) | |
| tree | b2682850f0d15079e0618ee09a23ba7ee71df55b /include | |
| parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) | |
| parent | 6a1ced59b3ac5d1088f597fd0613a724cdf19e2c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/arch.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/setup.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h index 56c6bf4ab0c3..4fa95084a8c0 100644 --- a/include/asm-arm/mach/arch.h +++ b/include/asm-arm/mach/arch.h @@ -50,7 +50,7 @@ struct machine_desc { */ #define MACHINE_START(_type,_name) \ const struct machine_desc __mach_desc_##_type \ - __attribute__((__section__(".arch.info"))) = { \ + __attribute__((__section__(".arch.info.init"))) = { \ .nr = MACH_TYPE_##_type, \ .name = _name, diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h index adcbd79762bf..ea3ed2465233 100644 --- a/include/asm-arm/setup.h +++ b/include/asm-arm/setup.h @@ -171,7 +171,7 @@ struct tagtable { int (*parse)(const struct tag *); }; -#define __tag __attribute_used__ __attribute__((__section__(".taglist"))) +#define __tag __attribute_used__ __attribute__((__section__(".taglist.init"))) #define __tagtable(tag, fn) \ static struct tagtable __tagtable_##fn __tag = { tag, fn } @@ -213,6 +213,6 @@ struct early_params { #define __early_param(name,fn) \ static struct early_params __early_##fn __attribute_used__ \ -__attribute__((__section__("__early_param"))) = { name, fn } +__attribute__((__section__(".early_param.init"))) = { name, fn } #endif |