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

Commit d35c7b0e authored by Ulrich Drepper's avatar Ulrich Drepper Committed by Linus Torvalds
Browse files

unified (weak) sys_pipe implementation 



This replaces the duplicated arch-specific versions of "sys_pipe()" with
one unified implementation.  This removes almost 250 lines of duplicated
code.

It's marked __weak, so that *if* an architecture wants to override the
default implementation it can do so by simply having its own replacement
version, since many architectures use alternate calling conventions for
the 'pipe()' system call for legacy reasons (ie traditional UNIX
implementations often return the two file descriptors in registers)

I still haven't changed the cris version even though Linus says the BKL
isn't needed.  The arch maintainer can easily do it if there are really
no obstacles.

Signed-off-by: default avatarUlrich Drepper <drepper@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2ddcca36

arch/arm/kernel/sys_arm.c

+0 −17
Original line number Diff line number Diff line
@@ -34,23 +34,6 @@ extern unsigned long do_mremap(unsigned long addr, unsigned long old_len, 
			       unsigned long new_len, unsigned long flags,

			       unsigned long new_addr);



/*

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

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

 */

asmlinkage int sys_pipe(unsigned long __user *fildes)

{

	int fd[2];

	int error;



	error = do_pipe(fd);

	if (!error) {

		if (copy_to_user(fildes, fd, 2*sizeof(int)))

			error = -EFAULT;

	}

	return error;

}



/* common code for old and new mmaps */

inline long do_mmap2(

	unsigned long addr, unsigned long len,

arch/avr32/kernel/sys_avr32.c

+0 −13
Original line number Diff line number Diff line
@@ -14,19 +14,6 @@ 
#include <asm/mman.h>

#include <asm/uaccess.h>



asmlinkage int sys_pipe(unsigned long __user *filedes)

{

	int fd[2];

	int error;



	error = do_pipe(fd);

	if (!error) {

		if (copy_to_user(filedes, fd, sizeof(fd)))

			error = -EFAULT;

	}

	return error;

}



asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,

			  unsigned long prot, unsigned long flags,

			  unsigned long fd, off_t offset)

arch/blackfin/kernel/sys_bfin.c

+0 −17
Original line number Diff line number Diff line
@@ -45,23 +45,6 @@ 
#include <asm/cacheflush.h>

#include <asm/dma.h>



/*

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

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

 */

asmlinkage int sys_pipe(unsigned long __user *fildes)

{

	int fd[2];

	int error;



	error = do_pipe(fd);

	if (!error) {

		if (copy_to_user(fildes, fd, 2 * sizeof(int)))

			error = -EFAULT;

	}

	return error;

}



/* common code for old and new mmaps */

static inline long

do_mmap2(unsigned long addr, unsigned long len,

arch/frv/kernel/sys_frv.c

+0 −17
Original line number Diff line number Diff line
@@ -28,23 +28,6 @@ 
#include <asm/setup.h>

#include <asm/uaccess.h>



/*

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

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

 */

asmlinkage long sys_pipe(unsigned long __user * fildes)

{

	int fd[2];

	int error;



	error = do_pipe(fd);

	if (!error) {

		if (copy_to_user(fildes, fd, 2*sizeof(int)))

			error = -EFAULT;

	}

	return error;

}



asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,

			  unsigned long prot, unsigned long flags,

			  unsigned long fd, unsigned long pgoff)

arch/h8300/kernel/sys_h8300.c

+0 −17
Original line number Diff line number Diff line
@@ -27,23 +27,6 @@ 
#include <asm/traps.h>

#include <asm/unistd.h>



/*

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

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

 */

asmlinkage int sys_pipe(unsigned long * fildes)

{

	int fd[2];

	int error;



	error = do_pipe(fd);

	if (!error) {

		if (copy_to_user(fildes, fd, 2*sizeof(int)))

			error = -EFAULT;

	}

	return error;

}



/* common code for old and new mmaps */

static inline long do_mmap2(

	unsigned long addr, unsigned long len,