From 11b05f11d4d6d61717e345d20f492977b95ab131 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 May 2014 10:11:13 +0200 Subject: score: Fix CPU context usage on SMP We must not alter the is executing indicator in _CPU_Context_Initialize() since this would cause an invalid state during a self restart. The is executing indicator must be valid at creation time since otherwise _Thread_Kill_zombies() uses an undefined value for not started threads. This could result in a system life lock. --- cpukit/score/cpu/i386/cpu_asm.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpukit/score/cpu/i386/cpu_asm.S') diff --git a/cpukit/score/cpu/i386/cpu_asm.S b/cpukit/score/cpu/i386/cpu_asm.S index cc08312f33..9b395678b8 100644 --- a/cpukit/score/cpu/i386/cpu_asm.S +++ b/cpukit/score/cpu/i386/cpu_asm.S @@ -58,24 +58,24 @@ SYM (_CPU_Context_switch): movl edi,REG_EDI(eax) /* save destination register */ #ifdef RTEMS_SMP - /* Indicate that this context is no longer executing */ + /* The executing context no longer executes on this processor */ movb $0, I386_CONTEXT_CONTROL_IS_EXECUTING_OFFSET(eax) #endif movl HEIRCONTEXT_ARG(esp),eax /* eax = heir threads context */ -restore: #ifdef RTEMS_SMP - /* Wait for context to stop execution if necessary */ + /* Wait for heir context to stop execution */ 1: movb I386_CONTEXT_CONTROL_IS_EXECUTING_OFFSET(eax), bl testb bl, bl jne 1b - /* Indicate that this context is executing */ + /* The heir context executes now on this processor */ movb $1, I386_CONTEXT_CONTROL_IS_EXECUTING_OFFSET(eax) #endif +restore: pushl REG_EFLAGS(eax) /* push eflags */ popf /* restore eflags */ movl REG_ESP(eax),esp /* restore stack pointer */ -- cgit v1.2.3