From patchwork Tue Mar 13 12:52:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10278569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C2BC60231 for ; Tue, 13 Mar 2018 12:54:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C50027F88 for ; Tue, 13 Mar 2018 12:54:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60A3428FD7; Tue, 13 Mar 2018 12:54:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E278E27F88 for ; Tue, 13 Mar 2018 12:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=I76ewjwM/YYGAbZUBinTbXpqXQq7xyJJK/LQkb3KuLg=; b=WCOOLE7TAUaUTBzNLMyDg0BbON KdV0dNyKyIMQr6/8rHy0GRZsFagAI/FsbepJTEsxcsQvomTFHhlLp6eZ50RtcA1Xo7sQIps0TFpA3 pTGncZnfbfrxI4oxJCiBu+dnrrwHIJKxyTeOQdkYnSPK2w3z0N+d076XzZPfio12EaOm/ZUgE4Qm4 cA8BYYBF5nAREl4bVayTl90t7xDMWiymLfe2nbJ1Iehmes77IYUbs7CAt2NCehUF95mjzYdaM/BWN OnC5tK6L8waACB0CT4IbHnvXpOApZaM4cB4KrcUjoWgU4X6uWlv2BTEA04+VaHcmB5TPRG2bO8ffE n9Tju31A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1evjRI-0006aL-Hm; Tue, 13 Mar 2018 12:54:00 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1evjQj-0006At-7x for linux-arm-kernel@lists.infradead.org; Tue, 13 Mar 2018 12:53:30 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.129]) with ESMTPA (Nemesis) id 0MSTZH-1f5reH3S4R-00TRPw; Tue, 13 Mar 2018 13:53:10 +0100 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH v2] arm64: fix undefined reference to 'printk' Date: Tue, 13 Mar 2018 13:52:36 +0100 Message-Id: <20180313125309.3662792-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: References: X-Provags-ID: V03:K0:20BptMwLZiFxFPC0ASmnMSPN35mCbHrTvO/+zyLhAE43Sf9K0Jd MsRbXhWtsYe7YmXb6bUyiEY6l1sUr9y6X+n3A9klSgQMMxGS+VPJwAnOKfQ8n8xVU/Q38TZ GbGg5yPPc+/Lo02re/3AqSNLy9sjGkZO0Z6BZLP1/my1EoidVNf52hSVNJtx51R6TKTqyEv AkKgcfiQ4E5CP6jFovXQg== X-UI-Out-Filterresults: notjunk:1; V01:K0:1tq1ARxm9NQ=:VT2DFcvOg1G29ioQ2IFx9+ b+PNXtOFJQcSlqvYtzZ9MMKcDtC0G0cWnMHtf93ZZhJcZPzJVgp40aRp1LtLzTXMfZhmvFMQS 6dn2Cu1FmK3ozHriC6suuaIw0DIpRK+VzendHBfkr/Za83NDD5cYzn6GTWOXdMlXW5jBKe2af 14Z9EMuAuK42lKJwTLLKr4LeYGESwouqo7TLYEHgTf9Fg0NW3tEYY3SXnPxNIVBpgUGQfAnZD JSDwpKVyQWVFXegYbfNUGm+kOckm+y8JNr7pEZXM0lpkEAKIPBUFEw8g9QZhOM8pOsURII4M8 ALrwwR/96GZfIMhO+s1R3R2+h0M7sAohnKMn5mOoryhOvEnYM0IdU5sa8EfRBJIfTs5oI5T2t i7LHhLl+c1dC80EJ51xXw82B2U6xTHSoiCrJ1K2ps5GXm19TwZhRJ5v3NGd0GEU9N70FfUPzu YM+mYro0RBdYENMMZuPnt2zXY+yv5nxjOkGlZo5JJI46//PoTYZHIJYkYqYzQqFExMcEYaZFh pGBX01EgTMxOs4X5LPA69cKRRuq7//EQOj0LR5YZoLw5ap+Beox7fwC69Z7K0XThOMd5BLE/w t54rRay/7fE+R1fSGdjJ5UwAeyKOe7ttgT1yheF+Q1zB8mUvqNQpY/Klf9wZYoWrLJQjjo8+J afUM2MuEQuXuH/7hQm3ymOa2fu+yw/9ZkJWXZPrhqRXy/akk7URoZEi+APhymG953fettt4GO UwMGME96dtYcdzUk/iN4uvTRXlqtfOLXaFJ2Bg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180313_055325_938375_33C32CD0 X-CRM114-Status: GOOD ( 12.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The printk symbol was intended as a generic address that is always exported, however that turned out to be false with CONFIG_PRINTK=n: ERROR: "printk" [arch/arm64/kernel/arm64-reloc-test.ko] undefined! This changes the references to memstart_addr, which should be there regardless of configuration. Fixes: a257e02579e4 ("arm64/kernel: don't ban ADRP to work around Cortex-A53 erratum #843419") Acked-by: Ard Biesheuvel Signed-off-by: Arnd Bergmann --- v2: fix changelog as pointed out by Ard arch/arm64/kernel/reloc_test_core.c | 2 +- arch/arm64/kernel/reloc_test_syms.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/reloc_test_core.c b/arch/arm64/kernel/reloc_test_core.c index a70489c584c7..5915ce5759cc 100644 --- a/arch/arm64/kernel/reloc_test_core.c +++ b/arch/arm64/kernel/reloc_test_core.c @@ -45,7 +45,7 @@ static struct { { "R_AARCH64_MOVW_SABS_Gn", signed_movw, UL(SYM64_ABS_VAL) }, { "R_AARCH64_MOVW_UABS_Gn", unsigned_movw, UL(SYM64_ABS_VAL) }, { "R_AARCH64_ADR_PREL_PG_HI21", relative_adrp, (u64)&sym64_rel }, - { "R_AARCH64_ADR_PREL_PG_HI21", relative_adrp_far, (u64)&printk }, + { "R_AARCH64_ADR_PREL_PG_HI21", relative_adrp_far, (u64)&memstart_addr }, { "R_AARCH64_ADR_PREL_LO21", relative_adr, (u64)&sym64_rel }, { "R_AARCH64_PREL64", relative_data64, (u64)&sym64_rel }, { "R_AARCH64_PREL32", relative_data32, (u64)&sym64_rel }, diff --git a/arch/arm64/kernel/reloc_test_syms.S b/arch/arm64/kernel/reloc_test_syms.S index f333b4b7880d..2b8d9cb8b078 100644 --- a/arch/arm64/kernel/reloc_test_syms.S +++ b/arch/arm64/kernel/reloc_test_syms.S @@ -54,8 +54,8 @@ ENDPROC(relative_adrp) .align 12 .space 0xffc ENTRY(relative_adrp_far) - adrp x0, printk - add x0, x0, #:lo12:printk + adrp x0, memstart_addr + add x0, x0, #:lo12:memstart_addr ret ENDPROC(relative_adrp_far)