Commit ea12c2ed authored by Tim Abbott's avatar Tim Abbott Committed by Linus Torvalds

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: default avatarTim Abbott <tabbott@mit.edu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 62bef288
...@@ -13,6 +13,5 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); ...@@ -13,6 +13,5 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct task_struct init_task = INIT_TASK(init_task); struct task_struct init_task = INIT_TASK(init_task);
EXPORT_SYMBOL(init_task); EXPORT_SYMBOL(init_task);
union thread_union init_thread_union union thread_union init_thread_union __init_task_data =
__attribute__((section(".data.init_thread"))) { INIT_THREAD_INFO(init_task) };
= { INIT_THREAD_INFO(init_task) };
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/thread_info.h>
OUTPUT_FORMAT("elf64-alpha") OUTPUT_FORMAT("elf64-alpha")
OUTPUT_ARCH(alpha) OUTPUT_ARCH(alpha)
...@@ -92,11 +93,6 @@ SECTIONS ...@@ -92,11 +93,6 @@ SECTIONS
__init_end = .; __init_end = .;
/* Freed after init ends here */ /* Freed after init ends here */
/* Note 2 page alignment above. */
.data.init_thread : {
*(.data.init_thread)
}
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.data.page_aligned : { .data.page_aligned : {
*(.data.page_aligned) *(.data.page_aligned)
...@@ -110,6 +106,7 @@ SECTIONS ...@@ -110,6 +106,7 @@ SECTIONS
_data = .; _data = .;
/* Data */ /* Data */
.data : { .data : {
INIT_TASK_DATA(THREAD_SIZE)
DATA_DATA DATA_DATA
CONSTRUCTORS CONSTRUCTORS
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment