From patchwork Thu Dec 12 20:39:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 3334091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4DF2CC0D4A for ; Thu, 12 Dec 2013 20:39:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B5D3207C3 for ; Thu, 12 Dec 2013 20:39:56 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E516206CB for ; Thu, 12 Dec 2013 20:39:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD31-0005m5-MR; Thu, 12 Dec 2013 20:39:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD2z-00011D-31; Thu, 12 Dec 2013 20:39:49 +0000 Received: from geoff by merlin.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrD2w-00010Q-2n; Thu, 12 Dec 2013 20:39:46 +0000 Message-Id: <51cf7ba0aab8ae3677673cab65ec560d78a645ce.1386879684.git.geoff@infradead.org> In-Reply-To: References: From: Geoff Levand Patch-Date: Fri, 6 Sep 2013 16:40:37 -0700 Subject: [PATCH 4/5] arm64: Add missing AT() macros to vmlinux.lds.S To: Catalin Marinas , Will Deacon Date: Thu, 12 Dec 2013 20:39:46 +0000 Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing AT() macros to vmlinux.lds to generate the sections properly. Some elf file tools expect correct paddr values in vmlinux. Fixes bad paddr values written to vmlinux like these: Program Header: LOAD off 0x0000000000010000 vaddr 0xffffffc000080000 paddr 0xffffffc000080000 align 2**16 Signed-off-by: Geoff Levand for Huawei, Linaro --- arch/arm64/kernel/vmlinux.lds.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 6563b64..065fe40d 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -48,11 +48,11 @@ SECTIONS . = PAGE_OFFSET + TEXT_OFFSET; - .head.text : { + .head.text : AT(ADDR(.head.text) - LOAD_OFFSET) { _text = .; HEAD_TEXT } - .text : { /* Real text segment */ + .text : AT(ADDR(.text) - LOAD_OFFSET) { /* Real text segment */ _stext = .; /* Text and read-only data */ __exception_text_start = .; *(.exception.text) @@ -77,11 +77,11 @@ SECTIONS __init_begin = .; INIT_TEXT_SECTION(8) - .exit.text : { + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { ARM_EXIT_KEEP(EXIT_TEXT) } . = ALIGN(16); - .init.data : { + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { INIT_DATA INIT_SETUP(16) INIT_CALLS @@ -89,7 +89,7 @@ SECTIONS SECURITY_INITCALL INIT_RAM_FS } - .exit.data : { + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET){ ARM_EXIT_KEEP(EXIT_DATA) }