Commit e90f22ed authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix NUMA node lookup debug code which had bitrotted

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3506229f
...@@ -17,16 +17,15 @@ ...@@ -17,16 +17,15 @@
/* Simple perfect hash to map physical addresses to node numbers */ /* Simple perfect hash to map physical addresses to node numbers */
extern int memnode_shift; extern int memnode_shift;
extern u8 memnodemap[NODEMAPSIZE]; extern u8 memnodemap[NODEMAPSIZE];
extern int maxnode;
extern struct pglist_data *node_data[]; extern struct pglist_data *node_data[];
static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) static inline __attribute__((pure)) int phys_to_nid(unsigned long addr)
{ {
int nid; unsigned nid;
VIRTUAL_BUG_ON((addr >> memnode_shift) >= NODEMAPSIZE); VIRTUAL_BUG_ON((addr >> memnode_shift) >= NODEMAPSIZE);
nid = memnodemap[addr >> memnode_shift]; nid = memnodemap[addr >> memnode_shift];
VIRTUAL_BUG_ON(nid > maxnode); VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]);
return nid; return nid;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment