Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01d7d51 authored by Vikas Shivappa's avatar Vikas Shivappa Committed by Thomas Gleixner
Browse files

x86/intel_rdt: Introduce a common compile option for RDT 



We currently have a CONFIG_RDT_A which is for RDT(Resource directory
technology) allocation based resctrl filesystem interface. As a
preparation to add support for RDT monitoring as well into the same
resctrl filesystem, change the config option to be CONFIG_RDT which
would include both RDT allocation and monitoring code.

No functional change.

Signed-off-by: default avatarVikas Shivappa <vikas.shivappa@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: ravi.v.shankar@intel.com
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
Cc: peterz@infradead.org
Cc: eranian@google.com
Cc: vikas.shivappa@intel.com
Cc: ak@linux.intel.com
Cc: davidcc@google.com
Cc: reinette.chatre@intel.com
Link: http://lkml.kernel.org/r/1501017287-28083-4-git-send-email-vikas.shivappa@linux.intel.com
parent 1640ae94

arch/x86/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -424,16 +424,16 @@ config GOLDFISH 
       def_bool y

       def_bool y

       depends on X86_GOLDFISH

       depends on X86_GOLDFISH





config INTEL_RDT_A

config INTEL_RDT

	bool "Intel Resource Director Technology Allocation support"

	bool "Intel Resource Director Technology support"

	default n

	default n

	depends on X86 && CPU_SUP_INTEL

	depends on X86 && CPU_SUP_INTEL

	select KERNFS

	select KERNFS

	help

	help

	  Select to enable resource allocation which is a sub-feature of

	  Select to enable resource allocation and monitoring which are

	  Intel Resource Director Technology(RDT). More information about

	  sub-features of Intel Resource Director Technology(RDT). More

	  RDT can be found in the Intel x86 Architecture Software

	  information about RDT can be found in the Intel x86

	  Developer Manual.

	  Architecture Software Developer Manual.





	  Say N if unsure.

	  Say N if unsure.

arch/x86/include/asm/intel_rdt.h

+2 −2
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_INTEL_RDT_H

#ifndef _ASM_X86_INTEL_RDT_H

#define _ASM_X86_INTEL_RDT_H

#define _ASM_X86_INTEL_RDT_H





#ifdef CONFIG_INTEL_RDT_A

#ifdef CONFIG_INTEL_RDT





#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/kernfs.h>

#include <linux/kernfs.h>
@@ -282,5 +282,5 @@ static inline void intel_rdt_sched_in(void) 




static inline void intel_rdt_sched_in(void) {}

static inline void intel_rdt_sched_in(void) {}





#endif /* CONFIG_INTEL_RDT_A */

#endif /* CONFIG_INTEL_RDT */

#endif /* _ASM_X86_INTEL_RDT_H */
 
#endif /* _ASM_X86_INTEL_RDT_H */

arch/x86/kernel/cpu/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o 
obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o

obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o

obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o

obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o





obj-$(CONFIG_INTEL_RDT_A)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_schemata.o

obj-$(CONFIG_INTEL_RDT)	+= intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_schemata.o





obj-$(CONFIG_X86_MCE)			+= mcheck/

obj-$(CONFIG_X86_MCE)			+= mcheck/

obj-$(CONFIG_MTRR)			+= mtrr/

obj-$(CONFIG_MTRR)			+= mtrr/

include/linux/sched.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -898,7 +898,7 @@ struct task_struct { 
	/* cg_list protected by css_set_lock and tsk->alloc_lock: */

	/* cg_list protected by css_set_lock and tsk->alloc_lock: */

	struct list_head		cg_list;

	struct list_head		cg_list;

#endif

#endif

#ifdef CONFIG_INTEL_RDT_A

#ifdef CONFIG_INTEL_RDT

	int				closid;

	int				closid;

#endif

#endif

#ifdef CONFIG_FUTEX

#ifdef CONFIG_FUTEX