diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-09-24 10:36:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:16:22 -0700 |
| commit | ea12c2ed547f415ef9699cc67374d90924592c9b (patch) | |
| tree | ad0dd859db20984a7d6e2f84fb0d5c087c892860 /arch/alpha | |
| parent | 62bef288588bee976b753f7168716621d7a984e2 (diff) | |
| download | linux-ea12c2ed547f415ef9699cc67374d90924592c9b.tar.gz linux-ea12c2ed547f415ef9699cc67374d90924592c9b.tar.bz2 linux-ea12c2ed547f415ef9699cc67374d90924592c9b.zip | |
alpha: use .data.init_task instead of .data.init_thread.
alpha is the only architecture that uses the section name
.data.init_thread instead of .data.init_task. So convert alpha to use
.data.init_task like everything else.
.data.init_task does not need a separate output section; this change
also moves it into the .data output section.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/init_task.c | 5 | ||||
| -rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/alpha/kernel/init_task.c b/arch/alpha/kernel/init_task.c index 19b86328ffd7..6f80ca4f9766 100644 --- a/arch/alpha/kernel/init_task.c +++ b/arch/alpha/kernel/init_task.c @@ -13,6 +13,5 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct task_struct init_task = INIT_TASK(init_task); EXPORT_SYMBOL(init_task); -union thread_union init_thread_union - __attribute__((section(".data.init_thread"))) - = { INIT_THREAD_INFO(init_task) }; +union thread_union init_thread_union __init_task_data = + { INIT_THREAD_INFO(init_task) }; diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 6dc03c35caa0..82803df17977 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -1,5 +1,6 @@ #include <asm-generic/vmlinux.lds.h> #include <asm/page.h> +#include <asm/thread_info.h> OUTPUT_FORMAT("elf64-alpha") OUTPUT_ARCH(alpha) @@ -92,11 +93,6 @@ SECTIONS __init_end = .; /* Freed after init ends here */ - /* Note 2 page alignment above. */ - .data.init_thread : { - *(.data.init_thread) - } - . = ALIGN(PAGE_SIZE); .data.page_aligned : { *(.data.page_aligned) @@ -110,6 +106,7 @@ SECTIONS _data = .; /* Data */ .data : { + INIT_TASK_DATA(THREAD_SIZE) DATA_DATA CONSTRUCTORS } |