patch-2.1.132 linux/arch/i386/kernel/entry.S

• Lines: 17
• Date: Wed Dec 16 11:08:23 1998
• Orig file: v2.1.131/linux/arch/i386/kernel/entry.S
• Orig date: Wed Dec 16 10:32:54 1998

diff -u --recursive --new-file v2.1.131/linux/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
@@ -155,7 +155,7 @@
 ret_from_fork:
 	GET_CURRENT(%ebx)
 #ifdef __SMP__
-	btrl	$0, SYMBOL_NAME(scheduler_lock)
+	lock ; btrl $0, SYMBOL_NAME(scheduler_lock)
 #endif /* __SMP__ */
 	jmp	ret_from_sys_call
 
@@ -193,6 +193,7 @@
 
 	ALIGN
 signal_return:
+	sti				# we can get here from an interrupt handler
 	testl $(VM_MASK),EFLAGS(%esp)
 	movl %esp,%eax
 	jne v86_signal_return