From owner-freebsd-current Tue Dec 18 10:55:40 2001 Delivered-To: freebsd-current@freebsd.org Received: from freebie.xs4all.nl (freebie.xs4all.nl [213.84.32.253]) by hub.freebsd.org (Postfix) with ESMTP id 4ECB837B427; Tue, 18 Dec 2001 10:54:58 -0800 (PST) Received: (from wkb@localhost) by freebie.xs4all.nl (8.11.6/8.11.6) id fBIIstx03953; Tue, 18 Dec 2001 19:54:55 +0100 (CET) (envelope-from wkb) Date: Tue, 18 Dec 2001 19:54:55 +0100 From: Wilko Bulte To: Ruslan Ermilov Cc: Soren Schmidt , current@FreeBSD.ORG, alpha@FreeBSD.ORG Subject: Re: Recent fdc(4) commit broke Alpha kernels Message-ID: <20011218195455.C3874@freebie.xs4all.nl> References: <20011218200918.A14073@sunbay.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20011218200918.A14073@sunbay.com>; from ru@FreeBSD.ORG on Tue, Dec 18, 2001 at 08:09:18PM +0200 X-OS: FreeBSD 4.4-STABLE X-PGP: finger wilko@freebsd.org Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Dec 18, 2001 at 08:09:18PM +0200, Ruslan Ermilov wrote: s/Soren/Joerg/ And yes, he knows about it. Wilko > Soren! > > I bet someone else already mentioned your commit broke Alpha kernels. > > Index: fd.c > =================================================================== > RCS file: /home/ncvs/src/sys/isa/fd.c,v > retrieving revision 1.223 > diff -u -p -r1.223 fd.c > --- fd.c 2001/12/16 05:37:22 1.223 > +++ fd.c 2001/12/18 18:08:03 > @@ -1180,7 +1180,7 @@ fd_probe(device_t dev) > fd->flags = FD_UA; /* make sure fdautoselect() will be called */ > > fd->type = FD_DTYPE(flags); > -#if _MACHINE_ARCH == i386 > +#ifdef __i386__ > if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) { > /* Look up what the BIOS thinks we have. */ > if (fd->fdu == 0) { > @@ -1200,7 +1200,7 @@ fd_probe(device_t dev) > if (fd->type == FDT_288M_1) > fd->type = FDT_288M; > } > -#endif /* _MACHINE_ARCH == i386 */ > +#endif /* __i386__ */ > /* is there a unit? */ > if (fd->type == FDT_NONE) > return (ENXIO); > > > Cheers, > -- > Ruslan Ermilov Oracle Developer/DBA, > ru@sunbay.com Sunbay Software AG, > ru@FreeBSD.org FreeBSD committer, > +380.652.512.251 Simferopol, Ukraine > > http://www.FreeBSD.org The Power To Serve > http://www.oracle.com Enabling The Information Age > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-alpha" in the body of the message ---end of quoted text--- -- | / o / /_ _ email: wilko@FreeBSD.org |/|/ / / /( (_) Bulte Arnhem, The Netherlands To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message