d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed type mismatches for functions with args of type vm_prot_t and/or

Browse Source 
vm_inherit_t.  These types are smaller than ints, so the prototypes
should have used the promoted type (int) to match the old-style function
definitions.  They use just vm_prot_t and/or vm_inherit_t.  This depends
on gcc features to work.  I fixed the definitions since this is easiest.
The correct fix may be to change the small types to u_int, to optimize
for time instead of space.
This commit is contained in:
Bruce Evans 1997-08-25 22:15:31 +00:00
parent 8b6e12e27f
commit b9dcd593ff
9 changed files with 47 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/i386/ibcs2/imgact_coff.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: imgact_coff.c,v 1.24 1997/04/13 01:48:13 dyson Exp $
* $Id: imgact_coff.c,v 1.25 1997/07/20 09:39:51 bde Exp $
*/
#include <sys/param.h>
@ -58,13 +58,8 @@ extern int exec_coff_imgact __P((struct image_params *imgp));
static int load_coff_section __P((struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot));
static int
load_coff_section(vmspace, vp, offset, vmaddr, memsz, filsz, prot)
struct vmspace *vmspace;
struct vnode *vp;
vm_offset_t offset;
caddr_t vmaddr;
size_t memsz, filsz;
vm_prot_t prot;
load_coff_section(struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset,
caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot)
{
size_t map_len;
vm_offset_t map_offset;

9
sys/vm/default_pager.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: default_pager.c,v 1.11 1997/02/22 09:47:58 peter Exp $
*/
#include <sys/param.h>
@ -72,11 +72,8 @@ struct pagerops defaultpagerops = {
* no_pager_alloc just returns an initialized object.
*/
static vm_object_t
default_pager_alloc(handle, size, prot, offset)
void *handle;
register vm_size_t size;
vm_prot_t prot;
vm_ooffset_t offset;
default_pager_alloc(void *handle, vm_size_t size, vm_prot_t prot,
vm_ooffset_t offset)
{
if (handle != NULL)
panic("default_pager_alloc: handle specified");

8
sys/vm/device_pager.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)device_pager.c 8.1 (Berkeley) 6/11/93
* $Id$
* $Id: device_pager.c,v 1.25 1997/02/22 09:48:01 peter Exp $
*/
#include <sys/param.h>
@ -95,11 +95,7 @@ dev_pager_init()
}
static vm_object_t
dev_pager_alloc(handle, size, prot, foff)
void *handle;
vm_size_t size;
vm_prot_t prot;
vm_ooffset_t foff;
dev_pager_alloc(void *handle, vm_size_t size, vm_prot_t prot, vm_ooffset_t foff)
{
dev_t dev;
d_mmap_t *mapfunc;

9
sys/vm/swap_pager.c
View File

@ -39,7 +39,7 @@
* from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
*
* @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
* $Id$
* $Id: swap_pager.c,v 1.75 1997/02/22 09:48:06 peter Exp $
*/
/*
@ -280,11 +280,8 @@ swap_pager_swp_alloc(object, wait)
* we should not wait for memory as it could resulting in deadlock.
*/
static vm_object_t
swap_pager_alloc(handle, size, prot, offset)
void *handle;
register vm_size_t size;
vm_prot_t prot;
vm_ooffset_t offset;
swap_pager_alloc(void *handle, vm_size_t size, vm_prot_t prot,
vm_ooffset_t offset)
{
vm_object_t object;

8
sys/vm/vm_fault.c
View File

@ -66,7 +66,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_fault.c,v 1.68 1997/04/06 16:16:11 peter Exp $
* $Id: vm_fault.c,v 1.69 1997/05/19 14:36:54 dfr Exp $
*/
/*
@ -123,11 +123,7 @@ int vm_fault_additional_pages __P((vm_page_t, int, int, vm_page_t *, int *));
* Caller may hold no locks.
*/
int
vm_fault(map, vaddr, fault_type, fault_flags)
vm_map_t map;
vm_offset_t vaddr;
vm_prot_t fault_type;
int fault_flags;
vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags)
{
vm_object_t first_object;
vm_pindex_t first_pindex;

69
sys/vm/vm_map.c
View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_map.c,v 1.86 1997/08/18 02:06:22 dyson Exp $
* $Id: vm_map.c,v 1.87 1997/08/18 03:29:21 fsmp Exp $
*/
/*
@ -500,14 +500,9 @@ vm_map_lookup_entry(map, address, entry)
* Requires that the map be locked, and leaves it so.
*/
int
vm_map_insert(map, object, offset, start, end, prot, max, cow)
vm_map_t map;
vm_object_t object;
vm_ooffset_t offset;
vm_offset_t start;
vm_offset_t end;
vm_prot_t prot, max;
int cow;
vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max,
int cow)
{
register vm_map_entry_t new_entry;
register vm_map_entry_t prev_entry;
@ -704,15 +699,10 @@ vm_map_findspace(map, start, length, addr)
*
*/
int
vm_map_find(map, object, offset, addr, length, find_space, prot, max, cow)
vm_map_t map;
vm_object_t object;
vm_ooffset_t offset;
vm_offset_t *addr; /* IN/OUT */
vm_size_t length;
boolean_t find_space;
vm_prot_t prot, max;
int cow;
vm_map_find(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
vm_offset_t *addr, /* IN/OUT */
vm_size_t length, boolean_t find_space, vm_prot_t prot,
vm_prot_t max, int cow)
{
register vm_offset_t start;
int result, s = 0;
@ -1011,12 +1001,8 @@ vm_map_submap(map, start, end, submap)
* otherwise, only the current protection is affected.
*/
int
vm_map_protect(map, start, end, new_prot, set_max)
register vm_map_t map;
register vm_offset_t start;
register vm_offset_t end;
register vm_prot_t new_prot;
register boolean_t set_max;
vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end,
vm_prot_t new_prot, boolean_t set_max)
{
register vm_map_entry_t current;
vm_map_entry_t entry;
@ -1236,11 +1222,8 @@ vm_map_madvise(map, pmap, start, end, advise)
* child maps at the time of vm_map_fork.
*/
int
vm_map_inherit(map, start, end, new_inheritance)
register vm_map_t map;
register vm_offset_t start;
register vm_offset_t end;
register vm_inherit_t new_inheritance;
vm_map_inherit(vm_map_t map, vm_offset_t start, vm_offset_t end,
vm_inherit_t new_inheritance)
{
register vm_map_entry_t entry;
vm_map_entry_t temp_entry;
@ -1932,11 +1915,8 @@ vm_map_remove(map, start, end)
* The entire region must be allocated.
*/
boolean_t
vm_map_check_protection(map, start, end, protection)
register vm_map_t map;
register vm_offset_t start;
register vm_offset_t end;
register vm_prot_t protection;
vm_map_check_protection(vm_map_t map, vm_offset_t start, vm_offset_t end,
vm_prot_t protection)
{
register vm_map_entry_t entry;
vm_map_entry_t tmp_entry;
@ -2231,18 +2211,15 @@ vmspace_unshare(struct proc *p) {
* remain the same.
*/
int
vm_map_lookup(var_map, vaddr, fault_type, out_entry,
object, pindex, out_prot, wired, single_use)
vm_map_t *var_map; /* IN/OUT */
register vm_offset_t vaddr;
register vm_prot_t fault_type;
vm_map_entry_t *out_entry; /* OUT */
vm_object_t *object; /* OUT */
vm_pindex_t *pindex; /* OUT */
vm_prot_t *out_prot; /* OUT */
boolean_t *wired; /* OUT */
boolean_t *single_use; /* OUT */
vm_map_lookup(vm_map_t *var_map, /* IN/OUT */
vm_offset_t vaddr,
vm_prot_t fault_type,
vm_map_entry_t *out_entry, /* OUT */
vm_object_t *object, /* OUT */
vm_pindex_t *pindex, /* OUT */
vm_prot_t *out_prot, /* OUT */
boolean_t *wired, /* OUT */
boolean_t *single_use) /* OUT */
{
vm_map_t share_map;
vm_offset_t share_offset;

14
sys/vm/vm_mmap.c
View File

@ -38,7 +38,7 @@
* from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
*
* @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94
* $Id: vm_mmap.c,v 1.64 1997/06/15 23:35:32 dyson Exp $
* $Id: vm_mmap.c,v 1.65 1997/07/17 04:34:03 dyson Exp $
*/
/*
@ -872,14 +872,10 @@ munlock(p, uap, retval)
* Handle is either a vnode pointer or NULL for MAP_ANON.
*/
int
vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
register vm_map_t map;
register vm_offset_t *addr;
register vm_size_t size;
vm_prot_t prot, maxprot;
register int flags;
caddr_t handle; /* XXX should be vp */
vm_ooffset_t foff;
vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
vm_prot_t maxprot, int flags,
caddr_t handle, /* XXX should be vp */
vm_ooffset_t foff)
{
boolean_t fitit;
vm_object_t object;

10
sys/vm/vm_pager.c
View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id$
* $Id: vm_pager.c,v 1.27 1997/02/22 09:48:35 peter Exp $
*/
/*
@ -155,12 +155,8 @@ vm_pager_bufferinit()
* need to perform page-level validation (e.g. the device pager).
*/
vm_object_t
vm_pager_allocate(type, handle, size, prot, off)
objtype_t type;
void *handle;
vm_size_t size;
vm_prot_t prot;
vm_ooffset_t off;
vm_pager_allocate(objtype_t type, void *handle, vm_size_t size, vm_prot_t prot,
vm_ooffset_t off)
{
struct pagerops *ops;

9
sys/vm/vnode_pager.c
View File

@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91
* $Id: vnode_pager.c,v 1.71 1997/05/19 14:36:56 dfr Exp $
* $Id: vnode_pager.c,v 1.72 1997/08/22 03:56:37 dyson Exp $
*/
/*
@ -102,11 +102,8 @@ static int vnode_pager_leaf_putpages __P((vm_object_t object, vm_page_t *m,
* Handle is a vnode pointer.
*/
vm_object_t
vnode_pager_alloc(handle, size, prot, offset)
void *handle;
vm_size_t size;
vm_prot_t prot;
vm_ooffset_t offset;
vnode_pager_alloc(void *handle, vm_size_t size, vm_prot_t prot,
vm_ooffset_t offset)
{
vm_object_t object;
struct vnode *vp;