include: Remove highmem.h from pagemap.h
Subsystems (24)
Matthew Wilcox
maintainerPATCH 1/1 include: Remove highmem.h from pagemap.h
From: "Matthew Wilcox (Oracle)" <[email protected]>
pagemap.h doesn't need highmem.h itself. Only two dozen users were relying on pagemap to pull in highmem (usually for kmap), so fix them all up and we can remove this header file dependency.
--- drivers/char/virtio_console.c | 1 + drivers/media/pci/ivtv/ivtv-driver.h | 1 + drivers/media/v4l2-core/videobuf-dma-sg.c | 1 + .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 1 + fs/affs/affs.h | 1 + fs/ext2/namei.c | 1 + fs/freevxfs/vxfs_immed.c | 1 + fs/freevxfs/vxfs_subr.c | 1 + fs/hfs/btree.c | 1 + fs/jffs2/gc.c | 1 + fs/minix/minix.h | 1 + fs/ocfs2/symlink.c | 1 + fs/qnx6/qnx6.h | 1 + fs/read_write.c | 1 + fs/reiserfs/ioctl.c | 1 + fs/reiserfs/tail_conversion.c | 1 + fs/reiserfs/xattr.c | 3 ++- fs/squashfs/file.c | 1 + fs/squashfs/symlink.c | 1 + fs/sysv/namei.c | 1 + fs/udf/file.c | 1 + fs/ufs/ufs_fs.h | 1 + include/linux/pagemap.h | 1 - kernel/bpf/stackmap.c | 1 + lib/iov_iter.c | 1 + net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 + net/sunrpc/cache.c | 1 + 27 files changed, 27 insertions(+), 2 deletions(-)
drivers/char/virtio_console.c +1 -0
@@ -13,6 +13,7 @@#include <linux/fs.h> #include <linux/splice.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/init.h> #include <linux/list.h> #include <linux/poll.h>
drivers/media/pci/ivtv/ivtv-driver.h +1 -0
@@ -50,6 +50,7 @@#include <linux/list.h> #include <linux/unistd.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/scatterlist.h> #include <linux/kthread.h> #include <linux/mutex.h>
drivers/media/v4l2-core/videobuf-dma-sg.c +1 -0
@@ -25,6 +25,7 @@#include <linux/dma-mapping.h> #include <linux/vmalloc.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/scatterlist.h> #include <asm/page.h> #include <asm/pgtable.h>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +1 -0
@@ -4,6 +4,7 @@#include <linux/kernel.h> #include <linux/types.h> #include <linux/errno.h> +#include <linux/highmem.h> #include <linux/interrupt.h> #include <linux/pagemap.h> #include <linux/dma-mapping.h>
fs/affs/affs.h +1 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/fs.h> #include <linux/buffer_head.h> +#include <linux/highmem.h> #include "amigaffs.h" #include <linux/mutex.h> #include <linux/workqueue.h>
fs/ext2/namei.c +1 -0
@@ -31,6 +31,7 @@* David S. Miller ([email protected]), 1995 */ +#include <linux/highmem.h> #include <linux/pagemap.h> #include <linux/quotaops.h> #include "ext2.h"
fs/freevxfs/vxfs_immed.c +1 -0
@@ -32,6 +32,7 @@*/ #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include "vxfs.h" #include "vxfs_extern.h"
fs/freevxfs/vxfs_subr.c +1 -0
@@ -34,6 +34,7 @@#include <linux/buffer_head.h> #include <linux/kernel.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include "vxfs_extern.h"
fs/hfs/btree.c +1 -0
@@ -10,6 +10,7 @@*/ #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/slab.h> #include <linux/log2.h>
fs/jffs2/gc.c +1 -0
@@ -16,6 +16,7 @@#include <linux/mtd/mtd.h> #include <linux/slab.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/crc32.h> #include <linux/compiler.h> #include <linux/stat.h>
fs/minix/minix.h +1 -0
@@ -4,6 +4,7 @@#include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/minix_fs.h> #define INODE_VERSION (inode) minix_sb(inode->i_sb)->s_version
fs/ocfs2/symlink.c +1 -0
@@ -38,6 +38,7 @@#include <linux/types.h> #include <linux/slab.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/namei.h> #include <cluster/masklog.h>
fs/qnx6/qnx6.h +1 -0
@@ -19,6 +19,7 @@#include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/highmem.h> typedef __u16 __bitwise __fs16 ;typedef __u32 __bitwise __fs32 ;
fs/read_write.c +1 -0
@@ -16,6 +16,7 @@#include <linux/export.h> #include <linux/syscalls.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/splice.h> #include <linux/compat.h> #include <linux/mount.h>
fs/reiserfs/ioctl.c +1 -0
@@ -9,6 +9,7 @@#include <linux/time.h> #include <linux/uaccess.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/compat.h> /*
fs/reiserfs/tail_conversion.c +1 -0
@@ -6,6 +6,7 @@#include <linux/time.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/buffer_head.h> #include "reiserfs.h"
fs/reiserfs/xattr.c +2 -1
@@ -37,11 +37,12 @@#include "reiserfs.h" #include <linux/capability.h> #include <linux/dcache.h> -#include <linux/namei.h> #include <linux/errno.h> #include <linux/gfp.h> #include <linux/fs.h> #include <linux/file.h> +#include <linux/highmem.h> +#include <linux/namei.h> #include <linux/pagemap.h> #include <linux/xattr.h> #include "xattr.h"
fs/squashfs/file.c +1 -0
@@ -33,6 +33,7 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/mutex.h> #include "squashfs_fs.h"
fs/squashfs/symlink.c +1 -0
@@ -22,6 +22,7 @@#include <linux/kernel.h> #include <linux/string.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/xattr.h> #include "squashfs_fs.h"
fs/sysv/namei.c +1 -0
@@ -13,6 +13,7 @@* Copyright (C) 1997, 1998 Krzysztof G. Baranowski */ +#include <linux/highmem.h> #include <linux/pagemap.h> #include "sysv.h"
fs/udf/file.c +1 -0
@@ -33,6 +33,7 @@#include <linux/capability.h> #include <linux/errno.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/uio.h> #include "udf_i.h"
fs/ufs/ufs_fs.h +1 -0
@@ -35,6 +35,7 @@#include <linux/kernel.h> #include <linux/stat.h> #include <linux/fs.h> +#include <linux/highmem.h> #include <linux/workqueue.h> #include <asm/div64.h>
include/linux/pagemap.h +0 -1
@@ -8,7 +8,6 @@#include <linux/mm.h> #include <linux/fs.h> #include <linux/list.h> -#include <linux/highmem.h> #include <linux/compiler.h> #include <linux/uaccess.h> #include <linux/gfp.h>
kernel/bpf/stackmap.c +1 -0
@@ -8,6 +8,7 @@#include <linux/perf_event.h> #include <linux/elf.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/irq_work.h> #include "percpu_freelist.h"
lib/iov_iter.c +1 -0
@@ -3,6 +3,7 @@#include <linux/bvec.h> #include <linux/uio.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/splice.h>
net/sunrpc/auth_gss/gss_krb5_wrap.c +1 -0
@@ -34,6 +34,7 @@#include <linux/sunrpc/gss_krb5.h> #include <linux/random.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #if IS_ENABLED (CONFIG_SUNRPC_DEBUG )# define RPCDBG_FACILITY RPCDBG_AUTH
net/sunrpc/cache.c +1 -0
@@ -27,6 +27,7 @@#include <linux/workqueue.h> #include <linux/mutex.h> #include <linux/pagemap.h> +#include <linux/highmem.h> #include <asm/ioctls.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/cache.h>
Signature · 1 line
2.25.0
Andrew Morton
maintainerQuoted 3 lines · On Thu, 13 Feb 2020 11:56:43 -0800 Matthew Wilcox <[email protected]> wrote:
pagemap.hdoesn't needhighmem.hitself. Only two dozen users were relying on pagemap to pull in highmem (usually for kmap), so fix them all up and we can remove this header file dependency.
Three compilation errors in an x86_64 allnoconfig build. This one will need a lot more testing, please.
Matthew Wilcox
maintainerQuoted 8 lines · Andrew Morton
Quoted 3 lines · On Thu, 13 Feb 2020 11:56:43 -0800 Matthew Wilcox <[email protected]> wrote:
pagemap.hdoesn't needhighmem.hitself. Only two dozen users were relying on pagemap to pull in highmem (usually for kmap), so fix them all up and we can remove this header file dependency.Three compilation errors in an
x86_64allnoconfig build. This one will need a lot more testing, please.
Weird; I did an allyesconfig build without error. Will try.