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

Commit b0c51b7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] s3c2410_wdt.c stop watchdog after boot
  [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7
  [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon
  [WATCHDOG] sc1200wdt.c printk fix
parents ee433530 655516c8

Documentation/watchdog/watchdog-api.txt

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ timeout or margin. The simplest way to ping the watchdog is to write 
some data to the device.  So a very simple watchdog daemon would look

like this:



#include <stdlib.h>

#include <fcntl.h>



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

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

	if (fd==-1) {

drivers/char/watchdog/i8xx_tco.c

+5 −11
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ 
 *	82801E   (C-ICH)  : document number 273599-001, 273645-002,

 *	82801EB  (ICH5)   : document number 252516-001, 252517-003,

 *	82801ER  (ICH5R)  : document number 252516-001, 252517-003,

 *	82801FB  (ICH6)   : document number 301473-002, 301474-007,

 *	82801FR  (ICH6R)  : document number 301473-002, 301474-007,

 *	82801FBM (ICH6-M) : document number 301473-002, 301474-007,

 *	82801FW  (ICH6W)  : document number 301473-001, 301474-007,

 *	82801FRW (ICH6RW) : document number 301473-001, 301474-007

 *

 *  20000710 Nils Faerber

 *	Initial Version 0.01
@@ -66,6 +61,10 @@ 
 *  20050807 Wim Van Sebroeck <wim@iguana.be>

 *	0.08 Make sure that the watchdog is only "armed" when started.

 *	     (Kernel Bug 4251)

 *  20060416 Wim Van Sebroeck <wim@iguana.be>

 *	0.09 Remove support for the ICH6, ICH6R, ICH6-M, ICH6W and ICH6RW and

 *	     ICH7 chipsets. (See Kernel Bug 6031 - other code will support these

 *	     chipsets)

 */



/*
@@ -90,7 +89,7 @@ 
#include "i8xx_tco.h"



/* Module and version information */

#define TCO_VERSION "0.08"

#define TCO_VERSION "0.09"

#define TCO_MODULE_NAME "i8xx TCO timer"

#define TCO_DRIVER_NAME   TCO_MODULE_NAME ", v" TCO_VERSION

#define PFX TCO_MODULE_NAME ": "
@@ -391,11 +390,6 @@ static struct pci_device_id i8xx_tco_pci_tbl[] = { 
	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801E_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,	PCI_ANY_ID, PCI_ANY_ID, },

	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,	PCI_ANY_ID, PCI_ANY_ID, },

	{ 0, },			/* End of list */

};

drivers/char/watchdog/s3c2410_wdt.c

+6 −0
Original line number Diff line number Diff line
@@ -423,6 +423,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev) 
	if (tmr_atboot && started == 0) {

		printk(KERN_INFO PFX "Starting Watchdog Timer\n");

		s3c2410wdt_start();

	} else if (!tmr_atboot) {

		/* if we're not enabling the watchdog, then ensure it is

		 * disabled if it has been left running from the bootloader

		 * or other source */



		s3c2410wdt_stop();

	}



	return 0;

drivers/char/watchdog/sc1200wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int __init sc1200wdt_init(void) 
{

	int ret;



	printk(banner);

	printk("%s\n", banner);



	spin_lock_init(&sc1200wdt_lock);

	sema_init(&open_sem, 1);