diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 23:09:23 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 23:09:23 +0100 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /arch/ia64/kernel/signal.c | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
| download | kernel-crypto-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.gz kernel-crypto-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz kernel-crypto-c514720716c7b109ff980f8b3cb93f9af872c91c.zip | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/ia64/kernel/signal.c')
| -rw-r--r-- | arch/ia64/kernel/signal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index edd9f07860b..b8a0a7d257a 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; } |