From owner-cvs-all@FreeBSD.ORG Thu Nov 9 10:51:02 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EFD116A403; Thu, 9 Nov 2006 10:51:02 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id C73DD43D5A; Thu, 9 Nov 2006 10:51:01 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id 7D1A960AB; Thu, 9 Nov 2006 13:50:59 +0300 (MSK) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id 447875F87; Thu, 9 Nov 2006 13:50:59 +0300 (MSK) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.8/8.13.8) id kA9Ap2Ol054701; Thu, 9 Nov 2006 13:51:02 +0300 (MSK) (envelope-from ru) Date: Thu, 9 Nov 2006 13:51:01 +0300 From: Ruslan Ermilov To: Takahashi Yoshihiro Message-ID: <20061109105101.GA53554@rambler-co.ru> References: <200611090828.kA98S3ms026878@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Bn2rw/3z4jIqBvZU" Content-Disposition: inline In-Reply-To: <200611090828.kA98S3ms026878@repoman.freebsd.org> User-Agent: Mutt/1.5.13 (2006-08-11) X-Virus-Scanned: No virus found Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/boot/pc98/libpc98 biossmap.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2006 10:51:02 -0000 --Bn2rw/3z4jIqBvZU Content-Type: multipart/mixed; boundary="sm4nu43k4a2Rpi4c" Content-Disposition: inline --sm4nu43k4a2Rpi4c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 09, 2006 at 08:28:02AM +0000, Takahashi Yoshihiro wrote: > nyan 2006-11-09 08:28:02 UTC >=20 > FreeBSD src repository >=20 > Added files: > sys/boot/pc98/libpc98 biossmap.c=20 > Log: > Add a stub of bios_addsmapdata(). PC98 does not have BIOS SMAP. > =20 > Revision Changes Path > 1.1 +38 -0 src/sys/boot/pc98/libpc98/biossmap.c (new) >=20 How about removing this and committing an attached patch instead? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --sm4nu43k4a2Rpi4c Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Content-Transfer-Encoding: quoted-printable Index: i386/libi386/bootinfo32.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/boot/i386/libi386/bootinfo32.c,v retrieving revision 1.37 diff -u -p -r1.37 bootinfo32.c --- i386/libi386/bootinfo32.c 2 Nov 2006 01:23:17 -0000 1.37 +++ i386/libi386/bootinfo32.c 9 Nov 2006 10:41:52 -0000 @@ -219,7 +219,9 @@ bi_load32(char *args, int *howtop, int * file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); +#ifndef PC98 bios_addsmapdata(kfp); +#endif =20 /* Figure out the size and location of the metadata */ *modulep =3D addr; Index: pc98/libpc98/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/boot/pc98/libpc98/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- pc98/libpc98/Makefile 11 Apr 2006 20:11:30 -0000 1.24 +++ pc98/libpc98/Makefile 9 Nov 2006 10:41:18 -0000 @@ -5,11 +5,13 @@ INTERNALLIB=3D =20 .PATH: ${.CURDIR}/../../i386/libi386 =20 -SRCS=3D bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ +SRCS=3D bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c \ bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c =20 +CFLAGS+=3D -DPC98 + BOOT_COMCONSOLE_PORT?=3D 0x238 CFLAGS+=3D -DCOMPORT=3D${BOOT_COMCONSOLE_PORT} =20 --sm4nu43k4a2Rpi4c-- --Bn2rw/3z4jIqBvZU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFUwgVqRfpzJluFF4RAkiCAJ4hXi7ol/vjEcIi7sD/sRXoA509KQCghAMw cS3/bD/QTSSALKN4sKxtWHE= =01Ok -----END PGP SIGNATURE----- --Bn2rw/3z4jIqBvZU--