From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755637AbbHEWR0 (ORCPT ); Wed, 5 Aug 2015 18:17:26 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40171 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753910AbbHEWRX (ORCPT ); Wed, 5 Aug 2015 18:17:23 -0400 Date: Wed, 5 Aug 2015 15:17:22 -0700 From: Andrew Morton To: Ulrich Obergfell Cc: linux-kernel@vger.kernel.org, dzickus@redhat.com, atomlin@redhat.com, jolsa@kernel.org, mhocko@suse.cz, eranian@google.com, cmetcalf@ezchip.com, fweisbec@gmail.com Subject: Re: [PATCH 4/4] watchdog: use suspend/resume interface in fixup_ht_bug() Message-Id: <20150805151722.86ca10b335b4f011181b65d2@linux-foundation.org> In-Reply-To: <1438433365-2979-5-git-send-email-uobergfe@redhat.com> References: <1438433365-2979-1-git-send-email-uobergfe@redhat.com> <1438433365-2979-5-git-send-email-uobergfe@redhat.com> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 1 Aug 2015 14:49:25 +0200 Ulrich Obergfell wrote: > Remove watchdog_nmi_disable_all() and watchdog_nmi_enable_all() > since these functions are no longer needed. If a subsystem has a > need to deactivate the watchdog temporarily, it should utilize the > watchdog_suspend() and watchdog_resume() functions. > With x86_64 allnoconfig I'm getting arch/x86/kernel/cpu/perf_event_intel.c: In function 'fixup_ht_bug': arch/x86/kernel/cpu/perf_event_intel.c:3371: error: implicit declaration of function 'watchdog_suspend' arch/x86/kernel/cpu/perf_event_intel.c:3382: error: implicit declaration of function 'watchdog_resume' I had to mangle your patches fairly heavily to make them fit against other pending changes. Specifically http://ozlabs.org/~akpm/mmots/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch and http://ozlabs.org/~akpm/mmots/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch. But I don't *think* I caused this... I'm testing this: --- a/include/linux/nmi.h~watchdog-use-suspend-resume-interface-in-fixup_ht_bug-fix +++ a/include/linux/nmi.h @@ -80,6 +80,15 @@ extern int proc_watchdog_cpumask(struct void __user *, size_t *, loff_t *); extern int watchdog_suspend(void); extern void watchdog_resume(void); +#else +static inline int watchdog_suspend(void) +{ + return 0; +} + +static inline void watchdog_resume(void) +{ +} #endif #ifdef CONFIG_HAVE_ACPI_APEI_NMI