Messages in this thread Patch in this message | | | Date | Thu, 22 Apr 2004 00:07:56 -0700 | From | Paul Jackson <> | Subject | [Patch 16 of 17] cpumask v4 - Remove cpumask hack from asm-x86_64/topology.h |
| |
mask16-cpumask-x86-64-online - Remove cpumask hack from asm-x86_64/topology.h This file had the cpumask cpu_online_map as type unsigned long, instead of type cpumask_t, for no good reason that I could see. So I changed it. Everywhere else, cpu_online_map is already of type cpumask_t.
Index: 2.6.5.bitmap/include/asm-x86_64/topology.h =================================================================== --- 2.6.5.bitmap.orig/include/asm-x86_64/topology.h 2004-04-05 02:41:33.000000000 -0700 +++ 2.6.5.bitmap/include/asm-x86_64/topology.h 2004-04-08 04:23:24.000000000 -0700 @@ -10,18 +10,18 @@ /* Map the K8 CPU local memory controllers to a simple 1:1 CPU:NODE topology */ extern int fake_node; -/* This is actually a cpumask_t, but doesn't matter because we don't have - >BITS_PER_LONG CPUs */ -extern unsigned long cpu_online_map; +extern cpumask_t cpu_online_map; #define cpu_to_node(cpu) (fake_node ? 0 : (cpu)) #define parent_node(node) (node) #define node_to_first_cpu(node) (fake_node ? 0 : (node)) #define node_to_cpumask(node) (fake_node ? cpu_online_map : (1UL << (node))) -static inline unsigned long pcibus_to_cpumask(int bus) +static inline cpumask_t pcibus_to_cpumask(int bus) { - return mp_bus_to_cpumask[bus] & cpu_online_map; + cpumask_t tmp; + cpus_and(tmp, mp_bus_to_cpumask[bus], cpu_online_map); + return tmp; } #define NODE_BALANCE_RATE 30 /* CHECKME */
-- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.650.933.1373 - 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/
| |