diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:09:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:09:47 +1000 |
| commit | 6ad609d8e30d2fcaa0236ed3617437b10f7a8ae1 (patch) | |
| tree | 7b19733e64e5e0b99002b13a9fdf85936fb1a44a /net | |
| parent | 93b90900b70a7f6ea9cda5999dd8e4f1539b8f4e (diff) | |
| parent | bd662bb5113d65b9a9e920316c09a49d30537418 (diff) | |
Merge commit 'sched-latest/latest'
Diffstat (limited to 'net')
| -rw-r--r-- | net/802/psnap.c | 1 | ||||
| -rw-r--r-- | net/8021q/vlan.c | 1 | ||||
| -rw-r--r-- | net/bridge/br_fdb.c | 1 | ||||
| -rw-r--r-- | net/bridge/br_stp.c | 1 | ||||
| -rw-r--r-- | net/netlabel/netlabel_domainhash.c | 3 |
5 files changed, 5 insertions, 2 deletions
diff --git a/net/802/psnap.c b/net/802/psnap.c index 31128cb92a23..ea4643931446 100644 --- a/net/802/psnap.c +++ b/net/802/psnap.c @@ -20,6 +20,7 @@ #include <linux/mm.h> #include <linux/in.h> #include <linux/init.h> +#include <linux/rculist.h> static LIST_HEAD(snap_list); static DEFINE_SPINLOCK(snap_lock); diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 2a739adaa92b..e7ddbfa0e02f 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -27,6 +27,7 @@ #include <linux/mm.h> #include <linux/in.h> #include <linux/init.h> +#include <linux/rculist.h> #include <net/p8022.h> #include <net/arp.h> #include <linux/rtnetlink.h> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9326c377822e..71be69e94f88 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/rculist.h> #include <linux/spinlock.h> #include <linux/times.h> #include <linux/netdevice.h> diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index e38034aa56f5..9e96ffcd29a3 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -13,6 +13,7 @@ * 2 of the License, or (at your option) any later version. */ #include <linux/kernel.h> +#include <linux/rculist.h> #include "br_private.h" #include "br_private_stp.h" diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c index 02c2f7c0b255..643c032a3a57 100644 --- a/net/netlabel/netlabel_domainhash.c +++ b/net/netlabel/netlabel_domainhash.c @@ -30,8 +30,7 @@ */ #include <linux/types.h> -#include <linux/rcupdate.h> -#include <linux/list.h> +#include <linux/rculist.h> #include <linux/skbuff.h> #include <linux/spinlock.h> #include <linux/string.h> |