Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / kernel / cpu / feature_names.c

diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c
index c9017799497c5f99db3df1ce96d010b6ea5e3230..b96b69545fbf8f3324cf2124425ce3446a787d82 100644 (file)
--- a/arch/x86/kernel/cpu/feature_names.c
+++ b/arch/x86/kernel/cpu/feature_names.c
@@ -46,7 +46,7 @@ const char * const x86_cap_flags[NCAPINTS*32] = {
        /* Intel-defined (#2) */
        "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
        "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
-       NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",
+       NULL, NULL, "dca", "sse4_1", "sse4_2", "x2apic", NULL, "popcnt",
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
        /* VIA/Cyrix/Centaur-defined */