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

Commit 05d72faa authored by Al Viro's avatar Al Viro
Browse files

sparc_brk() is not needed anymore 



the checks it's doing are duplicated in sys_brk() and failing
them early makes no sense, AFAICT.

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 2c6a1016

arch/sparc/kernel/sys_sparc_32.c

+0 −9
Original line number Diff line number Diff line
@@ -79,15 +79,6 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi 
	}

}



asmlinkage unsigned long sparc_brk(unsigned long brk)

{

	if(ARCH_SUN4C) {

		if ((brk & 0xe0000000) != (current->mm->brk & 0xe0000000))

			return current->mm->brk;

	}

	return sys_brk(brk);

}



/*

 * sys_pipe() is the normal C calling standard for creating

 * a pipe. It's not the way unix traditionally does this, though.

arch/sparc/kernel/sys_sparc_64.c

+0 −12
Original line number Diff line number Diff line
@@ -403,18 +403,6 @@ void arch_pick_mmap_layout(struct mm_struct *mm) 
	}

}



SYSCALL_DEFINE1(sparc_brk, unsigned long, brk)

{

	/* People could try to be nasty and use ta 0x6d in 32bit programs */

	if (test_thread_flag(TIF_32BIT) && brk >= STACK_TOP32)

		return current->mm->brk;



	if (unlikely(straddles_64bit_va_hole(current->mm->brk, brk)))

		return current->mm->brk;



	return sys_brk(brk);

}

                                                                

/*

 * sys_pipe() is the normal C calling standard for creating

 * a pipe. It's not the way unix traditionally does this, though.

arch/sparc/kernel/systbls.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
struct new_utsname;



extern asmlinkage unsigned long sys_getpagesize(void);

extern asmlinkage unsigned long sparc_brk(unsigned long brk);

extern asmlinkage long sparc_pipe(struct pt_regs *regs);

extern asmlinkage long sys_ipc(unsigned int call, int first,

			       unsigned long second,

arch/sparc/kernel/systbls_32.S

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ sys_call_table: 
/*0*/	.long sys_restart_syscall, sys_exit, sys_fork, sys_read, sys_write

/*5*/	.long sys_open, sys_close, sys_wait4, sys_creat, sys_link

/*10*/  .long sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys_mknod

/*15*/	.long sys_chmod, sys_lchown16, sparc_brk, sys_nis_syscall, sys_lseek

/*15*/	.long sys_chmod, sys_lchown16, sys_brk, sys_nis_syscall, sys_lseek

/*20*/	.long sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16

/*25*/	.long sys_vmsplice, sys_ptrace, sys_alarm, sys_sigaltstack, sys_pause

/*30*/	.long sys_utime, sys_lchown, sys_fchown, sys_access, sys_nice

arch/sparc/kernel/systbls_64.S

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ sys_call_table32: 
/*0*/	.word sys_restart_syscall, sys32_exit, sys_fork, sys_read, sys_write

/*5*/	.word sys32_open, sys_close, sys32_wait4, sys32_creat, sys_link

/*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys32_mknod

/*15*/	.word sys_chmod, sys_lchown16, sys_sparc_brk, sys32_perfctr, sys32_lseek

/*15*/	.word sys_chmod, sys_lchown16, sys_brk, sys32_perfctr, sys32_lseek

/*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16

/*25*/	.word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys_pause

/*30*/	.word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice
@@ -96,7 +96,7 @@ sys_call_table: 
/*0*/	.word sys_restart_syscall, sparc_exit, sys_fork, sys_read, sys_write

/*5*/	.word sys_open, sys_close, sys_wait4, sys_creat, sys_link

/*10*/  .word sys_unlink, sys_nis_syscall, sys_chdir, sys_chown, sys_mknod

/*15*/	.word sys_chmod, sys_lchown, sys_sparc_brk, sys_perfctr, sys_lseek

/*15*/	.word sys_chmod, sys_lchown, sys_brk, sys_perfctr, sys_lseek

/*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid, sys_getuid

/*25*/	.word sys_vmsplice, sys_ptrace, sys_alarm, sys_sigaltstack, sys_nis_syscall

/*30*/	.word sys_utime, sys_nis_syscall, sys_nis_syscall, sys_access, sys_nice