git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d02e30c) | patch
x86: apic: Fix mismerge, add arch_probe_nr_irqs() again
authorIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 10:17:16 +0000 (11:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 27 Feb 2010 11:49:56 +0000 (12:49 +0100)
commit21c2fd9970cc8e457058f84016450a2e9876125e
tree252bf6badc38550bc16cb3855278f3f2160ec1dctree | snapshot
parentd02e30c31c57683a66ed68a1bcff900ca78f6d56commit | diff
x86: apic: Fix mismerge, add arch_probe_nr_irqs() again

Merge commit aef55d4922 mis-merged io_apic.c so we lost the
arch_probe_nr_irqs() method.

This caused subtle boot breakages (udev confusion likely
due to missing drivers) with certain configs.

Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <20100207210250.GB8256@jenkins.home.ifup.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/io_apic.c diff | blob | history
Full containers within linux kernel