Forgot to commit these cleanups it seems.

 -Erik

diff --git a/dmesg.c b/dmesg.c
index b6c990d99f733e865823bd7b4e6775942dd3f4bd..df2bce7133b6afb76ed25940560c7cfce63b7f2d 100644 (file)
--- a/dmesg.c
+++ b/dmesg.c
@@ -23,7 +23,6 @@
 
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
-#include <sys/syscall.h>
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 #else                                                  /* __alpha__ */
 #define klogctl syslog

diff --git a/init.c b/init.c
index e0b4651260b1b79879f3bd7fee2a2c575ed6ec75..79f14ab33f4d316a9d53c26b108777ad41aefdda 100644 (file)
--- a/init.c
+++ b/init.c
@@ -110,7 +110,6 @@ struct serial_struct {
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-#include <sys/syscall.h>               /* for _syscall() macro */
 static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 

diff --git a/init/init.c b/init/init.c
index e0b4651260b1b79879f3bd7fee2a2c575ed6ec75..79f14ab33f4d316a9d53c26b108777ad41aefdda 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -110,7 +110,6 @@ struct serial_struct {
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-#include <sys/syscall.h>               /* for _syscall() macro */
 static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 

diff --git a/insmod.c b/insmod.c
index 469d056d3364c40fcc1dac050fa871a32f49554f..7e90dfbd9bfe9fc0b9bdb9ed5be943b08d82f1b4 100644 (file)
--- a/insmod.c
+++ b/insmod.c
@@ -40,7 +40,6 @@
 #include <assert.h>
 #include <getopt.h>
 #include <sys/utsname.h>
-#include <sys/syscall.h>
 
 //----------------------------------------------------------------------------
 //--------modutils module.h, lines 45-242
@@ -71,7 +70,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
 
-#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
+#ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -277,7 +276,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
+#ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 

diff --git a/internal.h b/internal.h
index 8086aa1ca60055ba17a94b8f14b3630c6eaee468..081cd47feb3b91fdef977f2cf37dea03f18eab57 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -35,6 +35,10 @@
 #include <sys/param.h>
 #include <mntent.h>
 #include <regex.h>
+/* for the _syscall() macros */
+#include <sys/syscall.h>
+#include <linux/unistd.h>
+
 
 /* Some useful definitions */
 #define FALSE   ((int) 1)

diff --git a/miscutils/update.c b/miscutils/update.c
index 1fdf04a894e7efea2086428a95ca5b73009942c5..f94346172e4e37f39afaa03de8f2a3af3a9c86d7 100644 (file)
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -24,7 +24,6 @@
  */
 
 #include "internal.h"
-#include <sys/syscall.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 

diff --git a/modutils/insmod.c b/modutils/insmod.c
index 469d056d3364c40fcc1dac050fa871a32f49554f..7e90dfbd9bfe9fc0b9bdb9ed5be943b08d82f1b4 100644 (file)
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -40,7 +40,6 @@
 #include <assert.h>
 #include <getopt.h>
 #include <sys/utsname.h>
-#include <sys/syscall.h>
 
 //----------------------------------------------------------------------------
 //--------modutils module.h, lines 45-242
@@ -71,7 +70,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
 
-#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
+#ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -277,7 +276,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
+#ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 

diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index a73d789f20c3e57efe5392c3fd1d17408ecd913a..3158686f058c112b41985652ba54bf6f7386d0f4 100644 (file)
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -26,8 +26,6 @@
 #include <errno.h>
 #include <unistd.h>
 #define __LIBRARY__
-#include <asm/unistd.h>
-/* #include <sys/syscall.h> */
 
 
 

diff --git a/rmmod.c b/rmmod.c
index a73d789f20c3e57efe5392c3fd1d17408ecd913a..3158686f058c112b41985652ba54bf6f7386d0f4 100644 (file)
--- a/rmmod.c
+++ b/rmmod.c
@@ -26,8 +26,6 @@
 #include <errno.h>
 #include <unistd.h>
 #define __LIBRARY__
-#include <asm/unistd.h>
-/* #include <sys/syscall.h> */
 
 
 

diff --git a/swaponoff.c b/swaponoff.c
index bb8395fa4aa414c4cb185fb2faca23f23170f898..b43f3cdc1b197677b74791f9f6c18cfeeed0424f 100644 (file)
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -28,7 +28,6 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
-#include <sys/syscall.h>
 
 _syscall2(int, swapon, const char *, path, int, flags);
 _syscall1(int, swapoff, const char *, path);

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index a185a4cc3718d6d272233785f82cc280cbdb5dea..55fd8dc740c90b3a255a295a2f5526cf0521646e 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
-#include <sys/syscall.h>
 
 #if ! defined __GLIBC__ && ! defined __UCLIBC__
 

diff --git a/syslogd.c b/syslogd.c
index a185a4cc3718d6d272233785f82cc280cbdb5dea..55fd8dc740c90b3a255a295a2f5526cf0521646e 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
-#include <sys/syscall.h>
 
 #if ! defined __GLIBC__ && ! defined __UCLIBC__
 

diff --git a/update.c b/update.c
index 1fdf04a894e7efea2086428a95ca5b73009942c5..f94346172e4e37f39afaa03de8f2a3af3a9c86d7 100644 (file)
--- a/update.c
+++ b/update.c
@@ -24,7 +24,6 @@
  */
 
 #include "internal.h"
-#include <sys/syscall.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index b6c990d99f733e865823bd7b4e6775942dd3f4bd..df2bce7133b6afb76ed25940560c7cfce63b7f2d 100644 (file)
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -23,7 +23,6 @@
 
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
-#include <sys/syscall.h>
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 #else                                                  /* __alpha__ */
 #define klogctl syslog

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index bb8395fa4aa414c4cb185fb2faca23f23170f898..b43f3cdc1b197677b74791f9f6c18cfeeed0424f 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -28,7 +28,6 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
-#include <sys/syscall.h>
 
 _syscall2(int, swapon, const char *, path, int, flags);
 _syscall1(int, swapoff, const char *, path);

diff --git a/utility.c b/utility.c
index cbbc02f989fb7ae7c9ce4be0a0d8b7cbda037b2a..0f78f287f32700fcdd73faee9a63b2431b2e61f5 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -133,12 +133,10 @@ extern int get_kernel_revision(void)
 
 
 #if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME
-#include <sys/syscall.h>
 _syscall1(int, sysinfo, struct sysinfo *, info);
 #endif                                                 /* BB_INIT */
 
 #if defined BB_MOUNT || defined BB_UMOUNT
-#include <sys/syscall.h>
 
 #ifndef __NR_umount2
 #define __NR_umount2           52