From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Thu, 27 May 2004 02:40:27 +0000 (-0700)
Subject: [PATCH] catchup with recent klibc
X-Git-Tag: 026~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84df02dd63bf53acb5a61e9db1da067760b927e9;p=systemd

[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 c4d44bbc..bbacfbdc 100644
--- 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 6dfd5a5c..f6c91cdd 100644
--- 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 b3a2a8ae..5e3db132 100644
--- 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 d807e416..5756b461 100644
--- 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"