From 1f868842df10e1d8ee516bc0b7ecc9035ab5017c Mon Sep 17 00:00:00 2001
From: dann frazier <dannf@hp.com>
Date: Wed, 2 Jun 2010 16:23:41 -0600
Subject: [PATCH] --- yaml --- r: 209320 b: refs/heads/master c:
 aae67f3602d8869c8ab1b34b6ba9206e9fff4b16 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/watchdog/hpwdt.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0504d343f70..e43f3e1d5ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f681c2eabbd8df062963c52abaa0c7c3b2c5a7d
+refs/heads/master: aae67f3602d8869c8ab1b34b6ba9206e9fff4b16
diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c
index 00299919df39..554526cf3233 100644
--- a/trunk/drivers/watchdog/hpwdt.c
+++ b/trunk/drivers/watchdog/hpwdt.c
@@ -450,6 +450,11 @@ static int hpwdt_change_timer(int new_margin)
 	return 0;
 }
 
+static int hpwdt_time_left(void)
+{
+	return TICKS_TO_SECS(ioread16(hpwdt_timer_reg));
+}
+
 /*
  *	NMI Handler
  */
@@ -591,6 +596,10 @@ static long hpwdt_ioctl(struct file *file, unsigned int cmd,
 	case WDIOC_GETTIMEOUT:
 		ret = put_user(soft_margin, p);
 		break;
+
+	case WDIOC_GETTIMELEFT:
+		ret = put_user(hpwdt_time_left(), p);
+		break;
 	}
 	return ret;
 }