The patch titled
i386 rename X86_FEATURE_DTES to X86_FEATURE_DS
has been added to the -mm tree. Its filename is
i386-rename-x86_feature_dtes-to-x86_feature_ds.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386 rename X86_FEATURE_DTES to X86_FEATURE_DS
From: Stephane Eranian <eranian@xxxxxxxxxx>
Here is a patch (used by perfmon2) that renames X86_FEATURE_DTES to
X86_FEATURE_DS to match Intel's documentation for the Debug Store save area on
i386. The patch also adds cpu_has_ds.
- rename X86_FEATURE_DTES to X86_FEATURE_DS to match documentation
- adds cpu_has_ds to test for X86_FEATURE_DS
Signed-off-by: stephane eranian <eranian@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-i386/cpufeature.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN include/asm-i386/cpufeature.h~i386-rename-x86_feature_dtes-to-x86_feature_ds include/asm-i386/cpufeature.h
--- a/include/asm-i386/cpufeature.h~i386-rename-x86_feature_dtes-to-x86_feature_ds
+++ a/include/asm-i386/cpufeature.h
@@ -31,7 +31,7 @@
#define X86_FEATURE_PSE36 (0*32+17) /* 36-bit PSEs */
#define X86_FEATURE_PN (0*32+18) /* Processor serial number */
#define X86_FEATURE_CLFLSH (0*32+19) /* Supports the CLFLUSH instruction */
-#define X86_FEATURE_DTES (0*32+21) /* Debug Trace Store */
+#define X86_FEATURE_DS (0*32+21) /* Debug Store */
#define X86_FEATURE_ACPI (0*32+22) /* ACPI via MSR */
#define X86_FEATURE_MMX (0*32+23) /* Multimedia Extensions */
#define X86_FEATURE_FXSR (0*32+24) /* FXSAVE and FXRSTOR instructions (fast save and restore */
@@ -134,6 +134,7 @@
#define cpu_has_phe_enabled boot_cpu_has(X86_FEATURE_PHE_EN)
#define cpu_has_pmm boot_cpu_has(X86_FEATURE_PMM)
#define cpu_has_pmm_enabled boot_cpu_has(X86_FEATURE_PMM_EN)
+#define cpu_has_ds boot_cpu_has(X86_FEATURE_DS)
#endif /* __ASM_I386_CPUFEATURE_H */
_
Patches currently in -mm which might be from eranian@xxxxxxxxxx are
x86_64-add-missing-enter_idle-calls.patch
x86_64-rename-x86_feature_dtes-to-x86_feature_ds.patch
add-x86_feature_pebs-and-detection.patch
i386-rename-x86_feature_dtes-to-x86_feature_ds.patch
i386-add-x86_feature_pebs-and-detection.patch
adds-carta_random32-library-routine.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
