Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 May 2002 19:43:45 +0300
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        Alfred Perlstein <alfred@FreeBSD.org>
Cc:        John Hay <jhay@icomtek.csir.co.za>, Takahashi Yoshihiro <nyan@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, current@FreeBSD.org
Subject:   Re: cvs commit: src/sys/dev/ct ct_machdep.h src/sys/dev/ncv ncr53c500var.h src/sys/dev/stg tmc18c30var.h
Message-ID:  <20020531164345.GB81288@sunbay.com>
In-Reply-To: <20020531163410.GZ17045@elvis.mu.org>
References:  <200205311202.g4VC2oU13402@zibbi.icomtek.csir.co.za> <200205300730.g4U7UhQ06252@freefall.freebsd.org> <20020531160839.GA74734@sunbay.com> <20020531163410.GZ17045@elvis.mu.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--cmJC7u66zC7hs+87
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, May 31, 2002 at 09:34:10AM -0700, Alfred Perlstein wrote:
> * Ruslan Ermilov <ru@FreeBSD.org> [020531 09:09] wrote:
> > >=20
> > > Stop in /usr/src/sys/i386/compile/GENERIC.
> > > #############################
> > >=20
> > > John
> >=20
> > Alfred,
> >=20
> > Your changes above broke building the GENERIC kernel.  __i386__ is alwa=
ys
> > 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.)
> >=20
> > I'm not sure what would me more correct; to include the definition of
> > softintr() from bsif.h, or to just commit the following:
>=20
> 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.
>=20
OK.  I also forgot the similar part for dev/nsp:

%%%
Index: nsp/nsp.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/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);
=20
-	SOFT_INTR_REQUIRED(slp);
 	return 0;
 }
=20
Index: nsp/nspvar.h
=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/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 *);
=20
-#if	defined(i386)
-#define	SOFT_INTR_REQUIRED(slp)	(softintr((slp)->sl_irq))
-#else	/* !i386 */
-#define	SOFT_INTR_REQUIRED(slp)
-#endif	/* !i386 */
 #endif	/* !_NSPVAR_H_ */
%%%

--=20
Ruslan Ermilov		Sysadmin and 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

--cmJC7u66zC7hs+87
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)

iD8DBQE896hAUkv4P6juNwoRAgGoAJ4uCgj4ZFT75i+ZNjrDQiMKpN0IagCfUjjk
haBVONshivjwaT54aGtF8I8=
=XlMF
-----END PGP SIGNATURE-----

--cmJC7u66zC7hs+87--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020531164345.GB81288>