2003-08-20 22:17:58

by Jeff Garzik

Subject: [patch] fix ioapic build breakage

===== arch/i386/kernel/setup.c 1.92 vs edited =====
--- 1.92/arch/i386/kernel/setup.c Tue Aug 19 16:01:09 2003
+++ edited/arch/i386/kernel/setup.c Wed Aug 20 18:15:34 2003
@@ -543,11 +543,13 @@
if (!acpi_force) acpi_disabled = 1;
}

+#ifdef CONFIG_X86_LOCAL_APIC
/* disable IO-APIC */
else if (!memcmp(from, "noapic", 6)) {
skip_ioapic_setup = 1;
}
-#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_ACPI_BOOT */

/*
* highmem=size forces highmem to be exactly 'size' bytes.

2003-08-20 22:57:05

by Alex Goddard

Subject: Re: [patch] fix ioapic build breakage

On Wed, 20 Aug 2003, Jeff Garzik wrote:

[Snip]

This appears to fix it for me.

--
Alex Goddard
agoddard at purdue.edu

2003-08-21 00:35:53

by Jeff Garzik

Subject: Re: [patch] fix ioapic build breakage

Zwane Mwaikambo wrote:
> On Wed, 20 Aug 2003, Jeff Garzik wrote:
>
>
>>
>>===== arch/i386/kernel/setup.c 1.92 vs edited =====
>>--- 1.92/arch/i386/kernel/setup.c Tue Aug 19 16:01:09 2003
>>+++ edited/arch/i386/kernel/setup.c Wed Aug 20 18:15:34 2003
>>@@ -543,11 +543,13 @@
>> if (!acpi_force) acpi_disabled = 1;
>> }
>>
>>+#ifdef CONFIG_X86_LOCAL_APIC
>> /* disable IO-APIC */
>> else if (!memcmp(from, "noapic", 6)) {
>> skip_ioapic_setup = 1;
>> }
>>-#endif
>>+#endif /* CONFIG_X86_LOCAL_APIC */
>>+#endif /* CONFIG_ACPI_BOOT */
>
>
> Shouldn't that be CONFIG_X86_IO_APIC ?


If so, other code wants changing, too...

Jeff

2003-08-21 00:27:40

by Zwane Mwaikambo

Subject: Re: [patch] fix ioapic build breakage

On Wed, 20 Aug 2003, Jeff Garzik wrote:

>
>
> ===== arch/i386/kernel/setup.c 1.92 vs edited =====
> --- 1.92/arch/i386/kernel/setup.c Tue Aug 19 16:01:09 2003
> +++ edited/arch/i386/kernel/setup.c Wed Aug 20 18:15:34 2003
> @@ -543,11 +543,13 @@
> if (!acpi_force) acpi_disabled = 1;
> }
>
> +#ifdef CONFIG_X86_LOCAL_APIC
> /* disable IO-APIC */
> else if (!memcmp(from, "noapic", 6)) {
> skip_ioapic_setup = 1;
> }
> -#endif
> +#endif /* CONFIG_X86_LOCAL_APIC */
> +#endif /* CONFIG_ACPI_BOOT */

Shouldn't that be CONFIG_X86_IO_APIC ?