Merge branch 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

#include <linux/cpu.h>

#include <linux/nmi.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/freezer.h>

#include <linux/kthread.h>

#include <linux/lockdep.h>

#include <linux/notifier.h>

#include <linux/module.h>

#include <linux/sysctl.h>

#include <linux/smpboot.h>

		/* should be in cleanup, but blocks oprofile */

		perf_event_release_kernel(event);

	}

	return;

	if (cpu == 0) {

		/* watchdog_nmi_enable() expects this to be zero initially. */

		cpu0_err = 0;

	}

}

#else

static int watchdog_nmi_enable(unsigned int cpu) { return 0; }