Commit e8af37f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "A 32-bit build fix, CONFIG_RETPOLINE fixes and rename CONFIG_RESCTRL
  to CONFIG_X86_RESCTRL"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE
  x86/cache: Rename config option to CONFIG_X86_RESCTRL
  samples/seccomp: Fix 32-bit build
parents 8e1b295b e4f35891

Documentation/x86/resctrl_ui.txt

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/include/asm/resctrl_sched.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/cpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/cpu/bugs.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = 
static enum spectre_v2_user_mitigation spectre_v2_user __ro_after_init =

	SPECTRE_V2_USER_NONE;



#ifdef RETPOLINE

#ifdef CONFIG_RETPOLINE

static bool spectre_v2_bad_module;



bool retpoline_module_ok(bool has_retpoline)

CRA Git | Maintained and supported by SUSTech CRA and CCSE