headers/deps: mm: Optimize <linux/mmzone.h> dependencies, remove <linux/mmzone_api.h> inclusion

          --------------------------------------------------------------------
          | Combined, preprocessed C code size of header, without line markers,
          | with comments stripped:
          -------------------------
  before: | #include <linux/mmzone.h>               | LOC:  7,593 | headers:  215
   after: | #include <linux/mmzone.h>               | LOC:    815 | headers:   63

Fix up dangling dependencies.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

10 files changed, 21 insertions, 20 deletions

diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index edc9c08f722329..88a11603d5b74c 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include <linux/mmzone.h>
+#include <linux/mmzone_api.h>
 #include <linux/cpumask_api.h>
 #include <linux/sched.h>
 #include <linux/sched/topology.h>
diff --git a/include/linux/mm_api.h b/include/linux/mm_api.h
index e08684baef4f2d..818cb802fc22c3 100644
--- a/include/linux/mm_api.h
+++ b/include/linux/mm_api.h
@@ -27,7 +27,7 @@
 #include <linux/gfp_types.h>
 #include <linux/bug.h>
 #include <linux/list.h>
-#include <linux/mmzone.h>
+#include <linux/mmzone_api.h>
 #include <linux/rbtree.h>
 #include <linux/atomic.h>
 #include <linux/debug_locks.h>
@@ -41,7 +41,7 @@
 #include <linux/page_ref.h>
 #include <linux/overflow.h>
 #include <linux/sizes.h>
-#include <linux/pgtable_types.h>
+#include <linux/pgtable_api.h>
 #include <linux/kasan.h>
 #include <linux/fcntl.h>
 
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 4b8dae7ec7d5d2..855794c582c30d 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -3,6 +3,5 @@
 #define _LINUX_MMZONE_H
 
 #include <linux/mmzone_types.h>
-#include <linux/mmzone_api.h>
 
 #endif /* _LINUX_MMZONE_H */
diff --git a/include/linux/mmzone_api.h b/include/linux/mmzone_api.h
index b3d7db1566edf2..862fef5634f0a8 100644
--- a/include/linux/mmzone_api.h
+++ b/include/linux/mmzone_api.h
@@ -276,20 +276,9 @@ extern int percpu_pagelist_high_fraction;
 extern char numa_zonelist_order[];
 #define NUMA_ZONELIST_ORDER_LEN	16
 
-#ifndef CONFIG_NUMA
-
-extern struct pglist_data contig_page_data;
-static inline struct pglist_data *NODE_DATA(int nid)
-{
-	return &contig_page_data;
-}
-#define NODE_MEM_MAP(nid)	mem_map
-
-#else /* CONFIG_NUMA */
-
-#include <asm/mmzone.h>
-
-#endif /* !CONFIG_NUMA */
+#ifdef CONFIG_NUMA
+# include <asm/mmzone.h>
+#endif
 
 extern struct pglist_data *first_online_pgdat(void);
 extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat);
diff --git a/include/linux/mmzone_types.h b/include/linux/mmzone_types.h
index 6df9276e3197c0..830cc652fad9f7 100644
--- a/include/linux/mmzone_types.h
+++ b/include/linux/mmzone_types.h
@@ -780,6 +780,15 @@ typedef struct pglist_data {
 	atomic_long_t		vm_stat[NR_VM_NODE_STAT_ITEMS];
 } pg_data_t;
 
+#ifndef CONFIG_NUMA
+extern struct pglist_data contig_page_data;
+static inline struct pglist_data *NODE_DATA(int nid)
+{
+	return &contig_page_data;
+}
+#define NODE_MEM_MAP(nid)	mem_map
+#endif
+
 #define node_present_pages(nid)	(NODE_DATA(nid)->node_present_pages)
 #define node_spanned_pages(nid)	(NODE_DATA(nid)->node_spanned_pages)
 #ifdef CONFIG_FLATMEM
diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index f819059796cbda..87fbf364845b1a 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -2,6 +2,7 @@
 #ifndef __LINUX_PAGEISOLATION_H
 #define __LINUX_PAGEISOLATION_H
 
+#include <linux/mmzone_api.h>
 #include <linux/types.h>
 
 #ifdef CONFIG_MEMORY_ISOLATION
diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
index 739147e4f1bcca..c9240d5a23374a 100644
--- a/include/linux/pfn_t.h
+++ b/include/linux/pfn_t.h
@@ -2,7 +2,7 @@
 #ifndef _LINUX_PFN_T_H_
 #define _LINUX_PFN_T_H_
 
-#include <linux/mmzone.h>
+#include <linux/mmzone_api.h>
 #include <linux/pgtable_api.h>
 
 /*
diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index 6a02f9978f9420..57cdfe3a7949c0 100644
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -16,6 +16,8 @@
 #include <linux/pci.h>
 #include <linux/rtsx_common.h>
 
+struct scatterlist;
+
 #define MAX_RW_REG_CNT			1024
 
 #define RTSX_HCBAR			0x00
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 1dd6b4f3a7c859..8e15e20f5c45da 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -2,6 +2,7 @@
 #ifndef _LINUX_SWAP_H
 #define _LINUX_SWAP_H
 
+#include <linux/nodemask.h>
 #include <linux/percpu-refcount-api.h>
 #include <linux/spinlock.h>
 #include <linux/linkage.h>
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
index 116ed4d5d0f881..eb2a0f49356099 100644
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/node.h>
-#include <linux/mmzone.h>
+#include <linux/mmzone_api.h>
 #include <linux/compaction.h>
 /*
  * The order of these masks is important. Matching masks will be seen