diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:50:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:17:36 -0400 |
commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /arch/x86/kernel/cpu | |
parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c (diff) | |
parent | 11494547b1754c4f3bd7f707ab869e2adf54d52f (diff) |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/common_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/feature_names.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index 305b465889b0..43f1aa51da5d 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c | |||
@@ -687,6 +687,8 @@ void __cpuinit cpu_init(void) | |||
687 | barrier(); | 687 | barrier(); |
688 | 688 | ||
689 | check_efer(); | 689 | check_efer(); |
690 | if (cpu != 0 && x2apic) | ||
691 | enable_x2apic(); | ||
690 | 692 | ||
691 | /* | 693 | /* |
692 | * set up and load the per-CPU TSS | 694 | * set up and load the per-CPU TSS |
diff --git a/arch/x86/kernel/cpu/feature_names.c b/arch/x86/kernel/cpu/feature_names.c index c9017799497c..b96b69545fbf 100644 --- 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] = { | |||
46 | /* Intel-defined (#2) */ | 46 | /* Intel-defined (#2) */ |
47 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", | 47 | "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est", |
48 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, | 48 | "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL, |
49 | NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt", | 49 | NULL, NULL, "dca", "sse4_1", "sse4_2", "x2apic", NULL, "popcnt", |
50 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 50 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
51 | 51 | ||
52 | /* VIA/Cyrix/Centaur-defined */ | 52 | /* VIA/Cyrix/Centaur-defined */ |