]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d261020) | patch
[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
authorAndi Kleen <ak@suse.de>
Mon, 1 May 2006 19:15:49 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 2 May 2006 01:17:43 +0000 (18:17 -0700)
commit32828546b32a96d550b85eab25609bc4ba3942ab
tree96d48910315bca328d34985337a99a8b41e8be6etree | snapshot
parentd2610202290b4924b71747314a0f88f28807702ecommit | diff
[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge

The patch I submitted earlier to fix disabled LAPIC handling in ACPI was
mismerged for some reason I still don't quite understand.  Parts of it was
applied to the wrong function.

This patch fixes it up.

Cc: <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/acpi/boot.c diff | blob | history
Linux 2.6 source tree