[Patch 22/23] mask v2 - Fix cpumask in asm-x86_64/topology.h
From: Paul Jackson (pj_at_sgi.com)
Date: 04/01/04
- Previous message: Paul Jackson: "Re: remove bitmap_shift_*() bitmap length limits"
- In reply to: Paul Jackson: "[Patch 0/23] mask v2 - Second version of mask, cpumask and nodemask consolidation"
- Next in thread: Paul Jackson: "[Patch 5/23] mask v2 - Add new mask.h file"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Thu, 1 Apr 2004 13:13:09 -0800 To: Paul Jackson <pj@sgi.com>
Patch_22_of_23 - 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.
Diffstat Patch_22_of_23:
topology.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -Nru a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h
--- a/include/asm-x86_64/topology.h Mon Mar 29 01:04:06 2004
+++ b/include/asm-x86_64/topology.h Mon Mar 29 01:04:06 2004
@@ -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/
- Previous message: Paul Jackson: "Re: remove bitmap_shift_*() bitmap length limits"
- In reply to: Paul Jackson: "[Patch 0/23] mask v2 - Second version of mask, cpumask and nodemask consolidation"
- Next in thread: Paul Jackson: "[Patch 5/23] mask v2 - Add new mask.h file"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
