Date: Sat, 23 Nov 1996 21:54:03 -0700 From: Steve Passe <smp@csn.net> To: freebsd-smp@freefall.freebsd.org Subject: Re: SMP -current merge Message-ID: <199611240454.VAA21729@clem.systemsix.com> In-Reply-To: Your message of "Sun, 24 Nov 1996 11:09:44 %2B0800." <199611240309.LAA24845@spinner.DIALix.COM>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi gang,
I found it!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
---
The problem was in machdep.c:
someone realized that r_gdt and r_idt were only used locally and moved
them from global scope to local scope. Unfortunately rcsmerge (I assumme)
retained the global copy. mp_machdep.c:init_secondary() uses the global ones,
which are now NOT initialized by init386()! this patch fixes the problem:
------------------------------------ cut --------------------------------
*** i386/i386/machdep.c~ 1996/11/24 03:55:31
--- i386/i386/machdep.c 1996/11/24 03:57:18
***************
*** 989,996 ****
--- 989,998 ----
struct gate_descriptor *gdp;
int gsel_tss;
struct isa_device *idp;
+ #if 0 /** FIXME: this is what broke the 11-20 merge */
/* table descriptors - used to load tables by microp */
struct region_descriptor r_gdt, r_idt;
+ #endif /** 0 */
int pagesinbase, pagesinext;
int target_page, pa_indx;
#ifdef SMP
------------------------------------ cut --------------------------------
In addition to this patch you do need to replace syscons.c and console.h
to make the 11-21 sources work. These files can be found in
freefall:/incoming/files1.tar.gz. Ignore the icu.s and vector.s files
in that tar, I don't think they're needed. Alternately you can revert to
rev 1.186 of i386/isa/syscons.c and rev 1.25 of i386/include/console.h
I have tested non-APIC_IO, APIC_IO, & APIC_IO-LAZY, all seem to work.
I need to do a lot of cleanup and further testing b4 I officially commit
this stuff, but the above changes should get you back in business.
I will hit it hard tomorrow and try to get everything properly tested
and committed by the end of the day.
--
Steve Passe | powered by
smp@csn.net | FreeBSD
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: 2.6.2
mQCNAzHe7tEAAAEEAM274wAEEdP+grIrV6UtBt54FB5ufifFRA5ujzflrvlF8aoE
04it5BsUPFi3jJLfvOQeydbegexspPXL6kUejYt2OeptHuroIVW5+y2M2naTwqtX
WVGeBP6s2q/fPPAS+g+sNZCpVBTbuinKa/C4Q6HJ++M9AyzIq5EuvO0a8Rr9AAUR
tBlTdGV2ZSBQYXNzZSA8c21wQGNzbi5uZXQ+
=ds99
-----END PGP PUBLIC KEY BLOCK-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199611240454.VAA21729>