plist: Split out plist_types.h

Trimming down sched.h dependencies: we don't want to include more than
the base types.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/include/linux/plist.h b/include/linux/plist.h
index 0f352c1d3c8058b5ee1d01b1d6df81088cc7c209..8c1c8adf7fe948c0b6dbe71692599314199b7a29 100644 (file)
--- a/include/linux/plist.h
+++ b/include/linux/plist.h
@@ -75,20 +75,10 @@
 
 #include <linux/container_of.h>
 #include <linux/list.h>
-#include <linux/types.h>
+#include <linux/plist_types.h>
 
 #include <asm/bug.h>
 
-struct plist_head {
-       struct list_head node_list;
-};
-
-struct plist_node {
-       int                     prio;
-       struct list_head        prio_list;
-       struct list_head        node_list;
-};
-
 /**
  * PLIST_HEAD_INIT - static struct plist_head initializer
  * @head:      struct plist_head variable name

diff --git a/include/linux/plist_types.h b/include/linux/plist_types.h
new file mode 100644 (file)
index 0000000..c37e784
--- /dev/null
+++ b/include/linux/plist_types.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef _LINUX_PLIST_TYPES_H
+#define _LINUX_PLIST_TYPES_H
+
+#include <linux/types.h>
+
+struct plist_head {
+       struct list_head node_list;
+};
+
+struct plist_node {
+       int                     prio;
+       struct list_head        prio_list;
+       struct list_head        node_list;
+};
+
+#endif /* _LINUX_PLIST_TYPES_H */

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9e2708c2cfa66b6f759ca633c4a5644c2efc72dc..8c230f24688bdf4b322a3e03150f6b9f99099f13 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -16,7 +16,7 @@
 #include <linux/shm.h>
 #include <linux/kmsan_types.h>
 #include <linux/mutex_types.h>
-#include <linux/plist.h>
+#include <linux/plist_types.h>
 #include <linux/hrtimer_types.h>
 #include <linux/irqflags.h>
 #include <linux/seccomp.h>

diff --git a/init/init_task.c b/init/init_task.c
index 5727d42149c334a989a2e657b3f71e26ae2899fc..56220898a256b132fe217f79a319e47dcd218f12 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -12,6 +12,7 @@
 #include <linux/audit.h>
 #include <linux/numa.h>
 #include <linux/scs.h>
+#include <linux/plist.h>
 
 #include <linux/uaccess.h>
 

diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index dad981a865b841c954deed1934674f514832ff7e..e0e853412c158e1277ea4c63a40576093b0bc673 100644 (file)
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -34,6 +34,7 @@
 #include <linux/compat.h>
 #include <linux/jhash.h>
 #include <linux/pagemap.h>
+#include <linux/plist.h>
 #include <linux/memblock.h>
 #include <linux/fault-inject.h>
 #include <linux/slab.h>

diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c
index eb21f065816ba68e95ed7d971d7bde85d7f2f91e..b47bb764b352015026f163224b73c83c85a5f860 100644 (file)
--- a/kernel/futex/requeue.c
+++ b/kernel/futex/requeue.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <linux/plist.h>
 #include <linux/sched/signal.h>
 
 #include "futex.h"

diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c
index 61b112897a84a088591fb0d19146273a5bda0507..3a10375d952186520c3583f43caef23a3a7a3041 100644 (file)
--- a/kernel/futex/waitwake.c
+++ b/kernel/futex/waitwake.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <linux/plist.h>
 #include <linux/sched/task.h>
 #include <linux/sched/signal.h>
 #include <linux/freezer.h>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 4bc70f459164147e260eeb3b669737b0df1a2b82..25019af07181e873b6ac06988631da02b8793e82 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -42,6 +42,7 @@
 #include <linux/completion.h>
 #include <linux/suspend.h>
 #include <linux/zswap.h>
+#include <linux/plist.h>
 
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>