From f211305eac0c338dcf7cfe1463e9a7629481ff67 Mon Sep 17 00:00:00 2001 From: Martin Hicks Date: Wed, 31 Aug 2005 11:21:00 -0700 Subject: [PATCH] --- yaml --- r: 6675 b: refs/heads/master c: a994018a5fc987702dfb4f5d31172842ea6186dc h: refs/heads/master i: 6673: 3e177c91ab01b433970cc9531a229090b6df650d 6671: 775053f2324f5e87b19221ae22b51d01be198b9b v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/uncached.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f00d2627429..ebfa31457476 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff67b59726a8cd3549b069dfa78de2f538d3b8e3 +refs/heads/master: a994018a5fc987702dfb4f5d31172842ea6186dc diff --git a/trunk/arch/ia64/kernel/uncached.c b/trunk/arch/ia64/kernel/uncached.c index 490dfc9ab47f..4e9d06c48a8b 100644 --- a/trunk/arch/ia64/kernel/uncached.c +++ b/trunk/arch/ia64/kernel/uncached.c @@ -184,7 +184,7 @@ uncached_free_page(unsigned long maddr) { int node; - node = nasid_to_cnodeid(NASID_GET(maddr)); + node = paddr_to_nid(maddr - __IA64_UNCACHED_OFFSET); dprintk(KERN_DEBUG "uncached_free_page(%lx) on node %i\n", maddr, node); @@ -217,7 +217,7 @@ uncached_build_memmap(unsigned long start, unsigned long end, void *arg) memset((char *)vstart, 0, length); - node = nasid_to_cnodeid(NASID_GET(start)); + node = paddr_to_nid(start); for (; vstart < vend ; vstart += PAGE_SIZE) { dprintk(KERN_INFO "sticking %lx into the pool!\n", vstart);