From: Andi Kleen <ak@suse.de>
Date: Tue, 18 Apr 2006 10:35:10 +0000 (+0200)
Subject: [PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
X-Git-Tag: v2.6.17-rc2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87cb23a48c208f31ab87c7a2aad37dbb355575f3;p=pandora-kernel.git

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

Reading git-diff-tree failed