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
/
sparc
/
kernel
/
sys_sunos.c
diff --git
a/arch/sparc/kernel/sys_sunos.c
b/arch/sparc/kernel/sys_sunos.c
index
6b2bcce
..
ad049c1
100644
(file)
--- a/
arch/sparc/kernel/sys_sunos.c
+++ b/
arch/sparc/kernel/sys_sunos.c
@@
-97,7
+97,7
@@
asmlinkage unsigned long sunos_mmap(unsigned long addr, unsigned long len,
iminor(file->f_dentry->d_inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
iminor(file->f_dentry->d_inode) == 5) {
flags |= MAP_ANONYMOUS;
fput(file);
- file =
0
;
+ file =
NULL
;
}
}
ret_type = flags & _MAP_NEW;
}
}
ret_type = flags & _MAP_NEW;
@@
-178,7
+178,7
@@
asmlinkage int sunos_brk(unsigned long brk)
* Check against rlimit and stack..
*/
retval = -ENOMEM;
* Check against rlimit and stack..
*/
retval = -ENOMEM;
- rlim = current->rlim[RLIMIT_DATA].rlim_cur;
+ rlim = current->
signal->
rlim[RLIMIT_DATA].rlim_cur;
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (brk - current->mm->end_code > rlim)
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (brk - current->mm->end_code > rlim)
@@
-505,7
+505,7
@@
asmlinkage int sunos_nosys(void)
info.si_signo = SIGSYS;
info.si_errno = 0;
info.si_code = __SI_FAULT|0x100;
info.si_signo = SIGSYS;
info.si_errno = 0;
info.si_code = __SI_FAULT|0x100;
- info.si_addr = (void *)regs->pc;
+ info.si_addr = (void
__user
*)regs->pc;
info.si_trapno = regs->u_regs[UREG_G1];
send_sig_info(SIGSYS, &info, current);
if (cnt++ < 4) {
info.si_trapno = regs->u_regs[UREG_G1];
send_sig_info(SIGSYS, &info, current);
if (cnt++ < 4) {
@@
-755,7
+755,7
@@
sunos_mount(char __user *type, char __user *dir, int flags, void __user *data)
{
int linux_flags = 0;
int ret = -EINVAL;
{
int linux_flags = 0;
int ret = -EINVAL;
- char *dev_fname =
0
;
+ char *dev_fname =
NULL
;
char *dir_page, *type_page;
if (!capable (CAP_SYS_ADMIN))
char *dir_page, *type_page;
if (!capable (CAP_SYS_ADMIN))