From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.0 required=3.0 tests=BAYES_00,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 0D913C4361A for ; Thu, 3 Dec 2020 22:29:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B329822224 for ; Thu, 3 Dec 2020 22:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729635AbgLCW2q (ORCPT ); Thu, 3 Dec 2020 17:28:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:53902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbgLCW2q (ORCPT ); Thu, 3 Dec 2020 17:28:46 -0500 From: Arnd Bergmann Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: Catalin Marinas , Will Deacon , Sumit Garg , Alexandru Elisei Cc: Arnd Bergmann , Andrew Morton , Vincenzo Frascino , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- 2.27.0