[PATCH] 2.5.40 - fix compilation w/out APIC (uniprocessor)

From: Carlos E Gorges (carlos@techlinux.com.br)
Date: Wed Oct 02 2002 - 19:39:16 EST


ps: ** UNTESTED **

diff -uar linux-2.5.40/arch/i386/kernel/mpparse.c linux-2.5/arch/i386/kernel/mpparse.c
--- linux-2.5.40/arch/i386/kernel/mpparse.c Tue Oct 1 04:06:28 2002
+++ linux-2.5/arch/i386/kernel/mpparse.c Wed Oct 2 21:30:02 2002
@@ -26,6 +26,7 @@
 
 #include <asm/smp.h>
 #include <asm/acpi.h>
+#include <asm/apic.h>
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
 #include <asm/pgalloc.h>
@@ -787,6 +788,7 @@
 void __init mp_register_lapic_address (
         u64 address)
 {
+#ifdef CONFIG_X86_LOCAL_APIC
         mp_lapic_addr = (unsigned long) address;
 
         set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
@@ -795,6 +797,7 @@
                 boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
 
         Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid);
+#endif
 }
 
 
--- linux-2.5.40/include/asm-i386/apic.h Tue Oct 1 04:07:45 2002
+++ linux-2.5/include/asm-i386/apic.h Wed Oct 2 21:21:44 2002
@@ -7,8 +7,6 @@
 #include <asm/apicdef.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_X86_LOCAL_APIC
-
 #define APIC_DEBUG 0
 
 #if APIC_DEBUG
@@ -16,6 +14,8 @@
 #else
 #define Dprintk(x...)
 #endif
+
+#ifdef CONFIG_X86_LOCAL_APIC
 
 /*
  * Basic functions accessing APICs.

-- 
	 _________________________
	 Carlos E Gorges          
	 (carlos@techlinux.com.br)
	 Tech informática LTDA
	 Brazil                   
	 _________________________

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:00:36 EST