diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 12:00:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 12:00:44 +1000 |
| commit | cb78e57bee009a40784b4368ec0e49d2f2943228 (patch) | |
| tree | 254ee7f5a660dfbc5a6c429fe04184ba43513a44 /include | |
| parent | 0c6d89b5b1c1943544045ff07d49bd888689bc51 (diff) | |
Revert "initconst adjustments"
This reverts commit efbe795f5f63b74ed642e196518907355aa94bd7.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 5 | ||||
| -rw-r--r-- | include/linux/init.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0d9abbc4136a..f1736ca7922c 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -336,11 +336,10 @@ #define INIT_DATA \ *(.init.data) \ DEV_DISCARD(init.data) \ - CPU_DISCARD(init.data) \ - MEM_DISCARD(init.data) \ - *(.init.rodata) \ DEV_DISCARD(init.rodata) \ + CPU_DISCARD(init.data) \ CPU_DISCARD(init.rodata) \ + MEM_DISCARD(init.data) \ MEM_DISCARD(init.rodata) #define INIT_TEXT \ diff --git a/include/linux/init.h b/include/linux/init.h index 9f70c9f25d4b..0e06c176f185 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -225,8 +225,7 @@ struct obs_kernel_param { * obs_kernel_param "array" too far apart in .init.setup. */ #define __setup_param(str, unique_id, fn, early) \ - static const char __setup_str_##unique_id[] __initconst \ - __aligned(1) = str; \ + static char __setup_str_##unique_id[] __initdata __aligned(1) = str; \ static struct obs_kernel_param __setup_##unique_id \ __used __section(.init.setup) \ __attribute__((aligned((sizeof(long))))) \ |