diff options
-rw-r--r-- | backport/compat/Kconfig | 1 | ||||
-rw-r--r-- | backport/compat/backport-4.7.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index 335d9058..f66d5f74 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -128,7 +128,6 @@ config BPAUTO_WANT_DEV_COREDUMP config BPAUTO_BUILD_WANT_DEV_COREDUMP bool - depends on KERNEL_3_18 default n if DEV_COREDUMP default n if DISABLE_DEV_COREDUMP default y if BPAUTO_WANT_DEV_COREDUMP diff --git a/backport/compat/backport-4.7.c b/backport/compat/backport-4.7.c index 25a00235..b0647077 100644 --- a/backport/compat/backport-4.7.c +++ b/backport/compat/backport-4.7.c @@ -116,8 +116,12 @@ int nla_put_64bit(struct sk_buff *skb, int attrtype, int attrlen, } EXPORT_SYMBOL_GPL(nla_put_64bit); -/* below 3.18 we copied the entire devcoredump */ -#if LINUX_VERSION_IS_GEQ(3,18,0) +/* + * Below 3.18 or if the kernel has devcoredump disabled, we copied the + * entire devcoredump, so no need to define these functions. + */ +#if LINUX_VERSION_IS_GEQ(3,18,0) && \ + !defined(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) #include <linux/devcoredump.h> #include <linux/scatterlist.h> |