Commit 14e71e4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] hpwdt - fix lower timeout limit
  [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
  [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.
  [WATCHDOG] doc: watchdog simple example: don't fail on fsync()
  [WATCHDOG] set max63xx driver as ARM only
  [WATCHDOG] powerpc: pika_wdt ident cannot be const
parents ab195c58 8ba42bd8

Documentation/watchdog/src/watchdog-simple.c

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ int main(void) 
			ret = -1;

			break;

		}

		ret = fsync(fd);

		if (ret)

			break;

		sleep(10);

	}

	close(fd);

Documentation/watchdog/src/watchdog-test.c

+6 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ static void keep_alive(void) 
 */

int main(int argc, char *argv[])

{

    int flags;



    fd = open("/dev/watchdog", O_WRONLY);



    if (fd == -1) {
@@ -41,12 +43,14 @@ int main(int argc, char *argv[]) 


    if (argc > 1) {

	if (!strncasecmp(argv[1], "-d", 2)) {

	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_DISABLECARD);

	    flags = WDIOS_DISABLECARD;

	    ioctl(fd, WDIOC_SETOPTIONS, &flags);

	    fprintf(stderr, "Watchdog card disabled.\n");

	    fflush(stderr);

	    exit(0);

	} else if (!strncasecmp(argv[1], "-e", 2)) {

	    ioctl(fd, WDIOC_SETOPTIONS, WDIOS_ENABLECARD);

	    flags = WDIOS_ENABLECARD;

	    ioctl(fd, WDIOC_SETOPTIONS, &flags);

	    fprintf(stderr, "Watchdog card enabled.\n");

	    fflush(stderr);

	    exit(0);

Documentation/watchdog/watchdog-api.txt

+2 −3
Original line number Diff line number Diff line
@@ -222,11 +222,10 @@ returned value is the temperature in degrees fahrenheit. 
    ioctl(fd, WDIOC_GETTEMP, &temperature);



Finally the SETOPTIONS ioctl can be used to control some aspects of

the cards operation; right now the pcwd driver is the only one

supporting this ioctl.

the cards operation.



    int options = 0;

    ioctl(fd, WDIOC_SETOPTIONS, options);

    ioctl(fd, WDIOC_SETOPTIONS, &options);



The following options are available:

drivers/watchdog/Kconfig

+6 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ config SOFT_WATCHDOG 
	  To compile this driver as a module, choose M here: the

	  module will be called softdog.



config MAX63XX_WATCHDOG

       tristate "Max63xx watchdog"

       help

         Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.



config WM831X_WATCHDOG

	tristate "WM831x watchdog"

	depends on MFD_WM831X
@@ -305,6 +300,12 @@ config TS72XX_WATCHDOG 
	  To compile this driver as a module, choose M here: the

	  module will be called ts72xx_wdt.



config MAX63XX_WATCHDOG

	tristate "Max63xx watchdog"

	depends on ARM

	help

	  Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.



# AVR32 Architecture



config AT32AP700X_WDT

drivers/watchdog/hpwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static void hpwdt_ping(void) 
static int hpwdt_change_timer(int new_margin)

{

	/* Arbitrary, can't find the card's limits */

	if (new_margin < 30 || new_margin > 600) {

	if (new_margin < 5 || new_margin > 600) {

		printk(KERN_WARNING

			"hpwdt: New value passed in is invalid: %d seconds.\n",

			new_margin);

CRA Git | Maintained and supported by SUSTech CRA and CCSE