diff options
author | wollman <wollman@FreeBSD.org> | 1993-12-19 00:55:01 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1993-12-19 00:55:01 +0000 |
commit | 71b67e5a560e27117fd4ff9fe76b1e67f1423f1e (patch) | |
tree | 62dff2aa17f4c31d27a9595b764f9cbc9810eb80 /sys/kern | |
parent | c7341bb860bd0d1789ca0b8bfce96c383fd7dbbc (diff) | |
download | FreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.zip FreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.tar.gz |
Make everything compile with -Wtraditional. Make it easier to distribute
a binary link-kit. Make all non-optional options (pagers, procfs) standard,
and update LINT to reflect new symtab requirements.
NB: -Wtraditional will henceforth be forgotten. This editing pass was
primarily intended to detect any constructions where the old code might
have been relying on traditional C semantics or syntax. These were all
fixed, and the result of fixing some of them means that -Wall is now a
realistic possibility within a few weeks.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/subr_rlist.c | 8 | ||||
-rw-r--r-- | sys/kern/subr_trap.c | 23 |
2 files changed, 17 insertions, 14 deletions
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c index 3880792..a29fece 100644 --- a/sys/kern/subr_rlist.c +++ b/sys/kern/subr_rlist.c @@ -45,12 +45,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: subr_rlist.c,v 1.2 1993/10/16 15:24:44 rgrimes Exp $ + * $Id: subr_rlist.c,v 1.3 1993/11/25 01:33:18 wollman Exp $ */ -#include "sys/param.h" -#include "sys/cdefs.h" -#include "sys/malloc.h" +#include "param.h" +#include "systm.h" +#include "malloc.h" #include "rlist.h" /* diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 0aa2296..41370cc 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.10 1993/12/03 05:07:45 alm Exp $ + * $Id: trap.c,v 1.11 1993/12/12 12:22:57 davidg Exp $ */ /* @@ -59,6 +59,7 @@ #include "vm/vm_param.h" #include "vm/pmap.h" #include "vm/vm_map.h" +#include "vm/vm_user.h" #include "sys/vmmeter.h" #include "machine/trap.h" @@ -70,7 +71,7 @@ * we omit the size from the mov instruction to avoid nonfatal bugs in gas. */ #define read_gs() ({ u_short gs; __asm("mov %%gs,%0" : "=r" (gs)); gs; }) -#define write_gs(gs) __asm("mov %0,%%gs" : : "r" ((u_short) gs)) +#define write_gs(newgs) __asm("mov %0,%%gs" : : "r" ((u_short) newgs)) #else /* not __GNUC__ */ @@ -81,7 +82,6 @@ void write_gs __P((/* promoted u_short */ int gs)); struct sysent sysent[]; int nsysent; -unsigned rcr2(); extern short cpl; #define MAX_TRAP_MSG 27 @@ -353,7 +353,8 @@ copyfault: v = vm->vm_maxsaddr; grow_amount = MAXSSIZ - (vm->vm_ssize << PGSHIFT); } - if (vm_allocate(&vm->vm_map, &v, grow_amount, FALSE) != + if (vm_allocate(&vm->vm_map, (vm_offset_t *)&v, + grow_amount, FALSE) != KERN_SUCCESS) { goto nogo; } @@ -363,10 +364,11 @@ copyfault: /* check if page table is mapped, if not, fault it first */ if (!pde_v(va)) { v = (char *)trunc_page(vtopte(va)); - rv = vm_fault(map, v, ftype, FALSE); + rv = vm_fault(map, (vm_offset_t)v, ftype, FALSE); if (rv != KERN_SUCCESS) goto nogo; /* check if page table fault, increment wiring */ - vm_map_pageable(map, v, round_page(v+1), FALSE); + vm_map_pageable(map, (vm_offset_t)v, + round_page(v+1), FALSE); } else v=0; rv = vm_fault(map, va, ftype, FALSE); if (rv == KERN_SUCCESS) { @@ -543,8 +545,9 @@ int trapwrite(addr) v = vm->vm_maxsaddr; grow_amount = MAXSSIZ - (vm->vm_ssize << PGSHIFT); } - if (vm_allocate(&vm->vm_map, &v, grow_amount, FALSE) != - KERN_SUCCESS) { + if (vm_allocate(&vm->vm_map, (vm_offset_t *)&v, + grow_amount, FALSE) + != KERN_SUCCESS) { return(1); } } @@ -613,13 +616,13 @@ syscall(frame) frame.sf_eflags |= PSL_C; /* carry bit */ #ifdef KTRACE if (KTRPOINT(p, KTR_SYSCALL)) - ktrsyscall(p->p_tracep, code, callp->sy_narg, &args); + ktrsyscall(p->p_tracep, code, callp->sy_narg, args); #endif goto done; } #ifdef KTRACE if (KTRPOINT(p, KTR_SYSCALL)) - ktrsyscall(p->p_tracep, code, callp->sy_narg, &args); + ktrsyscall(p->p_tracep, code, callp->sy_narg, args); #endif rval[0] = 0; rval[1] = frame.sf_edx; |