Merge with 2.4.0-test5 final.

7 files changed, 17 insertions, 7 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f8ec698cc..44853fbe7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -150,7 +150,6 @@ extern struct sec_size * blk_sec[MAX_BLKDEV];
 extern struct blk_dev_struct blk_dev[MAX_BLKDEV];
 extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size);
 extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size);
-extern void generic_unplug_device(void *data);
 extern void generic_make_request(request_queue_t *q, int rw,
 						struct buffer_head * bh);
 extern request_queue_t *blk_get_queue(kdev_t dev);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 050318926..a33f33768 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -193,8 +193,6 @@ extern void update_atime (struct inode *);
 
 extern void buffer_init(unsigned long);
 extern void inode_init(unsigned long);
-extern void file_table_init(void);
-extern void dcache_init(unsigned long);
 
 /* bh state bits */
 #define BH_Uptodate	0	/* 1 if the buffer contains valid data */
@@ -882,6 +880,9 @@ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
 extern int filp_close(struct file *, fl_owner_t id);
 extern char * getname(const char *);
 
+/* fs/dcache.c */
+extern void vfs_caches_init(unsigned long);
+
 #define __getname()	kmem_cache_alloc(names_cachep, SLAB_KERNEL)
 #define putname(name)	kmem_cache_free(names_cachep, (void *)(name))
 
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index e229fa2b4..8e449d0cb 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -181,10 +181,14 @@ struct hd_geometry {
 #define HDIO_GET_DMA		0x030b	/* get use-dma flag */
 #define HDIO_GET_NICE		0x030c	/* get nice flags */
 #define HDIO_GET_IDENTITY	0x030d	/* get IDE identification info */
-#define HDIO_DRIVE_CMD_AEB	0x031e
-#define HDIO_DRIVE_TASK		0x031e
+
+#define HDIO_DRIVE_RESET	0x031c	/* execute a device reset */
+#define HDIO_TRISTATE_HWIF	0x031d	/* execute a channel tristate */
+#define HDIO_DRIVE_TASK		0x031e	/* execute task and special drive command */
 #define HDIO_DRIVE_CMD		0x031f	/* execute a special drive command */
 
+#define HDIO_DRIVE_CMD_AEB	HDIO_DRIVE_TASK
+
 /* hd/ide ctl's that pass (arg) non-ptr values are numbered 0x032n/0x033n */
 #define HDIO_SET_MULTCOUNT	0x0321	/* change IDE blockmode */
 #define HDIO_SET_UNMASKINTR	0x0322	/* permit other irqs during I/O */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 13876daf5..e00d44760 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -143,6 +143,7 @@ typedef unsigned char	byte;	/* used everywhere */
 
 #define GET_ERR()		IN_BYTE(IDE_ERROR_REG)
 #define GET_STAT()		IN_BYTE(IDE_STATUS_REG)
+#define GET_ALTSTAT()		IN_BYTE(IDE_CONTROL_REG)
 #define OK_STAT(stat,good,bad)	(((stat)&((good)|(bad)))==(good))
 #define BAD_R_STAT		(BUSY_STAT   | ERR_STAT)
 #define BAD_W_STAT		(BAD_R_STAT  | WRERR_STAT)
@@ -341,6 +342,7 @@ typedef struct ide_drive_s {
 	int		lun;		/* logical unit */
 	int		crc_count;	/* crc counter to reduce drive speed */
 	byte		quirk_list;	/* drive is considered quirky if set for a specific host */
+	byte		suspend_reset;	/* drive suspend mode flag, soft-reset recovers */
 	byte		init_speed;	/* transfer rate set at boot */
 	byte		current_speed;	/* current transfer rate set */
 	byte		dn;		/* now wide spread use */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a53a165b1..fb2175942 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -420,6 +420,7 @@
 #define PCI_DEVICE_ID_MOTOROLA_CPX8216	0x4806
 
 #define PCI_VENDOR_ID_PROMISE		0x105a
+#define PCI_DEVICE_ID_PROMISE_20265	0x0d30
 #define PCI_DEVICE_ID_PROMISE_20267	0x4d30
 #define PCI_DEVICE_ID_PROMISE_20246	0x4d33
 #define PCI_DEVICE_ID_PROMISE_20262	0x4d38
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 9f722b49e..08d2a1b78 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -212,13 +212,12 @@ struct mddev_s
 	md_wait_queue_head_t		recovery_wait;
 
 	struct md_list_head		all_mddevs;
-	request_queue_t			queue;
 };
 
 struct mdk_personality_s
 {
 	char *name;
-	int (*make_request)(request_queue_t *q, mddev_t *mddev, int rw, struct buffer_head * bh);
+	int (*make_request)(mddev_t *mddev, int rw, struct buffer_head * bh);
 	int (*run)(mddev_t *mddev);
 	int (*stop)(mddev_t *mddev);
 	int (*status)(char *page, mddev_t *mddev);
diff --git a/include/linux/slab.h b/include/linux/slab.h
index ace3e2863..9b255c3cd 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -69,6 +69,10 @@ extern int slabinfo_write_proc(struct file *file, const char *buffer,
 extern kmem_cache_t	*vm_area_cachep;
 extern kmem_cache_t	*mm_cachep;
 extern kmem_cache_t	*names_cachep;
+extern kmem_cache_t	*files_cachep;
+extern kmem_cache_t	*filp_cachep;
+extern kmem_cache_t	*dquot_cachep;
+extern kmem_cache_t	*bh_cachep;
 
 #endif	/* __KERNEL__ */