diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-18 13:10:08 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:24 +0100 |
| commit | 017cecee99d897ae426f3948e7b970eb4f95e1f4 (patch) | |
| tree | 449551864d0ded68749b52dc6b60142c9666d187 /arch | |
| parent | 7a15dd5c4b9d916cb1734dfd79dbdd5773772abb (diff) | |
| download | linux-017cecee99d897ae426f3948e7b970eb4f95e1f4.tar.gz linux-017cecee99d897ae426f3948e7b970eb4f95e1f4.tar.bz2 linux-017cecee99d897ae426f3948e7b970eb4f95e1f4.zip | |
m68k: Add infrastructure for machine-specific random_get_entropy()
On m68k, get_cycles() (the default implementation for random_get_entropy())
always returns zero, providing no entropy for the random driver.
Add a hook where platforms can provide their own implementation, and wire
it up in the infrastructure provided by commit
61875f30daf60305712e25b209ef41ced2635bad ("random: allow architectures to
optionally define random_get_entropy()").
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/timex.h | 10 | ||||
| -rw-r--r-- | arch/m68k/kernel/time.c | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h index 6759dad954f6..efc1f4892357 100644 --- a/arch/m68k/include/asm/timex.h +++ b/arch/m68k/include/asm/timex.h @@ -28,4 +28,14 @@ static inline cycles_t get_cycles(void) return 0; } +extern unsigned long (*mach_random_get_entropy)(void); + +static inline unsigned long random_get_entropy(void) +{ + if (mach_random_get_entropy) + return mach_random_get_entropy(); + return 0; +} +#define random_get_entropy random_get_entropy + #endif diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index 7eb9792009f8..958f1adb9d0c 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -28,6 +28,10 @@ #include <linux/timex.h> #include <linux/profile.h> + +unsigned long (*mach_random_get_entropy)(void); + + /* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "xtime_update()" routine every clocktick |