x86/cache: Rename config option to CONFIG_X86_RESCTRL
CONFIG_RESCTRL is too generic. The final goal is to have a generic option called like this which is selected by the arch-specific ones CONFIG_X86_RESCTRL and CONFIG_ARM64_RESCTRL. The generic one will cover the resctrl filesystem and other generic and shared bits of functionality. Signed-off-by: Borislav Petkov <bp@suse.de> Suggested-by: Ingo Molnar <mingo@kernel.org> Requested-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Babu Moger <babu.moger@amd.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: James Morse <james.morse@arm.com> Cc: Reinette Chatre <reinette.chatre@intel.com> Cc: Tony Luck <tony.luck@intel.com> Cc: x86@kernel.org Link: http://lkml.kernel.org/r/20190108171401.GC12235@zn.tnic
This commit is contained in:
		
							parent
							
								
									a77d1d196b
								
							
						
					
					
						commit
						90802938f7
					
				| @ -9,7 +9,7 @@ Fenghua Yu <fenghua.yu@intel.com> | ||||
| Tony Luck <tony.luck@intel.com> | ||||
| Vikas Shivappa <vikas.shivappa@intel.com> | ||||
| 
 | ||||
| This feature is enabled by the CONFIG_RESCTRL and the X86 /proc/cpuinfo | ||||
| This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo | ||||
| flag bits: | ||||
| RDT (Resource Director Technology) Allocation - "rdt_a" | ||||
| CAT (Cache Allocation Technology) - "cat_l3", "cat_l2" | ||||
|  | ||||
| @ -446,7 +446,7 @@ config RETPOLINE | ||||
| 	  branches. Requires a compiler with -mindirect-branch=thunk-extern | ||||
| 	  support for full protection. The kernel may run slower. | ||||
| 
 | ||||
| config RESCTRL | ||||
| config X86_RESCTRL | ||||
| 	bool "Resource Control support" | ||||
| 	depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD) | ||||
| 	select KERNFS | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| #ifndef _ASM_X86_RESCTRL_SCHED_H | ||||
| #define _ASM_X86_RESCTRL_SCHED_H | ||||
| 
 | ||||
| #ifdef CONFIG_RESCTRL | ||||
| #ifdef CONFIG_X86_RESCTRL | ||||
| 
 | ||||
| #include <linux/sched.h> | ||||
| #include <linux/jump_label.h> | ||||
| @ -88,6 +88,6 @@ static inline void resctrl_sched_in(void) | ||||
| 
 | ||||
| static inline void resctrl_sched_in(void) {} | ||||
| 
 | ||||
| #endif /* CONFIG_RESCTRL */ | ||||
| #endif /* CONFIG_X86_RESCTRL */ | ||||
| 
 | ||||
| #endif /* _ASM_X86_RESCTRL_SCHED_H */ | ||||
|  | ||||
| @ -39,7 +39,7 @@ obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o | ||||
| obj-$(CONFIG_X86_MCE)			+= mce/ | ||||
| obj-$(CONFIG_MTRR)			+= mtrr/ | ||||
| obj-$(CONFIG_MICROCODE)			+= microcode/ | ||||
| obj-$(CONFIG_RESCTRL)			+= resctrl/ | ||||
| obj-$(CONFIG_X86_RESCTRL)		+= resctrl/ | ||||
| 
 | ||||
| obj-$(CONFIG_X86_LOCAL_APIC)		+= perfctr-watchdog.o | ||||
| 
 | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| # SPDX-License-Identifier: GPL-2.0
 | ||||
| obj-$(CONFIG_RESCTRL)	+= core.o rdtgroup.o monitor.o | ||||
| obj-$(CONFIG_RESCTRL)	+= ctrlmondata.o pseudo_lock.o | ||||
| obj-$(CONFIG_X86_RESCTRL)	+= core.o rdtgroup.o monitor.o | ||||
| obj-$(CONFIG_X86_RESCTRL)	+= ctrlmondata.o pseudo_lock.o | ||||
| CFLAGS_pseudo_lock.o = -I$(src) | ||||
|  | ||||
| @ -995,7 +995,7 @@ struct task_struct { | ||||
| 	/* cg_list protected by css_set_lock and tsk->alloc_lock: */ | ||||
| 	struct list_head		cg_list; | ||||
| #endif | ||||
| #ifdef CONFIG_RESCTRL | ||||
| #ifdef CONFIG_X86_RESCTRL | ||||
| 	u32				closid; | ||||
| 	u32				rmid; | ||||
| #endif | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user