Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Dave Martin <> | Subject | [PATCH v2 35/35] [SQUASHME] x86/resctrl: Move the resctrl filesystem code to /fs/resctrl | Date | Fri, 26 Apr 2024 16:09:04 +0100 |
| |
Relax asm #includes identified by checkpatch.pl as satisfiable by a <linux/> include in the destination files of this code move.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
FYI: James Morse (et al.):
* This patch is kept separate for now so that these changes do not get lost when rebuilding the previous code-movement patch.
It should be folded into the previous patch or dropped once the series is final.
Changes in v2:
* New patch. --- fs/resctrl/internal.h | 2 -- fs/resctrl/pseudo_lock.c | 4 ++-- fs/resctrl/rdtgroup.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h index f73267762a87..0e0c70d62c40 100644 --- a/fs/resctrl/internal.h +++ b/fs/resctrl/internal.h @@ -9,8 +9,6 @@ #include <linux/jump_label.h> #include <linux/tick.h> -#include <asm/resctrl.h> - /** * cpumask_any_housekeeping() - Choose any CPU in @mask, preferring those that * aren't marked nohz_full diff --git a/fs/resctrl/pseudo_lock.c b/fs/resctrl/pseudo_lock.c index 077c2abb6edd..2a36a2efbd49 100644 --- a/fs/resctrl/pseudo_lock.c +++ b/fs/resctrl/pseudo_lock.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/cacheflush.h> #include <linux/cacheinfo.h> #include <linux/cpu.h> #include <linux/cpumask.h> @@ -19,11 +20,10 @@ #include <linux/mman.h> #include <linux/perf_event.h> #include <linux/pm_qos.h> +#include <linux/resctrl.h> #include <linux/slab.h> #include <linux/uaccess.h> -#include <asm/cacheflush.h> -#include <asm/resctrl.h> #include <asm/perf_event.h> #include "internal.h" diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c index 8b18224eda35..09f120772c48 100644 --- a/fs/resctrl/rdtgroup.c +++ b/fs/resctrl/rdtgroup.c @@ -19,6 +19,7 @@ #include <linux/fs_parser.h> #include <linux/sysfs.h> #include <linux/kernfs.h> +#include <linux/resctrl.h> #include <linux/seq_buf.h> #include <linux/seq_file.h> #include <linux/sched/signal.h> @@ -29,7 +30,6 @@ #include <uapi/linux/magic.h> -#include <asm/resctrl.h> #include "internal.h" /* Mutex to protect rdtgroup access. */ -- 2.34.1
| ![\](/images/icornerr.gif) |