aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-30 07:30:07 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:07 -0500
commit7b11fb51567dedeaf6dc03f0135c0a8bb2399818 (patch)
treee4fd6f20d2aea1c4addddb01bf7dc2fa2b1cd5f4 /include
parente845c06bced7f5f325e0f9aefd3207cd45c21ff2 (diff)
x86: unify asm/cpufeature.h
asm/cpufeature.h was already almost unified; this completes the job. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/cpufeature.h191
-rw-r--r--include/asm-x86/cpufeature_32.h176
-rw-r--r--include/asm-x86/cpufeature_64.h30
3 files changed, 187 insertions, 210 deletions
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h
index b7160a4598d7..4c7875554d01 100644
--- a/include/asm-x86/cpufeature.h
+++ b/include/asm-x86/cpufeature.h
@@ -1,5 +1,188 @@
1#ifdef CONFIG_X86_32 1/*
2# include "cpufeature_32.h" 2 * Defines x86 CPU feature bits
3#else 3 */
4# include "cpufeature_64.h" 4#ifndef _ASM_X86_CPUFEATURE_H
5#define _ASM_X86_CPUFEATURE_H
6
7#ifndef __ASSEMBLY__
8#include <linux/bitops.h>
5#endif 9#endif
10#include <asm/required-features.h>
11
12#define NCAPINTS 8 /* N 32-bit words worth of info */
13
14/* Intel-defined CPU features, CPUID level 0x00000001 (edx), word 0 */
15#define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */
16#define X86_FEATURE_VME (0*32+ 1) /* Virtual Mode Extensions */
17#define X86_FEATURE_DE (0*32+ 2) /* Debugging Extensions */
18#define X86_FEATURE_PSE (0*32+ 3) /* Page Size Extensions */
19#define X86_FEATURE_TSC (0*32+ 4) /* Time Stamp Counter */
20#define X86_FEATURE_MSR (0*32+ 5) /* Model-Specific Registers, RDMSR, WRMSR */
21#define X86_FEATURE_PAE (0*32+ 6) /* Physical Address Extensions */
22#define X86_FEATURE_MCE (0*32+ 7) /* Machine Check Architecture */
23#define X86_FEATURE_CX8 (0*32+ 8) /* CMPXCHG8 instruction */
24#define X86_FEATURE_APIC (0*32+ 9) /* Onboard APIC */
25#define X86_FEATURE_SEP (0*32+11) /* SYSENTER/SYSEXIT */
26#define X86_FEATURE_MTRR (0*32+12) /* Memory Type Range Registers */
27#define X86_FEATURE_PGE (0*32+13) /* Page Global Enable */
28#define X86_FEATURE_MCA (0*32+14) /* Machine Check Architecture */
29#define X86_FEATURE_CMOV (0*32+15) /* CMOV instruction (FCMOVCC and FCOMI too if FPU present) */
30#define X86_FEATURE_PAT (0*32+16) /* Page Attribute Table */
31#define X86_FEATURE_PSE36 (0*32+17) /* 36-bit PSEs */
32#define X86_FEATURE_PN (0*32+18) /* Processor serial number */
33#define X86_FEATURE_CLFLSH (0*32+19) /* Supports the CLFLUSH instruction */
34#define X86_FEATURE_DS (0*32+21) /* Debug Store */
35#define X86_FEATURE_ACPI (0*32+22) /* ACPI via MSR */
36#define X86_FEATURE_MMX (0*32+23) /* Multimedia Extensions */
37#define X86_FEATURE_FXSR (0*32+24) /* FXSAVE and FXRSTOR instructions (fast save and restore */
38 /* of FPU context), and CR4.OSFXSR available */
39#define X86_FEATURE_XMM (0*32+25) /* Streaming SIMD Extensions */
40#define X86_FEATURE_XMM2 (0*32+26) /* Streaming SIMD Extensions-2 */
41#define X86_FEATURE_SELFSNOOP (0*32+27) /* CPU self snoop */
42#define X86_FEATURE_HT (0*32+28) /* Hyper-Threading */
43#define X86_FEATURE_ACC (0*32+29) /* Automatic clock control */
44#define X86_FEATURE_IA64 (0*32+30) /* IA-64 processor */
45
46/* AMD-defined CPU features, CPUID level 0x80000001, word 1 */
47/* Don't duplicate feature flags which are redundant with Intel! */
48#define X86_FEATURE_SYSCALL (1*32+11) /* SYSCALL/SYSRET */
49#define X86_FEATURE_MP (1*32+19) /* MP Capable. */
50#define X86_FEATURE_NX (1*32+20) /* Execute Disable */
51#define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */
52#define X86_FEATURE_RDTSCP (1*32+27) /* RDTSCP */
53#define X86_FEATURE_LM (1*32+29) /* Long Mode (x86-64) */
54#define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */
55#define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */
56
57/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */
58#define X86_FEATURE_RECOVERY (2*32+ 0) /* CPU in recovery mode */
59#define X86_FEATURE_LONGRUN (2*32+ 1) /* Longrun power control */
60#define X86_FEATURE_LRTI (2*32+ 3) /* LongRun table interface */
61
62/* Other features, Linux-defined mapping, word 3 */
63/* This range is used for feature bits which conflict or are synthesized */
64#define X86_FEATURE_CXMMX (3*32+ 0) /* Cyrix MMX extensions */
65#define X86_FEATURE_K6_MTRR (3*32+ 1) /* AMD K6 nonstandard MTRRs */
66#define X86_FEATURE_CYRIX_ARR (3*32+ 2) /* Cyrix ARRs (= MTRRs) */
67#define X86_FEATURE_CENTAUR_MCR (3*32+ 3) /* Centaur MCRs (= MTRRs) */
68/* cpu types for specific tunings: */
69#define X86_FEATURE_K8 (3*32+ 4) /* Opteron, Athlon64 */
70#define X86_FEATURE_K7 (3*32+ 5) /* Athlon */
71#define X86_FEATURE_P3 (3*32+ 6) /* P3 */
72#define X86_FEATURE_P4 (3*32+ 7) /* P4 */
73#define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */
74#define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */
75#define X86_FEATURE_FXSAVE_LEAK (3*32+10) /* FXSAVE leaks FOP/FIP/FOP */
76#define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */
77#define X86_FEATURE_PEBS (3*32+12) /* Precise-Event Based Sampling */
78#define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */
79/* 14 free */
80#define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */
81#define X86_FEATURE_REP_GOOD (3*32+16) /* rep microcode works well on this CPU */
82
83/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
84#define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */
85#define X86_FEATURE_MWAIT (4*32+ 3) /* Monitor/Mwait support */
86#define X86_FEATURE_DSCPL (4*32+ 4) /* CPL Qualified Debug Store */
87#define X86_FEATURE_EST (4*32+ 7) /* Enhanced SpeedStep */
88#define X86_FEATURE_TM2 (4*32+ 8) /* Thermal Monitor 2 */
89#define X86_FEATURE_CID (4*32+10) /* Context ID */
90#define X86_FEATURE_CX16 (4*32+13) /* CMPXCHG16B */
91#define X86_FEATURE_XTPR (4*32+14) /* Send Task Priority Messages */
92#define X86_FEATURE_DCA (4*32+18) /* Direct Cache Access */
93
94/* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
95#define X86_FEATURE_XSTORE (5*32+ 2) /* on-CPU RNG present (xstore insn) */
96#define X86_FEATURE_XSTORE_EN (5*32+ 3) /* on-CPU RNG enabled */
97#define X86_FEATURE_XCRYPT (5*32+ 6) /* on-CPU crypto (xcrypt insn) */
98#define X86_FEATURE_XCRYPT_EN (5*32+ 7) /* on-CPU crypto enabled */
99#define X86_FEATURE_ACE2 (5*32+ 8) /* Advanced Cryptography Engine v2 */
100#define X86_FEATURE_ACE2_EN (5*32+ 9) /* ACE v2 enabled */
101#define X86_FEATURE_PHE (5*32+ 10) /* PadLock Hash Engine */
102#define X86_FEATURE_PHE_EN (5*32+ 11) /* PHE enabled */
103#define X86_FEATURE_PMM (5*32+ 12) /* PadLock Montgomery Multiplier */
104#define X86_FEATURE_PMM_EN (5*32+ 13) /* PMM enabled */
105
106/* More extended AMD flags: CPUID level 0x80000001, ecx, word 6 */
107#define X86_FEATURE_LAHF_LM (6*32+ 0) /* LAHF/SAHF in long mode */
108#define X86_FEATURE_CMP_LEGACY (6*32+ 1) /* If yes HyperThreading not valid */
109
110/*
111 * Auxiliary flags: Linux defined - For features scattered in various
112 * CPUID levels like 0x6, 0xA etc
113 */
114#define X86_FEATURE_IDA (7*32+ 0) /* Intel Dynamic Acceleration */
115
116#define cpu_has(c, bit) \
117 (__builtin_constant_p(bit) && \
118 ( (((bit)>>5)==0 && (1UL<<((bit)&31) & REQUIRED_MASK0)) || \
119 (((bit)>>5)==1 && (1UL<<((bit)&31) & REQUIRED_MASK1)) || \
120 (((bit)>>5)==2 && (1UL<<((bit)&31) & REQUIRED_MASK2)) || \
121 (((bit)>>5)==3 && (1UL<<((bit)&31) & REQUIRED_MASK3)) || \
122 (((bit)>>5)==4 && (1UL<<((bit)&31) & REQUIRED_MASK4)) || \
123 (((bit)>>5)==5 && (1UL<<((bit)&31) & REQUIRED_MASK5)) || \
124 (((bit)>>5)==6 && (1UL<<((bit)&31) & REQUIRED_MASK6)) || \
125 (((bit)>>5)==7 && (1UL<<((bit)&31) & REQUIRED_MASK7)) ) \
126 ? 1 : \
127 test_bit(bit, (c)->x86_capability))
128#define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit)
129
130#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)
131#define cpu_has_vme boot_cpu_has(X86_FEATURE_VME)
132#define cpu_has_de boot_cpu_has(X86_FEATURE_DE)
133#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)
134#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC)
135#define cpu_has_pae boot_cpu_has(X86_FEATURE_PAE)
136#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE)
137#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)
138#define cpu_has_sep boot_cpu_has(X86_FEATURE_SEP)
139#define cpu_has_mtrr boot_cpu_has(X86_FEATURE_MTRR)
140#define cpu_has_mmx boot_cpu_has(X86_FEATURE_MMX)
141#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)
142#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM)
143#define cpu_has_xmm2 boot_cpu_has(X86_FEATURE_XMM2)
144#define cpu_has_xmm3 boot_cpu_has(X86_FEATURE_XMM3)
145#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT)
146#define cpu_has_mp boot_cpu_has(X86_FEATURE_MP)
147#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX)
148#define cpu_has_k6_mtrr boot_cpu_has(X86_FEATURE_K6_MTRR)
149#define cpu_has_cyrix_arr boot_cpu_has(X86_FEATURE_CYRIX_ARR)
150#define cpu_has_centaur_mcr boot_cpu_has(X86_FEATURE_CENTAUR_MCR)
151#define cpu_has_xstore boot_cpu_has(X86_FEATURE_XSTORE)
152#define cpu_has_xstore_enabled boot_cpu_has(X86_FEATURE_XSTORE_EN)
153#define cpu_has_xcrypt boot_cpu_has(X86_FEATURE_XCRYPT)
154#define cpu_has_xcrypt_enabled boot_cpu_has(X86_FEATURE_XCRYPT_EN)
155#define cpu_has_ace2 boot_cpu_has(X86_FEATURE_ACE2)
156#define cpu_has_ace2_enabled boot_cpu_has(X86_FEATURE_ACE2_EN)
157#define cpu_has_phe boot_cpu_has(X86_FEATURE_PHE)
158#define cpu_has_phe_enabled boot_cpu_has(X86_FEATURE_PHE_EN)
159#define cpu_has_pmm boot_cpu_has(X86_FEATURE_PMM)
160#define cpu_has_pmm_enabled boot_cpu_has(X86_FEATURE_PMM_EN)
161#define cpu_has_ds boot_cpu_has(X86_FEATURE_DS)
162#define cpu_has_pebs boot_cpu_has(X86_FEATURE_PEBS)
163#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLSH)
164#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS)
165
166#ifdef CONFIG_X86_64
167
168#undef cpu_has_vme
169#define cpu_has_vme 0
170
171#undef cpu_has_pae
172#define cpu_has_pae ___BUG___
173
174#undef cpu_has_mp
175#define cpu_has_mp 1
176
177#undef cpu_has_k6_mtrr
178#define cpu_has_k6_mtrr 0
179
180#undef cpu_has_cyrix_arr
181#define cpu_has_cyrix_arr 0
182
183#undef cpu_has_centaur_mcr
184#define cpu_has_centaur_mcr 0
185
186#endif /* CONFIG_X86_64 */
187
188#endif /* _ASM_X86_CPUFEATURE_H */
diff --git a/include/asm-x86/cpufeature_32.h b/include/asm-x86/cpufeature_32.h
deleted file mode 100644
index f17e688dfb05..000000000000
--- a/include/asm-x86/cpufeature_32.h
+++ /dev/null
@@ -1,176 +0,0 @@
1/*
2 * cpufeature.h
3 *
4 * Defines x86 CPU feature bits
5 */
6
7#ifndef __ASM_I386_CPUFEATURE_H
8#define __ASM_I386_CPUFEATURE_H
9
10#ifndef __ASSEMBLY__
11#include <linux/bitops.h>
12#endif
13#include <asm/required-features.h>
14
15#define NCAPINTS 8 /* N 32-bit words worth of info */
16
17/* Intel-defined CPU features, CPUID level 0x00000001 (edx), word 0 */
18#define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */
19#define X86_FEATURE_VME (0*32+ 1) /* Virtual Mode Extensions */
20#define X86_FEATURE_DE (0*32+ 2) /* Debugging Extensions */
21#define X86_FEATURE_PSE (0*32+ 3) /* Page Size Extensions */
22#define X86_FEATURE_TSC (0*32+ 4) /* Time Stamp Counter */
23#define X86_FEATURE_MSR (0*32+ 5) /* Model-Specific Registers, RDMSR, WRMSR */
24#define X86_FEATURE_PAE (0*32+ 6) /* Physical Address Extensions */
25#define X86_FEATURE_MCE (0*32+ 7) /* Machine Check Architecture */
26#define X86_FEATURE_CX8 (0*32+ 8) /* CMPXCHG8 instruction */
27#define X86_FEATURE_APIC (0*32+ 9) /* Onboard APIC */
28#define X86_FEATURE_SEP (0*32+11) /* SYSENTER/SYSEXIT */
29#define X86_FEATURE_MTRR (0*32+12) /* Memory Type Range Registers */
30#define X86_FEATURE_PGE (0*32+13) /* Page Global Enable */
31#define X86_FEATURE_MCA (0*32+14) /* Machine Check Architecture */
32#define X86_FEATURE_CMOV (0*32+15) /* CMOV instruction (FCMOVCC and FCOMI too if FPU present) */
33#define X86_FEATURE_PAT (0*32+16) /* Page Attribute Table */
34#define X86_FEATURE_PSE36 (0*32+17) /* 36-bit PSEs */
35#define X86_FEATURE_PN (0*32+18) /* Processor serial number */
36#define X86_FEATURE_CLFLSH (0*32+19) /* Supports the CLFLUSH instruction */
37#define X86_FEATURE_DS (0*32+21) /* Debug Store */
38#define X86_FEATURE_ACPI (0*32+22) /* ACPI via MSR */
39#define X86_FEATURE_MMX (0*32+23) /* Multimedia Extensions */
40#define X86_FEATURE_FXSR (0*32+24) /* FXSAVE and FXRSTOR instructions (fast save and restore */
41 /* of FPU context), and CR4.OSFXSR available */
42#define X86_FEATURE_XMM (0*32+25) /* Streaming SIMD Extensions */
43#define X86_FEATURE_XMM2 (0*32+26) /* Streaming SIMD Extensions-2 */
44#define X86_FEATURE_SELFSNOOP (0*32+27) /* CPU self snoop */
45#define X86_FEATURE_HT (0*32+28) /* Hyper-Threading */
46#define X86_FEATURE_ACC (0*32+29) /* Automatic clock control */
47#define X86_FEATURE_IA64 (0*32+30) /* IA-64 processor */
48
49/* AMD-defined CPU features, CPUID level 0x80000001, word 1 */
50/* Don't duplicate feature flags which are redundant with Intel! */
51#define X86_FEATURE_SYSCALL (1*32+11) /* SYSCALL/SYSRET */
52#define X86_FEATURE_MP (1*32+19) /* MP Capable. */
53#define X86_FEATURE_NX (1*32+20) /* Execute Disable */
54#define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */
55#define X86_FEATURE_RDTSCP (1*32+27) /* RDTSCP */
56#define X86_FEATURE_LM (1*32+29) /* Long Mode (x86-64) */
57#define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */
58#define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */
59
60/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */
61#define X86_FEATURE_RECOVERY (2*32+ 0) /* CPU in recovery mode */
62#define X86_FEATURE_LONGRUN (2*32+ 1) /* Longrun power control */
63#define X86_FEATURE_LRTI (2*32+ 3) /* LongRun table interface */
64
65/* Other features, Linux-defined mapping, word 3 */
66/* This range is used for feature bits which conflict or are synthesized */
67#define X86_FEATURE_CXMMX (3*32+ 0) /* Cyrix MMX extensions */
68#define X86_FEATURE_K6_MTRR (3*32+ 1) /* AMD K6 nonstandard MTRRs */
69#define X86_FEATURE_CYRIX_ARR (3*32+ 2) /* Cyrix ARRs (= MTRRs) */
70#define X86_FEATURE_CENTAUR_MCR (3*32+ 3) /* Centaur MCRs (= MTRRs) */
71/* cpu types for specific tunings: */
72#define X86_FEATURE_K8 (3*32+ 4) /* Opteron, Athlon64 */
73#define X86_FEATURE_K7 (3*32+ 5) /* Athlon */
74#define X86_FEATURE_P3 (3*32+ 6) /* P3 */
75#define X86_FEATURE_P4 (3*32+ 7) /* P4 */
76#define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */
77#define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */
78#define X86_FEATURE_FXSAVE_LEAK (3*32+10) /* FXSAVE leaks FOP/FIP/FOP */
79#define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */
80#define X86_FEATURE_PEBS (3*32+12) /* Precise-Event Based Sampling */
81#define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */
82/* 14 free */
83#define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */
84#define X86_FEATURE_REP_GOOD (3*32+16) /* rep microcode works well on this CPU */
85
86/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
87#define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */
88#define X86_FEATURE_MWAIT (4*32+ 3) /* Monitor/Mwait support */
89#define X86_FEATURE_DSCPL (4*32+ 4) /* CPL Qualified Debug Store */
90#define X86_FEATURE_EST (4*32+ 7) /* Enhanced SpeedStep */
91#define X86_FEATURE_TM2 (4*32+ 8) /* Thermal Monitor 2 */
92#define X86_FEATURE_CID (4*32+10) /* Context ID */
93#define X86_FEATURE_CX16 (4*32+13) /* CMPXCHG16B */
94#define X86_FEATURE_XTPR (4*32+14) /* Send Task Priority Messages */
95#define X86_FEATURE_DCA (4*32+18) /* Direct Cache Access */
96
97/* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
98#define X86_FEATURE_XSTORE (5*32+ 2) /* on-CPU RNG present (xstore insn) */
99#define X86_FEATURE_XSTORE_EN (5*32+ 3) /* on-CPU RNG enabled */
100#define X86_FEATURE_XCRYPT (5*32+ 6) /* on-CPU crypto (xcrypt insn) */
101#define X86_FEATURE_XCRYPT_EN (5*32+ 7) /* on-CPU crypto enabled */
102#define X86_FEATURE_ACE2 (5*32+ 8) /* Advanced Cryptography Engine v2 */
103#define X86_FEATURE_ACE2_EN (5*32+ 9) /* ACE v2 enabled */
104#define X86_FEATURE_PHE (5*32+ 10) /* PadLock Hash Engine */
105#define X86_FEATURE_PHE_EN (5*32+ 11) /* PHE enabled */
106#define X86_FEATURE_PMM (5*32+ 12) /* PadLock Montgomery Multiplier */
107#define X86_FEATURE_PMM_EN (5*32+ 13) /* PMM enabled */
108
109/* More extended AMD flags: CPUID level 0x80000001, ecx, word 6 */
110#define X86_FEATURE_LAHF_LM (6*32+ 0) /* LAHF/SAHF in long mode */
111#define X86_FEATURE_CMP_LEGACY (6*32+ 1) /* If yes HyperThreading not valid */
112
113/*
114 * Auxiliary flags: Linux defined - For features scattered in various
115 * CPUID levels like 0x6, 0xA etc
116 */
117#define X86_FEATURE_IDA (7*32+ 0) /* Intel Dynamic Acceleration */
118
119#define cpu_has(c, bit) \
120 (__builtin_constant_p(bit) && \
121 ( (((bit)>>5)==0 && (1UL<<((bit)&31) & REQUIRED_MASK0)) || \
122 (((bit)>>5)==1 && (1UL<<((bit)&31) & REQUIRED_MASK1)) || \
123 (((bit)>>5)==2 && (1UL<<((bit)&31) & REQUIRED_MASK2)) || \
124 (((bit)>>5)==3 && (1UL<<((bit)&31) & REQUIRED_MASK3)) || \
125 (((bit)>>5)==4 && (1UL<<((bit)&31) & REQUIRED_MASK4)) || \
126 (((bit)>>5)==5 && (1UL<<((bit)&31) & REQUIRED_MASK5)) || \
127 (((bit)>>5)==6 && (1UL<<((bit)&31) & REQUIRED_MASK6)) || \
128 (((bit)>>5)==7 && (1UL<<((bit)&31) & REQUIRED_MASK7)) ) \
129 ? 1 : \
130 test_bit(bit, (c)->x86_capability))
131#define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit)
132
133#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)
134#define cpu_has_vme boot_cpu_has(X86_FEATURE_VME)
135#define cpu_has_de boot_cpu_has(X86_FEATURE_DE)
136#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)
137#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC)
138#define cpu_has_pae boot_cpu_has(X86_FEATURE_PAE)
139#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE)
140#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)
141#define cpu_has_sep boot_cpu_has(X86_FEATURE_SEP)
142#define cpu_has_mtrr boot_cpu_has(X86_FEATURE_MTRR)
143#define cpu_has_mmx boot_cpu_has(X86_FEATURE_MMX)
144#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)
145#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM)
146#define cpu_has_xmm2 boot_cpu_has(X86_FEATURE_XMM2)
147#define cpu_has_xmm3 boot_cpu_has(X86_FEATURE_XMM3)
148#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT)
149#define cpu_has_mp boot_cpu_has(X86_FEATURE_MP)
150#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX)
151#define cpu_has_k6_mtrr boot_cpu_has(X86_FEATURE_K6_MTRR)
152#define cpu_has_cyrix_arr boot_cpu_has(X86_FEATURE_CYRIX_ARR)
153#define cpu_has_centaur_mcr boot_cpu_has(X86_FEATURE_CENTAUR_MCR)
154#define cpu_has_xstore boot_cpu_has(X86_FEATURE_XSTORE)
155#define cpu_has_xstore_enabled boot_cpu_has(X86_FEATURE_XSTORE_EN)
156#define cpu_has_xcrypt boot_cpu_has(X86_FEATURE_XCRYPT)
157#define cpu_has_xcrypt_enabled boot_cpu_has(X86_FEATURE_XCRYPT_EN)
158#define cpu_has_ace2 boot_cpu_has(X86_FEATURE_ACE2)
159#define cpu_has_ace2_enabled boot_cpu_has(X86_FEATURE_ACE2_EN)
160#define cpu_has_phe boot_cpu_has(X86_FEATURE_PHE)
161#define cpu_has_phe_enabled boot_cpu_has(X86_FEATURE_PHE_EN)
162#define cpu_has_pmm boot_cpu_has(X86_FEATURE_PMM)
163#define cpu_has_pmm_enabled boot_cpu_has(X86_FEATURE_PMM_EN)
164#define cpu_has_ds boot_cpu_has(X86_FEATURE_DS)
165#define cpu_has_pebs boot_cpu_has(X86_FEATURE_PEBS)
166#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLSH)
167#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS)
168
169#endif /* __ASM_I386_CPUFEATURE_H */
170
171/*
172 * Local Variables:
173 * mode:c
174 * comment-column:42
175 * End:
176 */
diff --git a/include/asm-x86/cpufeature_64.h b/include/asm-x86/cpufeature_64.h
deleted file mode 100644
index e18496b7b850..000000000000
--- a/include/asm-x86/cpufeature_64.h
+++ /dev/null
@@ -1,30 +0,0 @@
1/*
2 * cpufeature_32.h
3 *
4 * Defines x86 CPU feature bits
5 */
6
7#ifndef __ASM_X8664_CPUFEATURE_H
8#define __ASM_X8664_CPUFEATURE_H
9
10#include "cpufeature_32.h"
11
12#undef cpu_has_vme
13#define cpu_has_vme 0
14
15#undef cpu_has_pae
16#define cpu_has_pae ___BUG___
17
18#undef cpu_has_mp
19#define cpu_has_mp 1 /* XXX */
20
21#undef cpu_has_k6_mtrr
22#define cpu_has_k6_mtrr 0
23
24#undef cpu_has_cyrix_arr
25#define cpu_has_cyrix_arr 0
26
27#undef cpu_has_centaur_mcr
28#define cpu_has_centaur_mcr 0
29
30#endif /* __ASM_X8664_CPUFEATURE_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 22:07:52 -0500