Subject: CVS commit: src
To: None <>
From: Julio M. Merino Vidal <>
List: source-changes
Date: 02/03/2006 23:33:31
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()).

To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -r1.88 -r1.89 src/distrib/sets/lists/comp/md.i386
cvs rdiff -r1.12 -r1.13 src/sys/arch/amd64/amd64/autoconf.c
cvs rdiff -r1.4 -r1.5 src/sys/arch/amd64/include/Makefile
cvs rdiff -r0 -r1.1 src/sys/arch/amd64/include/autoconf.h
cvs rdiff -r1.81 -r1.82 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/i386/multiboot.c
cvs rdiff -r1.30 -r1.31 src/sys/arch/i386/include/Makefile
cvs rdiff -r0 -r1.1 src/sys/arch/i386/include/autoconf.h
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/include/multiboot.h
cvs rdiff -r1.5 -r1.6 src/sys/arch/x86/include/Makefile
cvs rdiff -r0 -r1.1 src/sys/arch/x86/include/autoconf.h
cvs rdiff -r1.6 -r1.7 src/sys/arch/x86/x86/x86_autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.