aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/appletalk/ddp.c1
-rw-r--r--net/ax25/af_ax25.c1
-rw-r--r--net/bluetooth/bnep/core.c1
-rw-r--r--net/bridge/br_stp.c1
-rw-r--r--net/bridge/br_stp_if.c1
-rw-r--r--net/bridge/br_stp_timer.c1
-rw-r--r--net/core/netpoll.c1
-rw-r--r--net/core/pktgen.c1
-rw-r--r--net/ipv4/af_inet.c1
-rw-r--r--net/ipv4/tcp.c1
-rw-r--r--net/ipv4/tcp_output.c1
-rw-r--r--net/ipv6/af_inet6.c1
-rw-r--r--net/ipx/af_ipx.c1
-rw-r--r--net/irda/af_irda.c1
-rw-r--r--net/netlink/af_netlink.c1
-rw-r--r--net/unix/af_unix.c1
-rw-r--r--net/x25/af_x25.c1
17 files changed, 0 insertions, 17 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index f6a92a0b7aa6..fbdfb1224ae1 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1844,7 +1844,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
1844 .sendpage = sock_no_sendpage, 1844 .sendpage = sock_no_sendpage,
1845}; 1845};
1846 1846
1847#include <linux/smp_lock.h>
1848SOCKOPS_WRAP(atalk_dgram, PF_APPLETALK); 1847SOCKOPS_WRAP(atalk_dgram, PF_APPLETALK);
1849 1848
1850static struct notifier_block ddp_notifier = { 1849static struct notifier_block ddp_notifier = {
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 6ded95272a53..429e13a6c6ad 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -23,7 +23,6 @@
23#include <linux/sched.h> 23#include <linux/sched.h>
24#include <linux/timer.h> 24#include <linux/timer.h>
25#include <linux/string.h> 25#include <linux/string.h>
26#include <linux/smp_lock.h>
27#include <linux/sockios.h> 26#include <linux/sockios.h>
28#include <linux/net.h> 27#include <linux/net.h>
29#include <net/ax25.h> 28#include <net/ax25.h>
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index ab2db55982ca..1c8f4a0c5f43 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -37,7 +37,6 @@
37#include <linux/init.h> 37#include <linux/init.h>
38#include <linux/wait.h> 38#include <linux/wait.h>
39#include <linux/errno.h> 39#include <linux/errno.h>
40#include <linux/smp_lock.h>
41#include <linux/net.h> 40#include <linux/net.h>
42#include <net/sock.h> 41#include <net/sock.h>
43 42
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index ebb0861e9bd5..0e035d6162cc 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -13,7 +13,6 @@
13 * 2 of the License, or (at your option) any later version. 13 * 2 of the License, or (at your option) any later version.
14 */ 14 */
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/smp_lock.h>
17 16
18#include "br_private.h" 17#include "br_private.h"
19#include "br_private_stp.h" 18#include "br_private_stp.h"
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 3e246b37020e..a786e7863200 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -14,7 +14,6 @@
14 */ 14 */
15 15
16#include <linux/kernel.h> 16#include <linux/kernel.h>
17#include <linux/smp_lock.h>
18#include <linux/etherdevice.h> 17#include <linux/etherdevice.h>
19#include <linux/rtnetlink.h> 18#include <linux/rtnetlink.h>
20 19
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 030aa798fea7..24e0ca4a3131 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -15,7 +15,6 @@
15 15
16#include <linux/kernel.h> 16#include <linux/kernel.h>
17#include <linux/times.h> 17#include <linux/times.h>
18#include <linux/smp_lock.h>
19 18
20#include "br_private.h" 19#include "br_private.h"
21#include "br_private_stp.h" 20#include "br_private_stp.h"
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index b316435b0e2a..758dafe284c0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -9,7 +9,6 @@
9 * Copyright (C) 2002 Red Hat, Inc. 9 * Copyright (C) 2002 Red Hat, Inc.
10 */ 10 */
11 11
12#include <linux/smp_lock.h>
13#include <linux/netdevice.h> 12#include <linux/netdevice.h>
14#include <linux/etherdevice.h> 13#include <linux/etherdevice.h>
15#include <linux/string.h> 14#include <linux/string.h>
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index b92a322872a8..9cd3a1cb60ef 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -117,7 +117,6 @@
117#include <linux/module.h> 117#include <linux/module.h>
118#include <linux/moduleparam.h> 118#include <linux/moduleparam.h>
119#include <linux/kernel.h> 119#include <linux/kernel.h>
120#include <linux/smp_lock.h>
121#include <linux/mutex.h> 120#include <linux/mutex.h>
122#include <linux/sched.h> 121#include <linux/sched.h>
123#include <linux/slab.h> 122#include <linux/slab.h>
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 16aae8ef5555..041fba3fa0aa 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -92,7 +92,6 @@
92#include <asm/uaccess.h> 92#include <asm/uaccess.h>
93#include <asm/system.h> 93#include <asm/system.h>
94 94
95#include <linux/smp_lock.h>
96#include <linux/inet.h> 95#include <linux/inet.h>
97#include <linux/igmp.h> 96#include <linux/igmp.h>
98#include <linux/inetdevice.h> 97#include <linux/inetdevice.h>
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 8b124eafbb90..bd4c295f5d79 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -252,7 +252,6 @@
252#include <linux/fcntl.h> 252#include <linux/fcntl.h>
253#include <linux/poll.h> 253#include <linux/poll.h>
254#include <linux/init.h> 254#include <linux/init.h>
255#include <linux/smp_lock.h>
256#include <linux/fs.h> 255#include <linux/fs.h>
257#include <linux/random.h> 256#include <linux/random.h>
258#include <linux/bootmem.h> 257#include <linux/bootmem.h>
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 0faacf9c419d..53232dd6fb48 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -40,7 +40,6 @@
40 40
41#include <linux/compiler.h> 41#include <linux/compiler.h>
42#include <linux/module.h> 42#include <linux/module.h>
43#include <linux/smp_lock.h>
44 43
45/* People can turn this off for buggy TCP's found in printers etc. */ 44/* People can turn this off for buggy TCP's found in printers etc. */
46int sysctl_tcp_retrans_collapse __read_mostly = 1; 45int sysctl_tcp_retrans_collapse __read_mostly = 1;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 18cb928c8d92..6dd377253cf7 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -42,7 +42,6 @@
42#include <linux/inet.h> 42#include <linux/inet.h>
43#include <linux/netdevice.h> 43#include <linux/netdevice.h>
44#include <linux/icmpv6.h> 44#include <linux/icmpv6.h>
45#include <linux/smp_lock.h>
46#include <linux/netfilter_ipv6.h> 45#include <linux/netfilter_ipv6.h>
47 46
48#include <net/ip.h> 47#include <net/ip.h>
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 392f8bc92691..15419dd682fd 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1961,7 +1961,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
1961 .sendpage = sock_no_sendpage, 1961 .sendpage = sock_no_sendpage,
1962}; 1962};
1963 1963
1964#include <linux/smp_lock.h>
1965SOCKOPS_WRAP(ipx_dgram, PF_IPX); 1964SOCKOPS_WRAP(ipx_dgram, PF_IPX);
1966 1965
1967static struct packet_type ipx_8023_packet_type = { 1966static struct packet_type ipx_8023_packet_type = {
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 06c97c60d542..dcd7e325b283 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2538,7 +2538,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(irda_ultra_ops) = {
2538}; 2538};
2539#endif /* CONFIG_IRDA_ULTRA */ 2539#endif /* CONFIG_IRDA_ULTRA */
2540 2540
2541#include <linux/smp_lock.h>
2542SOCKOPS_WRAP(irda_stream, PF_IRDA); 2541SOCKOPS_WRAP(irda_stream, PF_IRDA);
2543SOCKOPS_WRAP(irda_seqpacket, PF_IRDA); 2542SOCKOPS_WRAP(irda_seqpacket, PF_IRDA);
2544SOCKOPS_WRAP(irda_dgram, PF_IRDA); 2543SOCKOPS_WRAP(irda_dgram, PF_IRDA);
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 507828d7d4ae..1f15821c8da4 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -45,7 +45,6 @@
45#include <linux/rtnetlink.h> 45#include <linux/rtnetlink.h>
46#include <linux/proc_fs.h> 46#include <linux/proc_fs.h>
47#include <linux/seq_file.h> 47#include <linux/seq_file.h>
48#include <linux/smp_lock.h>
49#include <linux/notifier.h> 48#include <linux/notifier.h>
50#include <linux/security.h> 49#include <linux/security.h>
51#include <linux/jhash.h> 50#include <linux/jhash.h>
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index aec8cf165e1a..fc12ba51c1fc 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -111,7 +111,6 @@
111#include <net/scm.h> 111#include <net/scm.h>
112#include <linux/init.h> 112#include <linux/init.h>
113#include <linux/poll.h> 113#include <linux/poll.h>
114#include <linux/smp_lock.h>
115#include <linux/rtnetlink.h> 114#include <linux/rtnetlink.h>
116#include <linux/mount.h> 115#include <linux/mount.h>
117#include <net/checksum.h> 116#include <net/checksum.h>
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 0d6002fc77b2..479927cb45ca 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1605,7 +1605,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(x25_proto_ops) = {
1605 .sendpage = sock_no_sendpage, 1605 .sendpage = sock_no_sendpage,
1606}; 1606};
1607 1607
1608#include <linux/smp_lock.h>
1609SOCKOPS_WRAP(x25_proto, AF_X25); 1608SOCKOPS_WRAP(x25_proto, AF_X25);
1610 1609
1611static struct packet_type x25_packet_type = { 1610static struct packet_type x25_packet_type = {