Re: Linux-2.1.129..

Linus Torvalds (torvalds@transmeta.com)
Thu, 19 Nov 1998 11:11:31 -0800 (PST)


On Thu, 19 Nov 1998, Jeremy Katz wrote:
>
> I'm still working on getting the patch, but does it fix the "UP flu" that
> those of us not blessed with multi-processor machines have been seeing
> since 127-pre7? Unless I missed a message here, I thought the problem was
> still unresolved. This is one of the things which definitely needs to be
> fixed before 2.2 (so you're not just a chicken ;) or the outcry will be
> amazing...

Nope, the UP flu should be fixed by the separate patch I posted earlier
(and here it is for your edification again). Please tell me whether it
really does fix the problems you've seen..

Linus

-----
diff -u --recursive --new-file v2.1.129/linux/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
--- v2.1.129/linux/arch/i386/kernel/entry.S Sun Nov 8 14:02:42 1998
+++ linux/arch/i386/kernel/entry.S Thu Nov 19 10:05:37 1998
@@ -150,14 +150,14 @@
jmp ret_from_sys_call


-#ifdef __SMP__
ALIGN
- .globl ret_from_smpfork
-ret_from_smpfork:
+ .globl ret_from_fork
+ret_from_fork:
GET_CURRENT(%ebx)
+#ifdef __SMP__
btrl $0, SYMBOL_NAME(scheduler_lock)
- jmp ret_from_sys_call
#endif /* __SMP__ */
+ jmp ret_from_sys_call

/*
* Return to user mode is not as complex as all this looks,
diff -u --recursive --new-file v2.1.129/linux/arch/i386/kernel/process.c linux/arch/i386/kernel/process.c
--- v2.1.129/linux/arch/i386/kernel/process.c Fri Oct 9 13:27:05 1998
+++ linux/arch/i386/kernel/process.c Thu Nov 19 09:53:35 1998
@@ -50,11 +50,7 @@

spinlock_t semaphore_wake_lock = SPIN_LOCK_UNLOCKED;

-#ifdef __SMP__
-asmlinkage void ret_from_fork(void) __asm__("ret_from_smpfork");
-#else
-asmlinkage void ret_from_fork(void) __asm__("ret_from_sys_call");
-#endif
+asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");

#ifdef CONFIG_APM
extern int apm_do_idle(void);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/