[PATCH] rename shmat to make it clear it isn't a system call entrypoint

This renames sys_shmat to do_shmat.  Additionally, I've replaced the
cond_syscall with a conditional inline function.

It touches all archs - only i386 is tested.

1 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/shm.h b/include/linux/shm.h
index dd0cafabdc1c..69698d344053 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -90,7 +90,14 @@ struct shmid_kernel /* private to the kernel */
 #define SHM_LOCKED      02000   /* segment will not be swapped */
 #define SHM_HUGETLB     04000   /* segment will use huge TLB pages */
 
-long sys_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
+#ifdef CONFIG_SYSVIPC
+long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
+#else
+inline long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr)
+{
+	return -ENOSYS;
+}
+#endif
 asmlinkage long sys_shmget (key_t key, size_t size, int flag);
 asmlinkage long sys_shmdt (char __user *shmaddr);
 asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf);