Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index edd9f07860b2..b8a0a7d257a9 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -143,6 +143,7 @@ restore_sigcontext (struct sigcontext __user *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... */
+                preempt_disable();
                 if (psr->dfh)
                         ia64_drop_fpu(current);
                 else {
@@ -150,6 +151,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
                         __ia64_load_fpu(current->thread.fph);
                         ia64_set_local_fpu_owner(current);
                 }
+                preempt_enable();
         }
         return err;
 }