diff options
| author |   Borislav Petkov <bp@suse.de> | 2019-02-02 10:45:17 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-02-02 10:45:17 +0100 |
| commit | 84ba10d633f1e8886e62bfd88e1b04ea28310483 (patch) | |
| tree | cdea4b31d0e59393cccdfb31aa283d00d1836012 /include/linux | |
| parent | EDAC: Do not check return value of debugfs_create() functions (diff) | |
| parent | x86/resctrl: Avoid confusion over the new X86_RESCTRL config (diff) | |
Merge remote-tracking branch 'tip/x86/urgent' into edac-for-5.1
... to pick up dependent change:
00ae831dfe44 ("x86/cpu: Add Atom Tremont (Jacobsville)")
introducing the model number define which will be needed by the new
i10nm_edac driver for 10nm Intel Atoms.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler-gcc.h | 2 | ||||
| -rw-r--r-- | include/linux/module.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 5776da43da97..dd8268f5f5f0 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -68,7 +68,7 @@ */ #define uninitialized_var(x) x = x -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE #define __noretpoline __attribute__((__indirect_branch__("keep"))) #endif diff --git a/include/linux/module.h b/include/linux/module.h index 9a21fe3509af..8fa38d3e7538 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -828,7 +828,7 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr, static inline void module_bug_cleanup(struct module *mod) {} #endif /* CONFIG_GENERIC_BUG */ -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE extern bool retpoline_module_ok(bool has_retpoline); #else static inline bool retpoline_module_ok(bool has_retpoline) diff --git a/include/linux/sched.h b/include/linux/sched.h index 89541d248893..8c328b14c424 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -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_CPU_RESCTRL u32 closid; u32 rmid; #endif |