Merge with Linu 2.4.0-test6-pre6.

5 files changed, 5 insertions, 8 deletions

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index af03cdf7b..237d7ac64 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -13,8 +13,6 @@ MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS) paride
 
 O_TARGET := block.o
-MOD_LIST_NAME	:= BLOCK_MODULES
-
 
 export-objs	:= ll_rw_blk.o blkpg.o loop.o DAC960.o md.o xor.o
 list-multi	:= lvm-mod.o
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index ed52ee2b8..47651b852 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -192,7 +192,7 @@ static int lo_send(struct loop_device *lo, char *data, int len, loff_t pos,
 			goto fail;
 		if (aops->prepare_write(file, page, offset, offset+size))
 			goto unlock;
-		kaddr = (char*)page_address(page);
+		kaddr = page_address(page);
 		if ((lo->transfer)(lo, WRITE, kaddr+offset, data, size, IV))
 			goto write_fail;
 		if (aops->commit_write(file, page, offset, offset+size))
diff --git a/drivers/block/paride/Makefile b/drivers/block/paride/Makefile
index 32e856704..9f5293530 100644
--- a/drivers/block/paride/Makefile
+++ b/drivers/block/paride/Makefile
@@ -12,7 +12,6 @@ SUB_DIRS     :=
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS)
 
-MOD_LIST_NAME := PARIDE_MODULES
 L_TARGET := paride.a
 MX_OBJS  :=
 LX_OBJS  := 
diff --git a/drivers/block/raid1.c b/drivers/block/raid1.c
index 12eb8658f..7027d2dd6 100644
--- a/drivers/block/raid1.c
+++ b/drivers/block/raid1.c
@@ -274,7 +274,7 @@ static int raid1_grow_buffers (raid1_conf_t *conf, int cnt)
 		}
 		memset(r1_bh, 0, sizeof(*r1_bh));
 		r1_bh->bh_req.b_page = page;
-		r1_bh->bh_req.b_data = (char *) page_address(page);
+		r1_bh->bh_req.b_data = page_address(page);
 		r1_bh->next_r1 = conf->freebuf;
 		conf->freebuf = r1_bh;
 		i++;
@@ -1428,7 +1428,7 @@ static int raid1_sync_request (mddev_t *mddev, unsigned long block_nr)
 		BUG();
 	if (!bh->b_data)
 		BUG();
-	if (bh->b_data != (char *) page_address(bh->b_page))
+	if (bh->b_data != page_address(bh->b_page))
 		BUG();
 	bh->b_end_io = end_sync_read;
 	bh->b_private = r1_bh;
diff --git a/drivers/block/raid5.c b/drivers/block/raid5.c
index 22a66fe2a..a6c7b39e9 100644
--- a/drivers/block/raid5.c
+++ b/drivers/block/raid5.c
@@ -257,7 +257,7 @@ static int grow_raid5_buffers(struct stripe_head *sh, int num, int b_size, int p
 		memset(bh, 0, sizeof (struct buffer_head));
 		init_waitqueue_head(&bh->b_wait);
 		page = alloc_page(priority);
-		bh->b_data = (char *) page_address(page);
+		bh->b_data = page_address(page);
 		if (!bh->b_data) {
 			kfree(bh);
 			return 1;
@@ -1671,7 +1671,7 @@ static int __check_consistency (mddev_t *mddev, int row)
 	tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
 	tmp->b_size = 4096;
 	tmp->b_page = alloc_page(GFP_KERNEL);
-	tmp->b_data = (char *)page_address(tmp->b_page);
+	tmp->b_data = page_address(tmp->b_page);
 	if (!tmp->b_data)
 		goto out;
 	md_clear_page(tmp->b_data);