From patchwork Tue Feb 2 10:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 12061281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E5BC433E6 for ; Tue, 2 Feb 2021 10:10:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 18C4664E4F for ; Tue, 2 Feb 2021 10:10:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 18C4664E4F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:MIME-Version: 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=H8BunsmWE+dYcduOa4+0CFJOoO2LBoh2DHrndmwcZzw=; b=iLHYlQA88Fx99/2GBjeVSW3alN e/UzuSdGC1biAM8ZeZ8LrnDCt1pqg56oD6eKzQ9YrLqce3oXTAcoQGqmSa0G3a3jsi1HJC0PlGyAC ZT5oz8YaUx4CPgUvTfrQnOeU/QM2iqkHhwaZWl1Du1nxRdkOjwaSrXuROyNhwQ4tNYufGnbVCQbX8 zTu4hAsB9ZKEqrCdNUdSOzzHsxFOZFShfgdmV3Q22Tg2NhNAE1HSH3s4m3yh0ClrGeroRymov9++c ETN+HpKrDcSh89Qgz+K7K0By9aFzhk/AP6Us1A+EntloezN7V2HFVGHzud0bGEulRDFiv9MXkCFnj fNVu3yLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6sci-0006Hn-9X; Tue, 02 Feb 2021 10:09:28 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6scf-0006GC-2O for linux-arm-kernel@lists.infradead.org; Tue, 02 Feb 2021 10:09:26 +0000 Received: by mail-ej1-x633.google.com with SMTP id f14so4756388ejc.8 for ; Tue, 02 Feb 2021 02:09:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=ROBpI0H1sH3Bdn16B+TcSkCCiBYHadxhxvAD8liGX80=; b=lINFXTSGlw9ytH/IKb+fRhxjL5/GRVo7vTrGMKkL5BJlu30jPX+4hlHNEzk9Ql/RCl 8DYktJzZDSP1enoE5Rffjpd2Mm8KpWxGHF5XK4wjlfgQkHIybTslr9s/3zGZ8CA9LbYq rMpYS+xL0e/ko2wUOuQp7qLX6FDWEhC2oQJ790AweKmMTVibonDsvOIkJXRYgGbvyK5f 2yroGAwhkYWv1S4c/5qf/Sk7JO200ZHHjHoZuSz+ZXocbJHBjaXketoN6lwpr3N4EhhA /oUmWJ5qgeOMP543QKbJxj0v324VM9xzUWXGQdOEm/rFWnYnQs1y+ELlTIkQrct7Oxo1 Uu7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=ROBpI0H1sH3Bdn16B+TcSkCCiBYHadxhxvAD8liGX80=; b=RDVmlOiHdT8zUr/gQMY88qyTFrGrSnqgVNff0A4LtY0okC89MYZYwPKBVOuGfymQSm 7ZeWamNXglmyTNPBDD5lO00+p0QJxUuW2ZAH6Rkeby0e7dLNLjavupll8ln78E6Oi5i0 eswADlMBGBhE9PX8Rcy2x9cePGp6j8zjA9gTMn4vvDSeK6L9ODqj+aSy9rg7TThQcoef zCujuUf1bnfZuJ2qjvWLDVbHtij5uSEavL9HYbiNXC9MTl0cwL6T9bPLHoFwA9bNAgu4 jRvsiW8njISAc4Hx3oQyn5bVuejdK1DkmdyVtlUGohhyxOGzT1AXSH0juIX/ahV/9+AO tz0A== X-Gm-Message-State: AOAM530SEtF5V/mCsZR9cpXiTmh2IWjNJbloLxLyeRPxkCvQLi8WCBZn 0/UdMgvycm50q2EJ3UI/vTN3lqE3btACPOfcUCV7j/Ls+T5rbg== X-Google-Smtp-Source: ABdhPJzJhQtkmR40mYYncH/1EWrcijaBMdpdpRAHB6Uis0vGexLR6D/RbuikRBHcznR/q0gIzovWB4LZRvUpTuTVpkc= X-Received: by 2002:a17:906:3885:: with SMTP id q5mr22075171ejd.105.1612260560155; Tue, 02 Feb 2021 02:09:20 -0800 (PST) MIME-Version: 1.0 From: Anders Roxell Date: Tue, 2 Feb 2021 11:09:08 +0100 Message-ID: Subject: arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'? To: Stephen Rothwell , Andrey Konovalov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210202_050925_237887_8BE32F25 X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Linux-Next Mailing List , Will Deacon , Linux ARM , lkft-triage@lists.linaro.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, I've seen this failure on tag next-20210202: arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'? I think it may be a merge conflict that didn't get resolved correctly? The below change fixed the issue: Cheers, Anders Signed-off-by: Stephen Rothwell diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 275b5d0f38b8..8f5bd1293496 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -118,7 +118,7 @@ void mte_set_report_once(bool state) { WRITE_ONCE(report_fault_once, state); } -EXPORT_SYMBOL(mte_enable_kernel_sync); +EXPORT_SYMBOL(mte_enable_kernel); EXPORT_SYMBOL(mte_set_report_once); bool mte_report_once(void)