summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-03-05 15:49:53 +0100
committerMichal Simek <monstr@monstr.eu>2010-04-01 08:38:20 +0200
commit60a729f7bb936a9ab82b430de70a1952f560adf3 (patch)
tree408ce1e0d1ecce6cc5615e2bea3c94b8904de4e5
parent357bc3c9284b2fb201786176e8187d2273323bc1 (diff)
microblaze: move noMMU __range_ok function to uaccess.h
The same noMMU and MMU functions should be placed in one file. Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r--arch/microblaze/include/asm/uaccess.h7
-rw-r--r--arch/microblaze/mm/init.c8
2 files changed, 6 insertions, 9 deletions
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
index e2adad33950..ce5defb259a 100644
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@@ -75,7 +75,12 @@ struct exception_table_entry {
#ifndef CONFIG_MMU
-extern int ___range_ok(unsigned long addr, unsigned long size);
+/* Check against bounds of physical memory */
+static inline int ___range_ok(unsigned long addr, unsigned long size)
+{
+ return ((addr < memory_start) ||
+ ((addr + size) > memory_end));
+}
#define __range_ok(addr, size) \
___range_ok((unsigned long)(addr), (unsigned long)(size))
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 45b4bce606b..40bc10ede09 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -207,14 +207,6 @@ void __init mem_init(void)
}
#ifndef CONFIG_MMU
-/* Check against bounds of physical memory */
-int ___range_ok(unsigned long addr, unsigned long size)
-{
- return ((addr < memory_start) ||
- ((addr + size) > memory_end));
-}
-EXPORT_SYMBOL(___range_ok);
-
int page_is_ram(unsigned long pfn)
{
return __range_ok(pfn, 0);