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

Commit 1f033c1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Watchdog updates from Wim Van Sebroeck:

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: fix GETTIMEOUT ioctl in booke_wdt
  watchdog: update maintainers git entry
  watchdog: Fix typo in pnx4008_wdt.c
  watchdog: Fix typo in Kconfig
  watchdog: fix error in probe() of s3c2410_wdt (reset at booting)
  watchdog: hpwdt: clean up set_memory_x call for 32 bit
parents 13fb2d10 741b9c7d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7271,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS 
M:	Wim Van Sebroeck <wim@iguana.be>

L:	linux-watchdog@vger.kernel.org

W:	http://www.linux-watchdog.org/

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

T:	git git://www.linux-watchdog.org/linux-watchdog.git

S:	Maintained

F:	Documentation/watchdog/

F:	drivers/watchdog/

drivers/watchdog/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ config BOOKE_WDT_DEFAULT_TIMEOUT 
	  For Freescale Book-E processors, this is a number between 0 and 63.

	  For other Book-E processors, this is a number between 0 and 3.



	  The value can be overidden by the wdt_period command-line parameter.

	  The value can be overridden by the wdt_period command-line parameter.



# PPC64 Architecture

drivers/watchdog/booke_wdt.c

+5 −1
Original line number Diff line number Diff line
@@ -198,9 +198,13 @@ static long booke_wdt_ioctl(struct file *file, 
		booke_wdt_period = tmp;

#endif

		booke_wdt_set();

		return 0;

		/* Fall */

	case WDIOC_GETTIMEOUT:

#ifdef	CONFIG_FSL_BOOKE

		return put_user(period_to_sec(booke_wdt_period), p);

#else

		return put_user(booke_wdt_period, p);

#endif

	default:

		return -ENOTTY;

	}

drivers/watchdog/hpwdt.c

+3 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int __devinit cru_detect(unsigned long map_entry, 


	cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;



	set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));

	set_memory_x((unsigned long)bios32_map, 2);

	asminline_call(&cmn_regs, bios32_entrypoint);



	if (cmn_regs.u1.ral != 0) {
@@ -250,7 +250,8 @@ static int __devinit cru_detect(unsigned long map_entry, 
			cru_rom_addr =

				ioremap(cru_physical_address, cru_length);

			if (cru_rom_addr) {

				set_memory_x((unsigned long)cru_rom_addr, cru_length);

				set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,

					(cru_length + PAGE_SIZE - 1) >> PAGE_SHIFT);

				retval = 0;

			}

		}

drivers/watchdog/pnx4008_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev) 
	wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (wdt_mem == NULL) {

		printk(KERN_INFO MODULE_NAME

			"failed to get memory region resouce\n");

			"failed to get memory region resource\n");

		return -ENOENT;

	}