Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752868AbdHJNxt (ORCPT ); Thu, 10 Aug 2017 09:53:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58384 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752847AbdHJNxr (ORCPT ); Thu, 10 Aug 2017 09:53:47 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7E9983D3F95 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=dzickus@redhat.com Date: Thu, 10 Aug 2017 09:53:46 -0400 From: Don Zickus To: Nicholas Piggin Cc: Babu Moger , Michael Ellerman , Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: [PATCH] kernel/watchdog: fix Kconfig constraints for perf hardlockup watchdog Message-ID: <20170810135346.cwrbipkow5klm6ga@redhat.com> References: <20170810114452.6673-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170810114452.6673-1-npiggin@gmail.com> User-Agent: NeoMutt/20170714 (1.8.3) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 10 Aug 2017 13:53:47 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2092 Lines: 55 On Thu, Aug 10, 2017 at 09:44:52PM +1000, Nicholas Piggin wrote: > Patch 05a4a9527931 ("kernel/watchdog: split up config options") lost > the perf-based hardlockup detector's dependency on PERF_EVENTS, which > can result in broken builds with some powerpc configurations. > > Restore the dependency. Add it in for x86 too, despite x86 always > selecting PERF_EVENTS it seems reasonable to make the dependency > explicit. This is because ppc has the unusual configuration of supporting HARDLOCKUP through perf or directly through the arch, right? The Kconfigs assumed an arch went one way or the other. I think this is a good workaround for now. Acked-by: Don Zickus > > Fixes: 05a4a9527931 ("kernel/watchdog: split up config options") > Signed-off-by: Nicholas Piggin > --- > > arch/powerpc/Kconfig | 2 +- > arch/x86/Kconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 36f858c37ca7..81b0031f909f 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -199,7 +199,7 @@ config PPC > select HAVE_OPTPROBES if PPC64 > select HAVE_PERF_EVENTS > select HAVE_PERF_EVENTS_NMI if PPC64 > - select HAVE_HARDLOCKUP_DETECTOR_PERF if HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH > + select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH > select HAVE_PERF_REGS > select HAVE_PERF_USER_STACK_DUMP > select HAVE_RCU_TABLE_FREE if SMP > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 781521b7cf9e..29a1bf85e507 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -163,7 +163,7 @@ config X86 > select HAVE_PCSPKR_PLATFORM > select HAVE_PERF_EVENTS > select HAVE_PERF_EVENTS_NMI > - select HAVE_HARDLOCKUP_DETECTOR_PERF if HAVE_PERF_EVENTS_NMI > + select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI > select HAVE_PERF_REGS > select HAVE_PERF_USER_STACK_DUMP > select HAVE_REGS_AND_STACK_ACCESS_API > -- > 2.13.3 >