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

76 files changed, 86 insertions, 76 deletions

diff --git a/drivers/char/acquirewdt.c b/drivers/char/acquirewdt.c
index 272296b69479..a58e43e86f7f 100644
--- a/drivers/char/acquirewdt.c
+++ b/drivers/char/acquirewdt.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <asm/io.h>
diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
index ccd53dacce7b..399c6f118cde 100644
--- a/drivers/char/agp/agpgart_be.c
+++ b/drivers/char/agp/agpgart_be.c
@@ -32,7 +32,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/pci.h>
 #include <linux/init.h>
diff --git a/drivers/char/agp/agpgart_fe.c b/drivers/char/agp/agpgart_fe.c
index d16c62a22d8e..af15aa8a7c6a 100644
--- a/drivers/char/agp/agpgart_fe.c
+++ b/drivers/char/agp/agpgart_fe.c
@@ -33,7 +33,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/errno.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/pci.h>
 #include <linux/init.h>
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index fdcfe7805d4f..0504e0d141e9 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -85,7 +85,7 @@ static char *serial_version = "4.30";
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 63f26cc0fdfb..2b3f282d00df 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -22,7 +22,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/char/busmouse.c b/drivers/char/busmouse.c
index 9a983bb3e3bf..fb016439c73f 100644
--- a/drivers/char/busmouse.c
+++ b/drivers/char/busmouse.c
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/poll.h>
diff --git a/drivers/char/console.c b/drivers/char/console.c
index 0285eab79d24..2697cf5a6f36 100644
--- a/drivers/char/console.c
+++ b/drivers/char/console.c
@@ -79,7 +79,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/console.h>
diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
index 272074936ed3..bf55df922e45 100644
--- a/drivers/char/consolemap.c
+++ b/drivers/char/consolemap.c
@@ -14,8 +14,9 @@
 #include <linux/kd.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/tty.h>
 #include <asm/uaccess.h>
 #include <linux/consolemap.h>
 #include <linux/console_struct.h>
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 535566b6352d..7de536f7708b 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -25,7 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/version.h>
-#include <linux/malloc.h>	/* for kmalloc() and kfree() */
+#include <linux/slab.h>	/* for kmalloc() and kfree() */
 #include <linux/sched.h>	/* for struct wait_queue etc */
 #include <linux/major.h>
 #include <linux/types.h>
diff --git a/drivers/char/dz.c b/drivers/char/dz.c
index dd2b50d8cc8b..ff7627098d51 100644
--- a/drivers/char/dz.c
+++ b/drivers/char/dz.c
@@ -33,7 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h> 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/major.h>
 #include <linux/param.h>
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 6e575c3dd4b0..f519312205b8 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -61,7 +61,7 @@
 #include <asm/bitops.h>
 
 #include <asm/dma.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 
 #include <linux/hayesesp.h>
diff --git a/drivers/char/ftape/lowlevel/ftape-buffer.c b/drivers/char/ftape/lowlevel/ftape-buffer.c
index 02fe29dac1cf..a18b8681768f 100644
--- a/drivers/char/ftape/lowlevel/ftape-buffer.c
+++ b/drivers/char/ftape/lowlevel/ftape-buffer.c
@@ -25,7 +25,7 @@
  */
 
 #include <asm/segment.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/wrapper.h>
diff --git a/drivers/char/ftape/zftape/zftape-buffers.c b/drivers/char/ftape/zftape/zftape-buffers.c
index f3dace343a9e..58197e42918c 100644
--- a/drivers/char/ftape/zftape/zftape-buffers.c
+++ b/drivers/char/ftape/zftape/zftape-buffers.c
@@ -26,7 +26,7 @@
 
 #include <linux/errno.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <asm/segment.h>
 
 #include <linux/zftape.h>
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index a57e3abc1967..1f8e4edaab07 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/signal.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
diff --git a/drivers/char/ftape/zftape/zftape-vtbl.c b/drivers/char/ftape/zftape/zftape-vtbl.c
index e4804ea2edc5..aa64ca7d1385 100644
--- a/drivers/char/ftape/zftape/zftape-vtbl.c
+++ b/drivers/char/ftape/zftape/zftape-vtbl.c
@@ -30,7 +30,7 @@
 
 #include <linux/errno.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <asm/segment.h>
 
 #include <linux/zftape.h>
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index a5e3adca6f06..7cc4acb0067a 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -75,7 +75,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/wait.h>
 
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index bd6caa775cfd..ea4686691ec5 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -28,8 +28,9 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/cdk.h>
diff --git a/drivers/char/joystick/a3d.c b/drivers/char/joystick/a3d.c
index bd17f8de2c57..09642a9e7289 100644
--- a/drivers/char/joystick/a3d.c
+++ b/drivers/char/joystick/a3d.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/adi.c b/drivers/char/joystick/adi.c
index a2f68d74eb05..5bdf269fc8b6 100644
--- a/drivers/char/joystick/adi.c
+++ b/drivers/char/joystick/adi.c
@@ -34,7 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/analog.c b/drivers/char/joystick/analog.c
index dbd46fb7e774..a9f5a0b0dc6c 100644
--- a/drivers/char/joystick/analog.c
+++ b/drivers/char/joystick/analog.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/cobra.c b/drivers/char/joystick/cobra.c
index f059a2ff6c42..d71ac96ac368 100644
--- a/drivers/char/joystick/cobra.c
+++ b/drivers/char/joystick/cobra.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/gameport.c b/drivers/char/joystick/gameport.c
index 15ef908a6727..d3cb6422e659 100644
--- a/drivers/char/joystick/gameport.c
+++ b/drivers/char/joystick/gameport.c
@@ -35,7 +35,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/isapnp.h>
 #include <linux/stddef.h>
 #include <linux/delay.h>
diff --git a/drivers/char/joystick/gf2k.c b/drivers/char/joystick/gf2k.c
index cad8be16bd11..5ec0e7f6db64 100644
--- a/drivers/char/joystick/gf2k.c
+++ b/drivers/char/joystick/gf2k.c
@@ -32,7 +32,7 @@
 
 #include <linux/delay.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/grip.c b/drivers/char/joystick/grip.c
index 4cedd7892ac0..3d9742b33da4 100644
--- a/drivers/char/joystick/grip.c
+++ b/drivers/char/joystick/grip.c
@@ -33,7 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
 
diff --git a/drivers/char/joystick/iforce.c b/drivers/char/joystick/iforce.c
index af8adaed17dc..124edb321d11 100644
--- a/drivers/char/joystick/iforce.c
+++ b/drivers/char/joystick/iforce.c
@@ -29,7 +29,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/interact.c b/drivers/char/joystick/interact.c
index 7104e5d49e8d..267122804445 100644
--- a/drivers/char/joystick/interact.c
+++ b/drivers/char/joystick/interact.c
@@ -34,7 +34,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/lightning.c b/drivers/char/joystick/lightning.c
index 69dfd11121cb..c05c90021626 100644
--- a/drivers/char/joystick/lightning.c
+++ b/drivers/char/joystick/lightning.c
@@ -38,7 +38,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #define L4_PORT			0x201
 #define L4_SELECT_ANALOG	0xa4
diff --git a/drivers/char/joystick/magellan.c b/drivers/char/joystick/magellan.c
index e8c77f48e14b..2867a3a1855a 100644
--- a/drivers/char/joystick/magellan.c
+++ b/drivers/char/joystick/magellan.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/init.h>
diff --git a/drivers/char/joystick/ns558.c b/drivers/char/joystick/ns558.c
index 36c5d9f9e22a..a4b26a0830fd 100644
--- a/drivers/char/joystick/ns558.c
+++ b/drivers/char/joystick/ns558.c
@@ -38,7 +38,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/isapnp.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
diff --git a/drivers/char/joystick/serport.c b/drivers/char/joystick/serport.c
index 453e674d7032..14c6537aa43a 100644
--- a/drivers/char/joystick/serport.c
+++ b/drivers/char/joystick/serport.c
@@ -33,7 +33,7 @@
 
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/serio.h>
diff --git a/drivers/char/joystick/sidewinder.c b/drivers/char/joystick/sidewinder.c
index ae31265cbbe1..1ba4123053e8 100644
--- a/drivers/char/joystick/sidewinder.c
+++ b/drivers/char/joystick/sidewinder.c
@@ -33,7 +33,7 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
diff --git a/drivers/char/joystick/spaceball.c b/drivers/char/joystick/spaceball.c
index 8e2936f73e34..e6aa5f094d1d 100644
--- a/drivers/char/joystick/spaceball.c
+++ b/drivers/char/joystick/spaceball.c
@@ -35,7 +35,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/spaceorb.c b/drivers/char/joystick/spaceorb.c
index 866e1ba50a52..4c595fdce973 100644
--- a/drivers/char/joystick/spaceorb.c
+++ b/drivers/char/joystick/spaceorb.c
@@ -34,7 +34,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/drivers/char/joystick/tmdc.c b/drivers/char/joystick/tmdc.c
index f356f7dd5c2c..611ae962a92c 100644
--- a/drivers/char/joystick/tmdc.c
+++ b/drivers/char/joystick/tmdc.c
@@ -36,7 +36,7 @@
 
 #include <linux/delay.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/gameport.h>
diff --git a/drivers/char/joystick/warrior.c b/drivers/char/joystick/warrior.c
index 7000b8560b92..d84f2950e9f3 100644
--- a/drivers/char/joystick/warrior.c
+++ b/drivers/char/joystick/warrior.c
@@ -32,7 +32,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/init.h>
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 5a590422f84a..1c8f7663027e 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -121,7 +121,7 @@
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 71d833b36528..7aaa88f23c1f 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -13,12 +13,13 @@
 #include <linux/miscdevice.h>
 #include <linux/tpqic02.h>
 #include <linux/ftape.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mman.h>
 #include <linux/random.h>
 #include <linux/init.h>
 #include <linux/raw.h>
+#include <linux/tty.h>
 #include <linux/capability.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 465fed249e36..1da352fc4d6f 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -41,7 +41,7 @@
 #include <linux/miscdevice.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/stat.h>
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 3427c1421e31..130d53301f53 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -96,7 +96,7 @@
 
 #include <linux/poll.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/errno.h>
 #include <linux/string.h>	/* used in new tty drivers */
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index 8a825753a333..215988d59622 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -51,7 +51,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/errno.h>
 #include <linux/string.h>   /* used in new tty drivers */
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index c2ae319af99d..66124475aa80 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -38,7 +38,7 @@
 #include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/poll.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index bd7efe8461fb..1086559df069 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -94,7 +94,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <linux/mc146818rtc.h>
@@ -481,7 +481,8 @@ static void pc_set_checksum( void )
 #ifdef CONFIG_PROC_FS
 
 static char *floppy_types[] = {
-	"none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M", "3.5'' 2.88M"
+	"none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M",
+	"3.5'' 2.88M", "3.5'' 2.88M"
 };
 
 static char *gfx_types[] = {
diff --git a/drivers/char/pc_keyb.c b/drivers/char/pc_keyb.c
index 4a77583256a8..35e4e132831d 100644
--- a/drivers/char/pc_keyb.c
+++ b/drivers/char/pc_keyb.c
@@ -29,7 +29,7 @@
 #include <linux/random.h>
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/kbd_kern.h>
 #include <linux/smp_lock.h>
 
diff --git a/drivers/char/pcmcia/serial_cb.c b/drivers/char/pcmcia/serial_cb.c
index f959b9c40153..2efbc2459166 100644
--- a/drivers/char/pcmcia/serial_cb.c
+++ b/drivers/char/pcmcia/serial_cb.c
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
diff --git a/drivers/char/pcmcia/serial_cs.c b/drivers/char/pcmcia/serial_cs.c
index af25aa9e9caa..68597aa9a161 100644
--- a/drivers/char/pcmcia/serial_cs.c
+++ b/drivers/char/pcmcia/serial_cs.c
@@ -36,7 +36,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/tty.h>
diff --git a/drivers/char/pcwd.c b/drivers/char/pcwd.c
index 2b4a71546c9f..9a593a7baedc 100644
--- a/drivers/char/pcwd.c
+++ b/drivers/char/pcwd.c
@@ -53,7 +53,7 @@
 #include <linux/kernel.h>
 #include <linux/wait.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c
index 19c5f8416e0e..794f6bebd485 100644
--- a/drivers/char/pcxx.c
+++ b/drivers/char/pcxx.c
@@ -63,7 +63,7 @@
 #include <linux/delay.h>
 #include <linux/serial.h>
 #include <linux/tty_driver.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/version.h>
 
diff --git a/drivers/char/q40_keyb.c b/drivers/char/q40_keyb.c
index 22c981b79aa1..02fc307664a0 100644
--- a/drivers/char/q40_keyb.c
+++ b/drivers/char/q40_keyb.c
@@ -21,7 +21,7 @@
 #include <linux/random.h>
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #include <asm/keyboard.h>
 #include <asm/bitops.h>
diff --git a/drivers/char/qpmouse.c b/drivers/char/qpmouse.c
index 922f56a0c4d0..d3e606874e49 100644
--- a/drivers/char/qpmouse.c
+++ b/drivers/char/qpmouse.c
@@ -31,7 +31,7 @@
 #include <linux/fcntl.h>
 #include <linux/errno.h>
 #include <linux/timer.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/miscdevice.h>
 #include <linux/random.h>
 #include <linux/poll.h>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index bbd5aff21e3a..df2d53f2b02a 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -240,7 +240,7 @@
 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/poll.h>
 #include <linux/init.h>
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 6b0e3d298adc..5b1ae925c826 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -56,7 +56,7 @@
 #include <linux/tqueue.h>
 #include <linux/version.h>
 #include <linux/pci.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/miscdevice.h>
 
 #include <linux/compatmac.h>
diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c
index d5ab5ba02f6c..c1e2ca81899f 100644
--- a/drivers/char/rio/rioboot.c
+++ b/drivers/char/rio/rioboot.c
@@ -36,7 +36,7 @@ static char *_rioboot_c_sccs_ = "@(#)rioboot.c	1.3";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 3a330a07c51e..f651ed9e8ac5 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -36,8 +36,9 @@ static char *_riocmd_c_sccs_ = "@(#)riocmd.c	1.2";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/tty.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index af61dc9972dd..4a088353a8ba 100644
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -36,7 +36,7 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c	1.3";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
index cbefdac2d989..6ab8175c7d66 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -36,7 +36,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c	1.3";
 #define __NO_VERSION__
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
index f52124b78cac..c97f88640f40 100644
--- a/drivers/char/rio/riointr.c
+++ b/drivers/char/rio/riointr.c
@@ -36,8 +36,9 @@ static char *_riointr_c_sccs_ = "@(#)riointr.c	1.2";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/tty.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
index 4ce8443c3417..069172fec3e8 100644
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -36,8 +36,9 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c	1.3";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/tty.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index ab78ddf5d1a1..b621005dc2a9 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -35,7 +35,7 @@ static char *_rioroute_c_sccs_ = "@(#)rioroute.c	1.3";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 2b82c25ad457..c4a048b7b798 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -35,7 +35,7 @@ static char *_riotable_c_sccs_ = "@(#)riotable.c	1.2";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index c9134e3fc84b..aaa7a1f32796 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -38,8 +38,9 @@ static char *_riotty_c_sccs_ = "@(#)riotty.c	1.3";
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/tty.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 5cecdde405a6..7db2405edd58 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -66,7 +66,7 @@
 #include <linux/major.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 
 #include <linux/sched.h>
diff --git a/drivers/char/sbc60xxwdt.c b/drivers/char/sbc60xxwdt.c
index 0c3deed84165..e3f35a142370 100644
--- a/drivers/char/sbc60xxwdt.c
+++ b/drivers/char/sbc60xxwdt.c
@@ -63,7 +63,7 @@
 #include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>
diff --git a/drivers/char/scan_keyb.c b/drivers/char/scan_keyb.c
index 6ba861be2615..20ac1e7e0bc2 100644
--- a/drivers/char/scan_keyb.c
+++ b/drivers/char/scan_keyb.c
@@ -16,7 +16,7 @@
 #include <linux/random.h>
 #include <linux/poll.h>
 #include <linux/miscdevice.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/kbd_kern.h>
 
 struct scan_keyboard {
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index b804a61e1f09..39cf73765faf 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -15,7 +15,7 @@
 #include <linux/tty.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/char/serial_21285.c b/drivers/char/serial_21285.c
index 16ad022bd7a4..f8541f3cfa1d 100644
--- a/drivers/char/serial_21285.c
+++ b/drivers/char/serial_21285.c
@@ -19,7 +19,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/console.h>
 
diff --git a/drivers/char/serial_amba.c b/drivers/char/serial_amba.c
index eaab7d34e626..cbd353846293 100644
--- a/drivers/char/serial_amba.c
+++ b/drivers/char/serial_amba.c
@@ -48,7 +48,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/circ_buf.h>
 #include <linux/serial.h>
diff --git a/drivers/char/sh-sci.c b/drivers/char/sh-sci.c
index c14fa8487a2d..e329bfbb13bd 100644
--- a/drivers/char/sh-sci.c
+++ b/drivers/char/sh-sci.c
@@ -29,7 +29,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #ifdef CONFIG_SERIAL_CONSOLE
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index dbd51e51a11b..6628f9d05319 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -29,8 +29,9 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/version.h> /* for linux/stallion.h */
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/cd1400.h>
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 156c683e4d5e..da09b33a6c8d 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -78,7 +78,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #include <linux/netdevice.h>
 
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 71773fa6c8db..ad9b94da2a76 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -13,6 +13,7 @@
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
+#include <linux/tty.h>
 #include <linux/mount.h>
 #include <linux/kdev_t.h>
 #include <linux/major.h>
diff --git a/drivers/char/tpqic02.c b/drivers/char/tpqic02.c
index 536942f41398..0f9be7ac5aa6 100644
--- a/drivers/char/tpqic02.c
+++ b/drivers/char/tpqic02.c
@@ -87,7 +87,7 @@
 #include <linux/ioport.h>
 #include <linux/tpqic02.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h> 
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index dff7458ae4b9..57628904e1d7 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -81,7 +81,7 @@
 #include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index d6bc4e63b521..67ed42822c79 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -31,7 +31,7 @@
 #include <linux/delay.h>
 #include <linux/tqueue.h>
 #include <linux/version.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/miscdevice.h>
 #include <linux/console.h>
 #include <linux/init.h>
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 0a085944c31f..31c4fc470999 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -19,7 +19,7 @@
 #include <linux/kd.h>
 #include <linux/vt.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/console.h>
diff --git a/drivers/char/wdt.c b/drivers/char/wdt.c
index 9600a5b17ce8..0da4f4241831 100644
--- a/drivers/char/wdt.c
+++ b/drivers/char/wdt.c
@@ -40,7 +40,7 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include "wd501p.h"
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <asm/io.h>
diff --git a/drivers/char/wdt_pci.c b/drivers/char/wdt_pci.c
index 5ff7210aeeaa..f5572a1c7a36 100644
--- a/drivers/char/wdt_pci.c
+++ b/drivers/char/wdt_pci.c
@@ -43,7 +43,7 @@
 #include <linux/watchdog.h>
 #define WDT_IS_PCI
 #include "wd501p.h"
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <asm/io.h>