X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=ipc%2Fshm.c;h=cce022435dbc95ff562b28cd073b2d239206af52;hp=06cd5c91056f56af458a069aba6bb609bcf46989;hb=51490c89f95b8581782e9baa855da166441852be;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;ds=sidebyside

diff --git a/ipc/shm.c b/ipc/shm.c
index 06cd5c91056..cce022435db 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.