Replace <linux/mm.h> with the smaller pieces that were just splitted out. This affects a few headers that are included by many, e.g. bio.h and highmem.h, which now no longer depend on the fat <linux/mm.h> header. For this, several missing includes need to be added because they are no longer indirectly included, e.g. <linux/fs.h>. Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx> --- include/linux/bio.h | 2 ++ include/linux/bpfptr.h | 1 - include/linux/dma-mapping.h | 1 + include/linux/highmem-internal.h | 2 ++ include/linux/highmem.h | 4 +++- include/linux/net.h | 2 +- include/linux/oom.h | 2 +- include/linux/pagemap.h | 2 +- include/linux/scatterlist.h | 2 +- include/linux/skbuff.h | 4 ++++ include/linux/vmstat.h | 3 ++- lib/scatterlist.c | 1 + 12 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index 9b8a369f44bc..9b9b8b40f1e7 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -5,7 +5,9 @@ #ifndef __LINUX_BIO_H #define __LINUX_BIO_H +#include <linux/fs.h> // for struct kiocb, IOCB_NOWAIT #include <linux/mempool.h> +#include <linux/mm/folio_next.h> /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ #include <linux/blk_types.h> #include <linux/uio.h> diff --git a/include/linux/bpfptr.h b/include/linux/bpfptr.h index 1af241525a17..19967a0e510c 100644 --- a/include/linux/bpfptr.h +++ b/include/linux/bpfptr.h @@ -3,7 +3,6 @@ #ifndef _LINUX_BPFPTR_H #define _LINUX_BPFPTR_H -#include <linux/mm.h> #include <linux/sockptr.h> typedef sockptr_t bpfptr_t; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 4a658de44ee9..37d5591039c7 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -11,6 +11,7 @@ #include <linux/scatterlist.h> #include <linux/bug.h> #include <linux/mem_encrypt.h> +#include <linux/mm/vmalloc_addr.h> /** * List of possible attributes associated with a DMA mapping. The semantics diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h index a3028e400a9c..a479e6b7c54c 100644 --- a/include/linux/highmem-internal.h +++ b/include/linux/highmem-internal.h @@ -2,6 +2,8 @@ #ifndef _LINUX_HIGHMEM_INTERNAL_H #define _LINUX_HIGHMEM_INTERNAL_H +#include <linux/mm/page_address.h> + /* * Outside of CONFIG_HIGHMEM to support X86 32bit iomap_atomic() cruft. */ diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 00341b56d291..10a165a913ad 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -7,7 +7,9 @@ #include <linux/bug.h> #include <linux/cacheflush.h> #include <linux/kmsan.h> -#include <linux/mm.h> +#include <linux/mm/folio_size.h> // for page_size() +#include <linux/mm/folio_usage.h> // for folio_put() +#include <linux/mm/page_address.h> #include <linux/uaccess.h> #include <linux/hardirq.h> diff --git a/include/linux/net.h b/include/linux/net.h index 15df6d5f27a7..7c04b3124366 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -21,7 +21,7 @@ #include <linux/rcupdate.h> #include <linux/once.h> #include <linux/fs.h> -#include <linux/mm.h> +#include <linux/page_ref.h> // for page_count() #include <linux/sockptr.h> #include <uapi/linux/net.h> diff --git a/include/linux/oom.h b/include/linux/oom.h index 7d0c9c48a0c5..518426e092d0 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -8,7 +8,7 @@ #include <linux/nodemask.h> #include <uapi/linux/oom.h> #include <linux/sched/coredump.h> /* MMF_* */ -#include <linux/mm.h> /* VM_FAULT* */ +#include <linux/mm_types.h> /* VM_FAULT* */ struct zonelist; struct notifier_block; diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 850d32057939..70a99d7ebe10 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -5,7 +5,7 @@ /* * Copyright 1995 Linus Torvalds */ -#include <linux/mm.h> +#include <linux/mm_types.h> #include <linux/fs.h> #include <linux/list.h> #include <linux/highmem.h> diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 0516e64dc03e..9221bba82b23 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -5,7 +5,7 @@ #include <linux/string.h> #include <linux/types.h> #include <linux/bug.h> -#include <linux/mm.h> +#include <linux/mm/page_address.h> #include <asm/io.h> #ifdef CONFIG_UML diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c43d6afebd50..4c8fe40fe1eb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -16,6 +16,10 @@ #include <linux/bug.h> #include <linux/bvec.h> #include <linux/cache.h> +#include <linux/gfp.h> // for alloc_pages_node() +#include <linux/mm/folio_usage.h> // for get_page(), put_page() +#include <linux/mm/folio_zone.h> // for page_to_nid() +#include <linux/mm/pfmemalloc.h> // for page_is_pfmemalloc() #include <linux/rbtree.h> #include <linux/socket.h> #include <linux/refcount.h> diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 86bdcfe319ae..2cd9c921d516 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -4,7 +4,8 @@ #include <linux/types.h> #include <linux/percpu.h> -#include <linux/mm.h> // for folio_zone(), folio_nr_pages() +#include <linux/mm/folio_size.h> // for folio_nr_pages() +#include <linux/mm/folio_zone.h> // for folio_zone() #include <linux/mmzone.h> #include <linux/vm_event_item.h> #include <linux/atomic.h> diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 7bc2220fea80..775bad99fcd9 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -9,6 +9,7 @@ #include <linux/scatterlist.h> #include <linux/highmem.h> #include <linux/kmemleak.h> +#include <linux/mm.h> #include <linux/bvec.h> #include <linux/uio.h> -- 2.39.2
