aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/umip.h
diff options
context:
space:
mode:
authorBabu Moger <Babu.Moger@amd.com>2019-11-05 21:25:32 +0000
committerBorislav Petkov <bp@suse.de>2019-11-07 11:07:29 +0100
commitb971880fe79f4042aaaf426744a5b19521bf77b3 (patch)
tree5d56a0b3efc105b3080bda46673f990350bc9f2c /arch/x86/include/asm/umip.h
parentx86/Kconfig: Enforce limit of 512 CPUs with MAXSMP and no CPUMASK_OFFSTACK (diff)
downloadlinux-dev-b971880fe79f4042aaaf426744a5b19521bf77b3.tar.xz
linux-dev-b971880fe79f4042aaaf426744a5b19521bf77b3.zip
x86/Kconfig: Rename UMIP config parameter
AMD 2nd generation EPYC processors support the UMIP (User-Mode Instruction Prevention) feature. So, rename X86_INTEL_UMIP to generic X86_UMIP and modify the text to cover both Intel and AMD. [ bp: take of the disabled-features.h copy in tools/ too. ] Signed-off-by: Babu Moger <babu.moger@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "x86@kernel.org" <x86@kernel.org> Link: https://lkml.kernel.org/r/157298912544.17462.2018334793891409521.stgit@naples-babu.amd.com
Diffstat (limited to 'arch/x86/include/asm/umip.h')
-rw-r--r--arch/x86/include/asm/umip.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/umip.h b/arch/x86/include/asm/umip.h
index db43f2a0d92c..aeed98c3c9e1 100644
--- a/arch/x86/include/asm/umip.h
+++ b/arch/x86/include/asm/umip.h
@@ -4,9 +4,9 @@
#include <linux/types.h>
#include <asm/ptrace.h>
-#ifdef CONFIG_X86_INTEL_UMIP
+#ifdef CONFIG_X86_UMIP
bool fixup_umip_exception(struct pt_regs *regs);
#else
static inline bool fixup_umip_exception(struct pt_regs *regs) { return false; }
-#endif /* CONFIG_X86_INTEL_UMIP */
+#endif /* CONFIG_X86_UMIP */
#endif /* _ASM_X86_UMIP_H */