Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95949
b: refs/heads/master
c: d35c7b0
h: refs/heads/master
i:
  95947: e1bdca0
v: v3
  • Loading branch information
Ulrich Drepper authored and Linus Torvalds committed May 3, 2008
1 parent 29ae9fe commit 0ad4ebc
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 266 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ddcca36c8bcfa251724fe342c8327451988be0d
refs/heads/master: d35c7b0e54a596c5a8134d75999b7f391a9c6550
17 changes: 0 additions & 17 deletions trunk/arch/arm/kernel/sys_arm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 0 additions & 13 deletions trunk/arch/avr32/kernel/sys_avr32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/blackfin/kernel/sys_bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/frv/kernel/sys_frv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/h8300/kernel/sys_h8300.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/m68k/kernel/sys_m68k.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,6 @@
#include <asm/page.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 __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,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/m68knommu/kernel/sys_m68k.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,6 @@
#include <asm/cacheflush.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,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/mn10300/kernel/sys_mn10300.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,6 @@

#define MIN_MAP_ADDR PAGE_SIZE /* minimum fixed mmap address */

/*
* 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;
}

/*
* memory mapping syscall
*/
Expand Down
13 changes: 0 additions & 13 deletions trunk/arch/parisc/kernel/sys_parisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,6 @@
#include <linux/utsname.h>
#include <linux/personality.h>

int sys_pipe(int __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;
}

static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
{
struct vm_area_struct *vma;
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/powerpc/kernel/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,6 @@ int sys_ipc(uint call, int first, unsigned long second, long third,
return ret;
}

/*
* sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though.
*/
int sys_pipe(int __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;
}

static inline unsigned long do_mmap2(unsigned long addr, size_t len,
unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long off, int shift)
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/s390/kernel/sys_s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,6 @@
#include <asm/uaccess.h>
#include "entry.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;
}

/* common code for old and new mmaps */
static inline long do_mmap2(
unsigned long addr, unsigned long len,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/sh/kernel/sys_sh64.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,6 @@
#include <asm/ptrace.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;
}

/*
* Do a system call from kernel instead of calling sys_execve so we
* end up with proper pt_regs.
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/um/kernel/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,6 @@ long old_mmap(unsigned long addr, unsigned long len,
out:
return err;
}
/*
* sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though.
*/
long sys_pipe(unsigned long __user * fildes)
{
int fd[2];
long error;

error = do_pipe(fd);
if (!error) {
if (copy_to_user(fildes, fd, sizeof(fd)))
error = -EFAULT;
}
return error;
}


long sys_uname(struct old_utsname __user * name)
{
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/v850/kernel/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,6 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
return ret;
}

/*
* sys_pipe() is the normal C calling standard for creating
* a pipe. It's not the way unix traditionally does this, though.
*/
int sys_pipe (int *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;
}

static inline unsigned long
do_mmap2 (unsigned long addr, size_t len,
unsigned long prot, unsigned long flags,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/x86/kernel/sys_i386_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,6 @@
#include <asm/uaccess.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 __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)
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/x86/kernel/sys_x86_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@
#include <asm/uaccess.h>
#include <asm/ia32.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(int __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_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long off)
{
Expand Down
Loading

0 comments on commit 0ad4ebc

Please sign in to comment.