Module Name: src Committed By: riastradh Date: Sat May 9 06:12:32 UTC 2020
Modified Files: src/sys/kern: kern_entropy.c Log Message: Prune dead branch. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/kern/kern_entropy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/kern_entropy.c diff -u src/sys/kern/kern_entropy.c:1.17 src/sys/kern/kern_entropy.c:1.18 --- src/sys/kern/kern_entropy.c:1.17 Fri May 8 15:54:11 2020 +++ src/sys/kern/kern_entropy.c Sat May 9 06:12:32 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_entropy.c,v 1.17 2020/05/08 15:54:11 riastradh Exp $ */ +/* $NetBSD: kern_entropy.c,v 1.18 2020/05/09 06:12:32 riastradh Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.17 2020/05/08 15:54:11 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.18 2020/05/09 06:12:32 riastradh Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -670,7 +670,7 @@ entropy_account_cpu(struct entropy_cpu * /* Notify waiters that we now have full entropy. */ entropy_notify(); entropy_immediate_evcnt.ev_count++; - } else if (ec->ec_pending) { + } else { /* Record how much we can add to the global pool. */ diff = MIN(ec->ec_pending, ENTROPY_CAPACITY*NBBY - E->pending); E->pending += diff;