From patchwork Thu Dec 3 22:27:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11949755 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=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 B5322C433FE for ; Thu, 3 Dec 2020 22:29:14 +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 3D0BD22224 for ; Thu, 3 Dec 2020 22:29:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D0BD22224 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.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:MIME-Version: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=5Gny//mzRiPCUvbg0Z7EZUR3ivlOiMRWLXqNWdWsfzo=; b=Uu1wLuTLst1XTiVxAw0xBENVPq W/DAF01IVKFjsBIWUOv6eBZSbexLM9x2uUjm4eroAQiLQkm9pnensx2KTqI0MTPkvn74LwCGzUQvm iQLubCNwYkTMhdnumZKxXYFhqXp9hEq8bYvoEv9tASLNeHewlMNGt80LgtmDoNIlrU1pg8XsR3Np3 4gqzesMXo0N46vjBWVgcvNOVxK57Gv0mdMb/0RDbjMR5+9Rck93Ur04NUJQGmwUsVYKAKi9cEko7F IXTjCPoYc5MrBmYISFseLK1+ru8YkbEMmgf3PcURXkgbFoPba39p0n9NJMzhnCXrcDInLfOCUyvQr 5EwRQ2Nw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkx56-00049o-Hv; Thu, 03 Dec 2020 22:28:08 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkx54-00048W-95 for linux-arm-kernel@lists.infradead.org; Thu, 03 Dec 2020 22:28:07 +0000 From: Arnd Bergmann Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: Catalin Marinas , Will Deacon , Sumit Garg , Alexandru Elisei Subject: [PATCH] arm64: fix HARDLOCKUP_DETECTOR dependency Date: Thu, 3 Dec 2020 23:27:26 +0100 Message-Id: <20201203222800.1009987-1-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201203_172806_412072_176B04EA X-CRM114-Status: GOOD ( 13.13 ) 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: Arnd Bergmann , linux-kernel@vger.kernel.org, Mark Brown , Andrew Morton , Vincenzo Frascino , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann When CONFIG_HW_PERF_EVENTS is disabled, the hardware lockup detector fails to link: ld.lld: error: undefined symbol: hw_nmi_get_sample_period >>> referenced by watchdog_hld.c >>> watchdog_hld.o:(hardlockup_detector_event_create) in archive kernel/built-in.a Fix the dependency to refer to the Kconfig symbol that actually controls the feature. Fixes: 367c820ef080 ("arm64: Enable perf events based hard lockup detector") Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7599ad86e9a8..ecd900ad7755 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -176,7 +176,7 @@ config ARM64 select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI - select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI + select HAVE_HARDLOCKUP_DETECTOR_PERF if HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API