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.5.x5
[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
..
3ac216e
100644
(file)
--- a/
arch/ia64/kernel/sys_ia64.c
+++ b/
arch/ia64/kernel/sys_ia64.c
@@
-2,7
+2,7
@@
* This file contains various system calls that have different calling
* conventions on different platforms.
*
* This file contains various system calls that have different calling
* conventions on different platforms.
*
- * Copyright (C) 1999-2000, 2002-2003 Hewlett-Packard Co
+ * Copyright (C) 1999-2000, 2002-2003
, 2005
Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <linux/config.h>
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <linux/config.h>
@@
-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;
@@
-138,7
+138,7
@@
ia64_brk (unsigned long brk)
goto out;
/* Check against rlimit.. */
goto out;
/* Check against rlimit.. */
- rlim = current->rlim[RLIMIT_DATA].rlim_cur;
+ rlim = current->
signal->
rlim[RLIMIT_DATA].rlim_cur;
if (rlim < RLIM_INFINITY && brk - mm->start_data > rlim)
goto out;
if (rlim < RLIM_INFINITY && brk - mm->start_data > rlim)
goto out;
@@
-163,10
+163,9
@@
out:
* and r9) as this is faster than doing a copy_to_user().
*/
asmlinkage long
* and r9) as this is faster than doing a copy_to_user().
*/
asmlinkage long
-sys_pipe (long arg0, long arg1, long arg2, long arg3,
- long arg4, long arg5, long arg6, long arg7, long stack)
+sys_pipe (void)
{
{
- struct pt_regs *regs =
(struct pt_regs *) &stack
;
+ struct pt_regs *regs =
ia64_task_regs(current)
;
int fd[2];
int retval;
int fd[2];
int retval;
@@
-183,7
+182,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)) {