Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp2524669ybb; Sun, 5 Apr 2020 09:37:37 -0700 (PDT) X-Google-Smtp-Source: APiQypIJvBwU+x8Tg/GyCLv+7u0TX5YfrIWu2ib3j5jQ5k7jqZX6j8dtbmWfize3U621TmjJRadw X-Received: by 2002:aca:646:: with SMTP id 67mr9832635oig.4.1586104657776; Sun, 05 Apr 2020 09:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586104657; cv=none; d=google.com; s=arc-20160816; b=Dlz+74HPra79LOhp55hP1ARH2x9WpQDZEJ84nCJdr2+/JBHhz5YcwqRLgAatiYA9jE PhDaONbkK7t3+Q3c9C4A+D1rKXGZy0+I3RsCO00wt85XjLrzAoHcIM7rWy71PYFAordm BpQqrU6hQGVcYSw0epDRCcL95YNgM20iJA3tygHB7c5RVylP9JFIT1qSAPk4NPN1TLDd RCy4Cc3shdBcijhtr8S86E9txyiDKX2itL1G9Mn8xi7AP/4H1lXN0KwUqNAs/1pMu8A3 BqkeAUe/JWPiJVLwWQGH4RMoylPSzP/Bx2XYIDEImzsfe4hT3kvGP/mC0/irnjB8y1ex L4dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=5dte5dvvsDQ3wOKn6WARCRcNltPssbbsGfaDy3F1DZ8=; b=fkKc4OU/tUmjdk8EdhFisYVZ6ufFs4QdF6SlCFca/sM2EapO+QAKVazggU3Me69dEu b6cflo8mMtWvN/VSpc/Gls1H9IhdiLaOt0vk+PbmPTOPFPF5mfYVd4Az5gzkNY/dQjh4 9+qQUaidLPsBSTQYFAKlyYU+2E/umaIbxfJmvZ37HE9DuSQIpvsrTF9VPB9Rt+ug569A c5qFGFKnHTTOfKtxn0Hssb/9qEMtyPoIWT2yHDdh1DQ5URCFZdfoyVREmrxzNkdW/4VP mwSbnui6jDT4ZpvcBNisyV7Ki9dnwu4BcR5kHWoGhHHZi9ZyS1CHq0WQb7H7izBPph7U h1Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=NaC2xexF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 51si7050655oty.202.2020.04.05.09.37.25; Sun, 05 Apr 2020 09:37:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=NaC2xexF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727322AbgDEQcV (ORCPT + 99 others); Sun, 5 Apr 2020 12:32:21 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:31221 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726667AbgDEQcV (ORCPT ); Sun, 5 Apr 2020 12:32:21 -0400 Received: from grover.flets-west.jp (softbank126125134031.bbtec.net [126.125.134.31]) (authenticated) by conuserg-12.nifty.com with ESMTP id 035GUxjX014785; Mon, 6 Apr 2020 01:30:59 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com 035GUxjX014785 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1586104259; bh=5dte5dvvsDQ3wOKn6WARCRcNltPssbbsGfaDy3F1DZ8=; h=From:To:Cc:Subject:Date:From; b=NaC2xexFaOoeA+4Wyk79vOG79RDMzA1EzqcWHsj5lfpQ8wEgwpAeIMd/372L1zObg P6lY6M91GVEjJ/xAoZolwDTyQkAJ8WFvLQ6awzewAwocCIqngrtbwFRGIHMtFSfvKe 6rG34v8soPcO4sLbDqZtL54upYVUDFyRy8qcv2gTRF063ShETYiBrDga6gjchJCsGG 1FQzGP3x91GAY8XXBQhrf/p0pNYTkjXhIATJ6L7jLnzAWjYgzGj4G5KKEalmAA2I2u mC0pX7H3vkDFl79PV9K5uF2d4RylWgzNge9GOGkhj4Jgydj72Ibm4ay6uzKI86YN/b 7x8Hav1jv/wig== X-Nifty-SrcIP: [126.125.134.31] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linux-mips@linux-mips.org Cc: clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, Masahiro Yamada , Jiaxun Yang , Paul Burton , Thomas Bogendoerfer , linux-mips@vger.kernel.org Subject: [PATCH] MIPS: fw: arc: add __weak to prom_meminit and prom_free_prom_memory Date: Mon, 6 Apr 2020 01:30:52 +0900 Message-Id: <20200405163052.18942-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As far as I understood, prom_meminit() in arch/mips/fw/arc/memory.c is overridden by the one in arch/mips/sgi-ip32/ip32-memory.c if CONFIG_SGI_IP32 is enabled. The use of EXPORT_SYMBOL in static libraries potentially causes a problem for the llvm linker [1]. So, I want to forcibly link lib-y objects to vmlinux when CONFIG_MODULES=y. As a groundwork, we must fix multiple definitions that have previously been hidden by lib-y. The prom_cleanup() in this file is already marked as __weak (because it is overridden by the one in arch/mips/sgi-ip22/ip22-mc.c). I think it should be OK to do the same for these two. [1]: https://github.com/ClangBuiltLinux/linux/issues/515 Reported-by: kbuild test robot Signed-off-by: Masahiro Yamada --- If MIPS maintainers ack this patch, I want to inser it before the following patch: https://patchwork.kernel.org/patch/11432969/ arch/mips/fw/arc/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c index dbbcddc82823..89fa6e62a3b3 100644 --- a/arch/mips/fw/arc/memory.c +++ b/arch/mips/fw/arc/memory.c @@ -117,7 +117,7 @@ static int __init prom_memtype_classify(union linux_memtypes type) return memtype_classify_arc(type); } -void __init prom_meminit(void) +void __weak __init prom_meminit(void) { struct linux_mdesc *p; @@ -162,7 +162,7 @@ void __weak __init prom_cleanup(void) { } -void __init prom_free_prom_memory(void) +void __weak __init prom_free_prom_memory(void) { int i; -- 2.17.1