[PATCH] Unify pxm_to_node() and node_to_pxm()

Consolidate the various arch-specific implementations of pxm_to_node() and
node_to_pxm() into a single generic version.

Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 30988dfbddff..93577abae36d 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -139,7 +139,7 @@ static int __init pxm_to_nasid(int pxm)
         int i;
         int nid;
 
-        nid = pxm_to_nid_map[pxm];
+        nid = pxm_to_node(pxm);
         for (i = 0; i < num_node_memblks; i++) {
                 if (node_memblk[i].nid == nid) {
                         return NASID_GET(node_memblk[i].start_paddr);
@@ -704,7 +704,7 @@ void __init build_cnode_tables(void)
          * cnode == node for all C & M bricks.
          */
         for_each_online_node(node) {
-                nasid = pxm_to_nasid(nid_to_pxm_map[node]);
+                nasid = pxm_to_nasid(node_to_pxm(node));
                 sn_cnodeid_to_nasid[node] = nasid;
                 physical_node_map[nasid] = node;
         }