git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
sys_ia64.c
diff --git
a/arch/ia64/kernel/sys_ia64.c
b/arch/ia64/kernel/sys_ia64.c
index
eddde60
..
88d8b21
100644
(file)
--- a/
arch/ia64/kernel/sys_ia64.c
+++ b/
arch/ia64/kernel/sys_ia64.c
@@
-93,7
+93,7
@@
sys_getpagesize (void)
}
asmlinkage unsigned long
}
asmlinkage unsigned long
-ia64_shmat (int shmid, void *shmaddr, int shmflg)
+ia64_shmat (int shmid, void
__user
*shmaddr, int shmflg)
{
unsigned long raddr;
int retval;
{
unsigned long raddr;
int retval;
@@
-183,7
+183,7
@@
static inline unsigned long
do_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, unsigned long pgoff)
{
unsigned long roff;
do_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, unsigned long pgoff)
{
unsigned long roff;
- struct file *file =
0
;
+ struct file *file =
NULL
;
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
if (!(flags & MAP_ANONYMOUS)) {
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
if (!(flags & MAP_ANONYMOUS)) {