Disabling ACPI and latest 2.6.7 patch

Disabling ACPI and latest 2.6.7 patch

[Piotr Neuman]

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

I downloaded acpi update patch for 2.6.7 kernel 
(acpi-20040326-2.6.7.diff.bz2). There is a problem when disabling acpi in 
kernel configuration ("ACPI Support" menu option) during linux kernel image 
linking phase mp_register_gsi() is reported as undefined.

Attached simple patch to fix it (probably contains mistakes).

[-- Attachment #2: acpi-20040326-2.6.7.noacpi_fix.patch.bz2 --]
[-- Type: application/x-bzip2, Size: 606 bytes --]

[-- Attachment #3: acpi-20040326-2.6.7.noacpi_fix.patch --]
[-- Type: text/x-diff, Size: 1235 bytes --]

Index: linux/arch/i386/kernel/mpparse.c
===================================================================
--- linux.orig/arch/i386/kernel/mpparse.c	2004-07-01 20:18:14.605251000 +0200
+++ linux/arch/i386/kernel/mpparse.c	2004-07-01 20:27:12.095251000 +0200
@@ -844,7 +844,7 @@ void __init mp_register_lapic (
 	MP_processor_info(&processor);
 }
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef CONFIG_X86_IO_APIC
 
 #define MP_ISA_BUS		0
 #define MP_MAX_IOAPIC_PIN	127
@@ -874,6 +874,8 @@ static int mp_find_ioapic (
 	return -1;
 }
 	
+#endif /*CONFIG_X86_IO_APIC*/
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
 
 void __init mp_register_ioapic (
 	u8			id, 
@@ -1026,6 +1028,9 @@ void __init mp_config_acpi_legacy_irqs (
 	}
 }
 
+#endif /*CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER*/
+#ifdef CONFIG_X86_IO_APIC
+
 int (*platform_rename_gsi)(int ioapic, int gsi);
 
 void mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
@@ -1077,5 +1082,5 @@ void mp_register_gsi (u32 gsi, int edge_
 		    active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
 }
 
-#endif /*CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER*/
+#endif /*CONFIG_X86_IO_APIC*/
 #endif /*CONFIG_ACPI_BOOT*/