> Eric Sesterhenn / snakebyte <[email protected]> wrote:
> >
> > hi,
> >
> > a make randconfig gave me a situation where es7000 was enabled, but
> > acpi wasnt ( dont know if this makes sense ), gcc gave me some
> > compiling errors, which the following patch fixes. Please
> cc me as i am not on the list. Thanks.
> >
> >
>
> I believe that es7000 requires ACPI, so a better fix would be
> to enforce that within Kconfig.
>
> Natalie, can you please comment?
You are correct, Andrew: ES7000 "preferred" mode is ACPI (although it
runs in MPS as well, which we use for debugging of intermittent ACPI and
platform problems).
I have done a similar patch (see
http://bugzilla.kernel.org/attachment.cgi?id=5771&action=view) against
2.6.13, but the one suggested later by Peter Hagervall
http://www.ussg.iu.edu/hypermail/linux/kernel/0510.3/1302.html was
actually taking care of the compile problem through Kconfig better,
since "acpi=off" option is available for our debug/testing purposes
anyway.
Thanks,
--Natalie
>
> >
> >
> > diff -up
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000.h
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000.h
> > ---
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000.h
> 2005-12-12 23:44:39.000000000 +0100
> > +++ linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000.h
> 2005-12-12 23:43:51.000000000 +0100
> > @@ -83,6 +83,7 @@ struct es7000_oem_table {
> > struct psai psai;
> > };
> >
> > +#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
> > struct acpi_table_sdt {
> > unsigned long pa;
> > unsigned long count;
> > @@ -98,6 +99,7 @@ struct oem_table {
> > u32 OEMTableAddr;
> > u32 OEMTableSize;
> > };
> > +#endif
> >
> > struct mip_reg {
> > unsigned long long off_0;
> > diff -up
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000plat.c
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000plat.c
> > ---
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000.orig/es7000plat.c
> 2005-12-12 23:44:39.000000000 +0100
> > +++
> linux-2.6.15-rc5-git2/arch/i386/mach-es7000/es7000plat.c
> 2005-12-12 23:43:20.000000000 +0100
> > @@ -92,7 +92,9 @@ setup_unisys(void)
> > es7000_plat = ES7000_ZORRO;
> > else
> > es7000_plat = ES7000_CLASSIC;
> > +#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
> > ioapic_renumber_irq = es7000_rename_gsi;
> > +#endif
> > }
> >
> > /*
> > @@ -160,6 +162,7 @@ parse_unisys_oem (char *oemptr)
> > return es7000_plat;
> > }
> >
> > +#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
> > int __init
> > find_unisys_acpi_oem_table(unsigned long *oem_addr) { @@ -212,6
> > +215,7 @@ find_unisys_acpi_oem_table(unsigned long
> > }
> > return -1;
> > }
> > +#endif
> >
> > static void
> > es7000_spin(int n)
> >
> >
> > -
> > To unsubscribe from this list: send the line "unsubscribe
> > linux-kernel" in the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
