Skip to content

Commit b453257

Browse files
Al ViroLinus Torvalds
Al Viro
authored and
Linus Torvalds
committed
[PATCH] kill gratitious includes of major.h under net/*
A lot of places in there are including major.h for no reason whatsoever. Removed. And yes, it still builds. The history of that stuff is often amusing. E.g. for net/core/sock.c the story looks so, as far as I've been able to reconstruct it: we used to need major.h in net/socket.c circa 1.1.early. In 1.1.13 that need had disappeared, along with register_chrdev(SOCKET_MAJOR, "socket", &net_fops) in sock_init(). Include had not. When 1.2 -> 1.3 reorg of net/* had moved a lot of stuff from net/socket.c to net/core/sock.c, this crap had followed... Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 94f2f71 commit b453257

21 files changed

+0
-21
lines changed

‎net/bluetooth/af_bluetooth.c

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <linux/list.h>
3232
#include <linux/errno.h>
3333
#include <linux/kernel.h>
34-
#include <linux/major.h>
3534
#include <linux/sched.h>
3635
#include <linux/slab.h>
3736
#include <linux/skbuff.h>

‎net/bluetooth/bnep/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <linux/types.h>
3535
#include <linux/errno.h>
3636
#include <linux/kernel.h>
37-
#include <linux/major.h>
3837
#include <linux/sched.h>
3938
#include <linux/slab.h>
4039
#include <linux/poll.h>

‎net/bluetooth/cmtp/capi.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/types.h>
2727
#include <linux/errno.h>
2828
#include <linux/kernel.h>
29-
#include <linux/major.h>
3029
#include <linux/sched.h>
3130
#include <linux/slab.h>
3231
#include <linux/poll.h>

‎net/bluetooth/cmtp/core.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/types.h>
2727
#include <linux/errno.h>
2828
#include <linux/kernel.h>
29-
#include <linux/major.h>
3029
#include <linux/sched.h>
3130
#include <linux/slab.h>
3231
#include <linux/poll.h>

‎net/bluetooth/cmtp/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/types.h>
2727
#include <linux/errno.h>
2828
#include <linux/kernel.h>
29-
#include <linux/major.h>
3029
#include <linux/sched.h>
3130
#include <linux/slab.h>
3231
#include <linux/poll.h>

‎net/bluetooth/hci_conn.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/types.h>
3131
#include <linux/errno.h>
3232
#include <linux/kernel.h>
33-
#include <linux/major.h>
3433
#include <linux/sched.h>
3534
#include <linux/slab.h>
3635
#include <linux/poll.h>

‎net/bluetooth/hci_core.c

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <linux/types.h>
3232
#include <linux/errno.h>
3333
#include <linux/kernel.h>
34-
#include <linux/major.h>
3534
#include <linux/sched.h>
3635
#include <linux/slab.h>
3736
#include <linux/poll.h>

‎net/bluetooth/hci_event.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/types.h>
3131
#include <linux/errno.h>
3232
#include <linux/kernel.h>
33-
#include <linux/major.h>
3433
#include <linux/sched.h>
3534
#include <linux/slab.h>
3635
#include <linux/poll.h>

‎net/bluetooth/hci_sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/types.h>
3131
#include <linux/errno.h>
3232
#include <linux/kernel.h>
33-
#include <linux/major.h>
3433
#include <linux/sched.h>
3534
#include <linux/slab.h>
3635
#include <linux/poll.h>

‎net/bluetooth/hidp/core.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/types.h>
2727
#include <linux/errno.h>
2828
#include <linux/kernel.h>
29-
#include <linux/major.h>
3029
#include <linux/sched.h>
3130
#include <linux/slab.h>
3231
#include <linux/poll.h>

‎net/bluetooth/hidp/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/types.h>
2727
#include <linux/errno.h>
2828
#include <linux/kernel.h>
29-
#include <linux/major.h>
3029
#include <linux/sched.h>
3130
#include <linux/slab.h>
3231
#include <linux/poll.h>

‎net/bluetooth/l2cap.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/types.h>
3131
#include <linux/errno.h>
3232
#include <linux/kernel.h>
33-
#include <linux/major.h>
3433
#include <linux/sched.h>
3534
#include <linux/slab.h>
3635
#include <linux/poll.h>

‎net/bluetooth/rfcomm/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <linux/types.h>
3434
#include <linux/errno.h>
3535
#include <linux/kernel.h>
36-
#include <linux/major.h>
3736
#include <linux/sched.h>
3837
#include <linux/slab.h>
3938
#include <linux/poll.h>

‎net/bluetooth/sco.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <linux/types.h>
3131
#include <linux/errno.h>
3232
#include <linux/kernel.h>
33-
#include <linux/major.h>
3433
#include <linux/sched.h>
3534
#include <linux/slab.h>
3635
#include <linux/poll.h>

‎net/core/rtnetlink.c

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/types.h>
2323
#include <linux/socket.h>
2424
#include <linux/kernel.h>
25-
#include <linux/major.h>
2625
#include <linux/sched.h>
2726
#include <linux/timer.h>
2827
#include <linux/string.h>

‎net/core/scm.c

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/sched.h>
1616
#include <linux/mm.h>
1717
#include <linux/kernel.h>
18-
#include <linux/major.h>
1918
#include <linux/stat.h>
2019
#include <linux/socket.h>
2120
#include <linux/file.h>

‎net/core/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
#include <linux/socket.h>
9898
#include <linux/in.h>
9999
#include <linux/kernel.h>
100-
#include <linux/major.h>
101100
#include <linux/module.h>
102101
#include <linux/proc_fs.h>
103102
#include <linux/seq_file.h>

‎net/ipv4/af_inet.c

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
#include <linux/socket.h>
7474
#include <linux/in.h>
7575
#include <linux/kernel.h>
76-
#include <linux/major.h>
7776
#include <linux/module.h>
7877
#include <linux/sched.h>
7978
#include <linux/timer.h>

‎net/ipv6/af_inet6.c

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <linux/socket.h>
2929
#include <linux/in.h>
3030
#include <linux/kernel.h>
31-
#include <linux/major.h>
3231
#include <linux/sched.h>
3332
#include <linux/timer.h>
3433
#include <linux/string.h>

‎net/netlink/af_netlink.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include <linux/kernel.h>
2323
#include <linux/init.h>
24-
#include <linux/major.h>
2524
#include <linux/signal.h>
2625
#include <linux/sched.h>
2726
#include <linux/errno.h>

‎net/unix/af_unix.c

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
#include <linux/module.h>
8686
#include <linux/config.h>
8787
#include <linux/kernel.h>
88-
#include <linux/major.h>
8988
#include <linux/signal.h>
9089
#include <linux/sched.h>
9190
#include <linux/errno.h>

0 commit comments

Comments
 (0)