Re: Re: [PATCH] acpi-20030916-2.6.0-pre5.diff

Len Brown
2003-09-19T03:41:38Z

Andi,
Good hunting!

This fix has been integrated with others in the ACPI patch,
and is available now in these bitkeeper trees:

http://linux-acpi.bkbits.net/linux-acpi-test-2.4.22
http://linux-acpi.bkbits.net/linux-acpi-test-2.4.23
http://linux-acpi.bkbits.net/linux-acpi-test-2.6.0

thanks,
-Len

On Thu, 2003-09-18 at 21:11, Andi Kleen wrote:
> On Thu, Sep 18, 2003 at 03:57:15PM -0700, Andrew Morton wrote:
> > Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:
> > >
> > > This patch updates 2.6.0-test5 to the current ACPI in 2.4.22-pre5
> > > If nothing explodes, I'll be releasing it to Linus shortly via BK.
> >
> > And it doesn't include this fix.
>
> This fix is also missing.
>
> -Andi
>
>
> -----------------------------------------------------------------
>
> ACPI modules check acpi_disabled at module load time. This
> fixes random failures to load battery.o et.al.
>
>
> diff -u linux-2.6.0test5-work/arch/i386/kernel/setup.c-ACPIINIT linux-2.6.0test5-work/arch/i386/kernel/setup.c
> --- linux-2.6.0test5-work/arch/i386/kernel/setup.c-ACPIINIT 2003-09-09 20:55:26.000000000 +0200
> +++ linux-2.6.0test5-work/arch/i386/kernel/setup.c 2003-09-15 18:12:23.000000000 +0200
> @@ -64,9 +64,9 @@
> EXPORT_SYMBOL_GPL(mmu_cr4_features);
>
> #ifdef CONFIG_ACPI
> - int acpi_disabled __initdata = 0;
> + int acpi_disabled = 0;
> #else
> - int acpi_disabled __initdata = 1;
> + int acpi_disabled = 1;
> #endif
> EXPORT_SYMBOL(acpi_disabled);
>
> diff -u linux-2.6.0test5-work/arch/ia64/kernel/acpi.c-ACPIINIT linux-2.6.0test5-work/arch/ia64/kernel/acpi.c
> --- linux-2.6.0test5-work/arch/ia64/kernel/acpi.c-ACPIINIT 2003-09-19 03:10:10.000000000 +0200
> +++ linux-2.6.0test5-work/arch/ia64/kernel/acpi.c 2003-09-19 03:10:19.000000000 +0200
> @@ -56,7 +56,7 @@
>
> unsigned char acpi_kbd_controller_present = 1;
>
> -int acpi_disabled __initdata; /* XXX this shouldn't be needed---we can't boot without ACPI! */
> +int acpi_disabled; /* XXX this shouldn't be needed---we can't boot without ACPI! */
>
> const char *
> acpi_get_sysname (void)
> diff -u linux-2.6.0test5-work/arch/x86_64/kernel/setup.c-ACPIINIT linux-2.6.0test5-work/arch/x86_64/kernel/setup.c
> --- linux-2.6.0test5-work/arch/x86_64/kernel/setup.c-ACPIINIT 2003-09-19 03:09:33.000000000 +0200
> +++ linux-2.6.0test5-work/arch/x86_64/kernel/setup.c 2003-09-15 18:16:36.000000000 +0200
> @@ -64,7 +64,7 @@
> unsigned long mmu_cr4_features;
> EXPORT_SYMBOL_GPL(mmu_cr4_features);
>
> -int acpi_disabled __initdata = 0;
> +int acpi_disabled = 0;
>
> /* For PCI or other memory-mapped resources */
> unsigned long pci_mem_start = 0x10000000;