Re: [patch 070/198] x86_64 genapic update

[Chris Wedgwood <cw@f00f.org>]

On Tue, Apr 12, 2005 at 03:31:41AM -0700, akpm@osdl.org wrote:

> diff -puN arch/i386/kernel/acpi/boot.c~x86_64-genapic-update arch/i386/kernel/acpi/boot.c
> --- 25/arch/i386/kernel/acpi/boot.c~x86_64-genapic-update	2005-04-12 03:21:20.212064200 -0700
> +++ 25-akpm/arch/i386/kernel/acpi/boot.c	2005-04-12 03:21:20.217063440 -0700
> @@ -608,6 +608,10 @@ static int __init acpi_parse_fadt(unsign
>  	acpi_fadt.sci_int = fadt->sci_int;
>  #endif
>  
> +	/* 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;
> +

This breaks for me.  It seems acpi_fadt needs CONFIG_ACPI_BUS.  How
does this look?

Signed-off-By: Chris Wedgwood <cw@f00f.org>

Index: cw-current/arch/i386/kernel/acpi/boot.c
===================================================================
--- cw-current.orig/arch/i386/kernel/acpi/boot.c	2005-04-16 20:17:09.801272343 -0700
+++ cw-current/arch/i386/kernel/acpi/boot.c	2005-04-16 23:24:59.014298068 -0700
@@ -608,9 +608,11 @@
 	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 */


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/