From b036b05d9ad0ba367b6c99a046364ec912416f85 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 28 Jul 2018 19:01:17 +0200
Subject: device: Fix d_mmap type

* device/conf.h (dev_ops): Make d_mmap return vm_offset_t instead of
int.
(nomap): Update accordingly.
* device/blkio.c (block_io_mmap): Likewise.
* device/blkio.h (block_io_mmap): Likewise.
* device/dev_name.c (nomap): Likewise.
* i386/i386at/kd.c (kdmmap): Likewise.
* i386/i386at/kd.h (kdmmap): Likewise.
* i386/i386at/mem.c (memmmap): Likewise.
* i386/i386at/mem.h (memmmap): Likewise.
* i386/i386at/model_dep.c (timemmap): Likewise.
* i386/i386at/model_dep.h (timemmap): Likewise.
---
 i386/i386/thread.h      | 1 -
 i386/i386at/kd.c        | 2 +-
 i386/i386at/kd.h        | 2 +-
 i386/i386at/mem.c       | 2 +-
 i386/i386at/mem.h       | 2 +-
 i386/i386at/model_dep.c | 2 +-
 i386/i386at/model_dep.h | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'i386')

diff --git a/i386/i386/thread.h b/i386/i386/thread.h
index 3514de37..bae61e31 100644
--- a/i386/i386/thread.h
+++ b/i386/i386/thread.h
@@ -40,7 +40,6 @@
 
 #include <kern/lock.h>
 
-//#include <i386/tss.h>
 #include "gdt.h"
 
 /*
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index f3ada21c..8e9222a0 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -545,7 +545,7 @@ io_req_t uio;
  */
 
 /*ARGSUSED*/
-int
+vm_offset_t
 kdmmap(dev, off, prot)
 	dev_t dev;
 	vm_offset_t off;
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index 6008608f..6f425ae9 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -771,7 +771,7 @@ extern io_return_t kdsetstat(
 	mach_msg_type_number_t	count);
 
 extern int kdportdeath(dev_t dev, mach_port_t port);
-extern int kdmmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
+extern vm_offset_t kdmmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
 
 boolean_t kdcheckmagic(Scancode scancode);
 
diff --git a/i386/i386at/mem.c b/i386/i386at/mem.c
index eac2549f..61143185 100644
--- a/i386/i386at/mem.c
+++ b/i386/i386at/mem.c
@@ -30,7 +30,7 @@
 /* This provides access to any memory that is not main RAM */
 
 /*ARGSUSED*/
-int
+vm_offset_t
 memmmap(dev, off, prot)
 dev_t		dev;
 vm_offset_t	off;
diff --git a/i386/i386at/mem.h b/i386/i386at/mem.h
index 0bc85ea4..a5b4aefe 100644
--- a/i386/i386at/mem.h
+++ b/i386/i386at/mem.h
@@ -19,6 +19,6 @@
 #ifndef _MEM_H_
 #define _MEM_H_
 
-extern int memmmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
+extern vm_offset_t memmmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
 
 #endif /* _MEM_H_ */
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index feda8c33..08c9238c 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -643,7 +643,7 @@ void c_boot_entry(vm_offset_t bi)
 #include <vm/pmap.h>
 #include <mach/time_value.h>
 
-int
+vm_offset_t
 timemmap(dev, off, prot)
 	dev_t dev;
 	vm_offset_t off;
diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h
index 47551b85..d47378a1 100644
--- a/i386/i386at/model_dep.h
+++ b/i386/i386at/model_dep.h
@@ -30,7 +30,7 @@ extern vm_offset_t int_stack_top, int_stack_base;
 /* Check whether P points to the interrupt stack.  */
 #define ON_INT_STACK(P)	(((P) & ~(KERNEL_STACK_SIZE-1)) == int_stack_base)
 
-extern int timemmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
+extern vm_offset_t timemmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
 
 void inittodr(void);
 
-- 
cgit v1.2.3