Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753355AbZIXOlW (ORCPT ); Thu, 24 Sep 2009 10:41:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753318AbZIXOlU (ORCPT ); Thu, 24 Sep 2009 10:41:20 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:35868 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753316AbZIXOlS (ORCPT ); Thu, 24 Sep 2009 10:41:18 -0400 From: Tim Abbott To: Linus Torvalds Cc: Linux Kernel Mailing List , Sam Ravnborg , Tim Abbott , Chris Zankel Subject: [PATCH v2 04/11] xtensa: Cleanup linker script using new linker script macros. Date: Thu, 24 Sep 2009 10:36:19 -0400 Message-Id: <1253802986-8132-5-git-send-email-tabbott@ksplice.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1253802986-8132-1-git-send-email-tabbott@ksplice.com> References: <1253802986-8132-1-git-send-email-tabbott@ksplice.com> 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: 2917 Lines: 136 Signed-off-by: Tim Abbott Cc: Chris Zankel Acked-by: Sam Ravnborg --- arch/xtensa/kernel/vmlinux.lds.S | 75 +++++++------------------------------- 1 files changed, 14 insertions(+), 61 deletions(-) diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 921b6ff..9b52615 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S @@ -15,6 +15,8 @@ */ #include +#include +#include #include #include @@ -107,41 +109,18 @@ SECTIONS .fixup : { *(.fixup) } - . = ALIGN(16); - - __ex_table : { - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - } - + EXCEPTION_TABLE(16) /* Data section */ - . = ALIGN(XCHAL_ICACHE_LINESIZE); _fdata = .; - .data : - { - DATA_DATA - CONSTRUCTORS - . = ALIGN(XCHAL_ICACHE_LINESIZE); - *(.data.cacheline_aligned) - } - + RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) _edata = .; - /* The initial task */ - . = ALIGN(8192); - .data.init_task : { *(.data.init_task) } - /* Initialization code and data: */ - . = ALIGN(1 << 12); + . = ALIGN(PAGE_SIZE); __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) .init.data : { @@ -168,36 +147,15 @@ SECTIONS .DebugInterruptVector.text); __boot_reloc_table_end = ABSOLUTE(.) ; - } - . = ALIGN(XCHAL_ICACHE_LINESIZE); - - __setup_start = .; - .init.setup : { *(.init.setup) } - __setup_end = .; - - __initcall_start = .; - .initcall.init : { - INITCALLS + INIT_SETUP(XCHAL_ICACHE_LINESIZE) + INIT_CALLS + CON_INITCALL + SECURITY_INITCALL + INIT_RAM_FS } - __initcall_end = .; - - __con_initcall_start = .; - .con_initcall.init : { *(.con_initcall.init) } - __con_initcall_end = .; - - SECURITY_INIT - - -#ifdef CONFIG_BLK_DEV_INITRD - . = ALIGN(4096); - __initramfs_start =.; - .init.ramfs : { *(.init.ramfs) } - __initramfs_end = .; -#endif - - PERCPU(4096) + PERCPU(PAGE_SIZE) /* We need this dummy segment here */ @@ -252,16 +210,11 @@ SECTIONS .DoubleExceptionVector.literal) . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3; - . = ALIGN(1 << 12); + . = ALIGN(PAGE_SIZE); __init_end = .; - . = ALIGN(8192); - - /* BSS section */ - _bss_start = .; - .bss : { *(.bss.page_aligned) *(.bss) } - _bss_end = .; + BSS_SECTION(0, 8192, 0) _end = .; -- 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/