Changeset 09c18f7 in mainline

Timestamp:

2006-03-03T11:52:46Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd21922

Parents:

f76fed4

Message:

Correct sleeping on memory allocation during FPU lazy switch.

File:

• generic/src/proc/scheduler.c (modified) (3 diffs)

generic/src/proc/scheduler.c

@@ -97 +97 @@
 void scheduler_fpu_lazy_request(void)
 {
+restart:
         fpu_enable();
         spinlock_lock(&CPU->lock);
@@ -107 +108 @@
                 CPU->fpu_owner->fpu_context_engaged=0; 
                 spinlock_unlock(&CPU->fpu_owner->lock);
+                CPU->fpu_owner = NULL;
         }
 
@@ -117 +119 @@
                         /* Might sleep */
                         spinlock_unlock(&THREAD->lock);
+                        spinlock_unlock(&CPU->lock);
                         THREAD->saved_fpu_context = slab_alloc(fpu_context_slab,
                                                                0);
-                        spinlock_lock(&THREAD->lock);
+                        /* We may have switched CPUs during slab_alloc */
+                        goto restart; 
                 }
                 fpu_init();