[PATCH] catchup with recent klibc

Our own implementation of the sysinfo system call is no longer
needed, cause it's merged it into klibc now.

diff --git a/klibc_fixups.c b/klibc_fixups.c
index c4d44bbc490d3dd27752628fca1ac1fe9a7bdc58..bbacfbdc75cf02ada93fa6cf9aed42c6a1667284 100644 (file)
--- a/klibc_fixups.c
+++ b/klibc_fixups.c
@@ -37,8 +37,6 @@
 #define GR_FILE                "/etc/group"
 #define UTMP_FILE      "/var/run/utmp"
 
-_syscall1(int, sysinfo, struct sysinfo *, info);
-
 /* return the id of a passwd style line, selected by the users name */
 static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 {

diff --git a/klibc_fixups.h b/klibc_fixups.h
index 6dfd5a5c17e631fbb6e49bddcb9328f00636fbee..f6c91cdd9444fb61e11055a19417c85fd191b409 100644 (file)
--- a/klibc_fixups.h
+++ b/klibc_fixups.h
@@ -3,11 +3,6 @@
 #ifndef KLIBC_FIXUPS_H
 #define KLIBC_FIXUPS_H
 
-#include <linux/kernel.h>
-#include <linux/unistd.h>
-
-int sysinfo(struct sysinfo *info);
-
 struct passwd {
        char    *pw_name;       /* user name */
        char    *pw_passwd;     /* user password */

diff --git a/namedev.c b/namedev.c
index b3a2a8ae4b0bcb2bf0eb62955d47f71bf57153d8..5e3db1326c13e5a97eb70f2250b4488f65fdc3d1 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -32,9 +32,7 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#ifndef __KLIBC__
 #include <sys/sysinfo.h>
-#endif
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"

diff --git a/udevd.c b/udevd.c
index d807e4168d8b96b04ea939bdf661ff49ae3a4a22..5756b46122d0f03037c4b9521679fd53e2b14bab 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -34,9 +34,7 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #include "klibc_fixups.h"
-#ifndef __KLIBC__
 #include <sys/sysinfo.h>
-#endif
 
 #include "list.h"
 #include "udev.h"