[PATCH] catchup with recent klibc

[PATCH] catchup with recent klibc

[Kay Sievers]

[-- Attachment #1: Type: text/plain, Size: 121 bytes --]

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

thanks,
Kay

[-- Attachment #2: 01-sysinfo-klibc.patch --]
[-- Type: text/plain, Size: 1443 bytes --]

===== klibc_fixups.c 1.9 vs edited =====
--- 1.9/klibc_fixups.c	Sun Mar 28 01:55:06 2004
+++ edited/klibc_fixups.c	Fri May 21 04:12:37 2004
@@ -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)
 {
===== klibc_fixups.h 1.7 vs edited =====
--- 1.7/klibc_fixups.h	Sun Mar 28 03:05:19 2004
+++ edited/klibc_fixups.h	Fri May 21 04:17:58 2004
@@ -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 */
===== namedev.c 1.140 vs edited =====
--- 1.140/namedev.c	Sat Apr 17 05:23:25 2004
+++ edited/namedev.c	Fri May 21 04:13:15 2004
@@ -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"
===== udevd.c 1.31 vs edited =====
--- 1.31/udevd.c	Thu Apr 15 06:30:15 2004
+++ edited/udevd.c	Fri May 21 04:13:45 2004
@@ -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"

Re: [PATCH] catchup with recent klibc

[Greg KH]

On Fri, May 21, 2004 at 04:27:03AM +0200, Kay Sievers wrote:
> Our own implementation of the sysinfo system call is no longer
> needed, cause it's merged it into klibc now.

Applied, thanks.

greg k-h


-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id149&alloc_idÅ66&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel