diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/include/asm/sfp-util.h | 2 | ||||
-rw-r--r-- | arch/s390/kernel/sysinfo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/sfp-util.h b/arch/s390/include/asm/sfp-util.h index 0addc6466d95..ca3f8814e361 100644 --- a/arch/s390/include/asm/sfp-util.h +++ b/arch/s390/include/asm/sfp-util.h | |||
@@ -72,6 +72,6 @@ extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int, | |||
72 | 72 | ||
73 | #define UDIV_NEEDS_NORMALIZATION 0 | 73 | #define UDIV_NEEDS_NORMALIZATION 0 |
74 | 74 | ||
75 | #define abort() return 0 | 75 | #define abort() BUG() |
76 | 76 | ||
77 | #define __BYTE_ORDER __BIG_ENDIAN | 77 | #define __BYTE_ORDER __BIG_ENDIAN |
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c index 5c9e439bf3f6..2a94b774695c 100644 --- a/arch/s390/kernel/sysinfo.c +++ b/arch/s390/kernel/sysinfo.c | |||
@@ -442,7 +442,7 @@ void s390_adjust_jiffies(void) | |||
442 | */ | 442 | */ |
443 | FP_UNPACK_SP(SA, &fmil); | 443 | FP_UNPACK_SP(SA, &fmil); |
444 | if ((info->capability >> 23) == 0) | 444 | if ((info->capability >> 23) == 0) |
445 | FP_FROM_INT_S(SB, info->capability, 32, int); | 445 | FP_FROM_INT_S(SB, (long) info->capability, 64, long); |
446 | else | 446 | else |
447 | FP_UNPACK_SP(SB, &info->capability); | 447 | FP_UNPACK_SP(SB, &info->capability); |
448 | FP_DIV_S(SR, SA, SB); | 448 | FP_DIV_S(SR, SA, SB); |