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

20 files changed, 39 insertions, 42 deletions

diff --git a/include/asm-alpha/errno.h b/include/asm-alpha/errno.h
index fd5b8fafc6f0..724f03b77fd0 100644
--- a/include/asm-alpha/errno.h
+++ b/include/asm-alpha/errno.h
@@ -139,6 +139,4 @@
 #define ENOMEDIUM	129	/* No medium found */
 #define EMEDIUMTYPE	130	/* Wrong medium type */
 
-#define EHASHCOLLISION  131     /* Number of hash collisons exceeds maximum generation counter value.  */
-
 #endif
diff --git a/include/asm-i386/errno.h b/include/asm-i386/errno.h
index d22c4472b045..7cf599f4de50 100644
--- a/include/asm-i386/errno.h
+++ b/include/asm-i386/errno.h
@@ -128,6 +128,5 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
-#define	EHASHCOLLISION	125	/* Number of hash collisons exceeds maximum generation counter value.  */
 
 #endif
diff --git a/include/asm-m68k/errno.h b/include/asm-m68k/errno.h
index 8d309d38ec70..1ee6485abd22 100644
--- a/include/asm-m68k/errno.h
+++ b/include/asm-m68k/errno.h
@@ -129,6 +129,4 @@
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
 
-#define	EHASHCOLLISION	125	/* Number of hash collisons exceeds maximum generation counter value.  */
-
 #endif /* _M68K_ERRNO_H */
diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h
index 9d076f724fd7..a05f65856228 100644
--- a/include/asm-sparc/termios.h
+++ b/include/asm-sparc/termios.h
@@ -1,4 +1,4 @@
-/* $Id: termios.h,v 1.30 1999/12/02 09:57:46 davem Exp $ */
+/* $Id: termios.h,v 1.31 2001/02/05 05:54:29 davem Exp $ */
 #ifndef _SPARC_TERMIOS_H
 #define _SPARC_TERMIOS_H
 
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index ebc5dd3ebce5..082b57ac7c17 100644
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -1,4 +1,4 @@
-/* $Id: termios.h,v 1.9 1999/12/02 09:57:53 davem Exp $ */
+/* $Id: termios.h,v 1.10 2001/02/05 05:54:29 davem Exp $ */
 #ifndef _SPARC64_TERMIOS_H
 #define _SPARC64_TERMIOS_H
 
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4fce3f847249..f5bfb4eacc32 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -82,13 +82,11 @@ typedef int acpi_dstate_t;
 /* PM_TMR masks */
 #define ACPI_TMR_VAL_EXT 0x00000100
 #define ACPI_TMR_MASK	 0x00ffffff
-#define ACPI_TMR_HZ	 3580000 /* 3.58 MHz */
+#define ACPI_TMR_HZ	 3579545 /* 3.58 MHz */
+#define ACPI_TMR_KHZ	 (ACPI_TMR_HZ / 1000)
 
-/* strangess to avoid integer overflow */
 #define ACPI_MICROSEC_TO_TMR_TICKS(val) \
-  (((val) * (ACPI_TMR_HZ / 10000)) / 100)
-#define ACPI_TMR_TICKS_TO_MICROSEC(ticks) \
-  (((ticks) * 100) / (ACPI_TMR_HZ / 10000))
+  (((val) * (ACPI_TMR_KHZ)) / 1000)
 
 /* PM2_CNT flags */
 #define ACPI_ARB_DIS 0x01
@@ -147,6 +145,9 @@ enum
 	ACPI_C1_TIME,
 	ACPI_C2_TIME,
 	ACPI_C3_TIME,
+	ACPI_C1_COUNT,
+	ACPI_C2_COUNT,
+	ACPI_C3_COUNT,
 	ACPI_S0_SLP_TYP,
 	ACPI_S1_SLP_TYP,
 	ACPI_S5_SLP_TYP,
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
index f5e795919e4e..de20ba7c3652 100644
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
@@ -17,7 +17,7 @@
 #include <linux/sched.h> 
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/wait.h>		
 #include <linux/types.h>
 #include <linux/fs.h>
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 9e9b27dfa07e..9071feeaee2f 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_ELEVATOR_H
 #define _LINUX_ELEVATOR_H
 
-#define ELEVATOR_DEBUG
-
 typedef void (elevator_fn) (struct request *, elevator_t *,
 			    struct list_head *,
 			    struct list_head *, int);
@@ -68,8 +66,9 @@ extern void elevator_init(elevator_t *, elevator_t);
 	 (s1)->rq_dev < (s2)->rq_dev)
 
 #define BHRQ_IN_ORDER(bh, rq)			\
-	(((bh)->b_rdev == (rq)->rq_dev &&	\
-	  (bh)->b_rsector < (rq)->sector))
+	((((bh)->b_rdev == (rq)->rq_dev &&	\
+	   (bh)->b_rsector < (rq)->sector)) ||	\
+	 (bh)->b_rdev < (rq)->rq_dev)
 
 static inline int elevator_request_latency(elevator_t * elevator, int rw)
 {
diff --git a/include/linux/hfs_sysdep.h b/include/linux/hfs_sysdep.h
index cefce233dc79..8239b482cc91 100644
--- a/include/linux/hfs_sysdep.h
+++ b/include/linux/hfs_sysdep.h
@@ -17,7 +17,7 @@
 #ifndef _HFS_SYSDEP_H
 #define _HFS_SYSDEP_H
 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/locks.h>
 #include <linux/fs.h>
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index eb5405d336de..de8eea018272 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -38,7 +38,7 @@ static inline void *kmap(struct page *page) { return page_address(page); }
 #define kunmap_atomic(page,idx)		kunmap(page)
 
 #define bh_kmap(bh)	((bh)->b_data)
-#define bh_kunmap(bh)	do { } while (0);
+#define bh_kunmap(bh)	do { } while (0)
 
 #endif /* CONFIG_HIGHMEM */
 
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 9d214fadc8c8..cba5d1601572 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -146,7 +146,7 @@ extern struct tasklet_head tasklet_hi_vec[NR_CPUS];
 
 #ifdef CONFIG_SMP
 #define tasklet_trylock(t) (!test_and_set_bit(TASKLET_STATE_RUN, &(t)->state))
-#define tasklet_unlock_wait(t) while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { /* NOTHING */ }
+#define tasklet_unlock_wait(t) while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { barrier(); }
 #define tasklet_unlock(t) clear_bit(TASKLET_STATE_RUN, &(t)->state)
 #else
 #define tasklet_trylock(t) 1
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index c8c807068ec7..8397578f6280 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -196,7 +196,7 @@ typedef struct {
 #include <asm/io.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/tty.h>
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index e8d101049ddb..71fc46b1a7fa 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -8,7 +8,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 /* The map stuff is very simple. You fill in your struct map_info with
    a handful of routines for accessing the device, making sure they handle
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index 7d67f410b1e0..919fc654a155 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -196,7 +196,7 @@ struct ncp_entry_info {
 
 #ifdef DEBUG_NCP_MALLOC
 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 extern int ncp_malloced;
 extern int ncp_current_malloced;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a78410716707..205abe61e428 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -565,9 +565,9 @@ static inline int pcibios_find_class (unsigned int class_code, unsigned short in
 { 	return PCIBIOS_DEVICE_NOT_FOUND; }
 
 #define _PCI_NOP(o,s,t) \
-	static inline int pcibios_##o##_config_##s## (u8 bus, u8 dfn, u8 where, t val) \
+	static inline int pcibios_##o##_config_##s (u8 bus, u8 dfn, u8 where, t val) \
 		{ return PCIBIOS_FUNC_NOT_SUPPORTED; } \
-	static inline int pci_##o##_config_##s## (struct pci_dev *dev, int where, t val) \
+	static inline int pci_##o##_config_##s (struct pci_dev *dev, int where, t val) \
 		{ return PCIBIOS_FUNC_NOT_SUPPORTED; }
 #define _PCI_NOP_ALL(o,x)	_PCI_NOP(o,byte,u8 x) \
 				_PCI_NOP(o,word,u16 x) \
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index da8f6b3dc0e0..e142bb812a6e 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -2,7 +2,7 @@
 #define _LINUX_PROC_FS_H
 
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 /*
  * The proc filesystem constants/structures
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index d46dbd51264e..93a81473ef33 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -57,9 +57,9 @@
  *
  * Buffers for the md device that arrive via make_request are attached
  * to the appropriate stripe in one of two lists linked on b_reqnext.
- * One list for read requests, one for write.  There should never be
- * more than one buffer on the two lists together, but we are not
- * guaranteed of that so we allow for more.
+ * One list (bh_read) for read requests, one (bh_write) for write.
+ * There should never be more than one buffer on the two lists
+ * together, but we are not guaranteed of that so we allow for more.
  *
  * If a buffer is on the read list when the associated cache buffer is
  * Uptodate, the data is copied into the read buffer and it's b_end_io
@@ -70,16 +70,18 @@
  * that the Uptodate bit is set.  Once they have checked that they may
  * take buffers off the read queue.
  *
- * When a buffer on the write_list is committed for write, it is
- * marked clean, copied into the cache buffer, which is then marked
- * dirty, and moved onto a third list, the written list.  Once both
- * the parity block and the cached buffer are successfully written,
- * any buffer on a written list can be returned with b_end_io.
- *
- * The write_list and read_list lists act as fifos.  They are protected by the
- * device_lock which can be claimed when a stripe_lock is held.
- * The device_lock is only for list manipulations and will only be held for a very
- * short time.  It can be claimed from interrupts.
+ * When a buffer on the write list is committed for write is it copied
+ * into the cache buffer, which is then marked dirty, and moved onto a
+ * third list, the written list (bh_written).  Once both the parity
+ * block and the cached buffer are successfully written, any buffer on
+ * a written list can be returned with b_end_io.
+ *
+ * The write list and read list both act as fifos.  The read list is
+ * protected by the device_lock.  The write and written lists are
+ * protected by the stripe lock.  The device_lock, which can be
+ * claimed while the stipe lock is held, is only for list
+ * manipulations and will only be held for a very short time.  It can
+ * be claimed from interrupts.
  *
  *
  * Stripes in the stripe cache can be on one of two lists (or on
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 277281d6d7b4..97dbc003473b 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -15,7 +15,7 @@
 
 #include <linux/types.h>
 #ifdef __KERNEL__
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/tqueue.h>
 #endif
 
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 17e48d0e937e..0213728a6d5b 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -153,7 +153,7 @@ struct sk_buff {
 /*
  *	Handling routines are only of interest to the kernel
  */
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 804f34927760..3b84c5bff809 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -276,4 +276,4 @@ static inline void fib_res_put(struct fib_result *res)
 }
 
 
-#endif  _NET_FIB_H
+#endif  /* _NET_FIB_H */