diff options
author | Tim Abbott <tabbott@ksplice.com> | 2010-02-19 19:03:35 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-03 05:25:58 -0500 |
commit | 2af7687f1ad2c4571b9835f9bb2e3db9a738d258 (patch) | |
tree | 67d007ff71f9effcc9eb30030a8885f1bc0d3362 | |
parent | 4af57b787b4be09419a2bb48aa705fa87ef41cca (diff) |
Rename .data.init_task to .data..init_task.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | arch/ia64/kernel/init_task.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 4 | ||||
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 | ||||
-rw-r--r-- | include/linux/init_task.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index e253ab8fcbc8..f9efe9739d3f 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c | |||
@@ -23,7 +23,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | |||
23 | * Initial task structure. | 23 | * Initial task structure. |
24 | * | 24 | * |
25 | * We need to make sure that this is properly aligned due to the way process stacks are | 25 | * We need to make sure that this is properly aligned due to the way process stacks are |
26 | * handled. This is done by having a special ".data.init_task" section... | 26 | * handled. This is done by having a special ".data..init_task" section... |
27 | */ | 27 | */ |
28 | #define init_thread_info init_task_mem.s.thread_info | 28 | #define init_thread_info init_task_mem.s.thread_info |
29 | 29 | ||
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 3229c0622161..136dcf3ce7bd 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -223,9 +223,7 @@ SECTIONS | |||
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | /* The initial task and kernel stack */ | 225 | /* The initial task and kernel stack */ |
226 | .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { | 226 | INIT_TASK_DATA_SECTION(THREAD_SIZE) |
227 | INIT_TASK_DATA(THREAD_SIZE) | ||
228 | } | ||
229 | 227 | ||
230 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { | 228 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { |
231 | PAGE_ALIGNED_DATA(PAGE_SIZE) | 229 | PAGE_ALIGNED_DATA(PAGE_SIZE) |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 78450aaab9ef..9cb9a9021e6e 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -193,7 +193,7 @@ | |||
193 | 193 | ||
194 | #define INIT_TASK_DATA(align) \ | 194 | #define INIT_TASK_DATA(align) \ |
195 | . = ALIGN(align); \ | 195 | . = ALIGN(align); \ |
196 | *(.data.init_task) | 196 | *(.data..init_task) |
197 | 197 | ||
198 | /* | 198 | /* |
199 | * Read only Data | 199 | * Read only Data |
@@ -435,7 +435,7 @@ | |||
435 | */ | 435 | */ |
436 | #define INIT_TASK_DATA_SECTION(align) \ | 436 | #define INIT_TASK_DATA_SECTION(align) \ |
437 | . = ALIGN(align); \ | 437 | . = ALIGN(align); \ |
438 | .data.init_task : { \ | 438 | .data..init_task : { \ |
439 | INIT_TASK_DATA(align) \ | 439 | INIT_TASK_DATA(align) \ |
440 | } | 440 | } |
441 | 441 | ||
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index abec69b63d7e..f00253b3fc47 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -191,7 +191,7 @@ extern struct cred init_cred; | |||
191 | } | 191 | } |
192 | 192 | ||
193 | /* Attach to the init_task data structure for proper alignment */ | 193 | /* Attach to the init_task data structure for proper alignment */ |
194 | #define __init_task_data __attribute__((__section__(".data.init_task"))) | 194 | #define __init_task_data __attribute__((__section__(".data..init_task"))) |
195 | 195 | ||
196 | 196 | ||
197 | #endif | 197 | #endif |