On Fri, May 31, 2002 at 09:34:10AM -0700, Alfred Perlstein wrote: > * Ruslan Ermilov <[EMAIL PROTECTED]> [020531 09:09] wrote: > > > > > > Stop in /usr/src/sys/i386/compile/GENERIC. > > > ############################# > > > > > > John > > > > Alfred, > > > > Your changes above broke building the GENERIC kernel. __i386__ is always > > defined (whether -ansi or not), and this now causes SOFT_INTR_REQUIRED() > > macro to use non-existing softintr(). (Well, it's defined as empty in > > sys/i386/isa/bs/bsif.h.) > > > > I'm not sure what would me more correct; to include the definition of > > softintr() from bsif.h, or to just commit the following: > > I'm really fine with either. Let's wait till tomorrow for anyone to > speak up, if no one does please feel free to commit whichever one you > feel more comfortable with. > OK. I also forgot the similar part for dev/nsp:
%%%
Index: nsp/nsp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/nsp/nsp.c,v
retrieving revision 1.8
diff -u -p -r1.8 nsp.c
--- nsp/nsp.c 20 Mar 2002 02:07:34 -0000 1.8
+++ nsp/nsp.c 31 May 2002 16:39:07 -0000
@@ -492,7 +492,6 @@ nsp_world_start(sc, fdone)
nsphw_init(sc);
scsi_low_bus_reset(slp);
- SOFT_INTR_REQUIRED(slp);
return 0;
}
Index: nsp/nspvar.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/nsp/nspvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 nspvar.h
--- nsp/nspvar.h 20 Mar 2002 02:07:36 -0000 1.5
+++ nsp/nspvar.h 31 May 2002 16:39:07 -0000
@@ -105,9 +105,4 @@ void nspattachsubr(struct nsp_softc *);
int nspprint(void *, const char *);
int nspintr(void *);
-#if defined(i386)
-#define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq))
-#else /* !i386 */
-#define SOFT_INTR_REQUIRED(slp)
-#endif /* !i386 */
#endif /* !_NSPVAR_H_ */
%%%
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
msg39040/pgp00000.pgp
Description: PGP signature
