diff options
author | Martin Hicks <mort@sgi.com> | 2005-08-31 14:21:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-08-31 17:18:04 -0400 |
commit | a994018a5fc987702dfb4f5d31172842ea6186dc (patch) | |
tree | 53e353c9d7d29ddeffe378821ef82498cb5ecc42 /arch/ia64/kernel/uncached.c | |
parent | ff67b59726a8cd3549b069dfa78de2f538d3b8e3 (diff) |
[IA64] uncached allocator: use generic (not sn2 specific) functions
Change sn2-specific calls into generic functions. Without this change
the uncached allocator will not work on non-sn2 platforms.
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Martin Hicks <mort@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/uncached.c')
-rw-r--r-- | arch/ia64/kernel/uncached.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index 490dfc9ab47f..4e9d06c48a8b 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c | |||
@@ -184,7 +184,7 @@ uncached_free_page(unsigned long maddr) | |||
184 | { | 184 | { |
185 | int node; | 185 | int node; |
186 | 186 | ||
187 | node = nasid_to_cnodeid(NASID_GET(maddr)); | 187 | node = paddr_to_nid(maddr - __IA64_UNCACHED_OFFSET); |
188 | 188 | ||
189 | dprintk(KERN_DEBUG "uncached_free_page(%lx) on node %i\n", maddr, node); | 189 | dprintk(KERN_DEBUG "uncached_free_page(%lx) on node %i\n", maddr, node); |
190 | 190 | ||
@@ -217,7 +217,7 @@ uncached_build_memmap(unsigned long start, unsigned long end, void *arg) | |||
217 | 217 | ||
218 | memset((char *)vstart, 0, length); | 218 | memset((char *)vstart, 0, length); |
219 | 219 | ||
220 | node = nasid_to_cnodeid(NASID_GET(start)); | 220 | node = paddr_to_nid(start); |
221 | 221 | ||
222 | for (; vstart < vend ; vstart += PAGE_SIZE) { | 222 | for (; vstart < vend ; vstart += PAGE_SIZE) { |
223 | dprintk(KERN_INFO "sticking %lx into the pool!\n", vstart); | 223 | dprintk(KERN_INFO "sticking %lx into the pool!\n", vstart); |