summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup
diff options
context:
space:
mode:
authorWaiman Long <longman@redhat.com>2024-08-31 15:57:03 +0200
committerTejun Heo <tj@kernel.org>2024-09-04 22:46:49 +0200
commit8c7e22fc917a0d76794ebf3fcd81f9d91cee4f5d (patch)
treeab96a5a5283967bcde51b9c2e4bb2964bfabcb48 /kernel/cgroup
parentcgroup/cpuset: add sefltest for cpuset v1 (diff)
downloadlinux-8c7e22fc917a0d76794ebf3fcd81f9d91cee4f5d.tar.xz
linux-8c7e22fc917a0d76794ebf3fcd81f9d91cee4f5d.zip
cgroup/cpuset: Move cpu.h include to cpuset-internal.h
The newly created cpuset-v1.c file uses cpus_read_lock/unlock() functions which are defined in cpu.h but not included in cpuset-internal.h yet leading to compilation error under certain kernel configurations. Fix it by moving the cpu.h include from cpuset.c to cpuset-internal.h. While at it, sort the include files in alphabetic order. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202408311612.mQTuO946-lkp@intel.com/ Fixes: 047b83097448 ("cgroup/cpuset: move relax_domain_level to cpuset-v1.c") Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup')
-rw-r--r--kernel/cgroup/cpuset-internal.h7
-rw-r--r--kernel/cgroup/cpuset.c1
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/cgroup/cpuset-internal.h b/kernel/cgroup/cpuset-internal.h
index 8c113d46ddd3..976a8bc3ff60 100644
--- a/kernel/cgroup/cpuset-internal.h
+++ b/kernel/cgroup/cpuset-internal.h
@@ -3,11 +3,12 @@
#ifndef __CPUSET_INTERNAL_H
#define __CPUSET_INTERNAL_H
-#include <linux/union_find.h>
+#include <linux/cgroup.h>
+#include <linux/cpu.h>
#include <linux/cpumask.h>
-#include <linux/spinlock.h>
#include <linux/cpuset.h>
-#include <linux/cgroup.h>
+#include <linux/spinlock.h>
+#include <linux/union_find.h>
/* See "Frequency meter" comments, below. */
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 13016ad284a1..a4dd285cdf39 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -24,7 +24,6 @@
#include "cgroup-internal.h"
#include "cpuset-internal.h"
-#include <linux/cpu.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>