diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/atm_misc.c | 2 | ||||
| -rw-r--r-- | net/atm/clip.c | 2 | ||||
| -rw-r--r-- | net/atm/common.c | 2 | ||||
| -rw-r--r-- | net/atm/lec.c | 2 | ||||
| -rw-r--r-- | net/atm/proc.c | 2 | ||||
| -rw-r--r-- | net/bridge/br_fdb.c | 2 | ||||
| -rw-r--r-- | net/core/flow.c | 2 | ||||
| -rw-r--r-- | net/decnet/dn_fib.c | 2 | ||||
| -rw-r--r-- | net/decnet/dn_neigh.c | 2 | ||||
| -rw-r--r-- | net/decnet/dn_table.c | 2 | ||||
| -rw-r--r-- | net/decnet/dn_timer.c | 2 | ||||
| -rw-r--r-- | net/ipv4/cipso_ipv4.c | 2 | ||||
| -rw-r--r-- | net/ipv4/raw.c | 2 | ||||
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 | ||||
| -rw-r--r-- | net/iucv/iucv.c | 2 | ||||
| -rw-r--r-- | net/l2tp/l2tp_core.c | 2 | ||||
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nfnetlink_queue.c | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_cipso_v4.c | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_mgmt.c | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_mgmt.h | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/xprtrdma/xprt_rdma.h | 2 | ||||
| -rw-r--r-- | net/tipc/core.h | 2 | 
26 files changed, 26 insertions, 26 deletions
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c index fc63526d869..f41f02656ff 100644 --- a/net/atm/atm_misc.c +++ b/net/atm/atm_misc.c @@ -9,7 +9,7 @@  #include <linux/sonet.h>  #include <linux/bitops.h>  #include <linux/errno.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  int atm_charge(struct atm_vcc *vcc, int truesize)  { diff --git a/net/atm/clip.c b/net/atm/clip.c index 4bc8c67ecb1..852394072fa 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -37,7 +37,7 @@  #include <linux/uaccess.h>  #include <asm/byteorder.h> /* for htons etc. */  #include <asm/system.h> /* save/restore_flags */ -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "common.h"  #include "resources.h" diff --git a/net/atm/common.c b/net/atm/common.c index 22b963d06a1..14ff9fe3998 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -23,7 +23,7 @@  #include <linux/uaccess.h>  #include <linux/poll.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "resources.h"		/* atm_find_dev */  #include "common.h"		/* prototypes */ diff --git a/net/atm/lec.c b/net/atm/lec.c index ba48daa68c1..215c9fad7cd 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -1335,7 +1335,7 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,  #include <linux/types.h>  #include <linux/timer.h>  #include <linux/param.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <linux/inetdevice.h>  #include <net/route.h> diff --git a/net/atm/proc.c b/net/atm/proc.c index be3afdefec5..0d020de8d23 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c @@ -27,7 +27,7 @@  #include <net/atmclip.h>  #include <linux/uaccess.h>  #include <linux/param.h> /* for HZ */ -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "resources.h"  #include "common.h" /* atm_proc_init prototype */  #include "signaling.h" /* to get sigd - ugly too */ diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index e0dfbc151dd..68def3b7fb4 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -21,7 +21,7 @@  #include <linux/jhash.h>  #include <linux/random.h>  #include <linux/slab.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/unaligned.h>  #include "br_private.h" diff --git a/net/core/flow.c b/net/core/flow.c index 990703b8863..bf32c33cad3 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -22,7 +22,7 @@  #include <linux/cpumask.h>  #include <linux/mutex.h>  #include <net/flow.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <linux/security.h>  struct flow_cache_entry { diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index 2bd8e53d777..9e885f180b6 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c @@ -30,7 +30,7 @@  #include <linux/netdevice.h>  #include <linux/timer.h>  #include <linux/spinlock.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/uaccess.h>  #include <net/neighbour.h>  #include <net/dst.h> diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index 0dc3fe61085..7f0eb087dc1 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c @@ -38,7 +38,7 @@  #include <linux/seq_file.h>  #include <linux/rcupdate.h>  #include <linux/jhash.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <net/net_namespace.h>  #include <net/neighbour.h>  #include <net/dst.h> diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index cd0354e9bdb..a9a62f225a6 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c @@ -25,7 +25,7 @@  #include <linux/netdevice.h>  #include <linux/timer.h>  #include <linux/spinlock.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/uaccess.h>  #include <linux/route.h> /* RTF_xxx */  #include <net/neighbour.h> diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c index 09825711d58..67f691bd4ac 100644 --- a/net/decnet/dn_timer.c +++ b/net/decnet/dn_timer.c @@ -22,7 +22,7 @@  #include <linux/timer.h>  #include <linux/spinlock.h>  #include <net/sock.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <net/flow.h>  #include <net/dn.h> diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 2b3c23c287c..2c2a98e402e 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -50,7 +50,7 @@  #include <net/tcp.h>  #include <net/netlabel.h>  #include <net/cipso_ipv4.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/bug.h>  #include <asm/unaligned.h> diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 08526786dc3..1457acb39ce 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -38,7 +38,7 @@   */  #include <linux/types.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/byteorder.h>  #include <asm/current.h>  #include <asm/uaccess.h> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 36c2842a86b..0bc98886c38 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -40,7 +40,7 @@  #include <linux/slab.h>  #include <asm/uaccess.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <net/icmp.h>  #include <net/ip.h> diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index f2b713847b4..075a3808aa4 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c @@ -51,7 +51,7 @@  #include <linux/cpu.h>  #include <linux/reboot.h>  #include <net/iucv/iucv.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/ebcdic.h>  #include <asm/io.h>  #include <asm/irq.h> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index ed8a2335442..ad4ac2601a5 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -55,7 +55,7 @@  #include <net/protocol.h>  #include <asm/byteorder.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "l2tp_core.h" diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 39a21d0c61c..f42cd091596 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -97,7 +97,7 @@  #include <net/xfrm.h>  #include <asm/byteorder.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "l2tp_core.h" diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 2e7ccbb43dd..2d8158acf6f 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -33,7 +33,7 @@  #include <net/netfilter/nf_log.h>  #include <net/netfilter/nfnetlink_log.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #ifdef CONFIG_BRIDGE_NETFILTER  #include "../bridge/br_private.h" diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 49132bddd73..00bd475eab4 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -31,7 +31,7 @@  #include <net/sock.h>  #include <net/netfilter/nf_queue.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #ifdef CONFIG_BRIDGE_NETFILTER  #include "../bridge/br_private.h" diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c index bae5756b162..dd53a36d89a 100644 --- a/net/netlabel/netlabel_cipso_v4.c +++ b/net/netlabel/netlabel_cipso_v4.c @@ -39,7 +39,7 @@  #include <net/genetlink.h>  #include <net/netlabel.h>  #include <net/cipso_ipv4.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "netlabel_user.h"  #include "netlabel_cipso_v4.h" diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 1b83e0009d8..b528dd928d3 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -39,7 +39,7 @@  #include <net/netlabel.h>  #include <net/cipso_ipv4.h>  #include <asm/bug.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "netlabel_domainhash.h"  #include "netlabel_unlabeled.h" diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c index 4f251b19fbc..dff8a080924 100644 --- a/net/netlabel/netlabel_mgmt.c +++ b/net/netlabel/netlabel_mgmt.c @@ -42,7 +42,7 @@  #include <net/ipv6.h>  #include <net/netlabel.h>  #include <net/cipso_ipv4.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "netlabel_domainhash.h"  #include "netlabel_user.h" diff --git a/net/netlabel/netlabel_mgmt.h b/net/netlabel/netlabel_mgmt.h index 0a25838bcf4..8db37f4c10f 100644 --- a/net/netlabel/netlabel_mgmt.h +++ b/net/netlabel/netlabel_mgmt.h @@ -32,7 +32,7 @@  #define _NETLABEL_MGMT_H  #include <net/netlabel.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  /*   * The following NetLabel payloads are supported by the management interface. diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 9a290ef5c17..f1ecf848e3a 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c @@ -52,7 +52,7 @@  #include <net/net_namespace.h>  #include <net/netlabel.h>  #include <asm/bug.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include "netlabel_user.h"  #include "netlabel_addrlist.h" diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index cae761a8536..ddf05288d9f 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -42,7 +42,7 @@  #include <linux/wait.h> 		/* wait_queue_head_t, etc */  #include <linux/spinlock.h> 		/* spinlock_t, etc */ -#include <asm/atomic.h>			/* atomic_t, etc */ +#include <linux/atomic.h>			/* atomic_t, etc */  #include <rdma/rdma_cm.h>		/* RDMA connection api */  #include <rdma/ib_verbs.h>		/* RDMA verbs api */ diff --git a/net/tipc/core.h b/net/tipc/core.h index d234a98a460..2761af36d14 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -47,7 +47,7 @@  #include <linux/string.h>  #include <asm/uaccess.h>  #include <linux/interrupt.h> -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <asm/hardirq.h>  #include <linux/netdevice.h>  #include <linux/in.h>  |