diff options
Diffstat (limited to 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 14 | 
1 files changed, 14 insertions, 0 deletions
| diff --git a/ipc/shm.c b/ipc/shm.c index 06cd5c91056f..cce022435dbc 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -28,6 +28,8 @@  #include <linux/security.h>  #include <linux/syscalls.h>  #include <linux/audit.h> +#include <linux/ptrace.h> +  #include <asm/uaccess.h>  #include "util.h" @@ -771,6 +773,18 @@ out:  	return err;  } +asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg) +{ +	unsigned long ret; +	long err; + +	err = do_shmat(shmid, shmaddr, shmflg, &ret); +	if (err) +		return err; +	force_successful_syscall_return(); +	return (long)ret; +} +  /*   * detach and kill segment if marked destroyed.   * The work is done in shm_close. | 
