From a80958f4849316a18c06f75b9e850ccecbf20df8 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@hera.kernel.org>
Date: Mon, 4 Dec 2006 20:41:19 +0000
Subject: [PATCH] [PATCH] fix fallout from header dependency trimming
OK, that seems to be enough to deal with the mess.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
include/linux/kernelcapi.h | 1 +
include/linux/netfilter.h | 1 -
include/linux/skbuff.h | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index f8a0ff86dacc..aea34e74c496 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -48,6 +48,7 @@ typedef struct kcapi_carddef {
#include <linux/list.h>
#include <linux/skbuff.h>
#include <linux/workqueue.h>
+#include <asm/semaphore.h>
#define KCI_CONTRUP 0 /* arg: struct capi_profile */
#define KCI_CONTRDOWN 1 /* arg: NULL */
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 9389cf7d4062..d4c4c5120bc0 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -11,7 +11,6 @@
#include <linux/list.h>
#endif
#include <linux/compiler.h>
-#include <linux/rcupdate.h>
/* Responses from hook functions. */
#define NF_DROP 0
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6bdff9b148d0..a05a5f7c0b73 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -25,6 +25,7 @@
#include <linux/net.h>
#include <linux/textsearch.h>
#include <net/checksum.h>
+#include <linux/rcupdate.h>
#include <linux/dmaengine.h>
#define HAVE_ALLOC_SKB /* For the drivers to know */
--
GitLab