summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/cpufeature.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-13 11:36:19 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-13 11:36:19 +0200
commitd8d1c35139481ee8e292d91cd3fd35a6b3a316eb (patch)
tree0a06b6c185e91bf14b22e7f526755e2ca80209bf /arch/x86/include/asm/cpufeature.h
parentcb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (diff)
parent1886297ce0c8d563a08c8a8c4c0b97743e06cd37 (diff)
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base
Conflicts: arch/x86/include/asm/cpufeature.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/cpufeature.h')
-rw-r--r--arch/x86/include/asm/cpufeature.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 97e5f13ea471..c594e04bf529 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -126,7 +126,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)
#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)
#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
-#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)
#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)
#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
/*