Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux-beck.git] / arch / arm64 / kernel / signal32.c

diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index 92ada01f4cd8f56c9da6065ec1713c96c176f023..7f4f3673f2bc0e1ad4f1d0dd5f978cbb1b7f4255 100644 (file)
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -56,7 +56,7 @@ struct compat_sigcontext {
 
 struct compat_ucontext {
        compat_ulong_t                  uc_flags;
-       struct compat_ucontext          *uc_link;
+       compat_uptr_t                   uc_link;
        compat_stack_t                  uc_stack;
        struct compat_sigcontext        uc_mcontext;
        compat_sigset_t                 uc_sigmask;
@@ -560,7 +560,7 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
        err |= copy_siginfo_to_user32(&frame->info, info);
 
        __put_user_error(0, &frame->sig.uc.uc_flags, err);
-       __put_user_error(NULL, &frame->sig.uc.uc_link, err);
+       __put_user_error(0, &frame->sig.uc.uc_link, err);
 
        err |= __compat_save_altstack(&frame->sig.uc.uc_stack, regs->compat_sp);