From patchwork Tue Mar 13 11:41:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10278269 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 709E7602C2 for ; Tue, 13 Mar 2018 11:42:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62C3F2890B for ; Tue, 13 Mar 2018 11:42:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5783728EF9; Tue, 13 Mar 2018 11:42:30 +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 3EB872890B for ; Tue, 13 Mar 2018 11:42:29 +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: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:In-Reply-To: References:List-Owner; bh=phAlLYJE6pQEseuSZ+hfXXLWyiDxIDIrNaK6C4b5ISg=; b=GQw +YxqaRBjNTXefH+k2rffOWQDh04GFDIooIz6N7oql1vVDNwiq47jfaWoy69xFIRYVH7CgyDnPmT2V LRFLiSm/fWHgb5iYV4kisHtd9kY47ZQIb0PNnHFCpLX2BpLAtPkf6281V9yULcAYvpwJIAoZ4oE/a GRNVrqRDf9eZ2gLdfCn+9eD+kBnPZg/jUMzONHZEWIrTrPY7mCSL4Pjip6nWfaBOMCl1qvqb2HT4o 7vyj6IXonO26CBH8wFVqwtNGfmQlaVCLb54fTj2DkIHHiSMh1QgLIUj8I1PkNz1uy1xjiQFa0Y+Sq 2DNnQHfmuOXfn8CW5inu2xfFoqLhlvw==; 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 1eviJz-0006ZR-7U; Tue, 13 Mar 2018 11:42:23 +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 1eviJw-0006XH-5V for linux-arm-kernel@lists.infradead.org; Tue, 13 Mar 2018 11:42:22 +0000 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.129]) with ESMTPA (Nemesis) id 0MCk6A-1emKfB2A4I-009Rgi; Tue, 13 Mar 2018 12:42:03 +0100 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: fix undefined reference to 'printk' Date: Tue, 13 Mar 2018 12:41:41 +0100 Message-Id: <20180313114202.1977512-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:U1ifi3t5oDSw750VgHRFPRs+atECevdLU7JfMLSPODKNGYOoHZ1 1Jq4UlWF7y5GlHPlWFh47RnwS2x7YePF66P7mgEGupD0mkmeKE1/fsQppG/dihgHjB6UKCU plhQGvTj+hkpxGLaWvDOyEZSMIWs/AMUptzSTKzwb/khE28T8FPCLmT4fdwPEVHsbJ5aZPp po0M8LO5TsoSygW6u1p2w== X-UI-Out-Filterresults: notjunk:1; V01:K0:0OCtW/AB02c=:EJZgnvnyMSGbfv/jVCsY3x GU3wdSXP4knuNr2kpu4IEYVuoUeRwbiKYlchfqdt7yk1AC3ptt7lwru62VbDnGRih7XXLYCyV sVTfWiz51WXUt0ks454yAfflKtFU/JrTVFmq/78wEaaDfc/BaZlWfJ5IGVfb4oGcZ2QLxXyNh 7hFx2vQythM5MLlR/+1/QYlndgXDl7gLTlx6k/HLdbHfVcXgd1R5mXJ2KqnAia/ZV8RCAY+Dv Q8CWK/3mxVP2QzP8DnoqeIVV94QteqPGQvAUycXpZfKpHV5ztx5pupqrGxhwS6pZMaTI2pDjg 33bO/L/0vE+xP8Y38KBtJl/leDY4Z0ReYNwTiIpCGOdrrBhag3DXwokpUIw5OF1UbEsQGWsf1 khRd+y04q63zK8WjkaWSVjJwQGJyX14MU4L4UflDrcP42JxUcjt3hVZJtncf0cnoyNgDUwkzV DLjLCqn1yrObtUdthKhVjHt7OgzXFoaQEgmlCBFEUjAOoayPpnHjFiNd1yopNqRmnqOWjUQkX L9+7g2hyB43wU0hipKk1GmKDZMmWczR61zLb0mT5OmqSjOuGV0PkQjXLaZ+THPFWwIGQlyKsD Xn1hkG0IuaAkdiMH12nGjQjdkd1WWV3HyKOzqzgJQxEN/NDS9ikBuTzUA+/+ZrsaYO7J1NTi8 i2GuCifD0S5GmYeNjxnzLlEJJw1Kof6eitt04MKw0KCynRxxC+UE2VN2T4yHII3ogf1wKrWFw Uta8u7ZZxPb1/LBhYKA6E19NwZKWEzg9YujvGA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180313_044220_529127_03BA148D X-CRM114-Status: GOOD ( 12.20 ) 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") Ard Biesheuvel Signed-off-by: Arnd Bergmann Acked-by: ^^^ --- 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)