diff options
| author |   jasper <jasper@openbsd.org> | 2018-04-28 15:44:59 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2018-04-28 15:44:59 +0000 |
| commit | 9e9abf5b6221a42175e358d6f89e45cab0865401 (patch) | |
| tree | 1c307e20a20c21b9d9ad519b1682df884c132952 /sys/kern/subr_disk.c | |
| parent | Stop talking about /etc/networks, which is no longer used, (diff) | |
| download | wireguard-openbsd-9e9abf5b6221a42175e358d6f89e45cab0865401.tar.xz wireguard-openbsd-9e9abf5b6221a42175e358d6f89e45cab0865401.zip | |
replace add_*_randomness with enqueue_randomness()
this gets rid of the source annotation which doesn't really add
anything other than adding complexitiy. randomess is generally
good enough that the few extra bits that the source type would
add are not worth it.
ok mikeb@ deraadt@
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index f9a8d97cc85..7bb2c0d9af3 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.233 2018/03/05 03:31:39 jsg Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.234 2018/04/28 15:44:59 jasper Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -1128,7 +1128,7 @@ disk_attach_callback(void *xdat) /* Read disklabel. */ if (disk_readlabel(&dl, dk->dk_devno, errbuf, sizeof(errbuf)) == NULL) { - add_timer_randomness(dl.d_checksum); + enqueue_randomness(dl.d_checksum); dk->dk_flags |= DKF_LABELVALID; } @@ -1270,7 +1270,7 @@ disk_unbusy(struct disk *diskp, long bcount, daddr_t blkno, int read) mtx_leave(&diskp->dk_mtx); - add_disk_randomness(bcount ^ diff_time.tv_usec ^ + enqueue_randomness(bcount ^ diff_time.tv_usec ^ (blkno >> 32) ^ (blkno & 0xffffffff)); } |