From 2ef12ad0820ce90093da861f46debe4317282499 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 5 Nov 2005 17:25:54 +0100 Subject: [PATCH] --- yaml --- r: 14211 b: refs/heads/master c: e90f22edf432512219cc2952f5811961abbd164f h: refs/heads/master i: 14209: 0c41d127b4a596035a32fd5d26e1f4bebabbcfeb 14207: 66c348e474cbd0f73df185e37c19199eda224b22 v: v3 --- [refs] | 2 +- trunk/include/asm-x86_64/mmzone.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 921e2c29257e..bee092c8cd92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3506229ff9968e5dbc862a50285fbea0e8821b58 +refs/heads/master: e90f22edf432512219cc2952f5811961abbd164f diff --git a/trunk/include/asm-x86_64/mmzone.h b/trunk/include/asm-x86_64/mmzone.h index 8d48dc7e43a7..69baaa8a3ce0 100644 --- a/trunk/include/asm-x86_64/mmzone.h +++ b/trunk/include/asm-x86_64/mmzone.h @@ -17,16 +17,15 @@ /* Simple perfect hash to map physical addresses to node numbers */ extern int memnode_shift; extern u8 memnodemap[NODEMAPSIZE]; -extern int maxnode; extern struct pglist_data *node_data[]; static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) { - int nid; + unsigned nid; VIRTUAL_BUG_ON((addr >> memnode_shift) >= NODEMAPSIZE); nid = memnodemap[addr >> memnode_shift]; - VIRTUAL_BUG_ON(nid > maxnode); + VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]); return nid; }