Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec62d29 authored by Al Viro's avatar Al Viro
Browse files

kill useless checks in sparc mremap variants 



Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarHugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 93587414

arch/sparc/kernel/sys_sparc32.c

+0 −22
Original line number Diff line number Diff line
@@ -564,28 +564,6 @@ asmlinkage long sparc32_open(const char __user *filename, 
	return do_sys_open(AT_FDCWD, filename, flags, mode);

}



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 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 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(&current->mm->mmap_sem);

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

	up_write(&current->mm->mmap_sem);

out:

	return ret;       

}



long sys32_lookup_dcookie(unsigned long cookie_high,

			  unsigned long cookie_low,

			  char __user *buf, size_t len)

arch/sparc/kernel/sys_sparc_32.c

+0 −21
Original line number Diff line number Diff line
@@ -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(&current->mm->mmap_sem);

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

	up_write(&current->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)

arch/sparc/kernel/sys_sparc_64.c

+0 −6
Original line number Diff line number Diff line
@@ -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(&current->mm->mmap_sem);

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

arch/sparc/kernel/systbls_32.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ sys_call_table32: 
	.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys32_mlockall

/*240*/	.word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler

	.word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep

/*250*/	.word sys32_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl

/*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl

	.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep

/*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun

	.word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy