Date: Thu, 30 Jul 2015 20:15:17 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Larry Rosenman <ler@lerctr.org> Cc: Benno Rice <benno@freebsd.org>, freebsd-current@freebsd.org Subject: Re: pmspcv panic on boot on this box Message-ID: <20150730201517.GI90754@FreeBSD.org> In-Reply-To: <20150730201351.GH90754@FreeBSD.org> References: <20150728210109.GA6424@oldtbh.lerctr.org> <04E640B9-423C-4C30-BF90-D3DD148C930D@FreeBSD.org> <765D2BB8-F101-4D8C-BF1D-BB896904FB29@FreeBSD.org> <e510aec2b8d394cccf166ecabcad9785@thebighonker.lerctr.org> <20150730201351.GH90754@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150730201517.GI90754>