Justus Winter, le Wed 12 Mar 2014 15:55:53 +0100, a écrit :
> * mach-defpager/default_pager.c (new_partition): Fix type of bsize.
> * mach-defpager/file_io.h (page_read_file_direct): Fix type of size argument.
> (page_write_file_direct): Likewise.
> * mach-defpager/setup.c (page_read_file_direct): Likewise.
> (page_write_file_direct): Likewise.
Ack.
> ---
> mach-defpager/default_pager.c | 3 ++-
> mach-defpager/file_io.h | 6 +++---
> 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 4127126..362697e 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 d0b03f3..2721412 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 080b0fa..7c1afbc 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;
> --
> 1.9.0
>
--
Samuel
<i8b4uUnderground> d-_-b
<BonyNoMore> how u make that inverted b?
<BonyNoMore> wait
<BonyNoMore> never mind
