Re: 2.5.68-mm4

Martin J. Bligh
2003-05-02T16:54:43Z

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

Fix up NUMA-Q build with new generic apic mode stuff

[-- Attachment #2: mm4-fixed --]
[-- Type: text/plain, Size: 805 bytes --]

diff -urpN -X /home/fletch/.diff.exclude mm4/include/asm-i386/mach-numaq/mach_apic.h mm4-fixed/include/asm-i386/mach-numaq/mach_apic.h
--- mm4/include/asm-i386/mach-numaq/mach_apic.h Wed Mar 5 07:37:06 2003
+++ mm4-fixed/include/asm-i386/mach-numaq/mach_apic.h Fri May 2 09:45:58 2003
@@ -1,6 +1,9 @@
#ifndef __ASM_MACH_APIC_H
#define __ASM_MACH_APIC_H

+#include <asm/io.h>
+#include <linux/mmzone.h>
+
#define APIC_DFR_VALUE (APIC_DFR_CLUSTER)

#define TARGET_CPUS (0xf)
@@ -102,5 +105,14 @@ static inline int check_phys_apicid_pres
{
return (1);
}
+
+#define APIC_ID_MASK (0xF<<24)
+
+static inline unsigned get_apic_id(unsigned long x)
+{
+ return (((x)>>24)&0x0F);
+}
+
+#define GET_APIC_ID(x) get_apic_id(x)

#endif /* __ASM_MACH_APIC_H */