All Zhaoxin family 7 CPUs support the UMIP feature. Since X86_INTEL_UMIP and X86_AMD_UMIP both renamed to generic X86_UMIP, So remove the vendor dependency for Zhaoxin CPUs. LeoLiu-oc (2):   x86/Kconfig: Rename UMIP config parameter   x86/Kconfig: Drop vendor dependency for X86_UMIP  arch/x86/Kconfig                               | 15 +++++++--------  arch/x86/include/asm/disabled-features.h       |  2 +-  arch/x86/include/asm/umip.h                    |  4 ++--  arch/x86/kernel/Makefile                       |  2 +-  tools/arch/x86/include/asm/disabled-features.h |  2 +-  5 files changed, 12 insertions(+), 13 deletions(-) -- 2.20.1