![]() | ||||||||||
Messages in this thread
Patch in this message |
Linus Torvalds wrote: > > A huge merging frenzy for the feature freeze, Doesn't compile on ia32 uniprocessor. The owner of changeset 1.852 is hereby debited 31 CPUs. Also, non-IO_APIC kernels have not been linking for some time. Here is a quick fix for both problems. include/asm-i386/apic.h | 4 ++-- include/asm-i386/smp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- 2.5.43/include/asm-i386/smp.h~mpparse-fix Tue Oct 15 21:26:18 2002 +++ 2.5.43-akpm/include/asm-i386/smp.h Tue Oct 15 21:26:31 2002 @@ -37,6 +37,7 @@ #endif /* CONFIG_CLUSTERED_APIC */ #endif +#define BAD_APICID 0xFFu #ifdef CONFIG_SMP #ifndef __ASSEMBLY__ @@ -65,7 +66,6 @@ extern void zap_low_mappings (void); * the real APIC ID <-> CPU # mapping. */ #define MAX_APICID 256 -#define BAD_APICID 0xFFu extern volatile int cpu_to_physical_apicid[NR_CPUS]; extern volatile int physical_apicid_to_cpu[MAX_APICID]; extern volatile int cpu_to_logical_apicid[NR_CPUS]; --- 2.5.43/include/asm-i386/apic.h~mpparse-fix Tue Oct 15 21:34:03 2002 +++ 2.5.43-akpm/include/asm-i386/apic.h Tue Oct 15 21:34:05 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 @@ -17,6 +15,8 @@ #define Dprintk(x...) #endif +#ifdef CONFIG_X86_LOCAL_APIC + /* * Basic functions accessing APICs. */ . - 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/ | |||||||||
| Last update: 2005-03-22 12:30 [from the cache] ©2003-2008 | ||||||||||