lkml.org 
[lkml]   [2008]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 3/5] HWRNG: Add possibility to remove hwrng devices during suspend/resume
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make it possible to unregister a Hardware Random Number Generator
    device object in a safe way during a suspend/resume cycle.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Michael Buesch <mb@bu3sch.de>
    ---
    drivers/char/hw_random/core.c | 10 +++++-----
    include/linux/hw_random.h | 10 +++++++++-
    2 files changed, 14 insertions(+), 6 deletions(-)

    Index: linux-2.6.24-rc8-mm1/drivers/char/hw_random/core.c
    ===================================================================
    --- linux-2.6.24-rc8-mm1.orig/drivers/char/hw_random/core.c
    +++ linux-2.6.24-rc8-mm1/drivers/char/hw_random/core.c
    @@ -234,11 +234,11 @@ static DEVICE_ATTR(rng_available, S_IRUG
    NULL);


    -static void unregister_miscdev(void)
    +static void unregister_miscdev(bool suspended)
    {
    device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available);
    device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
    - misc_deregister(&rng_miscdev);
    + __misc_deregister(&rng_miscdev, suspended);
    }

    static int register_miscdev(void)
    @@ -313,7 +313,7 @@ out:
    }
    EXPORT_SYMBOL_GPL(hwrng_register);

    -void hwrng_unregister(struct hwrng *rng)
    +void __hwrng_unregister(struct hwrng *rng, bool suspended)
    {
    int err;

    @@ -332,11 +332,11 @@ void hwrng_unregister(struct hwrng *rng)
    }
    }
    if (list_empty(&rng_list))
    - unregister_miscdev();
    + unregister_miscdev(suspended);

    mutex_unlock(&rng_mutex);
    }
    -EXPORT_SYMBOL_GPL(hwrng_unregister);
    +EXPORT_SYMBOL_GPL(__hwrng_unregister);


    MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver");
    Index: linux-2.6.24-rc8-mm1/include/linux/hw_random.h
    ===================================================================
    --- linux-2.6.24-rc8-mm1.orig/include/linux/hw_random.h
    +++ linux-2.6.24-rc8-mm1/include/linux/hw_random.h
    @@ -44,7 +44,15 @@ struct hwrng {
    /** Register a new Hardware Random Number Generator driver. */
    extern int hwrng_register(struct hwrng *rng);
    /** Unregister a Hardware Random Number Generator driver. */
    -extern void hwrng_unregister(struct hwrng *rng);
    +extern void __hwrng_unregister(struct hwrng *rng, bool suspended);
    +static inline void hwrng_unregister(struct hwrng *rng)
    +{
    + __hwrng_unregister(rng, false);
    +}
    +static inline void hwrng_unregister_suspended(struct hwrng *rng)
    +{
    + __hwrng_unregister(rng, true);
    +}

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


    \
     
     \ /
      Last update: 2008-01-25 01:51    [W:2.433 / U:3.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site