Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ec0ced156f930aba24e7527905de294ad929ef65

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 9bb91784de
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

This patch fixes the following compile error caused by
commit 4016a1390d07f15b267eecb20e76a48fd5c524ef
(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: Adrian Bunk <adrian.bunk@movial.fi>
Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/asm-m32r/uaccess.h
Diff comments   View file @ ec0ced1
... ... @@ -14,6 +14,7 @@
14 14 #include <linux/errno.h>
15 15 #include <linux/thread_info.h>
16 16 #include <asm/page.h>
  17 +#include <asm/setup.h>
17 18  
18 19 #define VERIFY_READ 0
19 20 #define VERIFY_WRITE 1
... ... @@ -106,7 +107,6 @@
106 107 #else
107 108 static inline int access_ok(int type, const void *addr, unsigned long size)
108 109 {
109   - extern unsigned long memory_start, memory_end;
110 110 unsigned long val = (unsigned long)addr;
111 111  
112 112 return ((val >= memory_start) && ((val + size) < memory_end));