diff options
author | Andi Kleen <ak@suse.de> | 2006-05-01 12:15:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 18:17:43 -0700 |
commit | 32828546b32a96d550b85eab25609bc4ba3942ab (patch) | |
tree | 96d48910315bca328d34985337a99a8b41e8be6e /arch/i386/kernel/setup.c | |
parent | d2610202290b4924b71747314a0f88f28807702e (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>
Diffstat (limited to 'arch/i386/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions