summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_lock.c
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2010-06-21 09:55:56 +0000
committered <ed@FreeBSD.org>2010-06-21 09:55:56 +0000
commit76489ac1ea604f511232838164573ea21e9a74a8 (patch)
tree916572d41a618634b84823c3b89048c2144938df /sys/kern/subr_lock.c
parent107ec73aada25d2e0a7051e1f2a8cbef92902d04 (diff)
downloadFreeBSD-src-76489ac1ea604f511232838164573ea21e9a74a8.zip
FreeBSD-src-76489ac1ea604f511232838164573ea21e9a74a8.tar.gz
Use ISO C99 integer types in sys/kern where possible.
There are only about 100 occurences of the BSD-specific u_int*_t datatypes in sys/kern. The ISO C99 integer types are used here more often.
Diffstat (limited to 'sys/kern/subr_lock.c')
-rw-r--r--sys/kern/subr_lock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
index e09638e..61263f9 100644
--- a/sys/kern/subr_lock.c
+++ b/sys/kern/subr_lock.c
@@ -139,8 +139,8 @@ struct lock_profile_object {
int lpo_line;
uint16_t lpo_ref;
uint16_t lpo_cnt;
- u_int64_t lpo_acqtime;
- u_int64_t lpo_waittime;
+ uint64_t lpo_acqtime;
+ uint64_t lpo_waittime;
u_int lpo_contest_locking;
};
@@ -199,15 +199,15 @@ static int lock_prof_skipspin;
static int lock_prof_skipcount;
#ifndef USE_CPU_NANOSECONDS
-u_int64_t
+uint64_t
nanoseconds(void)
{
struct bintime bt;
- u_int64_t ns;
+ uint64_t ns;
binuptime(&bt);
/* From bintime2timespec */
- ns = bt.sec * (u_int64_t)1000000000;
+ ns = bt.sec * (uint64_t)1000000000;
ns += ((uint64_t)1000000000 * (uint32_t)(bt.frac >> 32)) >> 32;
return (ns);
}
@@ -598,7 +598,7 @@ lock_profile_release_lock(struct lock_object *lo)
struct lock_profile_object *l;
struct lock_prof_type *type;
struct lock_prof *lp;
- u_int64_t curtime, holdtime;
+ uint64_t curtime, holdtime;
struct lpohead *head;
int spin;
OpenPOWER on IntegriCloud