From owner-freebsd-current@freebsd.org Thu Jul 30 20:15:19 2015 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2841A9ACD44 for ; Thu, 30 Jul 2015 20:15:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 13FF0C0E; Thu, 30 Jul 2015 20:15:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id 837611AFB; Thu, 30 Jul 2015 20:15:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Thu, 30 Jul 2015 20:15:17 +0000 From: Glen Barber To: Larry Rosenman Cc: Benno Rice , freebsd-current@freebsd.org Subject: Re: pmspcv panic on boot on this box Message-ID: <20150730201517.GI90754@FreeBSD.org> References: <20150728210109.GA6424@oldtbh.lerctr.org> <04E640B9-423C-4C30-BF90-D3DD148C930D@FreeBSD.org> <765D2BB8-F101-4D8C-BF1D-BB896904FB29@FreeBSD.org> <20150730201351.GH90754@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6THr7QwYWIbrk6Kt" Content-Disposition: inline In-Reply-To: <20150730201351.GH90754@FreeBSD.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 20:15:19 -0000 --6THr7QwYWIbrk6Kt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 30, 2015 at 08:13:51PM +0000, Glen Barber wrote: > On Thu, Jul 30, 2015 at 03:09:30PM -0500, Larry Rosenman wrote: > > $ sudo -s > > Password: > > # cd /usr/src > > # patch -p0 < ~ler/pmspcv.diff > > Hmm... Looks like a unified diff to me... > > The text leading up to this was: > > -------------------------- > > |Index: sys/dev/pms/freebsd/driver/common/lxutil.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 > > |--- sys/dev/pms/freebsd/driver/common/lxutil.c (revision 286083) > > |+++ sys/dev/pms/freebsd/driver/common/lxutil.c (working copy) > > -------------------------- > > Patching file sys/dev/pms/freebsd/driver/common/lxutil.c using Plan A... > > Hunk #1 failed at 758. > > Hunk #2 failed at 767. > > 2 out of 2 hunks failed--saving rejects to > > sys/dev/pms/freebsd/driver/common/lxutil.c.rej > > done > > # vi sys/dev/pms/freebsd/driver/common/lxutil.c.rej > > @@ -758,6 +758,7 @@ > > int idx;^M > > static U32 cardMap[4] =3D { 0, 0, 0, 0 };^M >=20 > Hmm. Somehow you ended up with MS DOS EOL... >=20 > I'm able to apply the patch without issues. Try this: >=20 > vi pmspcv.diff > :%s:[ctrl-m]::g >=20 > It should apply afterward. >=20 Or, fetch the patch from here: https://people.freebsd.org/~gjb/pmspcv.diff.txt Glen --6THr7QwYWIbrk6Kt Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVuoXVAAoJEAMUWKVHj+KTcccP/i/o6umunh+Gw7n7fCDlrNOr wPR5UVJUy4gExeyJ8yhXrVV183EMELcjT+nDil7R0oX83PrIroPF+3doNLIfzTr7 PhpEolPUedLKyYjQXXek9H6OD0fT8u3o1IrhAodx4sK5qAEfDvvi9HgkXyPtddAi Ft8r02fSEyH+gBsVdKxqEPYAR62hsx2BmUHj5U+0Gc9awXvYj+A97RgAMt/R5KE3 rXkrI/KYIaXmHsn5pPFZ6VgZROgdEN4qIP2UkKWfklH9RHuRpqNgzjFI1DTgUHtk M7fI4E/Fe2EwlawwSTztAzZDub1Wsf4JEis7OxbBHWDdw0Y+KBcTJB4SpZjNOk/2 +by3VT++vmuJBZxEA2Fz78o0R2IVT0SxkWyTjkfg8P1drIJb7EkCE+qTfxc5jEcx WLLLhtX2XlKuuJElqfgu3fnEuU9gJtzqFUpEkl2OMN9+KwepBQOaxPrxDO70aT6A x5zWekjuYBRQyUxDnRVE5b9st+3LHDq2q6vTAtpW62pTwHhl/yZQycVigINRssYX CORpi6j5KZZY8q58mAVYAyHzth9Arh79nVG+wtC1WWLr2XGVPE1Gm32KQES3g7O7 cwGHKvGSvey/7oyj/tjKoTUeT9zplkAZtkTLwoA4RV7bbXMm58JU7+S/4qWU5/UT UX4xlw9HWEGjIAZNXoYL =CZQP -----END PGP SIGNATURE----- --6THr7QwYWIbrk6Kt--