* [RFC Patch 0/2] fix up includes of linux/major.h
@ 2020-06-16 23:26 Stephen Rothwell
2020-06-16 23:27 ` [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed Stephen Rothwell
2020-06-16 23:30 ` [PATCH 2/2] Remove the include of linux/major.h from files that do not need it Stephen Rothwell
0 siblings, 2 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-16 23:26 UTC (permalink / raw)
To: Linux-kernel Mailing List; +Cc: linux-arch, Arnd Bergmann, Greg KH
[-- Attachment #1: Type: text/plain, Size: 8997 bytes --]
Hi all,
[This is not cc'd very widely, but get_maintainers produces a very long
list ...]
I have been looking at our include file mess off and on over time and
have finally decided to start with something easy. linux/major.h
(actually uapi/linux/major.h) is included in quite a few places that
are unnecessary and not included in pleaces it should be. It also does
not include (or depend on) any other file. I was lead here while
looking at reducding the size of linux/tty.h (which this patch series
accomplishes).
Just 2 patches currently:
1/2 Explicitly include linux/major.h where it is needed
2/2 Remove the include of linux/major.h from files that do not need it
arch/alpha/kernel/osf_sys.c | 1 -
arch/alpha/kernel/process.c | 1 -
arch/arm/mach-iop32x/i2c.c | 1 -
arch/arm/mach-omap1/board-h3.c | 1 -
arch/arm/mach-pxa/corgi.c | 1 -
arch/arm/mach-pxa/lubbock.c | 1 -
arch/arm/mach-pxa/tosa.c | 1 -
arch/arm/mach-pxa/viper.c | 1 -
arch/m68k/atari/atasound.c | 1 -
arch/m68k/atari/stram.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 1 -
arch/mips/fw/arc/arc_con.c | 1 -
arch/powerpc/platforms/83xx/km83xx.c | 1 -
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
arch/powerpc/platforms/85xx/sbc8548.c | 1 -
arch/powerpc/platforms/chrp/setup.c | 1 -
arch/powerpc/platforms/maple/setup.c | 1 -
arch/powerpc/platforms/powermac/setup.c | 1 -
arch/powerpc/platforms/pseries/setup.c | 1 -
arch/powerpc/sysdev/fsl_soc.c | 1 -
arch/powerpc/sysdev/tsi108_dev.c | 1 -
arch/sparc/kernel/setup_32.c | 1 -
arch/sparc/kernel/setup_64.c | 1 -
arch/um/drivers/ubd_kern.c | 1 +
arch/xtensa/platforms/xt2000/setup.c | 1 -
arch/xtensa/platforms/xtfpga/setup.c | 1 -
block/genhd.c | 1 +
block/partitions/efi.h | 1 -
drivers/android/binderfs.c | 1 -
drivers/block/amiflop.c | 1 +
drivers/block/ataflop.c | 1 +
drivers/block/drbd/drbd_int.h | 1 -
drivers/block/drbd/drbd_main.c | 1 +
drivers/block/floppy.c | 1 +
drivers/block/swim.c | 1 +
drivers/block/swim3.c | 1 +
drivers/block/xen-blkfront.c | 1 +
drivers/cdrom/cdrom.c | 1 -
drivers/char/hpet.c | 1 -
drivers/char/mem.c | 1 +
drivers/char/mwave/mwavedd.c | 1 -
drivers/char/pcmcia/synclink_cs.c | 1 -
drivers/char/random.c | 1 -
drivers/char/ttyprintk.c | 1 +
drivers/hid/hidraw.c | 1 -
drivers/ide/ide-cs.c | 1 -
drivers/ide/ide-disk.c | 1 -
drivers/ide/ide-floppy.c | 1 -
drivers/ide/ide-io.c | 1 -
drivers/ide/ide-iops.c | 1 -
drivers/ide/ide.c | 1 -
drivers/input/serio/serio_raw.c | 1 -
drivers/isdn/capi/capi.c | 1 -
drivers/md/md.c | 1 +
drivers/message/fusion/mptctl.c | 1 +
drivers/misc/vmw_vmci/vmci_host.c | 1 +
drivers/mmc/core/block.c | 1 +
drivers/mmc/host/android-goldfish.c | 1 -
drivers/mtd/devices/pmc551.c | 1 -
drivers/mtd/devices/slram.c | 1 -
drivers/mtd/ftl.c | 1 -
drivers/mtd/maps/uclinux.c | 1 -
drivers/net/hamradio/mkiss.c | 1 -
drivers/net/tun.c | 1 -
drivers/parport/parport_cs.c | 1 -
drivers/pcmcia/cistpl.c | 1 -
drivers/pcmcia/cs.c | 1 -
drivers/pcmcia/socket_sysfs.c | 1 -
drivers/s390/block/dasd.c | 1 -
drivers/s390/block/dasd_genhd.c | 1 +
drivers/s390/block/dasd_ioctl.c | 1 -
drivers/s390/block/xpram.c | 1 +
drivers/s390/char/con3215.c | 1 +
drivers/s390/char/fs3270.c | 1 +
drivers/s390/char/raw3270.c | 1 -
drivers/s390/char/sclp_tty.c | 1 +
drivers/s390/char/tape_class.h | 1 -
drivers/s390/char/tty3270.c | 1 +
drivers/s390/scsi/zfcp_def.h | 1 -
drivers/sbus/char/display7seg.c | 1 -
drivers/scsi/nsp32.c | 1 -
drivers/scsi/pcmcia/aha152x_stub.c | 1 -
drivers/scsi/pcmcia/nsp_cs.c | 1 -
drivers/scsi/pcmcia/qlogic_stub.c | 1 -
drivers/scsi/sd.c | 1 +
drivers/scsi/sg.c | 1 +
drivers/scsi/sr.c | 1 +
drivers/scsi/st.c | 1 +
drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 1 +
drivers/staging/speakup/devsynth.c | 1 +
drivers/tty/hvc/hvc_console.c | 1 -
drivers/tty/hvc/hvcs.c | 1 -
drivers/tty/hvc/hvsi.c | 1 -
drivers/tty/moxa.c | 1 -
drivers/tty/mxser.c | 1 -
drivers/tty/n_gsm.c | 1 -
drivers/tty/n_tty.c | 1 -
drivers/tty/rocket.c | 1 -
drivers/tty/serial/8250/8250_core.c | 1 +
drivers/tty/serial/8250/serial_cs.c | 1 -
drivers/tty/serial/apbuart.c | 1 +
drivers/tty/serial/atmel_serial.c | 1 +
drivers/tty/serial/bcm63xx_uart.c | 1 +
drivers/tty/serial/icom.c | 1 -
drivers/tty/serial/mcf.c | 1 +
drivers/tty/serial/mux.c | 1 +
drivers/tty/serial/pxa.c | 1 +
drivers/tty/serial/serial_txx9.c | 1 +
drivers/tty/serial/sh-sci.c | 1 -
drivers/tty/synclink.c | 1 -
drivers/tty/synclink_gt.c | 1 -
drivers/tty/synclinkmp.c | 1 -
drivers/tty/sysrq.c | 1 -
drivers/tty/tty_ioctl.c | 1 -
drivers/tty/vt/vt_ioctl.c | 1 -
drivers/watchdog/cpwd.c | 1 -
drivers/watchdog/watchdog_dev.c | 1 +
drivers/xen/evtchn.c | 1 -
drivers/xen/gntalloc.c | 1 +
fs/block_dev.c | 1 -
fs/char_dev.c | 1 -
fs/coda/psdev.c | 1 -
fs/devpts/inode.c | 1 +
fs/proc/proc_tty.c | 1 +
fs/xfs/xfs_linux.h | 1 -
include/linux/blkdev.h | 1 -
include/linux/genhd.h | 1 -
include/linux/tty.h | 1 -
include/uapi/linux/raid/md_u.h | 2 ++
init/do_mounts.c | 1 +
init/do_mounts.h | 1 -
init/do_mounts_md.c | 1 +
init/do_mounts_rd.c | 1 +
kernel/bpf/inode.c | 1 -
net/ipv4/ipconfig.c | 1 -
tools/hv/hv_vss_daemon.c | 1 -
144 files changed, 44 insertions(+), 101 deletions(-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-16 23:26 [RFC Patch 0/2] fix up includes of linux/major.h Stephen Rothwell
@ 2020-06-16 23:27 ` Stephen Rothwell
2020-06-17 5:58 ` Greg KH
2020-06-16 23:30 ` [PATCH 2/2] Remove the include of linux/major.h from files that do not need it Stephen Rothwell
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-16 23:27 UTC (permalink / raw)
To: Linux-kernel Mailing List; +Cc: linux-arch, Arnd Bergmann, Greg KH
[-- Attachment #1: Type: text/plain, Size: 18783 bytes --]
This is in preparation for removing the include of major.h where it is
not needed.
These files were found using
grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
where /tmp/xx contains all the symbols defined in major.h. There were
a couple of files in that list that did not need the include since the
references are in comments.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/um/drivers/ubd_kern.c | 1 +
block/genhd.c | 1 +
drivers/block/amiflop.c | 1 +
drivers/block/ataflop.c | 1 +
drivers/block/drbd/drbd_main.c | 1 +
drivers/block/floppy.c | 1 +
drivers/block/swim.c | 1 +
drivers/block/swim3.c | 1 +
drivers/block/xen-blkfront.c | 1 +
drivers/char/mem.c | 1 +
drivers/char/ttyprintk.c | 1 +
drivers/md/md.c | 1 +
drivers/message/fusion/mptctl.c | 1 +
drivers/misc/vmw_vmci/vmci_host.c | 1 +
drivers/mmc/core/block.c | 1 +
drivers/s390/block/dasd_genhd.c | 1 +
drivers/s390/block/xpram.c | 1 +
drivers/s390/char/con3215.c | 1 +
drivers/s390/char/fs3270.c | 1 +
drivers/s390/char/sclp_tty.c | 1 +
drivers/s390/char/tty3270.c | 1 +
drivers/scsi/sd.c | 1 +
drivers/scsi/sg.c | 1 +
drivers/scsi/sr.c | 1 +
drivers/scsi/st.c | 1 +
drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 1 +
drivers/staging/speakup/devsynth.c | 1 +
drivers/tty/serial/8250/8250_core.c | 1 +
drivers/tty/serial/apbuart.c | 1 +
drivers/tty/serial/atmel_serial.c | 1 +
drivers/tty/serial/bcm63xx_uart.c | 1 +
drivers/tty/serial/mcf.c | 1 +
drivers/tty/serial/mux.c | 1 +
drivers/tty/serial/pxa.c | 1 +
drivers/tty/serial/serial_txx9.c | 1 +
drivers/watchdog/watchdog_dev.c | 1 +
drivers/xen/gntalloc.c | 1 +
fs/devpts/inode.c | 1 +
fs/proc/proc_tty.c | 1 +
include/uapi/linux/raid/md_u.h | 2 ++
init/do_mounts.c | 1 +
init/do_mounts_md.c | 1 +
init/do_mounts_rd.c | 1 +
43 files changed, 44 insertions(+)
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index eae8c83364f7..237babca7fac 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -35,6 +35,7 @@
#include <linux/vmalloc.h>
#include <linux/platform_device.h>
#include <linux/scatterlist.h>
+#include <linux/major.h>
#include <asm/tlbflush.h>
#include <kern_util.h>
#include "mconsole_kern.h"
diff --git a/block/genhd.c b/block/genhd.c
index 1a7659327664..5231ece77fc0 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -23,6 +23,7 @@
#include <linux/log2.h>
#include <linux/pm_runtime.h>
#include <linux/badblocks.h>
+#include <linux/major.h>
#include "blk.h"
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 226219da3da6..1f7ccf05dc06 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -67,6 +67,7 @@
#include <linux/elevator.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
+#include <linux/major.h>
#include <asm/setup.h>
#include <linux/uaccess.h>
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 1553d41f0b91..07247178d1f0 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -71,6 +71,7 @@
#include <linux/mutex.h>
#include <linux/completion.h>
#include <linux/wait.h>
+#include <linux/major.h>
#include <asm/atariints.h>
#include <asm/atari_stdma.h>
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 45fbd526c453..b6bf26e9cc12 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -41,6 +41,7 @@
#include <linux/unistd.h>
#include <linux/vmalloc.h>
#include <linux/sched/signal.h>
+#include <linux/major.h>
#include <linux/drbd_limits.h>
#include "drbd_int.h"
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 3e9db22db2a8..1130ef91511d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -193,6 +193,7 @@ static int print_unex = 1;
#include <linux/uaccess.h>
#include <linux/async.h>
#include <linux/compat.h>
+#include <linux/major.h>
/*
* PS/2 floppies have much slower step rates than regular floppies.
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index dd34504382e5..2e2825db7887 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -21,6 +21,7 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
+#include <linux/major.h>
#include <asm/mac_via.h>
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index aa77eb5fb7de..1a1f0c6ea7df 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -27,6 +27,7 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/wait.h>
+#include <linux/major.h>
#include <asm/io.h>
#include <asm/dbdma.h>
#include <asm/prom.h>
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 3b889ea950c2..8478bd553213 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -48,6 +48,7 @@
#include <linux/list.h>
#include <linux/workqueue.h>
#include <linux/sched/mm.h>
+#include <linux/major.h>
#include <xen/xen.h>
#include <xen/xenbus.h>
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 31cae88a730b..e20dc05d0cc0 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -34,6 +34,7 @@
#include <linux/pseudo_fs.h>
#include <uapi/linux/magic.h>
#include <linux/mount.h>
+#include <linux/major.h>
#ifdef CONFIG_IA64
# include <linux/efi.h>
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index 56db949a7b70..77fe7ef90c96 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -16,6 +16,7 @@
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/spinlock.h>
+#include <linux/major.h>
struct ttyprintk_port {
struct tty_port port;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index f567f536b529..06741df80c72 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -62,6 +62,7 @@
#include <linux/slab.h>
#include <linux/percpu-refcount.h>
#include <linux/part_stat.h>
+#include <linux/major.h>
#include <trace/events/block.h>
#include "md.h"
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 1074b882c57c..94c6f7f0799e 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -56,6 +56,7 @@
#include <linux/miscdevice.h>
#include <linux/mutex.h>
#include <linux/compat.h>
+#include <linux/major.h>
#include <asm/io.h>
#include <linux/uaccess.h>
diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c
index 2d8328d928d5..984d1b0437ec 100644
--- a/drivers/misc/vmw_vmci/vmci_host.c
+++ b/drivers/misc/vmw_vmci/vmci_host.c
@@ -24,6 +24,7 @@
#include <linux/smp.h>
#include <linux/fs.h>
#include <linux/io.h>
+#include <linux/major.h>
#include "vmci_handle_array.h"
#include "vmci_queue_pair.h"
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 7896952de1ac..c00ea508d890 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -38,6 +38,7 @@
#include <linux/pm_runtime.h>
#include <linux/idr.h>
#include <linux/debugfs.h>
+#include <linux/major.h>
#include <linux/mmc/ioctl.h>
#include <linux/mmc/card.h>
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index af5b0ecb8f89..d0dab4e48be6 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -16,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/fs.h>
#include <linux/blkpg.h>
+#include <linux/major.h>
#include <linux/uaccess.h>
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 45a04daec89e..06e8600699bc 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -43,6 +43,7 @@
#include <linux/platform_device.h>
#include <linux/gfp.h>
#include <linux/uaccess.h>
+#include <linux/major.h>
#define XPRAM_NAME "xpram"
#define XPRAM_DEVS 1 /* one partition */
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 92757f9bd010..66b2c43328c0 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -22,6 +22,7 @@
#include <linux/reboot.h>
#include <linux/serial.h> /* ASYNC_* flags */
#include <linux/slab.h>
+#include <linux/major.h>
#include <asm/ccwdev.h>
#include <asm/cio.h>
#include <asm/io.h>
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 4c4683d8784a..d124c4493a8f 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -18,6 +18,7 @@
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/types.h>
+#include <linux/major.h>
#include <asm/ccwdev.h>
#include <asm/cio.h>
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 5aff8b684eb2..1f78e0135510 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -17,6 +17,7 @@
#include <linux/interrupt.h>
#include <linux/gfp.h>
#include <linux/uaccess.h>
+#include <linux/major.h>
#include "ctrlchar.h"
#include "sclp.h"
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 98d7fc152e32..1480aa5b2a65 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -17,6 +17,7 @@
#include <linux/console.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
+#include <linux/major.h>
#include <linux/slab.h>
#include <linux/memblock.h>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d90fefffe31b..0e39639a9d63 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -57,6 +57,7 @@
#include <linux/pr.h>
#include <linux/t10-pi.h>
#include <linux/uaccess.h>
+#include <linux/major.h>
#include <asm/unaligned.h>
#include <scsi/scsi.h>
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 20472aaaf630..853c1d82cce6 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -47,6 +47,7 @@ static int sg_version_num = 30536; /* 2 digits for each component */
#include <linux/ratelimit.h>
#include <linux/uio.h>
#include <linux/cred.h> /* for sg_check_file_access() */
+#include <linux/major.h>
#include "scsi.h"
#include <scsi/scsi_dbg.h>
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 0c4aa4665a2f..8065f9145cc1 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -50,6 +50,7 @@
#include <linux/slab.h>
#include <linux/pm_runtime.h>
#include <linux/uaccess.h>
+#include <linux/major.h>
#include <asm/unaligned.h>
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 87fbc0ea350b..88a7e35cd9bd 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -42,6 +42,7 @@ static const char *verstr = "20160209";
#include <linux/idr.h>
#include <linux/delay.h>
#include <linux/mutex.h>
+#include <linux/major.h>
#include <linux/uaccess.h>
#include <asm/dma.h>
diff --git a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
index c3b30551e0ca..eacab9e2ba16 100644
--- a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
+++ b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
@@ -8,6 +8,7 @@
#include <linux/platform_device.h>
#include <linux/fs.h>
#include <linux/rwsem.h>
+#include <linux/major.h>
#include "kpc_dma_driver.h"
MODULE_LICENSE("GPL");
diff --git a/drivers/staging/speakup/devsynth.c b/drivers/staging/speakup/devsynth.c
index d30571663585..2980180220a0 100644
--- a/drivers/staging/speakup/devsynth.c
+++ b/drivers/staging/speakup/devsynth.c
@@ -3,6 +3,7 @@
#include <linux/miscdevice.h> /* for misc_register, and MISC_DYNAMIC_MINOR */
#include <linux/types.h>
#include <linux/uaccess.h>
+#include <linux/major.h>
#include "speakup.h"
#include "spk_priv.h"
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index fc118f649887..6655ace9f872 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -37,6 +37,7 @@
#ifdef CONFIG_SPARC
#include <linux/sunserialcore.h>
#endif
+#include <linux/major.h>
#include <asm/irq.h>
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index e8d56e899ec7..ad437d6be45e 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -28,6 +28,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/serial_core.h>
+#include <linux/major.h>
#include <asm/irq.h>
#include "apbuart.h"
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index e43471b33710..359a93aba62f 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -30,6 +30,7 @@
#include <linux/irq.h>
#include <linux/suspend.h>
#include <linux/mm.h>
+#include <linux/major.h>
#include <asm/div64.h>
#include <asm/io.h>
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 5674da2b76f0..0f234aa8eafa 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -25,6 +25,7 @@
#include <linux/serial_bcm63xx.h>
#include <linux/io.h>
#include <linux/of.h>
+#include <linux/major.h>
#define BCM63XX_NR_UARTS 2
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 7dbfb4cde124..aaadb03cbedb 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -21,6 +21,7 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <linux/platform_device.h>
+#include <linux/major.h>
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
#include <asm/mcfuart.h>
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 47ab280f553b..dc62fb72e4c7 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -21,6 +21,7 @@
#include <linux/console.h>
#include <linux/delay.h> /* for udelay */
#include <linux/device.h>
+#include <linux/major.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/parisc-device.h>
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 41319ef96fa6..9b8ae12d7cf0 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -35,6 +35,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/slab.h>
+#include <linux/major.h>
#define PXA_NAME_LEN 8
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index b4d89e31730e..df4cd7d08b5b 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -23,6 +23,7 @@
#include <linux/serial.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
+#include <linux/major.h>
#include <asm/io.h>
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 7e4cd34a8c20..7147dc472578 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -42,6 +42,7 @@
#include <linux/types.h> /* For standard types (like size_t) */
#include <linux/watchdog.h> /* For watchdog specific items */
#include <linux/uaccess.h> /* For copy_to_user/put_user/... */
+#include <linux/major.h>
#include <uapi/linux/sched/types.h> /* For struct sched_param */
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index 3fa40c723e8e..26992992cd5f 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -63,6 +63,7 @@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/highmem.h>
+#include <linux/major.h>
#include <xen/xen.h>
#include <xen/page.h>
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 42e5a766d33c..1edda7d190de 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -24,6 +24,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
#include <linux/seq_file.h>
+#include <linux/major.h>
#define DEVPTS_DEFAULT_MODE 0600
/*
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index c69ff191e5d8..1490f26ecc5f 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -15,6 +15,7 @@
#include <linux/tty.h>
#include <linux/seq_file.h>
#include <linux/bitops.h>
+#include <linux/major.h>
#include "internal.h"
/*
diff --git a/include/uapi/linux/raid/md_u.h b/include/uapi/linux/raid/md_u.h
index 105307244961..ddc48efc32ee 100644
--- a/include/uapi/linux/raid/md_u.h
+++ b/include/uapi/linux/raid/md_u.h
@@ -16,6 +16,8 @@
#ifndef _UAPI_MD_U_H
#define _UAPI_MD_U_H
+#include <linux/major.h>
+
/*
* Different major versions are not compatible.
* Different minor versions are only downward compatible.
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 29d326b6c29d..1aa866d59bde 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -19,6 +19,7 @@
#include <linux/slab.h>
#include <linux/ramfs.h>
#include <linux/shmem_fs.h>
+#include <linux/major.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_fs_sb.h>
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index b84031528dd4..e20fc6eb4b69 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -2,6 +2,7 @@
#include <linux/delay.h>
#include <linux/raid/md_u.h>
#include <linux/raid/md_p.h>
+#include <linux/major.h>
#include "do_mounts.h"
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 32fb049d18f9..22df2b2c3650 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -8,6 +8,7 @@
#include <linux/initrd.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <linux/major.h>
#include "do_mounts.h"
#include "../fs/squashfs/squashfs_fs.h"
--
2.27.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] Remove the include of linux/major.h from files that do not need it
2020-06-16 23:26 [RFC Patch 0/2] fix up includes of linux/major.h Stephen Rothwell
2020-06-16 23:27 ` [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed Stephen Rothwell
@ 2020-06-16 23:30 ` Stephen Rothwell
1 sibling, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-16 23:30 UTC (permalink / raw)
To: Linux-kernel Mailing List; +Cc: linux-arch, Arnd Bergmann, Greg KH
[-- Attachment #1: Type: text/plain, Size: 45109 bytes --]
This is fairly safe because major.h does not include any other files.
The only real risk is if a symbol defined in major.h is constructed by
concatenation in the preprocessor.
The actual change was done using the following command:
sed -i -E '/[<"](uapi\/)?linux\/major\.h/d' \
$(grep -L -w -f /tmp/xx \
$(git grep -E -l '[<"](uapi/)?linux/major\.h'))
Where the file /tmp/xx contians all the symbols defined in major.h
(genhd.h was added by inspection.)
The win here is really just the number of lines to be parsed by the
preprocessor. major.h is 180 lines long and was being included by these
101 files unnecessarily. In particular, there are 3 global include
files here (tty.h, genhd.h and blkdev.h) that are also included by 354,
68 and 554 other files, repectively.
After this, major.h is only included by 4 global include files (which
are in turn included by 297 other files), so its indirect inclusion is
hopefully much reduced.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/alpha/kernel/osf_sys.c | 1 -
arch/alpha/kernel/process.c | 1 -
arch/arm/mach-iop32x/i2c.c | 1 -
arch/arm/mach-omap1/board-h3.c | 1 -
arch/arm/mach-pxa/corgi.c | 1 -
arch/arm/mach-pxa/lubbock.c | 1 -
arch/arm/mach-pxa/tosa.c | 1 -
arch/arm/mach-pxa/viper.c | 1 -
arch/m68k/atari/atasound.c | 1 -
arch/m68k/atari/stram.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 1 -
arch/mips/fw/arc/arc_con.c | 1 -
arch/powerpc/platforms/83xx/km83xx.c | 1 -
arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 -
arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 -
arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
arch/powerpc/platforms/85xx/sbc8548.c | 1 -
arch/powerpc/platforms/chrp/setup.c | 1 -
arch/powerpc/platforms/maple/setup.c | 1 -
arch/powerpc/platforms/powermac/setup.c | 1 -
arch/powerpc/platforms/pseries/setup.c | 1 -
arch/powerpc/sysdev/fsl_soc.c | 1 -
arch/powerpc/sysdev/tsi108_dev.c | 1 -
arch/sparc/kernel/setup_32.c | 1 -
arch/sparc/kernel/setup_64.c | 1 -
arch/xtensa/platforms/xt2000/setup.c | 1 -
arch/xtensa/platforms/xtfpga/setup.c | 1 -
block/partitions/efi.h | 1 -
drivers/android/binderfs.c | 1 -
drivers/block/drbd/drbd_int.h | 1 -
drivers/cdrom/cdrom.c | 1 -
drivers/char/hpet.c | 1 -
drivers/char/mwave/mwavedd.c | 1 -
drivers/char/pcmcia/synclink_cs.c | 1 -
drivers/char/random.c | 1 -
drivers/hid/hidraw.c | 1 -
drivers/ide/ide-cs.c | 1 -
drivers/ide/ide-disk.c | 1 -
drivers/ide/ide-floppy.c | 1 -
drivers/ide/ide-io.c | 1 -
drivers/ide/ide-iops.c | 1 -
drivers/ide/ide.c | 1 -
drivers/input/serio/serio_raw.c | 1 -
drivers/isdn/capi/capi.c | 1 -
drivers/mmc/host/android-goldfish.c | 1 -
drivers/mtd/devices/pmc551.c | 1 -
drivers/mtd/devices/slram.c | 1 -
drivers/mtd/ftl.c | 1 -
drivers/mtd/maps/uclinux.c | 1 -
drivers/net/hamradio/mkiss.c | 1 -
drivers/net/tun.c | 1 -
drivers/parport/parport_cs.c | 1 -
drivers/pcmcia/cistpl.c | 1 -
drivers/pcmcia/cs.c | 1 -
drivers/pcmcia/socket_sysfs.c | 1 -
drivers/s390/block/dasd.c | 1 -
drivers/s390/block/dasd_ioctl.c | 1 -
drivers/s390/char/raw3270.c | 1 -
drivers/s390/char/tape_class.h | 1 -
drivers/s390/scsi/zfcp_def.h | 1 -
drivers/sbus/char/display7seg.c | 1 -
drivers/scsi/nsp32.c | 1 -
drivers/scsi/pcmcia/aha152x_stub.c | 1 -
drivers/scsi/pcmcia/nsp_cs.c | 1 -
drivers/scsi/pcmcia/qlogic_stub.c | 1 -
drivers/tty/hvc/hvc_console.c | 1 -
drivers/tty/hvc/hvcs.c | 1 -
drivers/tty/hvc/hvsi.c | 1 -
drivers/tty/moxa.c | 1 -
drivers/tty/mxser.c | 1 -
drivers/tty/n_gsm.c | 1 -
drivers/tty/n_tty.c | 1 -
drivers/tty/rocket.c | 1 -
drivers/tty/serial/8250/serial_cs.c | 1 -
drivers/tty/serial/icom.c | 1 -
drivers/tty/serial/sh-sci.c | 1 -
drivers/tty/synclink.c | 1 -
drivers/tty/synclink_gt.c | 1 -
drivers/tty/synclinkmp.c | 1 -
drivers/tty/sysrq.c | 1 -
drivers/tty/tty_ioctl.c | 1 -
drivers/tty/vt/vt_ioctl.c | 1 -
drivers/watchdog/cpwd.c | 1 -
drivers/xen/evtchn.c | 1 -
fs/block_dev.c | 1 -
fs/char_dev.c | 1 -
fs/coda/psdev.c | 1 -
fs/xfs/xfs_linux.h | 1 -
include/linux/blkdev.h | 1 -
include/linux/genhd.h | 1 -
include/linux/tty.h | 1 -
init/do_mounts.h | 1 -
kernel/bpf/inode.c | 1 -
net/ipv4/ipconfig.c | 1 -
tools/hv/hv_vss_daemon.c | 1 -
101 files changed, 101 deletions(-)
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index d5367a1c6300..ad0796b45118 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -27,7 +27,6 @@
#include <linux/utsname.h>
#include <linux/time.h>
#include <linux/timex.h>
-#include <linux/major.h>
#include <linux/stat.h>
#include <linux/mman.h>
#include <linux/shm.h>
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index b45f0b0d6511..db828c6d8405 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -23,7 +23,6 @@
#include <linux/ptrace.h>
#include <linux/user.h>
#include <linux/time.h>
-#include <linux/major.h>
#include <linux/stat.h>
#include <linux/vt.h>
#include <linux/mman.h>
diff --git a/arch/arm/mach-iop32x/i2c.c b/arch/arm/mach-iop32x/i2c.c
index e422286af469..07f10ce0d83a 100644
--- a/arch/arm/mach-iop32x/i2c.c
+++ b/arch/arm/mach-iop32x/i2c.c
@@ -9,7 +9,6 @@
#include <linux/mm.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
#include <linux/serial.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 4249984f9c30..5d68745c9986 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -13,7 +13,6 @@
#include <linux/gpio.h>
#include <linux/types.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/errno.h>
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 593c7f793da5..7e7192553367 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -12,7 +12,6 @@
#include <linux/module.h> /* symbol_get ; symbol_put */
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/leds.h>
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 742d18a1f7dc..2c6ab18e2870 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -18,7 +18,6 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/syscore_ops.h>
-#include <linux/major.h>
#include <linux/fb.h>
#include <linux/interrupt.h>
#include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 3d2c108e911e..a0976772f06d 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 3aa34e9a15d3..3d4868bd0c4e 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -26,7 +26,6 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/module.h>
#include <linux/pm.h>
#include <linux/sched.h>
diff --git a/arch/m68k/atari/atasound.c b/arch/m68k/atari/atasound.c
index a8724d998c39..9c7696100aba 100644
--- a/arch/m68k/atari/atasound.c
+++ b/arch/m68k/atari/atasound.c
@@ -18,7 +18,6 @@
#include <linux/sched.h>
#include <linux/timer.h>
-#include <linux/major.h>
#include <linux/fcntl.h>
#include <linux/errno.h>
#include <linux/mm.h>
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index ce79b322a99c..7bf922ae8a8a 100644
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 50f4d01363df..5d34f4afe8b6 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -22,7 +22,6 @@
#include <linux/console.h>
#include <linux/linkage.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/rtc.h>
#include <linux/interrupt.h>
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 490700aa2212..89c3bf2972cd 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -21,7 +21,6 @@
#include <linux/console.h>
#include <linux/linkage.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/rtc.h>
#include <linux/interrupt.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 5b86d10e0f84..9d3980cd4137 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -23,7 +23,6 @@
#include <linux/console.h>
#include <linux/linkage.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/rtc.h>
#include <linux/interrupt.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 4627de3c0603..b337a896a9af 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -20,7 +20,6 @@
#include <linux/console.h>
#include <linux/linkage.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/serial_reg.h>
#include <linux/rtc.h>
#include <linux/vt_kern.h>
diff --git a/arch/mips/fw/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c
index 365e3913231e..267831bb8dac 100644
--- a/arch/mips/fw/arc/arc_con.c
+++ b/arch/mips/fw/arc/arc_con.c
@@ -8,7 +8,6 @@
* Copyright (c) 2002 Thiemo Seufer
*/
#include <linux/tty.h>
-#include <linux/major.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/fs.h>
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index bcdc2c203ec9..a60d6f0df153 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -14,7 +14,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 6fa5402ebf20..e64cd15d20c8 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -13,7 +13,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index ebfd139bca20..8db822458d33 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -14,7 +14,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 356228e35279..24e719e29e15 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -14,7 +14,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 90d9cbfae659..51e44ad28656 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -20,7 +20,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 172d2b7cfeb7..85a100dafd6e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -14,7 +14,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 7759eca7d535..7a3a14d4492f 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -20,7 +20,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
index e4acf5ce6b07..29ab427aa852 100644
--- a/arch/powerpc/platforms/85xx/sbc8548.c
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -16,7 +16,6 @@
#include <linux/reboot.h>
#include <linux/pci.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index c45435aa5e36..4400adcdeff1 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -18,7 +18,6 @@
#include <linux/ptrace.h>
#include <linux/user.h>
#include <linux/tty.h>
-#include <linux/major.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
#include <linux/init.h>
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index f7e66a2005b4..e2627797f97a 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -22,7 +22,6 @@
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/ioport.h>
-#include <linux/major.h>
#include <linux/initrd.h>
#include <linux/vt_kern.h>
#include <linux/console.h>
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index f002b0fa69b8..d22a9bedfc25 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -32,7 +32,6 @@
#include <linux/string.h>
#include <linux/delay.h>
#include <linux/ioport.h>
-#include <linux/major.h>
#include <linux/initrd.h>
#include <linux/vt_kern.h>
#include <linux/console.h>
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 2db8469e475f..4beeebc6751b 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -21,7 +21,6 @@
#include <linux/unistd.h>
#include <linux/user.h>
#include <linux/tty.h>
-#include <linux/major.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>
#include <linux/init.h>
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 90ad16161604..9687c5d15200 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/export.h>
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index 0baec82510b9..ec4ec93190a2 100644
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/export.h>
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 6d07b85b9e24..e00e0236830a 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -23,7 +23,6 @@
#include <linux/seq_file.h>
#include <linux/syscalls.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/interrupt.h>
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index f765fda871eb..7d7091e1253a 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -21,7 +21,6 @@
#include <linux/seq_file.h>
#include <linux/syscalls.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/inet.h>
diff --git a/arch/xtensa/platforms/xt2000/setup.c b/arch/xtensa/platforms/xt2000/setup.c
index 145d129be76f..278feee56092 100644
--- a/arch/xtensa/platforms/xt2000/setup.c
+++ b/arch/xtensa/platforms/xt2000/setup.c
@@ -16,7 +16,6 @@
#include <linux/reboot.h>
#include <linux/kdev_t.h>
#include <linux/types.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/stringify.h>
diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index 4f7d6142d41f..ddaaaa6e25fd 100644
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -18,7 +18,6 @@
#include <linux/reboot.h>
#include <linux/kdev_t.h>
#include <linux/types.h>
-#include <linux/major.h>
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/of.h>
diff --git a/block/partitions/efi.h b/block/partitions/efi.h
index 8cc2b88d0aa8..1910f16faa37 100644
--- a/block/partitions/efi.h
+++ b/block/partitions/efi.h
@@ -15,7 +15,6 @@
#include <linux/fs.h>
#include <linux/genhd.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/efi.h>
#include <linux/compiler.h>
diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c
index 7cf566aafe1f..2b91c91ec874 100644
--- a/drivers/android/binderfs.c
+++ b/drivers/android/binderfs.c
@@ -13,7 +13,6 @@
#include <linux/list.h>
#include <linux/namei.h>
#include <linux/magic.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 14345a87c7cc..d634e475f1ee 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -24,7 +24,6 @@
#include <linux/ratelimit.h>
#include <linux/tcp.h>
#include <linux/mutex.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/backing-dev.h>
#include <linux/genhd.h>
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index d82b3b7658bd..67d0f529454a 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -268,7 +268,6 @@
#include <linux/atomic.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/kernel.h>
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index ed3b7dab678d..28a46d1de2d9 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/miscdevice.h>
-#include <linux/major.h>
#include <linux/ioport.h>
#include <linux/fcntl.h>
#include <linux/init.h>
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index e43c876a9223..9d4d823865f5 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -50,7 +50,6 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/init.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/device.h>
#include <linux/serial.h>
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index e342daa73d1b..7cdc84f5efe3 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -45,7 +45,6 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 2a41b21623ae..2b540f396d3d 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -312,7 +312,6 @@
#include <linux/utsname.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/slab.h>
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 2eee5e31c2b7..e0094bcb11bd 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -21,7 +21,6 @@
#include <linux/cdev.h>
#include <linux/poll.h>
#include <linux/device.h>
-#include <linux/major.h>
#include <linux/slab.h>
#include <linux/hid.h>
#include <linux/mutex.h>
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index f1e922e2479a..cc2b0fa73743 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -38,7 +38,6 @@
#include <linux/timer.h>
#include <linux/ioport.h>
#include <linux/ide.h>
-#include <linux/major.h>
#include <linux/delay.h>
#include <asm/io.h>
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 1d3407d7e095..9339ebd97468 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -21,7 +21,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/genhd.h>
#include <linux/slab.h>
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 1fe1f9d37a51..2f815538a4f5 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -24,7 +24,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/genhd.h>
#include <linux/cdrom.h>
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c31f1d2b3b07..2a1a79a83d77 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -31,7 +31,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/genhd.h>
#include <linux/blkpg.h>
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index f2be127ee96e..bdf5a0e2b969 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -12,7 +12,6 @@
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/genhd.h>
#include <linux/blkpg.h>
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9a9c64fd1032..89f75dd49a3f 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -50,7 +50,6 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/genhd.h>
#include <linux/init.h>
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index e9647ebff187..c863fc913acb 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -12,7 +12,6 @@
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/serio.h>
-#include <linux/major.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
#include <linux/wait.h>
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 85767f52fe3c..21b537efc992 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/fcntl.h>
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index ceb4924e02d0..d67eb2942d1c 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/major.h>
#include <linux/types.h>
#include <linux/pci.h>
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 6597fc2aad34..12c4cb142e65 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -85,7 +85,6 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/timer.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/ioctl.h>
#include <asm/io.h>
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 28131a127d06..68dbf795071e 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -38,7 +38,6 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/timer.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/ioctl.h>
#include <linux/init.h>
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 2578f27914ef..4c14aa6ee676 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -64,7 +64,6 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/timer.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/hdreg.h>
diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index de4c46318abb..0c536a785139 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/mm.h>
-#include <linux/major.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index deef14215110..50d9de805740 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -18,7 +18,6 @@
#include <linux/tty.h>
#include <linux/errno.h>
#include <linux/netdevice.h>
-#include <linux/major.h>
#include <linux/init.h>
#include <linux/rtnetlink.h>
#include <linux/etherdevice.h>
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 858b012074bd..14015eff5b99 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -36,7 +36,6 @@
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/sched/signal.h>
-#include <linux/major.h>
#include <linux/slab.h>
#include <linux/poll.h>
#include <linux/fcntl.h>
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 8e7e3ac4bb87..7fa5ddccb055 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -42,7 +42,6 @@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/ioport.h>
-#include <linux/major.h>
#include <linux/interrupt.h>
#include <linux/parport.h>
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index cf109d9a1112..86f24ff10500 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -13,7 +13,6 @@
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/timer.h>
#include <linux/slab.h>
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index e211e2619680..fd59a68102e7 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/mm.h>
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index d1b220a1e1ab..47eb78bddcdd 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -10,7 +10,6 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index cf87eb27879f..024653f0de4c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -15,7 +15,6 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/ctype.h>
-#include <linux/major.h>
#include <linux/slab.h>
#include <linux/hdreg.h>
#include <linux/async.h>
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 777734d1b4e5..f39a7f466da6 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -14,7 +14,6 @@
#include <linux/interrupt.h>
#include <linux/compat.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/blkpg.h>
#include <linux/slab.h>
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 63a41b168761..9aaa967dfde4 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -24,7 +24,6 @@
#include "raw3270.h"
-#include <linux/major.h>
#include <linux/kdev_t.h>
#include <linux/device.h>
#include <linux/mutex.h>
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index d25ac075b1ad..564c3110a651 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -13,7 +13,6 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/cdev.h>
#include <linux/device.h>
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index da8a5ceb615c..56cc641eade1 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/moduleparam.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/timer.h>
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index fad936eb845f..8d08fff8194d 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/ioport.h> /* request_region */
#include <linux/slab.h>
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index b6e04d14292d..92428ba6875c 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -19,7 +19,6 @@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/ioport.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index df82a349e969..b37c050a2057 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -41,7 +41,6 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <scsi/scsi.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <scsi/scsi_ioctl.h>
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index d79ce97a04bd..cf9de1d0f6bf 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -34,7 +34,6 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <linux/stat.h>
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 828d53faf09a..9c064ddf1644 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -39,7 +39,6 @@
#include <linux/ioport.h>
#include <asm/io.h>
#include <scsi/scsi.h>
-#include <linux/major.h>
#include <linux/blkdev.h>
#include <scsi/scsi_ioctl.h>
#include <linux/interrupt.h>
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index cdcc64ea2554..2438c9ad3821 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/list.h>
-#include <linux/major.h>
#include <linux/atomic.h>
#include <linux/sysrq.h>
#include <linux/tty.h>
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 55105ac38f89..533d0abff068 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -57,7 +57,6 @@
#include <linux/kref.h>
#include <linux/kthread.h>
#include <linux/list.h>
-#include <linux/major.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/sched.h>
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index 66f95f758be0..c7465cda0d33 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -24,7 +24,6 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
-#include <linux/major.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/sysrq.h>
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 9f13f7d49dd7..75f0cb5ddd18 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -29,7 +29,6 @@
#include <linux/interrupt.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 3703987c4666..a78ee27a5b60 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -25,7 +25,6 @@
#include <linux/tty_flip.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 0a29a94ec438..9a3a96372efd 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -23,7 +23,6 @@
*/
#include <linux/types.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/fcntl.h>
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 1794d84e7bf6..50605ce1c85d 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -29,7 +29,6 @@
*/
#include <linux/types.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/fcntl.h>
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 2540b2e4c8e8..5797e59a5adb 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -48,7 +48,6 @@
#include <linux/module.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/kernel.h>
#include <linux/signal.h>
#include <linux/slab.h>
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index e3d10794dbba..4cd8ddd73d70 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -41,7 +41,6 @@
#include <linux/timer.h>
#include <linux/serial_core.h>
#include <linux/delay.h>
-#include <linux/major.h>
#include <asm/io.h>
#include <pcmcia/cistpl.h>
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 624f3d541c68..cdb92f2ca114 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -20,7 +20,6 @@
#include <linux/tty_flip.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index e1179e74a2b8..87e241c37f65 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -30,7 +30,6 @@
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/ktime.h>
-#include <linux/major.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/of.h>
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 08d2976593d5..f1f30147cb8c 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -70,7 +70,6 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index b794177ccfb9..a2c8f613f2c8 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -53,7 +53,6 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 33ff2dbb6650..06c476e950fb 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -44,7 +44,6 @@
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial.h>
-#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 7c95afa905a0..19bb2d84de79 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -24,7 +24,6 @@
#include <linux/fs.h>
#include <linux/mount.h>
#include <linux/kdev_t.h>
-#include <linux/major.h>
#include <linux/reboot.h>
#include <linux/sysrq.h>
#include <linux/kbd_kern.h>
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 9245fffdbceb..d94353dd6ed7 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -12,7 +12,6 @@
#include <linux/errno.h>
#include <linux/sched/signal.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/tty.h>
#include <linux/fcntl.h>
#include <linux/string.h>
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index daf61c28ba76..6ce35b4cc1e7 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -21,7 +21,6 @@
#include <linux/vt.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/major.h>
#include <linux/fs.h>
#include <linux/console.h>
#include <linux/consolemap.h>
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 808eeb4779e4..b7a7a53dc7f1 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/errno.h>
-#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 6e0b1dd5573c..054f13c8abf4 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -41,7 +41,6 @@
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
-#include <linux/major.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/poll.h>
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 47860e589388..edb053cae078 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -11,7 +11,6 @@
#include <linux/fcntl.h>
#include <linux/slab.h>
#include <linux/kmod.h>
-#include <linux/major.h>
#include <linux/device_cgroup.h>
#include <linux/highmem.h>
#include <linux/blkdev.h>
diff --git a/fs/char_dev.c b/fs/char_dev.c
index ba0ded7842a7..cc645798a0ac 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/major.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/seq_file.h>
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 240669f51eac..1125bcbf53f3 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
-#include <linux/major.h>
#include <linux/time.h>
#include <linux/sched/signal.h>
#include <linux/slab.h>
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 9f70d2f68e05..7bb9fb4f2f59 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -38,7 +38,6 @@ typedef __u32 xfs_nlink_t;
#include <linux/errno.h>
#include <linux/sched/signal.h>
#include <linux/bitops.h>
-#include <linux/major.h>
#include <linux/pagemap.h>
#include <linux/vfs.h>
#include <linux/seq_file.h>
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8fd900998b4e..0edac52a9e36 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -7,7 +7,6 @@
#ifdef CONFIG_BLOCK
-#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/list.h>
#include <linux/llist.h>
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 392aad5e29a2..cf2fe7f67c5b 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -32,7 +32,6 @@ extern struct class block_class;
#define DISK_MAX_PARTS 256
#define DISK_NAME_LEN 32
-#include <linux/major.h>
#include <linux/device.h>
#include <linux/smp.h>
#include <linux/string.h>
diff --git a/include/linux/tty.h b/include/linux/tty.h
index a99e9b8e4e31..f2de77662885 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -3,7 +3,6 @@
#define _LINUX_TTY_H
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/termios.h>
#include <linux/workqueue.h>
#include <linux/tty_driver.h>
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 0bb0806de4ce..10f7d73fdb1d 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -6,7 +6,6 @@
#include <linux/unistd.h>
#include <linux/slab.h>
#include <linux/mount.h>
-#include <linux/major.h>
#include <linux/root_dev.h>
void change_floppy(char *fmt, ...);
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index fb878ba3f22f..863af1993433 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -10,7 +10,6 @@
#include <linux/init.h>
#include <linux/magic.h>
-#include <linux/major.h>
#include <linux/mount.h>
#include <linux/namei.h>
#include <linux/fs.h>
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 561f15b5a944..0a932d26e5ce 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -53,7 +53,6 @@
#include <linux/udp.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <linux/major.h>
#include <linux/root_dev.h>
#include <linux/delay.h>
#include <linux/nfs_fs.h>
diff --git a/tools/hv/hv_vss_daemon.c b/tools/hv/hv_vss_daemon.c
index dd111870beee..6795b078ea03 100644
--- a/tools/hv/hv_vss_daemon.c
+++ b/tools/hv/hv_vss_daemon.c
@@ -21,7 +21,6 @@
#include <ctype.h>
#include <errno.h>
#include <linux/fs.h>
-#include <linux/major.h>
#include <linux/hyperv.h>
#include <syslog.h>
#include <getopt.h>
--
2.27.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-16 23:27 ` [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed Stephen Rothwell
@ 2020-06-17 5:58 ` Greg KH
2020-06-17 6:18 ` Stephen Rothwell
2020-06-29 23:12 ` Stephen Rothwell
0 siblings, 2 replies; 9+ messages in thread
From: Greg KH @ 2020-06-17 5:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-kernel Mailing List, linux-arch, Arnd Bergmann
On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> This is in preparation for removing the include of major.h where it is
> not needed.
>
> These files were found using
>
> grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
>
> where /tmp/xx contains all the symbols defined in major.h. There were
> a couple of files in that list that did not need the include since the
> references are in comments.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Any reason this had an RFC, but patch 2/2 did not?
They look good to me, I will be glad to take these, but do you still
want reviews from others for this? It seems simple enough to me...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-17 5:58 ` Greg KH
@ 2020-06-17 6:18 ` Stephen Rothwell
2020-06-22 4:25 ` Stephen Rothwell
2020-06-29 23:12 ` Stephen Rothwell
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-17 6:18 UTC (permalink / raw)
To: Greg KH; +Cc: Linux-kernel Mailing List, linux-arch, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]
Hi Greg,
On Wed, 17 Jun 2020 07:58:43 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> > This is in preparation for removing the include of major.h where it is
> > not needed.
> >
> > These files were found using
> >
> > grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
> >
> > where /tmp/xx contains all the symbols defined in major.h. There were
> > a couple of files in that list that did not need the include since the
> > references are in comments.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Any reason this had an RFC, but patch 2/2 did not?
I forgot :-) I added RFC just to hopefully get some attention as this
is just the start of a long slow use of my "spare" time.
> They look good to me, I will be glad to take these, but do you still
> want reviews from others for this? It seems simple enough to me...
Yeah, well, we all know the simplest patches usually cause the most pain :-)
However, I have been fairly careful and it is an easy include file to
work with. And I have done my usual build checks, so the linux-next
maintainer won't complain about build problems :-)
I would like to hear from Arnd, at least, as I don't want to step on
his toes (he is having a larger look at our include files).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-17 6:18 ` Stephen Rothwell
@ 2020-06-22 4:25 ` Stephen Rothwell
2020-06-22 7:22 ` Arnd Bergmann
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-22 4:25 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Greg KH, Linux-kernel Mailing List, linux-arch
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
Hi Arnd,
On Wed, 17 Jun 2020 16:18:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 17 Jun 2020 07:58:43 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> > > This is in preparation for removing the include of major.h where it is
> > > not needed.
> > >
> > > These files were found using
> > >
> > > grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
> > >
> > > where /tmp/xx contains all the symbols defined in major.h. There were
> > > a couple of files in that list that did not need the include since the
> > > references are in comments.
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Any reason this had an RFC, but patch 2/2 did not?
>
> I forgot :-) I added RFC just to hopefully get some attention as this
> is just the start of a long slow use of my "spare" time.
>
> > They look good to me, I will be glad to take these, but do you still
> > want reviews from others for this? It seems simple enough to me...
>
> Yeah, well, we all know the simplest patches usually cause the most pain :-)
>
> However, I have been fairly careful and it is an easy include file to
> work with. And I have done my usual build checks, so the linux-next
> maintainer won't complain about build problems :-)
>
> I would like to hear from Arnd, at least, as I don't want to step on
> his toes (he is having a larger look at our include files).
Any comment?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-22 4:25 ` Stephen Rothwell
@ 2020-06-22 7:22 ` Arnd Bergmann
0 siblings, 0 replies; 9+ messages in thread
From: Arnd Bergmann @ 2020-06-22 7:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, Linux-kernel Mailing List, linux-arch
On Mon, Jun 22, 2020 at 6:25 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Wed, 17 Jun 2020 16:18:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Wed, 17 Jun 2020 07:58:43 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
> > > On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> > > > This is in preparation for removing the include of major.h where it is
> > > > not needed.
> > > >
> > > > These files were found using
> > > >
> > > > grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
> > > >
> > > > where /tmp/xx contains all the symbols defined in major.h. There were
> > > > a couple of files in that list that did not need the include since the
> > > > references are in comments.
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > >
> > > Any reason this had an RFC, but patch 2/2 did not?
> >
> > I forgot :-) I added RFC just to hopefully get some attention as this
> > is just the start of a long slow use of my "spare" time.
> >
> > > They look good to me, I will be glad to take these, but do you still
> > > want reviews from others for this? It seems simple enough to me...
> >
> > Yeah, well, we all know the simplest patches usually cause the most pain :-)
> >
> > However, I have been fairly careful and it is an easy include file to
> > work with. And I have done my usual build checks, so the linux-next
> > maintainer won't complain about build problems :-)
> >
> > I would like to hear from Arnd, at least, as I don't want to step on
> > his toes (he is having a larger look at our include files).
>
> Any comment?
I now have a set of regex/header file pairs and a script that automatically
adds the #include statements to any source file that needs them as a
preparation for a larger-scale cleanup. Your change is going in the
same direction, and linux/major.h is a header that was not on my list
yet, so I'm completely happy with this.
One thing that I did differently in my script is to insert the new #include
statement in a way that retains alphabetical ordering of the other inclusions
rather than adding it at the end.
If the headers were not sorted before, it just tries a trivial nearest match,
adding it somewhat randomly, but it would still avoid some clashes with
patches that add different headers at the end or that add the same header
using the same method.
Arnd
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-17 5:58 ` Greg KH
2020-06-17 6:18 ` Stephen Rothwell
@ 2020-06-29 23:12 ` Stephen Rothwell
2020-06-30 8:45 ` Greg KH
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2020-06-29 23:12 UTC (permalink / raw)
To: Greg KH; +Cc: Linux-kernel Mailing List, linux-arch, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]
Hi Greg,
On Wed, 17 Jun 2020 07:58:43 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> > This is in preparation for removing the include of major.h where it is
> > not needed.
> >
> > These files were found using
> >
> > grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
> >
> > where /tmp/xx contains all the symbols defined in major.h. There were
> > a couple of files in that list that did not need the include since the
> > references are in comments.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Any reason this had an RFC, but patch 2/2 did not?
>
> They look good to me, I will be glad to take these, but do you still
> want reviews from others for this? It seems simple enough to me...
I am going to do another round of this patchset splitting out most of
the "safe" removals that can be done anytime so other maintainers can
take them. Then there will be the left over order dependent changes at
the end.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed
2020-06-29 23:12 ` Stephen Rothwell
@ 2020-06-30 8:45 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2020-06-30 8:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-kernel Mailing List, linux-arch, Arnd Bergmann
On Tue, Jun 30, 2020 at 09:12:03AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Wed, 17 Jun 2020 07:58:43 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Jun 17, 2020 at 09:27:47AM +1000, Stephen Rothwell wrote:
> > > This is in preparation for removing the include of major.h where it is
> > > not needed.
> > >
> > > These files were found using
> > >
> > > grep -E -L '[<"](uapi/)?linux/major\.h' $(git grep -l -w -f /tmp/xx)
> > >
> > > where /tmp/xx contains all the symbols defined in major.h. There were
> > > a couple of files in that list that did not need the include since the
> > > references are in comments.
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Any reason this had an RFC, but patch 2/2 did not?
> >
> > They look good to me, I will be glad to take these, but do you still
> > want reviews from others for this? It seems simple enough to me...
>
> I am going to do another round of this patchset splitting out most of
> the "safe" removals that can be done anytime so other maintainers can
> take them. Then there will be the left over order dependent changes at
> the end.
Ok, I'll wait for the next round of patches, thanks.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-06-30 8:45 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-16 23:26 [RFC Patch 0/2] fix up includes of linux/major.h Stephen Rothwell
2020-06-16 23:27 ` [RFC PATCH 1/2] Explicitly include linux/major.h where it is needed Stephen Rothwell
2020-06-17 5:58 ` Greg KH
2020-06-17 6:18 ` Stephen Rothwell
2020-06-22 4:25 ` Stephen Rothwell
2020-06-22 7:22 ` Arnd Bergmann
2020-06-29 23:12 ` Stephen Rothwell
2020-06-30 8:45 ` Greg KH
2020-06-16 23:30 ` [PATCH 2/2] Remove the include of linux/major.h from files that do not need it Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).