Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753220AbZGaVDS (ORCPT ); Fri, 31 Jul 2009 17:03:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753070AbZGaVDP (ORCPT ); Fri, 31 Jul 2009 17:03:15 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:54671 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753173AbZGaVDM (ORCPT ); Fri, 31 Jul 2009 17:03:12 -0400 From: Tim Abbott To: Linux Kernel Mailing List Cc: Sam Ravnborg , Anders Kaseorg , Nelson Elhage , Tim Abbott , Richard Henderson , linux-alpha@vger.kernel.org Subject: [PATCH 1/2] alpha: use .data.init_task instead of .data.init_thread. Date: Fri, 31 Jul 2009 16:56:25 -0400 Message-Id: <1249073786-29788-1-git-send-email-tabbott@ksplice.com> X-Mailer: git-send-email 1.6.3.3 X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2099 Lines: 67 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 Cc: Richard Henderson Cc: linux-alpha@vger.kernel.org --- arch/alpha/kernel/init_task.c | 5 ++--- 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 19b8632..6f80ca4 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 b9d6568..a4bb75e 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -1,5 +1,6 @@ #include #include +#include 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 } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/