lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 109/234] random: pull add_hwgenerator_randomness() declaration into random.h
    Date
    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    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: Herbert Xu <herbert@gondor.apana.org.au>
    Reviewed-by: Eric Biggers <ebiggers@google.com>
    Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/char/hw_random/core.c | 1 +
    include/linux/hw_random.h | 2 --
    include/linux/random.h | 2 ++
    3 files changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/char/hw_random/core.c
    +++ b/drivers/char/hw_random/core.c
    @@ -15,6 +15,7 @@
    #include <linux/err.h>
    #include <linux/fs.h>
    #include <linux/hw_random.h>
    +#include <linux/random.h>
    #include <linux/kernel.h>
    #include <linux/kthread.h>
    #include <linux/sched/signal.h>
    --- a/include/linux/hw_random.h
    +++ b/include/linux/hw_random.h
    @@ -59,7 +59,5 @@ extern int devm_hwrng_register(struct de
    /** Unregister a Hardware Random Number Generator driver. */
    extern void hwrng_unregister(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_ */
    --- a/include/linux/random.h
    +++ b/include/linux/random.h
    @@ -32,6 +32,8 @@ static inline void add_latent_entropy(vo
    extern void add_input_randomness(unsigned int type, unsigned int code,
    unsigned int value) __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 int wait_for_random_bytes(void);

    \
     
     \ /
      Last update: 2022-06-23 20:07    [W:10.598 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site