Merge branch '3.10-fixes' into mips-for-linux-next

This that should have been fixed but weren't, way to much, intrusive
and late.

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 25c7a3f9652d..ea5d84a1fdad 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -208,7 +208,7 @@ static long sbwdog_ioctl(struct file *file, unsigned int cmd,
                  * get the remaining count from the ... count register
                  * which is 1*8 before the config register
                  */
-                ret = put_user(__raw_readq(user_dog - 8) / 1000000, p);
+                ret = put_user((u32)__raw_readq(user_dog - 8) / 1000000, p);
                 break;
         }
         return ret;