summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--i386/i386/fpu.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e5fe90c..eab93ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * i386/i386/fpu.c (fpintr): Do not panic if the we receive the
+ interrupt twice in the same thread.
+
2008-05-28 Thomas Schwinge <tschwinge@gnu.org>
[bug #23417, patch #6508 -- Building with -g3]
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index ad2173c..306baa4 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -674,7 +674,7 @@ ASSERT_IPL(SPL1);
/* leave fp_intr_thread THREAD_NULL */
return;
}
- if (fp_intr_thread != THREAD_NULL)
+ if (fp_intr_thread != THREAD_NULL && fp_intr_thread != thread)
panic("fp_intr: already caught intr");
fp_intr_thread = thread;
#endif /* NCPUS == 1 */