From: Greg Kroah-Hartman Date: Mon, 29 Jun 2020 07:14:35 +0000 (+0200) Subject: drop queue-5.7/x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch X-Git-Tag: v5.7.7~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1a3d0b3cf6e73bc15128b8be7425e31d54e71c9;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.7/x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch --- diff --git a/queue-5.7/series b/queue-5.7/series index c5344a9afce..55ab583a5c1 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -205,4 +205,3 @@ blktrace-break-out-of-blktrace-setup-on-concurrent-c.patch nvdimm-region-always-show-the-align-attribute.patch block-update-hctx-map-when-use-multiple-maps.patch risc-v-don-t-allow-write-exec-only-page-mapping-requ.patch -x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch diff --git a/queue-5.7/x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch b/queue-5.7/x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch deleted file mode 100644 index b5c05cb3adf..00000000000 --- a/queue-5.7/x86-resctrl-rename-asm-resctrl_sched.h-to-asm-resctr.patch +++ /dev/null @@ -1,136 +0,0 @@ -From b8f7ac6bb04665e0949eb1eda085fe04a6105075 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 15:36:12 -0700 -Subject: x86/resctrl: Rename asm/resctrl_sched.h to asm/resctrl.h - -From: Reinette Chatre - -[ Upstream commit 8dd97c65185c5a63c668e5bd8a861c04f47a35ed ] - -asm/resctrl_sched.h is dedicated to the code used for configuration -of the CPU resource control state when a task is scheduled. - -Rename resctrl_sched.h to resctrl.h in preparation of additions that -will no longer make this file dedicated to work done during scheduling. - -No functional change. - -Suggested-by: Borislav Petkov -Signed-off-by: Reinette Chatre -Signed-off-by: Borislav Petkov -Link: https://lkml.kernel.org/r/6914e0ef880b539a82a6d889f9423496d471ad1d.1588715690.git.reinette.chatre@intel.com -Signed-off-by: Sasha Levin ---- - MAINTAINERS | 2 +- - arch/x86/include/asm/{resctrl_sched.h => resctrl.h} | 6 +++--- - arch/x86/kernel/cpu/resctrl/core.c | 2 +- - arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- - arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- - arch/x86/kernel/process_32.c | 2 +- - arch/x86/kernel/process_64.c | 2 +- - 7 files changed, 9 insertions(+), 9 deletions(-) - rename arch/x86/include/asm/{resctrl_sched.h => resctrl.h} (96%) - -diff --git a/MAINTAINERS b/MAINTAINERS -index 50659d76976b7..36a9c2d269377 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -14230,7 +14230,7 @@ M: Reinette Chatre - L: linux-kernel@vger.kernel.org - S: Supported - F: Documentation/x86/resctrl* --F: arch/x86/include/asm/resctrl_sched.h -+F: arch/x86/include/asm/resctrl.h - F: arch/x86/kernel/cpu/resctrl/ - F: tools/testing/selftests/resctrl/ - -diff --git a/arch/x86/include/asm/resctrl_sched.h b/arch/x86/include/asm/resctrl.h -similarity index 96% -rename from arch/x86/include/asm/resctrl_sched.h -rename to arch/x86/include/asm/resctrl.h -index c8a27cbbdae29..07603064df8fc 100644 ---- a/arch/x86/include/asm/resctrl_sched.h -+++ b/arch/x86/include/asm/resctrl.h -@@ -1,6 +1,6 @@ - /* SPDX-License-Identifier: GPL-2.0 */ --#ifndef _ASM_X86_RESCTRL_SCHED_H --#define _ASM_X86_RESCTRL_SCHED_H -+#ifndef _ASM_X86_RESCTRL_H -+#define _ASM_X86_RESCTRL_H - - #ifdef CONFIG_X86_CPU_RESCTRL - -@@ -93,4 +93,4 @@ static inline void resctrl_cpu_detect(struct cpuinfo_x86 *c) {} - - #endif /* CONFIG_X86_CPU_RESCTRL */ - --#endif /* _ASM_X86_RESCTRL_SCHED_H */ -+#endif /* _ASM_X86_RESCTRL_H */ -diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c -index c1551541c7a53..bc1d818b5b766 100644 ---- a/arch/x86/kernel/cpu/resctrl/core.c -+++ b/arch/x86/kernel/cpu/resctrl/core.c -@@ -22,7 +22,7 @@ - #include - - #include --#include -+#include - #include "internal.h" - - /* Mutex to protect rdtgroup access. */ -diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c -index d7623e1b927d1..4bd28b388a1aa 100644 ---- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c -+++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - - #include "../../events/perf_event.h" /* For X86_CONFIG() */ -diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c -index 29a3878ab3c01..0aa212582c296 100644 ---- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c -+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - #include "internal.h" - - DEFINE_STATIC_KEY_FALSE(rdt_enable_key); -diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index 954b013cc585f..538d4e8d6589d 100644 ---- a/arch/x86/kernel/process_32.c -+++ b/arch/x86/kernel/process_32.c -@@ -52,7 +52,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "process.h" -diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c -index 5ef9d8f25b0e8..0c169a5687e1c 100644 ---- a/arch/x86/kernel/process_64.c -+++ b/arch/x86/kernel/process_64.c -@@ -52,7 +52,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #ifdef CONFIG_IA32_EMULATION --- -2.25.1 -