lkml.org 
[lkml]   [2018]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 06/13] arch/x86: Use new config parameter RESCTRL for compilation
    Date
    Use newly added config parameter RESCTRL to compile sources.
    This is common parameter across both Intel and AMD.

    Signed-off-by: Babu Moger <babu.moger@amd.com>
    ---
    arch/x86/include/asm/resctrl_sched.h | 4 ++--
    arch/x86/kernel/cpu/Makefile | 4 ++--
    include/linux/sched.h | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/include/asm/resctrl_sched.h b/arch/x86/include/asm/resctrl_sched.h
    index 6e082697a613..54990fe2a3ae 100644
    --- a/arch/x86/include/asm/resctrl_sched.h
    +++ b/arch/x86/include/asm/resctrl_sched.h
    @@ -2,7 +2,7 @@
    #ifndef _ASM_X86_RESCTRL_SCHED_H
    #define _ASM_X86_RESCTRL_SCHED_H

    -#ifdef CONFIG_INTEL_RDT
    +#ifdef CONFIG_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_INTEL_RDT */
    +#endif /* CONFIG_RESCTRL */

    #endif /* _ASM_X86_RESCTRL_SCHED_H */
    diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
    index 222cf8cc078d..79279953c5f9 100644
    --- a/arch/x86/kernel/cpu/Makefile
    +++ b/arch/x86/kernel/cpu/Makefile
    @@ -35,8 +35,8 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
    obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
    obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o

    -obj-$(CONFIG_INTEL_RDT) += resctrl.o resctrl_rdtgroup.o resctrl_monitor.o
    -obj-$(CONFIG_INTEL_RDT) += resctrl_ctrlmondata.o resctrl_pseudo_lock.o
    +obj-$(CONFIG_RESCTRL) += resctrl.o resctrl_rdtgroup.o resctrl_monitor.o
    +obj-$(CONFIG_RESCTRL) += resctrl_ctrlmondata.o resctrl_pseudo_lock.o
    CFLAGS_resctrl_pseudo_lock.o = -I$(src)

    obj-$(CONFIG_X86_MCE) += mcheck/
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index 977cb57d7bc9..c4cf94c447b2 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -985,7 +985,7 @@ struct task_struct {
    /* cg_list protected by css_set_lock and tsk->alloc_lock: */
    struct list_head cg_list;
    #endif
    -#ifdef CONFIG_INTEL_RDT
    +#ifdef CONFIG_RESCTRL
    u32 closid;
    u32 rmid;
    #endif
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-19 00:53    [W:4.145 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site