From dbbf1dd7751923e5bd81de341688ff3d2bc6e08c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 1 Oct 2015 21:43:54 +0100 Subject: [PATCH] blkdev: fix (void *) arithmetic --- Kernel/dev/blkdev.h | 2 +- Kernel/dev/mbr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/dev/blkdev.h b/Kernel/dev/blkdev.h index ef00875b..31f9dffe 100644 --- a/Kernel/dev/blkdev.h +++ b/Kernel/dev/blkdev.h @@ -22,7 +22,7 @@ typedef struct { * so let's make good use of every advantage we can from it. */ struct blkparam { /* do not change the order without adjusting BLKPARAM_*_OFFSET macros below */ - void *addr; /* address for transfer buffer */ + uint8_t *addr; /* address for transfer buffer */ uint8_t is_user; /* 0: kernel 1: user 2: swap */ uint8_t swap_page; /* page to pass to map_swap */ blkdev_t *blkdev; /* active block device */ diff --git a/Kernel/dev/mbr.c b/Kernel/dev/mbr.c index 0b6b8f5c..0a421819 100644 --- a/Kernel/dev/mbr.c +++ b/Kernel/dev/mbr.c @@ -36,7 +36,7 @@ void mbr_parse(char letter) blk_op.is_read = true; blk_op.is_user = false; - blk_op.addr = br; + blk_op.addr = (uint8_t *)br; blk_op.lba = 0; do{ -- 2.34.1