]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d16e862) | patch
[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
authorAndi Kleen <ak@suse.de>
Tue, 18 Apr 2006 10:35:10 +0000 (12:35 +0200)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 17:39:19 +0000 (10:39 -0700)
commit87cb23a48c208f31ab87c7a2aad37dbb355575f3
treec047f5c38753b896e381b40a6ad6ed9ee5a5eaeftree | snapshot
parentd16e86243ecf6f8fb97b5b7d685e0afa77a123e5commit | 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: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/acpi/boot.c diff | blob | history
Linux 2.6 source tree