summaryrefslogtreecommitdiff
path: root/include/asm-arm/memory.h
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2002-08-21 03:19:57 +0100
committerRussell King <rmk@flint.arm.linux.org.uk>2002-08-21 03:19:57 +0100
commite39a6ad818628aa68404e32a89f9ab31dfdff370 (patch)
tree1b58943d45e58979a2347c21a28c94c752b878f8 /include/asm-arm/memory.h
parent04e1aae594680eb02fc8dbde0170370e4fdaaed3 (diff)
[ARM] Move PHYS_TO_NID() to asm/memory.h
When CONFIG_DISCONTIGMEM=n, we define PHYS_TO_NID(x) to zero in each architecture specific file. This cset moves it into the generic ARM code.
Diffstat (limited to 'include/asm-arm/memory.h')
-rw-r--r--include/asm-arm/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 57f6b758164a..d68bfbdf5f61 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -74,6 +74,8 @@ static inline void *phys_to_virt(unsigned long x)
#define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
#define virt_addr_valid(kaddr) ((kaddr) >= PAGE_OFFSET && (kaddr) < (unsigned long)high_memory)
+#define PHYS_TO_NID(addr) (0)
+
#else
/*
* This is more complex. We have a set of mem_map arrays spread