From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2018 23:28:59 +0000 (+1000)
Subject: netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()
X-Git-Tag: v4.17-rc3~39^2~9^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=765cca91b895c8b747bca0b5fa54d1dc85c867a7;p=linux-2.6-block.git

netfilter: conntrack: include kmemleak.h for kmemleak_not_leak()

After merging the netfilter tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/netfilter/nf_conntrack_extend.c: In function 'nf_ct_ext_add':
net/netfilter/nf_conntrack_extend.c:74:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
  kmemleak_not_leak(old);
  ^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors

Fixes: 114aa35d06d4 ("netfilter: conntrack: silent a memory leak warning")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index bd71a828ebde..277bbfe26478 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -9,6 +9,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 #include <linux/kernel.h>
+#include <linux/kmemleak.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/rcupdate.h>