summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/uaccess.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-07-19 10:49:15 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 19:04:51 +0200
commit10146801e8b960d7473e350b60458d9d5a2be1cf (patch)
tree98b42daabeda36e89202265dd2e83c9d4703602a /include/asm-m68knommu/uaccess.h
parentm68knommu: start dump from exception stack (diff)
downloadlinux-10146801e8b960d7473e350b60458d9d5a2be1cf.tar.xz
linux-10146801e8b960d7473e350b60458d9d5a2be1cf.zip
m68knommu: remove is_in_rom() function
Remove is_in_rom() function. It doesn't actually serve the purpose it was intended to. If you look at the use of it _access_ok() (which is the only use of it) then it is obvious that most of memory is marked as access_ok. No point having is_in_rom() then, so remove it. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--include/asm-m68knommu/uaccess.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-m68knommu/uaccess.h b/include/asm-m68knommu/uaccess.h
index 62b29b10bc6d..9ed9169a8849 100644
--- a/include/asm-m68knommu/uaccess.h
+++ b/include/asm-m68knommu/uaccess.h
@@ -15,12 +15,15 @@
#define access_ok(type,addr,size) _access_ok((unsigned long)(addr),(size))
+/*
+ * It is not enough to just have access_ok check for a real RAM address.
+ * This would disallow the case of code/ro-data running XIP in flash/rom.
+ * Ideally we would check the possible flash ranges too, but that is
+ * currently not so easy.
+ */
static inline int _access_ok(unsigned long addr, unsigned long size)
{
- extern unsigned long memory_start, memory_end;
-
- return (((addr >= memory_start) && (addr+size < memory_end)) ||
- (is_in_rom(addr) && is_in_rom(addr+size)));
+ return 1;
}
/*