diff options
| -rw-r--r-- | mach-defpager/default_pager.c | 3 | ||||
| -rw-r--r-- | mach-defpager/file_io.h | 6 | ||||
| -rw-r--r-- | mach-defpager/setup.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c index 4127126d..362697e0 100644 --- a/mach-defpager/default_pager.c +++ b/mach-defpager/default_pager.c @@ -253,7 +253,8 @@ new_partition (const char *name, struct file_direct *fdp, { /* Filesystem block size is smaller than page size, so we must do several reads to get the whole page. */ - vm_address_t baddr, bsize; + vm_address_t baddr; + vm_size_t bsize; rc = page_read_file_direct(part->file, rsize, LINUX_PAGE_SIZE-rsize, &baddr, diff --git a/mach-defpager/file_io.h b/mach-defpager/file_io.h index d0b03f33..2721412b 100644 --- a/mach-defpager/file_io.h +++ b/mach-defpager/file_io.h @@ -57,13 +57,13 @@ struct file_direct int page_read_file_direct (struct file_direct *fdp, vm_offset_t offset, vm_size_t size, - vm_offset_t *addr, /* out */ - mach_msg_type_number_t *size_read); /* out */ + vm_offset_t *addr, /* out */ + vm_size_t *size_read); /* out */ int page_write_file_direct(struct file_direct *fdp, vm_offset_t offset, vm_offset_t addr, vm_size_t size, - vm_offset_t *size_written); /* out */ + vm_size_t *size_written); /* out */ #endif /* file_io.h */ diff --git a/mach-defpager/setup.c b/mach-defpager/setup.c index 080b0fa6..7c1afbc9 100644 --- a/mach-defpager/setup.c +++ b/mach-defpager/setup.c @@ -106,8 +106,8 @@ int page_read_file_direct (struct file_direct *fdp, vm_offset_t offset, vm_size_t size, - vm_offset_t *addr, /* out */ - mach_msg_type_number_t *size_read) /* out */ + vm_offset_t *addr, /* out */ + vm_size_t *size_read) /* out */ { struct storage_run *r; error_t err; @@ -173,7 +173,7 @@ page_write_file_direct(struct file_direct *fdp, vm_offset_t offset, vm_offset_t addr, vm_size_t size, - vm_offset_t *size_written) /* out */ + vm_size_t *size_written) /* out */ { struct storage_run *r; error_t err; |