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 branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
sys_sparc.c
diff --git
a/arch/sparc64/kernel/sys_sparc.c
b/arch/sparc64/kernel/sys_sparc.c
index
ac1bff5
..
39749e3
100644
(file)
--- a/
arch/sparc64/kernel/sys_sparc.c
+++ b/
arch/sparc64/kernel/sys_sparc.c
@@
-418,7
+418,7
@@
asmlinkage long sparc_pipe(struct pt_regs *regs)
int fd[2];
int error;
int fd[2];
int error;
- error = do_pipe
(fd
);
+ error = do_pipe
_flags(fd, 0
);
if (error)
goto out;
regs->u_regs[UREG_I1] = fd[1];
if (error)
goto out;
regs->u_regs[UREG_I1] = fd[1];
@@
-542,7
+542,7
@@
asmlinkage long sparc64_personality(unsigned long personality)
return ret;
}
return ret;
}
-int sparc
64
_mmap_check(unsigned long addr, unsigned long len)
+int sparc_mmap_check(unsigned long addr, unsigned long len)
{
if (test_thread_flag(TIF_32BIT)) {
if (len >= STACK_TOP32)
{
if (test_thread_flag(TIF_32BIT)) {
if (len >= STACK_TOP32)
@@
-614,9
+614,9
@@
asmlinkage unsigned long sys64_mremap(unsigned long addr,
goto out;
if (unlikely(new_len >= VA_EXCLUDE_START))
goto out;
goto out;
if (unlikely(new_len >= VA_EXCLUDE_START))
goto out;
- if (unlikely(sparc
64
_mmap_check(addr, old_len)))
+ if (unlikely(sparc_mmap_check(addr, old_len)))
goto out;
goto out;
- if (unlikely(sparc
64
_mmap_check(new_addr, new_len)))
+ if (unlikely(sparc_mmap_check(new_addr, new_len)))
goto out;
down_write(¤t->mm->mmap_sem);
goto out;
down_write(¤t->mm->mmap_sem);