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 /arch/parisc | |
| parent | 5d12a58c4049a4839abbbdf87dd189505513b1b6 (diff) | |
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 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/ccio-dma.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/iosapic.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/lba_pci.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/pci-dma.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/sba_iommu.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/parisc/mm/kmap.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/parisc/kernel/ccio-dma.c b/arch/parisc/kernel/ccio-dma.c index c8f72c813037..1df06d59d206 100644 --- a/arch/parisc/kernel/ccio-dma.c +++ b/arch/parisc/kernel/ccio-dma.c @@ -36,7 +36,7 @@ #include <linux/init.h> #include <linux/mm.h> #include <linux/spinlock.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/pci.h> diff --git a/arch/parisc/kernel/iosapic.c b/arch/parisc/kernel/iosapic.c index 688cbf9bb6b5..917fa76eb5e3 100644 --- a/arch/parisc/kernel/iosapic.c +++ b/arch/parisc/kernel/iosapic.c @@ -162,7 +162,7 @@ #include <linux/spinlock.h> #include <linux/pci.h> /* pci cfg accessor functions */ #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> /* irqaction */ #include <linux/irq.h> /* irq_region support */ diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index aec36f7ccc00..b3914a1b19dc 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -35,7 +35,7 @@ #include <linux/types.h> #include <linux/ioport.h> #include <linux/timex.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/random.h> #include <linux/interrupt.h> #include <linux/irq.h> diff --git a/arch/parisc/kernel/lba_pci.c b/arch/parisc/kernel/lba_pci.c index 6096d01531a2..490b4659bbc4 100644 --- a/arch/parisc/kernel/lba_pci.c +++ b/arch/parisc/kernel/lba_pci.c @@ -36,7 +36,7 @@ #include <linux/init.h> /* for __init and __devinit */ #include <linux/pci.h> #include <linux/ioport.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/smp_lock.h> #include <asm/byteorder.h> diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index 88a9ddc775f2..f885584f51df 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c @@ -26,7 +26,7 @@ #include <linux/pci.h> #include <linux/init.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <asm/uaccess.h> diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index a8d7a707e88b..d699f5dab009 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -19,7 +19,7 @@ #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/interrupt.h> #include <linux/reboot.h> diff --git a/arch/parisc/kernel/sba_iommu.c b/arch/parisc/kernel/sba_iommu.c index b7b5414788c0..701bf38cf1c3 100644 --- a/arch/parisc/kernel/sba_iommu.c +++ b/arch/parisc/kernel/sba_iommu.c @@ -23,7 +23,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/spinlock.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/init.h> #include <linux/mm.h> diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 16a35df3081f..a14b5ac62215 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -28,7 +28,7 @@ #include <linux/errno.h> #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <linux/ptrace.h> #include <linux/sched.h> diff --git a/arch/parisc/mm/kmap.c b/arch/parisc/mm/kmap.c index 686d540d9d3f..4bd5dd4b439a 100644 --- a/arch/parisc/mm/kmap.c +++ b/arch/parisc/mm/kmap.c @@ -7,7 +7,7 @@ #include <linux/string.h> #include <linux/pci.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <asm/uaccess.h> |