aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/required-features.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 10:02:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 10:02:36 -0700
commit0f477dd0851bdcee82923da66a7fc4a44cb1bc3d (patch)
treecf8937ba8c7800c6143aa3c9758c6e184c1289ec /arch/x86/include/asm/required-features.h
parentc4efd6b569b2646e1346a08a4c40286f8bcb5f11 (diff)
parente8c534ec068af1a0845aceda373a9bfd2de62030 (diff)
downloadkernel_goldelico_gta04-0f477dd0851bdcee82923da66a7fc4a44cb1bc3d.zip
kernel_goldelico_gta04-0f477dd0851bdcee82923da66a7fc4a44cb1bc3d.tar.gz
kernel_goldelico_gta04-0f477dd0851bdcee82923da66a7fc4a44cb1bc3d.tar.bz2
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix keeping track of AMD C1E x86, cpu: Package Level Thermal Control, Power Limit Notification definitions x86, cpu: Export AMD errata definitions x86, cpu: Use AMD errata checking framework for erratum 383 x86, cpu: Clean up AMD erratum 400 workaround x86, cpu: AMD errata checking framework x86, cpu: Split addon_cpuid_features.c x86, cpu: Clean up formatting in cpufeature.h, remove override x86, cpu: Enumerate xsaveopt x86, cpu: Add xsaveopt cpufeature x86, cpu: Make init_scattered_cpuid_features() consider cpuid subleaves x86, cpu: Support the features flags in new CPUID leaf 7 x86, cpu: Add CPU flags for F16C and RDRND x86: Look for IA32_ENERGY_PERF_BIAS support x86, AMD: Extend support to future families x86, cacheinfo: Carve out L3 cache slot accessors x86, xsave: Cleanup return codes in check_for_xstate()
Diffstat (limited to 'arch/x86/include/asm/required-features.h')
-rw-r--r--arch/x86/include/asm/required-features.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/required-features.h b/arch/x86/include/asm/required-features.h
index 64cf2d2..6c7fc25 100644
--- a/arch/x86/include/asm/required-features.h
+++ b/arch/x86/include/asm/required-features.h
@@ -84,5 +84,7 @@
#define REQUIRED_MASK5 0
#define REQUIRED_MASK6 0
#define REQUIRED_MASK7 0
+#define REQUIRED_MASK8 0
+#define REQUIRED_MASK9 0
#endif /* _ASM_X86_REQUIRED_FEATURES_H */