Commit ec0ced15 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

asm-m32r/uaccess.h must #include <asm/setup.h>

This patch fixes the following compile error caused by
commit 4016a139
(mm/nommu.c: return 0 from kobjsize with invalid objects):

/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c: In function 'kobjsize':
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: 'memory_end' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: for each function it appears in.)

The patch also removes now no longer required memory_{start,end}
declarations inside access_ok().
Reported-by: default avatarAdrian Bunk <adrian.bunk@movial.fi>
Signed-off-by: default avatarAdrian Bunk <adrian.bunk@movial.fi>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9bb91784
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/thread_info.h> #include <linux/thread_info.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/setup.h>
#define VERIFY_READ 0 #define VERIFY_READ 0
#define VERIFY_WRITE 1 #define VERIFY_WRITE 1
...@@ -106,7 +107,6 @@ static inline void set_fs(mm_segment_t s) ...@@ -106,7 +107,6 @@ static inline void set_fs(mm_segment_t s)
#else #else
static inline int access_ok(int type, const void *addr, unsigned long size) 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; unsigned long val = (unsigned long)addr;
return ((val >= memory_start) && ((val + size) < memory_end)); return ((val >= memory_start) && ((val + size) < memory_end));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment