diff options
author | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
commit | c0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch) | |
tree | 100ee9bb6f13fc0fb3d1887516712541a5fc0769 /arch/i386/kernel/acpi | |
parent | 81450b73dde07f473a4a7208b209b4c8b7251d90 (diff) | |
parent | db2d4ccdc8f9f3433d3a8566404189f2e9295c23 (diff) |
Pull fluff into release branch
Conflicts:
arch/x86_64/pci/mmconfig.c
drivers/acpi/bay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/acpi')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index fb3e72328a5a..e5eb97a910ed 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
@@ -850,10 +850,9 @@ static inline int acpi_parse_madt_ioapic_entries(void) | |||
850 | static void __init acpi_process_madt(void) | 850 | static void __init acpi_process_madt(void) |
851 | { | 851 | { |
852 | #ifdef CONFIG_X86_LOCAL_APIC | 852 | #ifdef CONFIG_X86_LOCAL_APIC |
853 | int count, error; | 853 | int error; |
854 | 854 | ||
855 | count = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt); | 855 | if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) { |
856 | if (count >= 1) { | ||
857 | 856 | ||
858 | /* | 857 | /* |
859 | * Parse MADT LAPIC entries | 858 | * Parse MADT LAPIC entries |