Skip to content

Commit 8af0c18

Browse files
surenbaghdasaryantorvalds
authored andcommitted
include/: refactor headers to allow kthread.h inclusion in psi_types.h
kthread.h can't be included in psi_types.h because it creates a circular inclusion with kthread.h eventually including psi_types.h and complaining on kthread structures not being defined because they are defined further in the kthread.h. Resolve this by removing psi_types.h inclusion from the headers included from kthread.h. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Suren Baghdasaryan <[email protected]> Acked-by: Johannes Weiner <[email protected]> Cc: Dennis Zhou <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Li Zefan <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 333f301 commit 8af0c18

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

drivers/spi/spi-rockchip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <linux/clk.h>
1717
#include <linux/dmaengine.h>
18+
#include <linux/interrupt.h>
1819
#include <linux/module.h>
1920
#include <linux/of.h>
2021
#include <linux/pinctrl/consumer.h>

include/linux/kthread.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
/* Simple interface for creating and stopping kernel threads without mess. */
55
#include <linux/err.h>
66
#include <linux/sched.h>
7-
#include <linux/cgroup.h>
87

98
__printf(4, 5)
109
struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
@@ -198,6 +197,8 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
198197

199198
void kthread_destroy_worker(struct kthread_worker *worker);
200199

200+
struct cgroup_subsys_state;
201+
201202
#ifdef CONFIG_BLK_CGROUP
202203
void kthread_associate_blkcg(struct cgroup_subsys_state *css);
203204
struct cgroup_subsys_state *kthread_blkcg(void);

include/linux/sched.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/latencytop.h>
2727
#include <linux/sched/prio.h>
2828
#include <linux/signal_types.h>
29-
#include <linux/psi_types.h>
3029
#include <linux/mm_types_task.h>
3130
#include <linux/task_io_accounting.h>
3231
#include <linux/rseq.h>

kernel/kthread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/kthread.h>
1212
#include <linux/completion.h>
1313
#include <linux/err.h>
14+
#include <linux/cgroup.h>
1415
#include <linux/cpuset.h>
1516
#include <linux/unistd.h>
1617
#include <linux/file.h>

0 commit comments

Comments
 (0)