diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
| commit | c8ebfc888f9ee93f2dc7cd62b3be66263755d99a (patch) | |
| tree | f449a3433c022ed8fd9aaa8f291a1b4e354fd5b9 /ipc | |
| parent | 5d12a58c4049a4839abbbdf87dd189505513b1b6 (diff) | |
| download | history-c8ebfc888f9ee93f2dc7cd62b3be66263755d99a.tar.gz | |
v2.4.1.2 -> v2.4.1.3
- Jens: better ordering of requests when unable to merge
- Neil Brown: make md work as a module again (we cannot autodetect
in modules, not enough background information)
- Neil Brown: raid5 SMP locking cleanups
- Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
dentry leak fix
- maestro3 shutdown fix
- fix dcache hash calculation that could cause bad hashes under certain
circumstances (Dean Gaudet)
- David Miller: networking and sparc updates
- Jeff Garzik: include file cleanups
- Andy Grover: ACPI update
- Coda-fs error return fixes
- rth: alpha Jensen update
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/msg.c | 2 | ||||
| -rw-r--r-- | ipc/sem.c | 2 | ||||
| -rw-r--r-- | ipc/shm.c | 2 | ||||
| -rw-r--r-- | ipc/util.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index de2c406b975d41..41f7dbcbe8828d 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -16,7 +16,7 @@ */ #include <linux/config.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/msg.h> #include <linux/spinlock.h> #include <linux/init.h> diff --git a/ipc/sem.c b/ipc/sem.c index 203418a8abb4fc..0ef4113ccba061 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -56,7 +56,7 @@ */ #include <linux/config.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/init.h> #include <linux/proc_fs.h> diff --git a/ipc/shm.c b/ipc/shm.c index 71e22cd58d29e9..b6558a8b5c93c2 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -16,7 +16,7 @@ */ #include <linux/config.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/shm.h> #include <linux/init.h> #include <linux/file.h> diff --git a/ipc/util.c b/ipc/util.c index 6e1158be2842a7..b891e7775ac525 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -17,7 +17,7 @@ #include <linux/msg.h> #include <linux/smp_lock.h> #include <linux/vmalloc.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/highuid.h> #if defined(CONFIG_SYSVIPC) |