Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / arch / arm / kernel / signal.c

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index f3800c0..d0a800b 100644 (file)
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -25,40 +25,6 @@ extern const unsigned long sigreturn_codes[17];
 
 static unsigned long signal_return_offset;
 
-#ifdef CONFIG_CRUNCH
-static int preserve_crunch_context(struct crunch_sigframe __user *frame)
-{
-       char kbuf[sizeof(*frame) + 8];
-       struct crunch_sigframe *kframe;
-
-       /* the crunch context must be 64 bit aligned */
-       kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) & ~7);
-       kframe->magic = CRUNCH_MAGIC;
-       kframe->size = CRUNCH_STORAGE_SIZE;
-       crunch_task_copy(current_thread_info(), &kframe->storage);
-       return __copy_to_user(frame, kframe, sizeof(*frame));
-}
-
-static int restore_crunch_context(char __user **auxp)
-{
-       struct crunch_sigframe __user *frame =
-               (struct crunch_sigframe __user *)*auxp;
-       char kbuf[sizeof(*frame) + 8];
-       struct crunch_sigframe *kframe;
-
-       /* the crunch context must be 64 bit aligned */
-       kframe = (struct crunch_sigframe *)((unsigned long)(kbuf + 8) & ~7);
-       if (__copy_from_user(kframe, frame, sizeof(*frame)))
-               return -1;
-       if (kframe->magic != CRUNCH_MAGIC ||
-           kframe->size != CRUNCH_STORAGE_SIZE)
-               return -1;
-       *auxp += CRUNCH_STORAGE_SIZE;
-       crunch_task_restore(current_thread_info(), &kframe->storage);
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_IWMMXT
 
 static int preserve_iwmmxt_context(struct iwmmxt_sigframe __user *frame)
@@ -205,10 +171,6 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
        err |= !valid_user_regs(regs);
 
        aux = (char __user *) sf->uc.uc_regspace;
-#ifdef CONFIG_CRUNCH
-       if (err == 0)
-               err |= restore_crunch_context(&aux);
-#endif
 #ifdef CONFIG_IWMMXT
        if (err == 0)
                err |= restore_iwmmxt_context(&aux);
@@ -321,10 +283,6 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)
        err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));
 
        aux = (struct aux_sigframe __user *) sf->uc.uc_regspace;
-#ifdef CONFIG_CRUNCH
-       if (err == 0)
-               err |= preserve_crunch_context(&aux->crunch);
-#endif
 #ifdef CONFIG_IWMMXT
        if (err == 0)
                err |= preserve_iwmmxt_context(&aux->iwmmxt);
@@ -711,14 +669,6 @@ struct page *get_signal_page(void)
        return page;
 }
 
-/* Defer to generic check */
-asmlinkage void addr_limit_check_failed(void)
-{
-#ifdef CONFIG_MMU
-       addr_limit_user_check();
-#endif
-}
-
 #ifdef CONFIG_DEBUG_RSEQ
 asmlinkage void do_rseq_syscall(struct pt_regs *regs)
 {