lkml.org 
[lkml]   [2007]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 08/11] mv64x60_wdt: Add a module parameter to change nowayout setting
    Also, use the WATCHDOG_NOWAYOUT macro, rather than #ifdefs,
    and use __module_get to prevent module unloading if WATCHDOG_NOWAYOUT
    is set.

    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    ---
    drivers/char/watchdog/mv64x60_wdt.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    Index: linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c
    ===================================================================
    --- linux-2.6-powerpc-wdt.orig/drivers/char/watchdog/mv64x60_wdt.c 2007-07-19 22:11:42.000000000 +0000
    +++ linux-2.6-powerpc-wdt/drivers/char/watchdog/mv64x60_wdt.c 2007-07-19 22:34:01.000000000 +0000
    @@ -45,6 +45,10 @@ static void __iomem *mv64x60_wdt_regs;
    static int mv64x60_wdt_timeout;
    static unsigned int bus_clk;

    +static int nowayout = WATCHDOG_NOWAYOUT;
    +module_param(nowayout, int, 0);
    +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
    +
    static void mv64x60_wdt_reg_write(u32 val)
    {
    /* Allow write only to CTL1 / CTL2 fields, retaining values in
    @@ -99,6 +103,9 @@ static int mv64x60_wdt_open(struct inode
    if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
    return -EBUSY;

    + if (nowayout)
    + __module_get(THIS_MODULE);
    +
    mv64x60_wdt_service();
    mv64x60_wdt_handler_enable();

    @@ -109,9 +116,8 @@ static int mv64x60_wdt_release(struct in
    {
    mv64x60_wdt_service();

    -#if !defined(CONFIG_WATCHDOG_NOWAYOUT)
    - mv64x60_wdt_handler_disable();
    -#endif
    + if (!nowayout)
    + mv64x60_wdt_handler_disable();

    clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-24 20:19    [W:0.021 / U:60.168 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site