Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3df0392 authored by Yangtao Li's avatar Yangtao Li Committed by Mark Salyzyn
Browse files

UPSTREAM: random: convert to ENTROPY_BITS for better code readability 



Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-2-tiny.windzz@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
(cherry picked from commit 12faac30d157970fdbfa171bbeb1fb88350303b1)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 148665638
Change-Id: If96c7d9b69618ec879f1de1565cff0ac057ffe84
parent 97145ad7

drivers/char/random.c

+2 −3
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) 
			if (entropy_bits < 128)

				return;

			crng_reseed(&primary_crng, r);

			entropy_bits = r->entropy_count >> ENTROPY_SHIFT;

			entropy_bits = ENTROPY_BITS(r);

		}

	}

}
@@ -1378,8 +1378,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, 
		goto retry;



	trace_debit_entropy(r->name, 8 * ibytes);

	if (ibytes &&

	    (r->entropy_count >> ENTROPY_SHIFT) < random_write_wakeup_bits) {

	if (ibytes && ENTROPY_BITS(r) < random_write_wakeup_bits) {

		wake_up_interruptible(&random_write_wait);

		kill_fasync(&fasync, SIGIO, POLL_OUT);

	}