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

11 files changed, 22 insertions, 13 deletions

diff --git a/drivers/ide/hd.c b/drivers/ide/hd.c
index bed5f6210b54..e49dd0b9c1f5 100644
--- a/drivers/ide/hd.c
+++ b/drivers/ide/hd.c
@@ -36,7 +36,7 @@
 #include <linux/kernel.h>
 #include <linux/hdreg.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/mc146818rtc.h> /* CMOS defines */
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index c727cb889bc2..ef46e91ed286 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -14,7 +14,7 @@
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/errno.h>
 #include <linux/hdreg.h>
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 8528dc8d3904..16b0ade47f3c 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -302,7 +302,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/cdrom.h>
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index bf4350f73264..4a199ca71912 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -19,7 +19,7 @@
     are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
 
     Alternatively, the contents of this file may be used under the
-    terms of the GNU Public License version 2 (the "GPL"), in which
+    terms of the GNU General Public License version 2 (the "GPL"), in which
     case the provisions of the GPL are applicable instead of the
     above.  If you wish to allow the use of your version of this file
     only under the terms of the GPL and not to allow others to use
@@ -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/ioport.h>
@@ -95,7 +95,7 @@ static void ide_release(u_long arg);
 static int ide_event(event_t event, int priority,
 		     event_callback_args_t *args);
 
-static dev_info_t dev_info = "ide_cs";
+static dev_info_t dev_info = "ide-cs";
 
 static dev_link_t *ide_attach(void);
 static void ide_detach(dev_link_t *);
@@ -387,6 +387,11 @@ void ide_release(u_long arg)
 	ide_unregister(info->hd);
 	MOD_DEC_USE_COUNT;
     }
+
+    request_region(link->io.BasePort1, link->io.NumPorts1,"ide-cs");
+    if (link->io.NumPorts2)
+	request_region(link->io.BasePort2, link->io.NumPorts2,"ide-cs");
+    
     info->ndev = 0;
     link->dev = NULL;
     
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 08cee052a5c3..d246487e9256 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -44,7 +44,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
 
diff --git a/drivers/ide/ide-features.c b/drivers/ide/ide-features.c
index 2dfef8bee0d5..80a28c9631a6 100644
--- a/drivers/ide/ide-features.c
+++ b/drivers/ide/ide-features.c
@@ -27,7 +27,7 @@
 #include <linux/errno.h>
 #include <linux/genhd.h>
 #include <linux/blkpg.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
@@ -189,6 +189,10 @@ int ide_driveid_update (ide_drive_t *drive)
 	__cli();		/* local CPU only; some systems need this */
 	SELECT_MASK(HWIF(drive), drive, 0);
 	id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
+	if (!id) {
+		__restore_flags(flags);	/* local CPU only */
+		return 0;
+	}
 	ide_input_data(drive, id, SECTOR_WORDS);
 	(void) GET_STAT();	/* clear drive IRQ */
 	ide__sti();		/* local CPU only */
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index b6258aad80f5..52343a5f3e82 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -45,7 +45,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/cdrom.h>
 #include <linux/ide.h>
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4ade9d555b9d..8b3a37914e49 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -40,7 +40,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/spinlock.h>
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 0e7a23994c7b..774594bbc746 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -399,7 +399,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
 #include <linux/smp_lock.h>
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 95640895a22b..5dd08aea728d 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -140,7 +140,7 @@
 #include <linux/errno.h>
 #include <linux/genhd.h>
 #include <linux/blkpg.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #ifndef MODULE
 #include <linux/init.h>
 #endif /* MODULE */
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c
index a842a3287466..4976e49dc2ac 100644
--- a/drivers/ide/rapide.c
+++ b/drivers/ide/rapide.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/errno.h>
 #include <linux/ide.h>