Re: [ACPI] RE: [patch] 2.4.x ACPI updates

["Sérgio Monteiro Basto" <sergiomb@netcabo.pt>]

[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]

Hi

So had this compile error :
setup.c: In function `parse_cmdline_early':
setup.c:830: `skip_ioapic_setup' undeclared (first use in this function)
setup.c:830: (Each undeclared identifier is reported only once
setup.c:830: for each function it appears in.)

Since just in arch/i386/kernel/io_apic.c, skip_ioapic_setup is declared
and in arch/i386/kernel/Makefile we have
obj-$(CONFIG_X86_IO_APIC)       += io_apic.o
I think this is the correct patch.

thanks

On Wed, 2003-08-20 at 19:15, Marcelo Tosatti wrote:
> 
> 
> On Tue, 19 Aug 2003, Brown, Len wrote:
> 
> > Andy/Jeff/Marcelo,
> >
> > At Jeff's request, I've back ported ACPICA 20030813 from
> > http://linux-acpi.bkbits.net/linux-acpi-2.4 into a new tree for 2.4.22:
> > http://linux-acpi.bkbits.net/linux-acpi-2.4.22
> >
> > I've restored acpitable.[ch], which was deleted too late for this
> > release cycle; and will live on until 2.4.23 -- as well as restored
> > CONFIG_ACPI_HT_ONLY under CONFIG_ACPI; restored the 8-bit characters
> > that got expanded to 16-bits in a previous merge; and deleted some dmesg
> > verbiage that Jeff didn't think was appropriate for the baseline kernel.
> >
> > I exported this a patch and then imported onto a clone of Marcelo's
> > tree, so it appears as a single cset where the changes that got un-done
> > never happened.  I've done some sanity tests on it, and will test it
> > some more tomorrow.  Take a look at it and let me know if I missed
> > anything.  When Andy is happy with it I'll leave it to him to re-issue a
> > pull request from Marcelo.
> 
> Cool!!
> 
> Ill try to take a look at the patch now (having serious conectivity issues
> :()
> 
-- 
SérgioMB
email: sergiomb@netcabo.pt

Who gives me one shell, give me everything.

[-- Attachment #2: fixcompile.diff --]
[-- Type: text/plain, Size: 628 bytes --]

--- linux-2.4.22-rc2.orig/arch/i386/kernel/setup.c	Wed Aug 20 23:52:45 2003
+++ linux-2.4.22-rc2/arch/i386/kernel/setup.c	Wed Aug 20 23:54:36 2003
@@ -824,11 +824,12 @@
 			acpi_ht = 1; 
 			if (!acpi_force) acpi_disabled = 1; 
 		} 
-
-                /* disable IO-APIC */
-                else if (!memcmp(from, "noapic", 6)) {
-                        skip_ioapic_setup = 1;
-                }
+#ifdef CONFIG_X86_IO_APIC
+		/* disable IO-APIC */
+		else if (!memcmp(from, "noapic", 6)) {
+			skip_ioapic_setup = 1;
+		}
+#endif
 #endif
 		/*
 		 * highmem=size forces highmem to be exactly 'size' bytes.