diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /arch/x86/kernel/apic.c | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'arch/x86/kernel/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 849c23009bf5..abfa0b641aea 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
| @@ -1447,7 +1447,7 @@ static int __init detect_init_APIC(void) | |||
| 1447 | switch (boot_cpu_data.x86_vendor) { | 1447 | switch (boot_cpu_data.x86_vendor) { |
| 1448 | case X86_VENDOR_AMD: | 1448 | case X86_VENDOR_AMD: |
| 1449 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || | 1449 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || |
| 1450 | (boot_cpu_data.x86 == 15)) | 1450 | (boot_cpu_data.x86 >= 15)) |
| 1451 | break; | 1451 | break; |
| 1452 | goto no_apic; | 1452 | goto no_apic; |
| 1453 | case X86_VENDOR_INTEL: | 1453 | case X86_VENDOR_INTEL: |