Skip to content

Commit

Permalink
alpha: use .data.init_task instead of .data.init_thread.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Abbott authored and Linus Torvalds committed Sep 25, 2009
1 parent 62bef28 commit ea12c2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
5 changes: 2 additions & 3 deletions arch/alpha/kernel/init_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) };
7 changes: 2 additions & 5 deletions arch/alpha/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -110,6 +106,7 @@ SECTIONS
_data = .;
/* Data */
.data : {
INIT_TASK_DATA(THREAD_SIZE)
DATA_DATA
CONSTRUCTORS
}
Expand Down

0 comments on commit ea12c2e

Please sign in to comment.