Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[pandora-kernel.git] / arch / s390 / kernel / sysinfo.c

diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index 5c9e439..2a94b77 100644 (file)
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -442,7 +442,7 @@ void s390_adjust_jiffies(void)
                 */
                FP_UNPACK_SP(SA, &fmil);
                if ((info->capability >> 23) == 0)
-                       FP_FROM_INT_S(SB, info->capability, 32, int);
+                       FP_FROM_INT_S(SB, (long) info->capability, 64, long);
                else
                        FP_UNPACK_SP(SB, &info->capability);
                FP_DIV_S(SR, SA, SB);