Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764683AbZD3XEs (ORCPT ); Thu, 30 Apr 2009 19:04:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764442AbZD3XEB (ORCPT ); Thu, 30 Apr 2009 19:04:01 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:52474 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764552AbZD3XEA (ORCPT ); Thu, 30 Apr 2009 19:04:00 -0400 From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , Richard Henderson , linux-alpha@vger.kernel.org, Tim Abbott Subject: [PATCH 4/4] alpha: use .data.init_task instead of .data.init_thread Date: Thu, 30 Apr 2009 19:00:16 -0400 Message-Id: <1241132416-7055-5-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241132416-7055-4-git-send-email-tabbott@mit.edu> References: <1241132416-7055-1-git-send-email-tabbott@mit.edu> <1241132416-7055-2-git-send-email-tabbott@mit.edu> <1241132416-7055-3-git-send-email-tabbott@mit.edu> <1241132416-7055-4-git-send-email-tabbott@mit.edu> 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: 1978 Lines: 63 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 should 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 c2938e5..475d46a 100644 --- a/arch/alpha/kernel/init_task.c +++ b/arch/alpha/kernel/init_task.c @@ -16,6 +16,5 @@ struct task_struct init_task = INIT_TASK(init_task); EXPORT_SYMBOL(init_mm); 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 7acd1eb..caca724 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,14 +93,10 @@ SECTIONS __init_end = .; /* Freed after init ends here */ - /* Note 2 page alignment above. */ - .data.init_thread : { - *(.data.init_thread) - } - _data = .; /* Data */ .data : { + INIT_TASK_DATA(THREAD_SIZE) PAGE_ALIGNED_DATA CACHELINE_ALIGNED_DATA(64) DATA_DATA -- 1.6.2.1 -- 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/