tree c047f5c38753b896e381b40a6ad6ed9ee5a5eaef
parent d16e86243ecf6f8fb97b5b7d685e0afa77a123e5
author Andi Kleen <ak@suse.de> 1145356510 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> 1145381959 -0700

[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>