diff -urpN -X /home/fletch/.diff.exclude 00-virgin/include/asm-i386/mach-default/mach_apic.h 01-apicid_to_node/include/asm-i386/mach-default/mach_apic.h
--- 00-virgin/include/asm-i386/mach-default/mach_apic.h Thu Jan 2 22:05:15 2003
+++ 01-apicid_to_node/include/asm-i386/mach-default/mach_apic.h Tue Jan 7 09:24:35 2003
@@ -53,6 +53,11 @@ static inline int multi_timer_check(int
return 0;
}
+static inline int apicid_to_node(int logical_apicid)
+{
+ return 0;
+}
+
static inline int cpu_present_to_apicid(int mps_cpu)
{
return mps_cpu;
diff -urpN -X /home/fletch/.diff.exclude 00-virgin/include/asm-i386/mach-numaq/mach_apic.h 01-apicid_to_node/include/asm-i386/mach-numaq/mach_apic.h
--- 00-virgin/include/asm-i386/mach-numaq/mach_apic.h Thu Jan 2 22:05:15 2003
+++ 01-apicid_to_node/include/asm-i386/mach-numaq/mach_apic.h Tue Jan 7 09:24:35 2003
@@ -47,14 +47,14 @@ static inline int generate_logical_apici
return ( (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1) );
}
-static inline int apicid_to_quad(int logical_apicid)
+static inline int apicid_to_node(int logical_apicid)
{
return (logical_apicid >> 4);
}
static inline unsigned long apicid_to_cpu_present(int logical_apicid)
{
- return ( (logical_apicid&0xf) << (4*apicid_to_quad(logical_apicid)) );
+ return ( (logical_apicid&0xf) << (4*apicid_to_node(logical_apicid)) );
}
static inline int mpc_apic_id(struct mpc_config_processor *m, int quad)
diff -urpN -X /home/fletch/.diff.exclude 00-virgin/include/asm-i386/mach-summit/mach_apic.h 01-apicid_to_node/include/asm-i386/mach-summit/mach_apic.h
--- 00-virgin/include/asm-i386/mach-summit/mach_apic.h Thu Jan 2 22:05:15 2003
+++ 01-apicid_to_node/include/asm-i386/mach-summit/mach_apic.h Tue Jan 7 09:24:35 2003
@@ -32,6 +32,11 @@ static inline void clustered_apic_check(
(x86_summit ? "Summit" : "Flat"), nr_ioapics);
}
+static inline int apicid_to_node(int logical_apicid)
+{
+ return (logical_apicid >> 5); /* 2 clusterids per CEC */
+}
+
static inline int cpu_present_to_apicid(int mps_cpu)
{
if (x86_summit)
-
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 : Tue Jan 07 2003 - 22:00:36 EST