From b7e8f062514e1e392b1e53a7cb280178a2429259 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Sat, 21 Jul 2007 13:42:18 +0000
Subject: [PATCH] --- yaml --- r: 63506 b: refs/heads/master c:
 5c4eb61b375ce16fc7af5055d8ab7bc19e788361 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/char/watchdog/cpu5wdt.c     | 4 ++++
 trunk/drivers/char/watchdog/machzwd.c     | 1 +
 trunk/drivers/char/watchdog/mixcomwd.c    | 5 +++++
 trunk/drivers/char/watchdog/mpc83xx_wdt.c | 3 +++
 trunk/drivers/char/watchdog/mtx-1_wdt.c   | 1 +
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f831f72e1611..fce47796b99b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec9505a7ecadc0ab8f8e3c4c5fa900d57467e391
+refs/heads/master: 5c4eb61b375ce16fc7af5055d8ab7bc19e788361
diff --git a/trunk/drivers/char/watchdog/cpu5wdt.c b/trunk/drivers/char/watchdog/cpu5wdt.c
index d0d45a8b09f0..20eb6c3e9853 100644
--- a/trunk/drivers/char/watchdog/cpu5wdt.c
+++ b/trunk/drivers/char/watchdog/cpu5wdt.c
@@ -162,6 +162,10 @@ static int cpu5wdt_ioctl(struct inode *inode, struct file *file, unsigned int cm
 			if ( copy_to_user(argp, &value, sizeof(int)) )
 				return -EFAULT;
 			break;
+		case WDIOC_GETBOOTSTATUS:
+			if ( copy_to_user(argp, &value, sizeof(int)) )
+				retrun -EFAULT;
+			break;
 		case WDIOC_GETSUPPORT:
 			if ( copy_to_user(argp, &ident, sizeof(ident)) )
 				return -EFAULT;
diff --git a/trunk/drivers/char/watchdog/machzwd.c b/trunk/drivers/char/watchdog/machzwd.c
index a0d27160c80e..6d35bb112a5f 100644
--- a/trunk/drivers/char/watchdog/machzwd.c
+++ b/trunk/drivers/char/watchdog/machzwd.c
@@ -321,6 +321,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 		break;
 
 	case WDIOC_GETSTATUS:
+	case WDIOC_GETBOOTSTATUS:
 		return put_user(0, p);
 
 	case WDIOC_KEEPALIVE:
diff --git a/trunk/drivers/char/watchdog/mixcomwd.c b/trunk/drivers/char/watchdog/mixcomwd.c
index db2ccb864412..1adf1d56027d 100644
--- a/trunk/drivers/char/watchdog/mixcomwd.c
+++ b/trunk/drivers/char/watchdog/mixcomwd.c
@@ -215,6 +215,11 @@ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
 				return -EFAULT;
 			}
 			break;
+		case WDIOC_GETBOOTSTATUS:
+			if (copy_to_user(p, &status, sizeof(int))) {
+				return -EFAULT;
+			}
+			break;
 		case WDIOC_GETSUPPORT:
 			if (copy_to_user(argp, &ident, sizeof(ident))) {
 				return -EFAULT;
diff --git a/trunk/drivers/char/watchdog/mpc83xx_wdt.c b/trunk/drivers/char/watchdog/mpc83xx_wdt.c
index 18ca752e2f90..a0bf95fb9763 100644
--- a/trunk/drivers/char/watchdog/mpc83xx_wdt.c
+++ b/trunk/drivers/char/watchdog/mpc83xx_wdt.c
@@ -119,6 +119,9 @@ static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
 	switch (cmd) {
 	case WDIOC_GETSUPPORT:
 		return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+	case WDIOC_GETSTATUS:
+	case WDIOC_GETBOOTSTATUS:
+		return put_user(0, p);
 	case WDIOC_KEEPALIVE:
 		mpc83xx_wdt_keepalive();
 		return 0;
diff --git a/trunk/drivers/char/watchdog/mtx-1_wdt.c b/trunk/drivers/char/watchdog/mtx-1_wdt.c
index 419ab445c944..dcfd401a7ad7 100644
--- a/trunk/drivers/char/watchdog/mtx-1_wdt.c
+++ b/trunk/drivers/char/watchdog/mtx-1_wdt.c
@@ -143,6 +143,7 @@ static int mtx1_wdt_ioctl(struct inode *inode, struct file *file, unsigned int c
 			mtx1_wdt_reset();
 			break;
 		case WDIOC_GETSTATUS:
+		case WDIOC_GETBOOTSTATUS:
 			if ( copy_to_user(argp, &value, sizeof(int)) )
 				return -EFAULT;
 			break;