On Feb 3, 2006, at 3:33 PM, Julio M. Merino Vidal wrote:

>
> Module Name:	src
> Committed By:	jmmv
> Date:		Fri Feb  3 23:33:31 UTC 2006
>
> Modified Files:
> 	src/distrib/sets/lists/comp: md.amd64 md.i386
> 	src/sys/arch/amd64/amd64: autoconf.c
> 	src/sys/arch/amd64/include: Makefile
> 	src/sys/arch/i386/i386: autoconf.c multiboot.c
> 	src/sys/arch/i386/include: Makefile multiboot.h
> 	src/sys/arch/x86/include: Makefile
> 	src/sys/arch/x86/x86: x86_autoconf.c
> Added Files:
> 	src/sys/arch/amd64/include: autoconf.h
> 	src/sys/arch/i386/include: autoconf.h
> 	src/sys/arch/x86/include: autoconf.h
>
> Log Message:
> When booting an i386 kernel with Multiboot, properly detect the  
> boot device
> by looking it up in the x86_alldisks table (instead of trying to  
> match it
> to 'wd*' manually).
>
> In order to do this, move the cpu_rootconf function from x86 common  
> code
> to amd64 and i386 specific one.  This way, i386 can do an extra  
> step (call
> the appropriate Multiboot code) in the appropriate place (after
> x86_matchbiosdisks and before findroot()).

This is really unfortunate.  Is there any way to share more of that  
code between i386 and amd64?

-- thorpej