git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
uaccess.h
diff --git
a/arch/mn10300/include/asm/uaccess.h
b/arch/mn10300/include/asm/uaccess.h
index
197a7af
..
679dee0
100644
(file)
--- a/
arch/mn10300/include/asm/uaccess.h
+++ b/
arch/mn10300/include/asm/uaccess.h
@@
-14,9
+14,8
@@
/*
* User space memory access functions
*/
/*
* User space memory access functions
*/
-#include <linux/
sched
.h>
+#include <linux/
thread_info
.h>
#include <asm/page.h>
#include <asm/page.h>
-#include <asm/pgtable.h>
#include <asm/errno.h>
#define VERIFY_READ 0
#include <asm/errno.h>
#define VERIFY_READ 0
@@
-29,7
+28,6
@@
*
* For historical reasons, these macros are grossly misnamed.
*/
*
* For historical reasons, these macros are grossly misnamed.
*/
-
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
#define KERNEL_XDS MAKE_MM_SEG(0xBFFFFFFF)
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
#define KERNEL_XDS MAKE_MM_SEG(0xBFFFFFFF)
@@
-377,7
+375,7
@@
unsigned long __generic_copy_to_user_nocheck(void *to, const void *from,
#if 0
#if 0
-#error
don't use - these macros don't increment to & from pointers
+#error
"don't use - these macros don't increment to & from pointers"
/* Optimize just a little bit when we know the size of the move. */
#define __constant_copy_user(to, from, size) \
do { \
/* Optimize just a little bit when we know the size of the move. */
#define __constant_copy_user(to, from, size) \
do { \