diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /net/khttpd | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'net/khttpd')
| -rw-r--r-- | net/khttpd/misc.c | 2 | ||||
| -rw-r--r-- | net/khttpd/rfc.c | 2 | ||||
| -rw-r--r-- | net/khttpd/rfc_time.c | 2 | ||||
| -rw-r--r-- | net/khttpd/security.c | 2 | ||||
| -rw-r--r-- | net/khttpd/sysctl.c | 4 | ||||
| -rw-r--r-- | net/khttpd/userspace.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/net/khttpd/misc.c b/net/khttpd/misc.c index b459b51fe..b5a2f3fd6 100644 --- a/net/khttpd/misc.c +++ b/net/khttpd/misc.c @@ -26,7 +26,7 @@ General functions #include <linux/ctype.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/sched.h> #include <linux/skbuff.h> diff --git a/net/khttpd/rfc.c b/net/khttpd/rfc.c index ff5e25451..c2629682a 100644 --- a/net/khttpd/rfc.c +++ b/net/khttpd/rfc.c @@ -28,7 +28,7 @@ RFC related functions (headers and stuff) #include <linux/ctype.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/sched.h> #include <linux/skbuff.h> diff --git a/net/khttpd/rfc_time.c b/net/khttpd/rfc_time.c index 8672cce7c..4fd267885 100644 --- a/net/khttpd/rfc_time.c +++ b/net/khttpd/rfc_time.c @@ -27,7 +27,7 @@ Functions related to time: #include <linux/time.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/ctype.h> diff --git a/net/khttpd/security.c b/net/khttpd/security.c index 792abd083..f54e6e960 100644 --- a/net/khttpd/security.c +++ b/net/khttpd/security.c @@ -27,7 +27,7 @@ Permissions/Security functions #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/sched.h> #include <linux/skbuff.h> diff --git a/net/khttpd/sysctl.c b/net/khttpd/sysctl.c index 244eb76db..4352b92e4 100644 --- a/net/khttpd/sysctl.c +++ b/net/khttpd/sysctl.c @@ -25,7 +25,7 @@ Sysctl interface #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/sched.h> #include <linux/skbuff.h> @@ -259,7 +259,7 @@ void EndSysctl(void) static int proc_dosecurestring(ctl_table *table, int write, struct file *filp, void *buffer, size_t *lenp) { - int len; + size_t len; char *p, c=0; char String[256]; diff --git a/net/khttpd/userspace.c b/net/khttpd/userspace.c index 9c05d4788..9c7843996 100644 --- a/net/khttpd/userspace.c +++ b/net/khttpd/userspace.c @@ -35,7 +35,7 @@ Return value: #include <linux/kernel.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/net.h> #include <linux/sched.h> #include <linux/skbuff.h> |