aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-24 10:36:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 20:16:22 -0400
commitea12c2ed547f415ef9699cc67374d90924592c9b (patch)
treead0dd859db20984a7d6e2f84fb0d5c087c892860 /arch/alpha
parent62bef288588bee976b753f7168716621d7a984e2 (diff)
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.c5
-rw-r--r--arch/alpha/kernel/vmlinux.lds.S7
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);
13struct task_struct init_task = INIT_TASK(init_task); 13struct task_struct init_task = INIT_TASK(init_task);
14EXPORT_SYMBOL(init_task); 14EXPORT_SYMBOL(init_task);
15 15
16union thread_union init_thread_union 16union thread_union init_thread_union __init_task_data =
17 __attribute__((section(".data.init_thread"))) 17 { INIT_THREAD_INFO(init_task) };
18 = { 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 @@
1#include <asm-generic/vmlinux.lds.h> 1#include <asm-generic/vmlinux.lds.h>
2#include <asm/page.h> 2#include <asm/page.h>
3#include <asm/thread_info.h>
3 4
4OUTPUT_FORMAT("elf64-alpha") 5OUTPUT_FORMAT("elf64-alpha")
5OUTPUT_ARCH(alpha) 6OUTPUT_ARCH(alpha)
@@ -92,11 +93,6 @@ SECTIONS
92 __init_end = .; 93 __init_end = .;
93 /* Freed after init ends here */ 94 /* Freed after init ends here */
94 95
95 /* Note 2 page alignment above. */
96 .data.init_thread : {
97 *(.data.init_thread)
98 }
99
100 . = ALIGN(PAGE_SIZE); 96 . = ALIGN(PAGE_SIZE);
101 .data.page_aligned : { 97 .data.page_aligned : {
102 *(.data.page_aligned) 98 *(.data.page_aligned)
@@ -110,6 +106,7 @@ SECTIONS
110 _data = .; 106 _data = .;
111 /* Data */ 107 /* Data */
112 .data : { 108 .data : {
109 INIT_TASK_DATA(THREAD_SIZE)
113 DATA_DATA 110 DATA_DATA
114 CONSTRUCTORS 111 CONSTRUCTORS
115 } 112 }