kernel - Remove libc shm shims
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 29 Oct 2011 01:53:26 +0000 (18:53 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 29 Oct 2011 01:53:26 +0000 (18:53 -0700)
* Remove the shims so the new system calls are used instead of shmsys().

lib/libc/gen/Makefile.inc
lib/libc/gen/shmat.c [deleted file]
lib/libc/gen/shmctl.c [deleted file]
lib/libc/gen/shmdt.c [deleted file]
lib/libc/gen/shmget.c [deleted file]
lib/libc/i386/sys/Makefile.inc

index 152e5c3..976fd20 100644 (file)
@@ -29,7 +29,7 @@ SRCS+=  _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
        scandir.c seed48.c seekdir.c semconfig.c semctl.c semget.c semop.c \
        setdomainname.c sethostname.c setjmperr.c setmode.c setprogname.c \
        setproctitle.c \
-       shmat.c shmctl.c shmdt.c shmget.c siginterrupt.c siglist.c signal.c \
+       siginterrupt.c siglist.c signal.c \
        signbitd.c signbitf.c sigsetops.c sigwait.c sleep.c srand48.c \
        stringlist.c strtofflags.c sysconf.c sysctl.c sysctlbyname.c \
        sysctlnametomib.c syslog.c telldir.c termios.c time.c times.c \
diff --git a/lib/libc/gen/shmat.c b/lib/libc/gen/shmat.c
deleted file mode 100644 (file)
index ccd1b76..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * $FreeBSD: src/lib/libc/gen/shmat.c,v 1.4 1999/08/27 23:58:56 peter Exp $
- * $DragonFly: src/lib/libc/gen/shmat.c,v 1.4 2005/11/19 22:32:53 swildner Exp $
- */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-void *
-shmat(int shmid, void *shmaddr, int shmflg)
-{
-       return ((void *)shmsys(0, shmid, shmaddr, shmflg));
-}
diff --git a/lib/libc/gen/shmctl.c b/lib/libc/gen/shmctl.c
deleted file mode 100644 (file)
index a074792..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * $FreeBSD: src/lib/libc/gen/shmctl.c,v 1.4 1999/08/27 23:58:57 peter Exp $
- * $DragonFly: src/lib/libc/gen/shmctl.c,v 1.3 2005/11/13 00:07:42 swildner Exp $
- */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-int shmctl(int shmid, int cmd, struct shmid_ds *buf)
-{
-       return (shmsys(4, shmid, cmd, buf));
-}
diff --git a/lib/libc/gen/shmdt.c b/lib/libc/gen/shmdt.c
deleted file mode 100644 (file)
index 827f909..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * $FreeBSD: src/lib/libc/gen/shmdt.c,v 1.4 1999/08/27 23:58:57 peter Exp $
- * $DragonFly: src/lib/libc/gen/shmdt.c,v 1.3 2005/11/13 00:07:42 swildner Exp $
- */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-int shmdt(void *shmaddr)
-{
-       return (shmsys(2, shmaddr));
-}
diff --git a/lib/libc/gen/shmget.c b/lib/libc/gen/shmget.c
deleted file mode 100644 (file)
index 099c34c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * $FreeBSD: src/lib/libc/gen/shmget.c,v 1.4 1999/08/27 23:58:57 peter Exp $
- * $DragonFly: src/lib/libc/gen/shmget.c,v 1.3 2005/11/13 00:07:42 swildner Exp $
- */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-int shmget(key_t key, int size, int shmflg)
-{
-       return (shmsys(3, key, size, shmflg));
-}
index bb738d8..ca16f5c 100644 (file)
@@ -12,7 +12,7 @@ MDASM=        Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
 NOASM= __semctl.o break.o exit.o ftruncate.o getdomainname.o getlogin.o \
        lseek.o mmap.o msgctl.o msgget.o msgrcv.o msgsnd.o \
        openbsd_poll.o semconfig.o semget.o \
-       semop.o setdomainname.o shmat.o shmctl.o shmdt.o shmget.o sstk.o \
+       semop.o setdomainname.o sstk.o \
        truncate.o uname.o vfork.o yield.o
 
 PSEUDO=        _getlogin.o _exit.o