On Sat, 1 Aug 2015 14:49:25 +0200 Ulrich Obergfell <uober...@redhat.com> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
