diff options
| author | Richard Weinberger <richard@nod.at> | 2015-05-13 23:02:14 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-05-31 17:39:19 +0200 |
| commit | 6c684465587aab2a0d2712ee755c0164fa33efd1 (patch) | |
| tree | 1211b404e0f125215aec633dbee712497a1442ba /arch/x86/um | |
| parent | f8d65d27e677da0ce33de570e3068308a77ed2b1 (diff) | |
| download | linux-6c684465587aab2a0d2712ee755c0164fa33efd1.tar.bz2 | |
um: Fix warning in setup_signal_stack_si()
Fixes:
arch/x86/um/signal.c: In function ‘setup_signal_stack_si’:
include/asm-generic/uaccess.h:146:27: warning: initialization from incompatible pointer type [enabled by default]
__typeof__(*(ptr)) __x = (x); \
^
arch/x86/um/signal.c:544:10: note: in expansion of macro ‘__put_user’
err |= __put_user(ksig->ka.sa.sa_restorer,
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/signal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index 592491d1d70d..06934a8a4872 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c @@ -541,7 +541,8 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig, */ /* x86-64 should always use SA_RESTORER. */ if (ksig->ka.sa.sa_flags & SA_RESTORER) - err |= __put_user(ksig->ka.sa.sa_restorer, &frame->pretcode); + err |= __put_user((void *)ksig->ka.sa.sa_restorer, + &frame->pretcode); else /* could use a vstub here */ return err; |