From owner-freebsd-alpha Tue Dec 18 10: 9:32 2001 Delivered-To: freebsd-alpha@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 31E1A37B416; Tue, 18 Dec 2001 10:09:22 -0800 (PST) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id fBII9Iu14405; Tue, 18 Dec 2001 20:09:18 +0200 (EET) (envelope-from ru) Date: Tue, 18 Dec 2001 20:09:18 +0200 From: Ruslan Ermilov To: Soren Schmidt Cc: current@FreeBSD.org, alpha@FreeBSD.org Subject: Recent fdc(4) commit broke Alpha kernels Message-ID: <20011218200918.A14073@sunbay.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.23i Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org 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