Merge with Linux 2.4.0-pre3-test6.

5 files changed, 9 insertions, 8 deletions

diff --git a/drivers/block/lvm.c b/drivers/block/lvm.c
index f5c2bb1e4..1e2a21cf1 100644
--- a/drivers/block/lvm.c
+++ b/drivers/block/lvm.c
@@ -165,6 +165,8 @@ static char *lvm_short_version = "version 0.8final  (15/02/2000)";
 #include <linux/kerneld.h>
 #endif
 
+#define LOCAL_END_REQUEST
+
 #include <linux/blk.h>
 #include <linux/blkpg.h>
 
diff --git a/drivers/block/md.c b/drivers/block/md.c
index 3fa5e5318..058c001c7 100644
--- a/drivers/block/md.c
+++ b/drivers/block/md.c
@@ -496,7 +496,7 @@ static int alloc_array_sb (mddev_t * mddev)
 	mddev->sb = (mdp_super_t *) __get_free_page (GFP_KERNEL);
 	if (!mddev->sb)
 		return -ENOMEM;
-	md_clear_page((unsigned long)mddev->sb);
+	md_clear_page(mddev->sb);
 	return 0;
 }
 
@@ -510,7 +510,7 @@ static int alloc_disk_sb (mdk_rdev_t * rdev)
 		printk (OUT_OF_MEM);
 		return -EINVAL;
 	}
-	md_clear_page((unsigned long)rdev->sb);
+	md_clear_page(rdev->sb);
 
 	return 0;
 }
diff --git a/drivers/block/raid0.c b/drivers/block/raid0.c
index 32821d936..f06ddc355 100644
--- a/drivers/block/raid0.c
+++ b/drivers/block/raid0.c
@@ -120,7 +120,7 @@ static int create_strip_zones (mddev_t *mddev)
 
 static int raid0_run (mddev_t *mddev)
 {
-	int cur=0, i=0, size, zone0_size, nb_zone;
+	unsigned long cur=0, i=0, size, zone0_size, nb_zone;
 	raid0_conf_t *conf;
 
 	MOD_INC_USE_COUNT;
@@ -142,11 +142,11 @@ static int raid0_run (mddev_t *mddev)
 	printk("raid0 : conf->smallest->size is %d blocks.\n", conf->smallest->size);
 	nb_zone = md_size[mdidx(mddev)]/conf->smallest->size +
 			(md_size[mdidx(mddev)] % conf->smallest->size ? 1 : 0);
-	printk("raid0 : nb_zone is %d.\n", nb_zone);
+	printk("raid0 : nb_zone is %ld.\n", nb_zone);
 	conf->nr_zones = nb_zone;
 
-	printk("raid0 : Allocating %d bytes for hash.\n",
-				sizeof(struct raid0_hash)*nb_zone);
+	printk("raid0 : Allocating %ld bytes for hash.\n",
+				nb_zone*sizeof(struct raid0_hash));
 
 	conf->hash_table = vmalloc (sizeof (struct raid0_hash)*nb_zone);
 	if (!conf->hash_table)
diff --git a/drivers/block/raid1.c b/drivers/block/raid1.c
index 69d03feca..6748c8016 100644
--- a/drivers/block/raid1.c
+++ b/drivers/block/raid1.c
@@ -551,7 +551,6 @@ static int raid1_make_request (request_queue_t *q, mddev_t *mddev, int rw,
 	int disks = MD_SB_DISKS;
 	int i, sum_bhs = 0, sectors;
 	struct mirror_info *mirror;
-	DECLARE_WAITQUEUE(wait, current);
 
 	if (!buffer_locked(bh))
 		BUG();
diff --git a/drivers/block/raid5.c b/drivers/block/raid5.c
index e7bf85d08..116be21a1 100644
--- a/drivers/block/raid5.c
+++ b/drivers/block/raid5.c
@@ -1674,7 +1674,7 @@ static int __check_consistency (mddev_t *mddev, int row)
 	tmp->b_data = (char *)page_address(tmp->b_page);
 	if (!tmp->b_data)
 		goto out;
-	md_clear_page((unsigned long)tmp->b_data);
+	md_clear_page(tmp->b_data);
 	memset(bh, 0, MD_SB_DISKS * sizeof(struct buffer_head *));
 	for (i = 0; i < conf->raid_disks; i++) {
 		dev = conf->disks[i].dev;