diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:17:42 +0100 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /arch/x86/kernel/apic.c | |
| parent | Merge branches 'sched/rt' and 'sched/urgent' into sched/core (diff) | |
| parent | Linux 2.6.29-rc4 (diff) | |
| download | wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.tar.xz wireguard-linux-f437e8b53eab92a5829e65781e29aed23d8ffd0c.zip | |
Merge commit 'v2.6.29-rc4' into sched/core
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 4b6df2469fe3..115449f869ee 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -1436,7 +1436,7 @@ static int __init detect_init_APIC(void) switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || - (boot_cpu_data.x86 == 15)) + (boot_cpu_data.x86 >= 15)) break; goto no_apic; case X86_VENDOR_INTEL: |