Merge with Linux 2.4.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 c8f72c813..1df06d59d 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 688cbf9bb..917fa76eb 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 aec36f7cc..b3914a1b1 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 6096d0153..490b4659b 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 88a9ddc77..f885584f5 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 a8d7a707e..d699f5dab 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 b7b541478..701bf38cf 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 16a35df30..a14b5ac62 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 686d540d9..4bd5dd4b4 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>