summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-05-26 19:40:27 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:47 -0700
commit84df02dd63bf53acb5a61e9db1da067760b927e9 (patch)
tree53467be0f6490d93841fc357db37689aab55dfcd
parent9e86e12e10ad147d27cb19bc3a6f799f38fd4502 (diff)
downloadsystemd-84df02dd63bf53acb5a61e9db1da067760b927e9.tar.gz
systemd-84df02dd63bf53acb5a61e9db1da067760b927e9.tar.bz2
systemd-84df02dd63bf53acb5a61e9db1da067760b927e9.zip
[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.
-rw-r--r--klibc_fixups.c2
-rw-r--r--klibc_fixups.h5
-rw-r--r--namedev.c2
-rw-r--r--udevd.c2
4 files changed, 0 insertions, 11 deletions
diff --git a/klibc_fixups.c b/klibc_fixups.c
index c4d44bbc49..bbacfbdc75 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 6dfd5a5c17..f6c91cdd94 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 b3a2a8ae4b..5e3db1326c 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 d807e4168d..5756b46122 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"