[2.6.26 patch] asm-m32r/uaccess.h must #include <asm/setup.h>

[Adrian Bunk]

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

<--  snip  -->

...
  CC      mm/nommu.o
/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.)
make[2]: *** [mm/nommu.o] Error 1

<--  snip  -->

The patch also removes now no longer required memory_{start,end} 
declarations inside access_ok().

Reported-by: Adrian Bunk <adrian.bunk@xxxxxxxxx>
Signed-off-by: Adrian Bunk <adrian.bunk@xxxxxxxxx>

---

There doesn't seem to be any fixed location for memory_{start,end} among 
all architectures, but since mm/nommu.c already has an #include <asm/uaccess.h>
and the non-MMU access_ok anyway needs them this seems to be the logical 
way to fix this compile error.

 include/asm-m32r/uaccess.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

6bf3808a28c19a31ba73c0dad3798e95bddd0fbb diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h
index bd8c837..1c7047b 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));

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/