Commit d606f88f authored by Randy Dunlap's avatar Randy Dunlap Committed by Andi Kleen

[PATCH] i386: fix must_checks

Fix __must_check warnings in i386/math-emu.
Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent dd315df1
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
#define TAG_Special Const(2) /* De-normal, + or - infinity, #define TAG_Special Const(2) /* De-normal, + or - infinity,
or Not a Number */ or Not a Number */
#define TAG_Empty Const(3) /* empty */ #define TAG_Empty Const(3) /* empty */
#define TAG_Error Const(0x80) /* probably need to abort */
#define LOADED_DATA Const(10101) /* Special st() number to identify #define LOADED_DATA Const(10101) /* Special st() number to identify
loaded data (not on stack). */ loaded data (not on stack). */
......
...@@ -742,7 +742,8 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf) ...@@ -742,7 +742,8 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf)
S387->fcs &= ~0xf8000000; S387->fcs &= ~0xf8000000;
S387->fos |= 0xffff0000; S387->fos |= 0xffff0000;
#endif /* PECULIAR_486 */ #endif /* PECULIAR_486 */
__copy_to_user(d, &S387->cwd, 7*4); if (__copy_to_user(d, &S387->cwd, 7*4))
return -1;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
d += 7*4; d += 7*4;
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#define FPU_access_ok(x,y,z) if ( !access_ok(x,y,z) ) \ #define FPU_access_ok(x,y,z) if ( !access_ok(x,y,z) ) \
math_abort(FPU_info,SIGSEGV) math_abort(FPU_info,SIGSEGV)
#define FPU_abort math_abort(FPU_info, SIGSEGV)
#undef FPU_IGNORE_CODE_SEGV #undef FPU_IGNORE_CODE_SEGV
#ifdef FPU_IGNORE_CODE_SEGV #ifdef FPU_IGNORE_CODE_SEGV
......
...@@ -227,6 +227,8 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes, ...@@ -227,6 +227,8 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,
case 027: /* fild m64int */ case 027: /* fild m64int */
clear_C1(); clear_C1();
loaded_tag = FPU_load_int64((long long __user *)data_address); loaded_tag = FPU_load_int64((long long __user *)data_address);
if (loaded_tag == TAG_Error)
return 0;
FPU_settag0(loaded_tag); FPU_settag0(loaded_tag);
break; break;
case 030: /* fstenv m14/28byte */ case 030: /* fstenv m14/28byte */
......
...@@ -244,7 +244,8 @@ int FPU_load_int64(long long __user *_s) ...@@ -244,7 +244,8 @@ int FPU_load_int64(long long __user *_s)
RE_ENTRANT_CHECK_OFF; RE_ENTRANT_CHECK_OFF;
FPU_access_ok(VERIFY_READ, _s, 8); FPU_access_ok(VERIFY_READ, _s, 8);
copy_from_user(&s,_s,8); if (copy_from_user(&s,_s,8))
FPU_abort;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
if (s == 0) if (s == 0)
...@@ -907,7 +908,8 @@ int FPU_store_int64(FPU_REG *st0_ptr, u_char st0_tag, long long __user *d) ...@@ -907,7 +908,8 @@ int FPU_store_int64(FPU_REG *st0_ptr, u_char st0_tag, long long __user *d)
RE_ENTRANT_CHECK_OFF; RE_ENTRANT_CHECK_OFF;
FPU_access_ok(VERIFY_WRITE,d,8); FPU_access_ok(VERIFY_WRITE,d,8);
copy_to_user(d, &tll, 8); if (copy_to_user(d, &tll, 8))
FPU_abort;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
return 1; return 1;
...@@ -1336,7 +1338,8 @@ u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d) ...@@ -1336,7 +1338,8 @@ u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d)
I387.soft.fcs &= ~0xf8000000; I387.soft.fcs &= ~0xf8000000;
I387.soft.fos |= 0xffff0000; I387.soft.fos |= 0xffff0000;
#endif /* PECULIAR_486 */ #endif /* PECULIAR_486 */
__copy_to_user(d, &control_word, 7*4); if (__copy_to_user(d, &control_word, 7*4))
FPU_abort;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
d += 0x1c; d += 0x1c;
} }
...@@ -1359,9 +1362,11 @@ void fsave(fpu_addr_modes addr_modes, u_char __user *data_address) ...@@ -1359,9 +1362,11 @@ void fsave(fpu_addr_modes addr_modes, u_char __user *data_address)
FPU_access_ok(VERIFY_WRITE,d,80); FPU_access_ok(VERIFY_WRITE,d,80);
/* Copy all registers in stack order. */ /* Copy all registers in stack order. */
__copy_to_user(d, register_base+offset, other); if (__copy_to_user(d, register_base+offset, other))
FPU_abort;
if ( offset ) if ( offset )
__copy_to_user(d+other, register_base, offset); if (__copy_to_user(d+other, register_base, offset))
FPU_abort;
RE_ENTRANT_CHECK_ON; RE_ENTRANT_CHECK_ON;
finit(); finit();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment