Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a905dc5 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

FROMLIST: refactor header includes 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.

Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>

(not upstream yet, latest version published at: https://lore.kernel.org/patchwork/patch/1052417/

)

Bug: 127712811
Bug: 129157727
Test: lmkd in PSI mode
Change-Id: I88cd99f41534f0b9df18043cde8d1ee54aaa93de
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
parent 23c32cf5

drivers/spi/spi-rockchip.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 




#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/consumer.h>

include/linux/kthread.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
/* Simple interface for creating and stopping kernel threads without mess. */

/* Simple interface for creating and stopping kernel threads without mess. */

#include <linux/err.h>

#include <linux/err.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/cgroup.h>





__printf(4, 5)

__printf(4, 5)

struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),

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); 




void kthread_destroy_worker(struct kthread_worker *worker);

void kthread_destroy_worker(struct kthread_worker *worker);





struct cgroup_subsys_state;



#ifdef CONFIG_BLK_CGROUP

#ifdef CONFIG_BLK_CGROUP

void kthread_associate_blkcg(struct cgroup_subsys_state *css);

void kthread_associate_blkcg(struct cgroup_subsys_state *css);

struct cgroup_subsys_state *kthread_blkcg(void);

struct cgroup_subsys_state *kthread_blkcg(void);

include/linux/sched.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/latencytop.h>

#include <linux/latencytop.h>

#include <linux/sched/prio.h>

#include <linux/sched/prio.h>

#include <linux/signal_types.h>

#include <linux/signal_types.h>

#include <linux/psi_types.h>

#include <linux/mm_types_task.h>

#include <linux/mm_types_task.h>

#include <linux/task_io_accounting.h>

#include <linux/task_io_accounting.h>

#include <linux/rseq.h>

#include <linux/rseq.h>

kernel/kthread.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kthread.h>

#include <linux/kthread.h>

#include <linux/completion.h>

#include <linux/completion.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/cgroup.h>

#include <linux/cpuset.h>

#include <linux/cpuset.h>

#include <linux/unistd.h>

#include <linux/unistd.h>

#include <linux/file.h>

#include <linux/file.h>