diff options
| author | Babu Moger <Babu.Moger@amd.com> | 2019-11-05 21:25:32 +0000 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-11-07 11:07:29 +0100 |
| commit | b971880fe79f4042aaaf426744a5b19521bf77b3 (patch) | |
| tree | 5d56a0b3efc105b3080bda46673f990350bc9f2c /tools/arch | |
| parent | 1edae1ae62589f28d00da186465a003e2a7f9c6c (diff) | |
| download | linux-b971880fe79f4042aaaf426744a5b19521bf77b3.tar.bz2 | |
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 'tools/arch')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index a5ea841cc6d2..8e1d0bb46361 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -22,7 +22,7 @@ # define DISABLE_SMAP (1<<(X86_FEATURE_SMAP & 31)) #endif -#ifdef CONFIG_X86_INTEL_UMIP +#ifdef CONFIG_X86_UMIP # define DISABLE_UMIP 0 #else # define DISABLE_UMIP (1<<(X86_FEATURE_UMIP & 31)) |