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

Commit 75cc37f4 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

random: pull add_hwgenerator_randomness() declaration into random.h 



commit b777c38239fec5a528e59f55b379e31b1a187524 upstream.

add_hwgenerator_randomness() is a function implemented and documented
inside of random.c. It is the way that hardware RNGs push data into it.
Therefore, it should be declared in random.h. Otherwise sparse complains
with:

random.c:1137:6: warning: symbol 'add_hwgenerator_randomness' was not declared. Should it be static?

The alternative would be to include hw_random.h into random.c, but that
wouldn't really be good for anything except slowing down compile time.

Cc: Matt Mackall <mpm@selenic.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6b013ee

drivers/char/hw_random/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include <linux/device.h>

#include <linux/device.h>

#include <linux/hw_random.h>

#include <linux/hw_random.h>

#include <linux/random.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/fs.h>

#include <linux/fs.h>

include/linux/hw_random.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -60,7 +60,5 @@ extern int devm_hwrng_register(struct device *dev, struct hwrng *rng); 
/** Unregister a Hardware Random Number Generator driver. */

/** Unregister a Hardware Random Number Generator driver. */

extern void hwrng_unregister(struct hwrng *rng);

extern void hwrng_unregister(struct hwrng *rng);

extern void devm_hwrng_unregister(struct device *dve, struct hwrng *rng);

extern void devm_hwrng_unregister(struct device *dve, struct hwrng *rng);

/** Feed random bits into the pool. */

extern void add_hwgenerator_randomness(const void *buffer, size_t count, size_t entropy);





#endif /* LINUX_HWRANDOM_H_ */
 
#endif /* LINUX_HWRANDOM_H_ */

include/linux/random.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ static inline void add_latent_entropy(void) {} 
extern void add_input_randomness(unsigned int type, unsigned int code,

extern void add_input_randomness(unsigned int type, unsigned int code,

				 unsigned int value) __latent_entropy;

				 unsigned int value) __latent_entropy;

extern void add_interrupt_randomness(int irq) __latent_entropy;

extern void add_interrupt_randomness(int irq) __latent_entropy;

extern void add_hwgenerator_randomness(const void *buffer, size_t count,

				       size_t entropy);





extern void get_random_bytes(void *buf, size_t nbytes);

extern void get_random_bytes(void *buf, size_t nbytes);

extern int wait_for_random_bytes(void);

extern int wait_for_random_bytes(void);