projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-m32r
/
uaccess.h
diff --git
a/include/asm-m32r/uaccess.h
b/include/asm-m32r/uaccess.h
index bd8c83765a5c66361c8bfc35e0ee172ec5cd3f87..1c7047bea2002b013ab779a8c752654b9a2a9c23 100644
(file)
--- 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 <linux/errno.h>
#include <linux/thread_info.h>
#include <asm/page.h>
+#include <asm/setup.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#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)
{
#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));
unsigned long val = (unsigned long)addr;
return ((val >= memory_start) && ((val + size) < memory_end));