diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-04-08 18:03:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-22 14:11:15 +0200 |
| commit | fa15650b51f684aa0dfff7112e3998f7085b160f (patch) | |
| tree | 0dff783e4b2c3956604ed1b9cb141965a04e3559 /arch/sparc | |
| parent | 9dfc14590c5deed09d420688d7a028c6b074c981 (diff) | |
| download | linux-stable-fa15650b51f684aa0dfff7112e3998f7085b160f.tar.gz linux-stable-fa15650b51f684aa0dfff7112e3998f7085b160f.tar.bz2 linux-stable-fa15650b51f684aa0dfff7112e3998f7085b160f.zip | |
sparc: use fallback for random_get_entropy() instead of zero
commit ac9756c79797bb98972736b13cfb239fd2cffb79 upstream.
In the event that random_get_entropy() can't access a cycle counter or
similar, falling back to returning 0 is really not the best we can do.
Instead, at least calling random_get_entropy_fallback() would be
preferable, because that always needs to return _something_, even
falling back to jiffies eventually. It's not as though
random_get_entropy_fallback() is super high precision or guaranteed to
be entropic, but basically anything that's not zero all the time is
better than returning zero all the time.
This is accomplished by just including the asm-generic code like on
other architectures, which means we can get rid of the empty stub
function here.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/timex_32.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/timex_32.h b/arch/sparc/include/asm/timex_32.h index 542915b46209..f86326a6f89e 100644 --- a/arch/sparc/include/asm/timex_32.h +++ b/arch/sparc/include/asm/timex_32.h @@ -9,8 +9,6 @@ #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ -/* XXX Maybe do something better at some point... -DaveM */ -typedef unsigned long cycles_t; -#define get_cycles() (0) +#include <asm-generic/timex.h> #endif |