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.
This commit is contained in:
Ralf Baechle 2013-07-02 17:19:04 +02:00
commit 6ac5310e64
45 changed files with 507 additions and 364 deletions

View file

@ -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;