linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] fix ioapic build breakage
@ 2003-08-20 22:17 Jeff Garzik
  2003-08-20 23:00 ` Alex Goddard
  2003-08-21  0:27 ` Zwane Mwaikambo
  0 siblings, 2 replies; 4+ messages in thread
From: Jeff Garzik @ 2003-08-20 22:17 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel



===== 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] fix ioapic build breakage
  2003-08-20 22:17 [patch] fix ioapic build breakage Jeff Garzik
@ 2003-08-20 23:00 ` Alex Goddard
  2003-08-21  0:27 ` Zwane Mwaikambo
  1 sibling, 0 replies; 4+ messages in thread
From: Alex Goddard @ 2003-08-20 23:00 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: torvalds, linux-kernel

On Wed, 20 Aug 2003, Jeff Garzik wrote:

[Snip]

This appears to fix it for me.

-- 
Alex Goddard
agoddard at purdue.edu

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] fix ioapic build breakage
  2003-08-20 22:17 [patch] fix ioapic build breakage Jeff Garzik
  2003-08-20 23:00 ` Alex Goddard
@ 2003-08-21  0:27 ` Zwane Mwaikambo
  2003-08-21  0:35   ` Jeff Garzik
  1 sibling, 1 reply; 4+ messages in thread
From: Zwane Mwaikambo @ 2003-08-21  0:27 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: torvalds, linux-kernel

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 ?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] fix ioapic build breakage
  2003-08-21  0:27 ` Zwane Mwaikambo
@ 2003-08-21  0:35   ` Jeff Garzik
  0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2003-08-21  0:35 UTC (permalink / raw)
  To: Zwane Mwaikambo; +Cc: torvalds, linux-kernel

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




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2003-08-21  0:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-08-20 22:17 [patch] fix ioapic build breakage Jeff Garzik
2003-08-20 23:00 ` Alex Goddard
2003-08-21  0:27 ` Zwane Mwaikambo
2003-08-21  0:35   ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).