From e5c5084d0fe426aaaab2268eb5e168cea33f5bd6 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Mon, 18 Apr 2005 08:01:30 -0700 Subject: [PATCH] --- yaml --- r: 242 b: refs/heads/master c: 15e8869943060780b79b242851b0692286fc7d18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/acpi/boot.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b1c6c8177f62..a52213d5f331 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c7d3b3a6b6aaeded9d9e5c5111dbcc65b0b0f91 +refs/heads/master: 15e8869943060780b79b242851b0692286fc7d18 diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c index 040451e90a04..53eb5cfd5b63 100644 --- a/trunk/arch/i386/kernel/acpi/boot.c +++ b/trunk/arch/i386/kernel/acpi/boot.c @@ -608,9 +608,11 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) acpi_fadt.sci_int = fadt->sci_int; #endif +#ifdef CONFIG_ACPI_BUS /* initialize rev and apic_phys_dest_mode for x86_64 genapic */ acpi_fadt.revision = fadt->revision; acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode; +#endif #ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */