watchdog: mei_wdt: implement MEI iAMT watchdog driver

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index c663874b7d4f73a039de46b8fd5c27b134f91a08..0c9110785f4d87c2842ce402be32a4ec3f1680dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,7 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR
        mv tmp data
 
 PVE_CONFIG_OPTS= \
+-m INTEL_MEI_WDT \
 -d CONFIG_SND_PCM_OSS \
 -d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
 -d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
@@ -256,6 +257,10 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 < ../981-2-PCI-Quirk-PCH-root-port-ACS-for-Sunrise-Point.patch
        cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
        cd ${KERNEL_SRC}; patch -p1 < ../ie31200_edac-add-skylake-support.patch
+       # avoid iAMT watchdog problems (not a real watchdog, because does not reset the host)
+       cd ${KERNEL_SRC}; patch -p1 < ../watchdog_implement-mei-iamt-driver.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@