Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753469AbZIGOWS (ORCPT ); Mon, 7 Sep 2009 10:22:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752945AbZIGOWR (ORCPT ); Mon, 7 Sep 2009 10:22:17 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:48001 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282AbZIGOWR (ORCPT ); Mon, 7 Sep 2009 10:22:17 -0400 Date: Mon, 7 Sep 2009 10:21:50 -0400 (EDT) From: Tim Abbott X-X-Sender: tabbott@dr-wily.mit.edu To: Greg Ungerer cc: Linux Kernel Mailing List , Sam Ravnborg , Greg Ungerer Subject: Re: [PATCH] m68knommu: Clean up linker script using new linker script macros. In-Reply-To: <4AA4B104.7040507@snapgear.com> Message-ID: References: <1252293044-13102-1-git-send-email-tabbott@ksplice.com> <4AA49946.2000804@snapgear.com> <4AA4B104.7040507@snapgear.com> User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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: 1678 Lines: 59 On Mon, 7 Sep 2009, Greg Ungerer wrote: > Now, back to the original patch. Now fails with another syntax error > at the last line in this: > > .init : { > . = ALIGN((1 << (12))); > __init_begin = .; > . = ALIGN((1 << (12))); .init.text : AT(ADDR(.init.text) - 0) { _sinittext = > .; *(.init.text) *(.devinit.text) *(.cpuinit.text) *(.meminit.text) _einittext > = .; } Oops. The ".init : { }" wrapping the new macros there should have been removed. The following patch should fix this issue (obviously, you'll want to squash it with the original patch, but I figure sending the diff will be easier to review). -Tim Abbott Signed-off-by: Tim Abbott --- arch/m68knommu/kernel/vmlinux.lds.S | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 979acb5..c380040 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S @@ -154,14 +154,12 @@ SECTIONS { _edata = . ; } > DATA - .init : { - . = ALIGN(PAGE_SIZE); - __init_begin = .; - INIT_TEXT_SECTION(PAGE_SIZE) - INIT_DATA_SECTION(16) - . = ALIGN(PAGE_SIZE); - __init_end = .; - } > INIT + . = ALIGN(PAGE_SIZE); + __init_begin = .; + INIT_TEXT_SECTION(PAGE_SIZE) > INIT + INIT_DATA_SECTION(16) > INIT + . = ALIGN(PAGE_SIZE); + __init_end = .; /DISCARD/ : { EXIT_TEXT -- 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/