On Tue, Nov 05, 2019 at 09:25:32PM +0000, Moger, Babu wrote: > 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. > > Signed-off-by: Babu Moger <babu.moger@xxxxxxx> > --- > arch/x86/Kconfig | 10 +++++----- > arch/x86/include/asm/disabled-features.h | 2 +- > arch/x86/include/asm/umip.h | 4 ++-- > arch/x86/kernel/Makefile | 2 +- > 4 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index d6e1faa28c58..b7fb285d7c0f 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -1880,13 +1880,13 @@ config X86_SMAP > > If unsure, say Y. > > -config X86_INTEL_UMIP > +config X86_UMIP > def_bool y > - depends on CPU_SUP_INTEL > - prompt "Intel User Mode Instruction Prevention" if EXPERT > + depends on CPU_SUP_INTEL || CPU_SUP_AMD > + prompt "User Mode Instruction Prevention" if EXPERT > ---help--- > - The User Mode Instruction Prevention (UMIP) is a security > - feature in newer Intel processors. If enabled, a general > + User Mode Instruction Prevention (UMIP) is a security > + feature in newer x86 processors. If enabled, a general Better to say certain x86 processors? Intel and AMD have it but what about others? Thanks and BR, Ricardo