diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 08:58:11 -0500 |
| commit | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (patch) | |
| tree | 7fc06930e46ee13d394f5b031166c40206af3189 /arch/x86/kernel/apic.c | |
| parent | 44581a28e805a31661469c4b466b9cd14b36e7b6 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.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 c6f15647eba9..383d827eef89 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
| @@ -1461,7 +1461,7 @@ static int __init detect_init_APIC(void) | |||
| 1461 | switch (boot_cpu_data.x86_vendor) { | 1461 | switch (boot_cpu_data.x86_vendor) { |
| 1462 | case X86_VENDOR_AMD: | 1462 | case X86_VENDOR_AMD: |
| 1463 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || | 1463 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || |
| 1464 | (boot_cpu_data.x86 == 15)) | 1464 | (boot_cpu_data.x86 >= 15)) |
| 1465 | break; | 1465 | break; |
| 1466 | goto no_apic; | 1466 | goto no_apic; |
| 1467 | case X86_VENDOR_INTEL: | 1467 | case X86_VENDOR_INTEL: |