aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorManfred Spraul <manfred@colorfullife.com>2004-02-22 21:28:40 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-02-22 21:28:40 -0800
commit5da0c2c3b175c1217e5e4890c898628ca2a6bd22 (patch)
treeeface0ee25a8abb40d03ba10d27f9dba54502aae /ipc
parent8b7667947a780c03424c2370a43a893f5d020d47 (diff)
downloadhistory-5da0c2c3b175c1217e5e4890c898628ca2a6bd22.tar.gz
[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.
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 4260a6d53c83a9..f5eadc2747ca97 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -635,7 +635,7 @@ out:
* "raddr" thing points to kernel space, and there has to be a wrapper around
* this.
*/
-asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
+long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
{
struct shmid_kernel *shp;
unsigned long addr;