diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:00 +0200 |
| commit | 6d72b7952fa7d7c61d021398970c29afde6a4443 (patch) | |
| tree | 31c00be8e2837e2db2e62c694421a93a9f4c79d7 /include/asm-m32r | |
| parent | move BUG_TABLE into RODATA (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-6d72b7952fa7d7c61d021398970c29afde6a4443.tar.xz linux-6d72b7952fa7d7c61d021398970c29afde6a4443.zip | |
Merge branch 'linus' into core/rodata
Diffstat (limited to 'include/asm-m32r')
| -rw-r--r-- | include/asm-m32r/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h index bd8c83765a5c..1c7047bea200 100644 --- a/include/asm-m32r/uaccess.h +++ b/include/asm-m32r/uaccess.h @@ -14,6 +14,7 @@ #include <linux/errno.h> #include <linux/thread_info.h> #include <asm/page.h> +#include <asm/setup.h> #define VERIFY_READ 0 #define VERIFY_WRITE 1 @@ -106,7 +107,6 @@ static inline void set_fs(mm_segment_t s) #else static inline int access_ok(int type, const void *addr, unsigned long size) { - extern unsigned long memory_start, memory_end; unsigned long val = (unsigned long)addr; return ((val >= memory_start) && ((val + size) < memory_end)); |