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
Pull cpuidle into release branch
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
sys_m32r.c
diff --git
a/arch/m32r/kernel/sys_m32r.c
b/arch/m32r/kernel/sys_m32r.c
index
b567351
..
6d7a80f
100644
(file)
--- a/
arch/m32r/kernel/sys_m32r.c
+++ b/
arch/m32r/kernel/sys_m32r.c
@@
-10,8
+10,8
@@
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/mm.h>
+#include <linux/fs.h>
#include <linux/smp.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>
@@
-20,18
+20,18
@@
#include <linux/mman.h>
#include <linux/file.h>
#include <linux/utsname.h>
#include <linux/mman.h>
#include <linux/file.h>
#include <linux/utsname.h>
+#include <linux/ipc.h>
#include <asm/uaccess.h>
#include <asm/cachectl.h>
#include <asm/cacheflush.h>
#include <asm/uaccess.h>
#include <asm/cachectl.h>
#include <asm/cacheflush.h>
-#include <asm/ipc.h>
#include <asm/syscall.h>
#include <asm/unistd.h>
/*
* sys_tas() - test-and-set
*/
#include <asm/syscall.h>
#include <asm/unistd.h>
/*
* sys_tas() - test-and-set
*/
-asmlinkage int sys_tas(int *addr)
+asmlinkage int sys_tas(int
__user
*addr)
{
int oldval;
{
int oldval;
@@
-90,7
+90,7
@@
sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2,
error = do_pipe(fd);
if (!error) {
error = do_pipe(fd);
if (!error) {
- if (copy_to_user((void
*)r0, (void *)
fd, 2*sizeof(int)))
+ if (copy_to_user((void
__user *)r0,
fd, 2*sizeof(int)))
error = -EFAULT;
}
return error;
error = -EFAULT;
}
return error;
@@
-201,7
+201,7
@@
asmlinkage int sys_ipc(uint call, int first, int second,
}
}
}
}
-asmlinkage int sys_uname(struct old_utsname * name)
+asmlinkage int sys_uname(struct old_utsname
__user
* name)
{
int err;
if (!name)
{
int err;
if (!name)
@@
-214,7
+214,7
@@
asmlinkage int sys_uname(struct old_utsname * name)
asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)
{
asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)
{
- /* This should flush more selectivly ... */
+ /* This should flush more selectiv
e
ly ... */
_flush_cache_all();
return 0;
}
_flush_cache_all();
return 0;
}