diff options
-rw-r--r-- | dmesg.c | 1 | ||||
-rw-r--r-- | init.c | 1 | ||||
-rw-r--r-- | init/init.c | 1 | ||||
-rw-r--r-- | insmod.c | 5 | ||||
-rw-r--r-- | internal.h | 4 | ||||
-rw-r--r-- | miscutils/update.c | 1 | ||||
-rw-r--r-- | modutils/insmod.c | 5 | ||||
-rw-r--r-- | modutils/rmmod.c | 2 | ||||
-rw-r--r-- | rmmod.c | 2 | ||||
-rw-r--r-- | swaponoff.c | 1 | ||||
-rw-r--r-- | sysklogd/syslogd.c | 1 | ||||
-rw-r--r-- | syslogd.c | 1 | ||||
-rw-r--r-- | update.c | 1 | ||||
-rw-r--r-- | util-linux/dmesg.c | 1 | ||||
-rw-r--r-- | util-linux/swaponoff.c | 1 | ||||
-rw-r--r-- | utility.c | 2 |
16 files changed, 8 insertions, 22 deletions
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #ifndef __alpha__ | 24 | #ifndef __alpha__ |
25 | # define __NR_klogctl __NR_syslog | 25 | # define __NR_klogctl __NR_syslog |
26 | #include <sys/syscall.h> | ||
27 | static inline _syscall3(int, klogctl, int, type, char *, b, int, len); | 26 | static inline _syscall3(int, klogctl, int, type, char *, b, int, len); |
28 | #else /* __alpha__ */ | 27 | #else /* __alpha__ */ |
29 | #define klogctl syslog | 28 | #define klogctl syslog |
@@ -110,7 +110,6 @@ struct serial_struct { | |||
110 | #if defined(__GLIBC__) | 110 | #if defined(__GLIBC__) |
111 | #include <sys/kdaemon.h> | 111 | #include <sys/kdaemon.h> |
112 | #else | 112 | #else |
113 | #include <sys/syscall.h> /* for _syscall() macro */ | ||
114 | static _syscall2(int, bdflush, int, func, int, data); | 113 | static _syscall2(int, bdflush, int, func, int, data); |
115 | #endif /* __GLIBC__ */ | 114 | #endif /* __GLIBC__ */ |
116 | 115 | ||
diff --git a/init/init.c b/init/init.c index e0b465126..79f14ab33 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -110,7 +110,6 @@ struct serial_struct { | |||
110 | #if defined(__GLIBC__) | 110 | #if defined(__GLIBC__) |
111 | #include <sys/kdaemon.h> | 111 | #include <sys/kdaemon.h> |
112 | #else | 112 | #else |
113 | #include <sys/syscall.h> /* for _syscall() macro */ | ||
114 | static _syscall2(int, bdflush, int, func, int, data); | 113 | static _syscall2(int, bdflush, int, func, int, data); |
115 | #endif /* __GLIBC__ */ | 114 | #endif /* __GLIBC__ */ |
116 | 115 | ||
@@ -40,7 +40,6 @@ | |||
40 | #include <assert.h> | 40 | #include <assert.h> |
41 | #include <getopt.h> | 41 | #include <getopt.h> |
42 | #include <sys/utsname.h> | 42 | #include <sys/utsname.h> |
43 | #include <sys/syscall.h> | ||
44 | 43 | ||
45 | //---------------------------------------------------------------------------- | 44 | //---------------------------------------------------------------------------- |
46 | //--------modutils module.h, lines 45-242 | 45 | //--------modutils module.h, lines 45-242 |
@@ -71,7 +70,7 @@ | |||
71 | #ifndef MODUTILS_MODULE_H | 70 | #ifndef MODUTILS_MODULE_H |
72 | #define MODUTILS_MODULE_H 1 | 71 | #define MODUTILS_MODULE_H 1 |
73 | 72 | ||
74 | #ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $" | 73 | #ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $" |
75 | 74 | ||
76 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
77 | We do not use the kernel headers directly because we do not wish | 76 | We do not use the kernel headers directly because we do not wish |
@@ -277,7 +276,7 @@ int delete_module(const char *); | |||
277 | #ifndef MODUTILS_OBJ_H | 276 | #ifndef MODUTILS_OBJ_H |
278 | #define MODUTILS_OBJ_H 1 | 277 | #define MODUTILS_OBJ_H 1 |
279 | 278 | ||
280 | #ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $" | 279 | #ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $" |
281 | 280 | ||
282 | /* The relocatable object is manipulated using elfin types. */ | 281 | /* The relocatable object is manipulated using elfin types. */ |
283 | 282 | ||
diff --git a/internal.h b/internal.h index 8086aa1ca..081cd47fe 100644 --- a/internal.h +++ b/internal.h | |||
@@ -35,6 +35,10 @@ | |||
35 | #include <sys/param.h> | 35 | #include <sys/param.h> |
36 | #include <mntent.h> | 36 | #include <mntent.h> |
37 | #include <regex.h> | 37 | #include <regex.h> |
38 | /* for the _syscall() macros */ | ||
39 | #include <sys/syscall.h> | ||
40 | #include <linux/unistd.h> | ||
41 | |||
38 | 42 | ||
39 | /* Some useful definitions */ | 43 | /* Some useful definitions */ |
40 | #define FALSE ((int) 1) | 44 | #define FALSE ((int) 1) |
diff --git a/miscutils/update.c b/miscutils/update.c index 1fdf04a89..f94346172 100644 --- a/miscutils/update.c +++ b/miscutils/update.c | |||
@@ -24,7 +24,6 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "internal.h" | 26 | #include "internal.h" |
27 | #include <sys/syscall.h> | ||
28 | #include <sys/param.h> | 27 | #include <sys/param.h> |
29 | #include <sys/syslog.h> | 28 | #include <sys/syslog.h> |
30 | 29 | ||
diff --git a/modutils/insmod.c b/modutils/insmod.c index 469d056d3..7e90dfbd9 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <assert.h> | 40 | #include <assert.h> |
41 | #include <getopt.h> | 41 | #include <getopt.h> |
42 | #include <sys/utsname.h> | 42 | #include <sys/utsname.h> |
43 | #include <sys/syscall.h> | ||
44 | 43 | ||
45 | //---------------------------------------------------------------------------- | 44 | //---------------------------------------------------------------------------- |
46 | //--------modutils module.h, lines 45-242 | 45 | //--------modutils module.h, lines 45-242 |
@@ -71,7 +70,7 @@ | |||
71 | #ifndef MODUTILS_MODULE_H | 70 | #ifndef MODUTILS_MODULE_H |
72 | #define MODUTILS_MODULE_H 1 | 71 | #define MODUTILS_MODULE_H 1 |
73 | 72 | ||
74 | #ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $" | 73 | #ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $" |
75 | 74 | ||
76 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 75 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
77 | We do not use the kernel headers directly because we do not wish | 76 | We do not use the kernel headers directly because we do not wish |
@@ -277,7 +276,7 @@ int delete_module(const char *); | |||
277 | #ifndef MODUTILS_OBJ_H | 276 | #ifndef MODUTILS_OBJ_H |
278 | #define MODUTILS_OBJ_H 1 | 277 | #define MODUTILS_OBJ_H 1 |
279 | 278 | ||
280 | #ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $" | 279 | #ident "$Id: insmod.c,v 1.15 2000/07/11 17:52:22 andersen Exp $" |
281 | 280 | ||
282 | /* The relocatable object is manipulated using elfin types. */ | 281 | /* The relocatable object is manipulated using elfin types. */ |
283 | 282 | ||
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index a73d789f2..3158686f0 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <unistd.h> | 27 | #include <unistd.h> |
28 | #define __LIBRARY__ | 28 | #define __LIBRARY__ |
29 | #include <asm/unistd.h> | ||
30 | /* #include <sys/syscall.h> */ | ||
31 | 29 | ||
32 | 30 | ||
33 | 31 | ||
@@ -26,8 +26,6 @@ | |||
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <unistd.h> | 27 | #include <unistd.h> |
28 | #define __LIBRARY__ | 28 | #define __LIBRARY__ |
29 | #include <asm/unistd.h> | ||
30 | /* #include <sys/syscall.h> */ | ||
31 | 29 | ||
32 | 30 | ||
33 | 31 | ||
diff --git a/swaponoff.c b/swaponoff.c index bb8395fa4..b43f3cdc1 100644 --- a/swaponoff.c +++ b/swaponoff.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <mntent.h> | 28 | #include <mntent.h> |
29 | #include <dirent.h> | 29 | #include <dirent.h> |
30 | #include <errno.h> | 30 | #include <errno.h> |
31 | #include <sys/syscall.h> | ||
32 | 31 | ||
33 | _syscall2(int, swapon, const char *, path, int, flags); | 32 | _syscall2(int, swapon, const char *, path, int, flags); |
34 | _syscall1(int, swapoff, const char *, path); | 33 | _syscall1(int, swapoff, const char *, path); |
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index a185a4cc3..55fd8dc74 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <sys/types.h> | 40 | #include <sys/types.h> |
41 | #include <sys/un.h> | 41 | #include <sys/un.h> |
42 | #include <sys/param.h> | 42 | #include <sys/param.h> |
43 | #include <sys/syscall.h> | ||
44 | 43 | ||
45 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | 44 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ |
46 | 45 | ||
@@ -40,7 +40,6 @@ | |||
40 | #include <sys/types.h> | 40 | #include <sys/types.h> |
41 | #include <sys/un.h> | 41 | #include <sys/un.h> |
42 | #include <sys/param.h> | 42 | #include <sys/param.h> |
43 | #include <sys/syscall.h> | ||
44 | 43 | ||
45 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ | 44 | #if ! defined __GLIBC__ && ! defined __UCLIBC__ |
46 | 45 | ||
@@ -24,7 +24,6 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "internal.h" | 26 | #include "internal.h" |
27 | #include <sys/syscall.h> | ||
28 | #include <sys/param.h> | 27 | #include <sys/param.h> |
29 | #include <sys/syslog.h> | 28 | #include <sys/syslog.h> |
30 | 29 | ||
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index b6c990d99..df2bce713 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #ifndef __alpha__ | 24 | #ifndef __alpha__ |
25 | # define __NR_klogctl __NR_syslog | 25 | # define __NR_klogctl __NR_syslog |
26 | #include <sys/syscall.h> | ||
27 | static inline _syscall3(int, klogctl, int, type, char *, b, int, len); | 26 | static inline _syscall3(int, klogctl, int, type, char *, b, int, len); |
28 | #else /* __alpha__ */ | 27 | #else /* __alpha__ */ |
29 | #define klogctl syslog | 28 | #define klogctl syslog |
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index bb8395fa4..b43f3cdc1 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <mntent.h> | 28 | #include <mntent.h> |
29 | #include <dirent.h> | 29 | #include <dirent.h> |
30 | #include <errno.h> | 30 | #include <errno.h> |
31 | #include <sys/syscall.h> | ||
32 | 31 | ||
33 | _syscall2(int, swapon, const char *, path, int, flags); | 32 | _syscall2(int, swapon, const char *, path, int, flags); |
34 | _syscall1(int, swapoff, const char *, path); | 33 | _syscall1(int, swapoff, const char *, path); |
@@ -133,12 +133,10 @@ extern int get_kernel_revision(void) | |||
133 | 133 | ||
134 | 134 | ||
135 | #if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME | 135 | #if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME |
136 | #include <sys/syscall.h> | ||
137 | _syscall1(int, sysinfo, struct sysinfo *, info); | 136 | _syscall1(int, sysinfo, struct sysinfo *, info); |
138 | #endif /* BB_INIT */ | 137 | #endif /* BB_INIT */ |
139 | 138 | ||
140 | #if defined BB_MOUNT || defined BB_UMOUNT | 139 | #if defined BB_MOUNT || defined BB_UMOUNT |
141 | #include <sys/syscall.h> | ||
142 | 140 | ||
143 | #ifndef __NR_umount2 | 141 | #ifndef __NR_umount2 |
144 | #define __NR_umount2 52 | 142 | #define __NR_umount2 52 |