diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_module.c | 5 | ||||
| -rw-r--r-- | sys/kern/subr_prof.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 0a752bb..948fa79 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_module.c,v 1.6 1997/11/07 08:52:56 phk Exp $ + * $Id: kern_module.c,v 1.7 1998/07/11 07:45:40 bde Exp $ */ #include <sys/param.h> @@ -81,10 +81,9 @@ module_register_init(void *arg) moduledata_t* data = (moduledata_t*) arg; int error; -#define fptrint_t unsigned /* XXX */ if (error = module_register(data->name, data->evhand, data->priv)) printf("module_register_init: module_register(%s, %lx, %p) returned %d", - data->name, (u_long)(fptrint_t)data->evhand, data->priv, error); + data->name, (u_long)(uintfptr_t)data->evhand, data->priv, error); } int diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 80fda30..467b748 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.25 1998/04/15 17:46:23 bde Exp $ + * $Id: subr_prof.c,v 1.26 1998/05/01 16:40:20 bde Exp $ */ #include <sys/param.h> @@ -87,7 +87,7 @@ kmstartup(dummy) int mexitcount_overhead; int nullfunc_loop_overhead; int nullfunc_loop_profiled_time; - fptrint_t tmp_addr; + uintfptr_t tmp_addr; #endif /* @@ -188,8 +188,8 @@ kmstartup(dummy) enable_intr(); nullfunc_loop_profiled_time = 0; - for (tmp_addr = (fptrint_t)nullfunc_loop_profiled; - tmp_addr < (fptrint_t)nullfunc_loop_profiled_end; + for (tmp_addr = (uintfptr_t)nullfunc_loop_profiled; + tmp_addr < (uintfptr_t)nullfunc_loop_profiled_end; tmp_addr += HISTFRACTION * sizeof(HISTCOUNTER)) nullfunc_loop_profiled_time += KCOUNT(p, PC_TO_I(p, tmp_addr)); #define CALIB_DOSCALE(count) (((count) + CALIB_SCALE / 3) / CALIB_SCALE) |
