restricted ia64 patches to ia64 again, they still break builds on

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / kernel / signal.c

diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 3b55d7f..3037b25 100644 (file)
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -142,13 +142,8 @@ restore_sigcontext (struct sigcontext *sc, struct sigscratch *scr)
 
                __copy_from_user(current->thread.fph, &sc->sc_fr[32], 96*16);
                psr->mfh = 0;   /* drop signal handler's fph contents... */
-               if (psr->dfh)
-                       current->thread.last_fph_cpu = -1;
-               else {
+               if (!psr->dfh)
                        __ia64_load_fpu(current->thread.fph);
-                       ia64_set_fpu_owner(current);
-                       current->thread.last_fph_cpu = smp_processor_id();
-               }
        }
        return err;
 }
@@ -528,7 +523,7 @@ ia64_do_signal (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
                        else
                                errno = -errno;
                }
-       } else if ((long) scr->pt.r10 != -1)
+       } else if (scr->pt.r10 != -1)
                /*
                 * A system calls has to be restarted only if one of the error codes
                 * ERESTARTNOHAND, ERESTARTSYS, or ERESTARTNOINTR is returned.  If r10