Signed-off-by: Al Viro <[email protected]>
---
arch/sparc/kernel/sys_sparc32.c | 7 +------
arch/sparc/kernel/sys_sparc_32.c | 21 ---------------------
arch/sparc/kernel/sys_sparc_64.c | 6 ------
arch/sparc/kernel/systbls_32.S | 2 +-
4 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index 04e28b2..e3af1a4 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -577,17 +577,12 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr,
unsigned long old_len, unsigned long new_len,
unsigned long flags, u32 __new_addr)
{
- unsigned long ret = -EINVAL;
+ unsigned long ret;
unsigned long new_addr = __new_addr;
- if (unlikely(sparc_mmap_check(addr, old_len)))
- goto out;
- if (unlikely(sparc_mmap_check(new_addr, new_len)))
- goto out;
down_write(¤t->mm->mmap_sem);
ret = do_mremap(addr, old_len, new_len, flags, new_addr);
up_write(¤t->mm->mmap_sem);
-out:
return ret;
}
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
index 03035c8..10c43be 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@ -287,27 +287,6 @@ long sparc_remap_file_pages(unsigned long start, unsigned long size,
(pgoff >> (PAGE_SHIFT - 12)), flags);
}
-extern unsigned long do_mremap(unsigned long addr,
- unsigned long old_len, unsigned long new_len,
- unsigned long flags, unsigned long new_addr);
-
-asmlinkage unsigned long sparc_mremap(unsigned long addr,
- unsigned long old_len, unsigned long new_len,
- unsigned long flags, unsigned long new_addr)
-{
- unsigned long ret = -EINVAL;
-
- if (unlikely(sparc_mmap_check(addr, old_len)))
- goto out;
- if (unlikely(sparc_mmap_check(new_addr, new_len)))
- goto out;
- down_write(¤t->mm->mmap_sem);
- ret = do_mremap(addr, old_len, new_len, flags, new_addr);
- up_write(¤t->mm->mmap_sem);
-out:
- return ret;
-}
-
/* we come to here via sys_nis_syscall so it can setup the regs argument */
asmlinkage unsigned long
c_sys_nis_syscall (struct pt_regs *regs)
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index e2d1024..ddda12f 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -614,12 +614,6 @@ SYSCALL_DEFINE5(64_mremap, unsigned long, addr, unsigned long, old_len,
if (test_thread_flag(TIF_32BIT))
goto out;
- if (unlikely(new_len >= VA_EXCLUDE_START))
- goto out;
- if (unlikely(sparc_mmap_check(addr, old_len)))
- goto out;
- if (unlikely(sparc_mmap_check(new_addr, new_len)))
- goto out;
down_write(¤t->mm->mmap_sem);
ret = do_mremap(addr, old_len, new_len, flags, new_addr);
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 0f1658d..81822a8 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -67,7 +67,7 @@ sys_call_table:
/*235*/ .long sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys_mlockall
/*240*/ .long sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler
/*245*/ .long sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys_sched_rr_get_interval, sys_nanosleep
-/*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
--
1.5.6.5
From: Al Viro <[email protected]>
Date: Sat, 05 Dec 2009 19:08:50 +0000
>
> Signed-off-by: Al Viro <[email protected]>
Acked-by: David S. Miller <[email protected]>
On Sat, Dec 05, 2009 at 03:09:41PM -0800, David Miller wrote:
> From: Al Viro <[email protected]>
> Date: Sat, 05 Dec 2009 19:08:50 +0000
>
> >
> > Signed-off-by: Al Viro <[email protected]>
>
> Acked-by: David S. Miller <[email protected]>
BTW, do we need sys32_mremap() after that? The only difference between
it and sys_mremap() that we have new_addr u32 in the former and u64 in
the latter and IIRC the upper 32 bits of %i4 are going to be 0 anyway...
From: Al Viro <[email protected]>
Date: Sun, 6 Dec 2009 01:13:32 +0000
> On Sat, Dec 05, 2009 at 03:09:41PM -0800, David Miller wrote:
>> From: Al Viro <[email protected]>
>> Date: Sat, 05 Dec 2009 19:08:50 +0000
>>
>> >
>> > Signed-off-by: Al Viro <[email protected]>
>>
>> Acked-by: David S. Miller <[email protected]>
>
> BTW, do we need sys32_mremap() after that? The only difference between
> it and sys_mremap() that we have new_addr u32 in the former and u64 in
> the latter and IIRC the upper 32 bits of %i4 are going to be 0 anyway...
That's right, it should be superfluous now.