From owner-freebsd-current@freebsd.org Thu Jul 30 20:20:47 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 4D75E9ACE65; Thu, 30 Jul 2015 20:20:47 +0000 (UTC) (envelope-from ler@lerctr.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "thebighonker.lerctr.org", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 227EEE65; Thu, 30 Jul 2015 20:20:47 +0000 (UTC) (envelope-from ler@lerctr.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=lerami; h=Message-ID:References:In-Reply-To:Subject:Cc:To:From:Date:Content-Transfer-Encoding:Content-Type:MIME-Version; bh=/9zl7fIyrvUvL4gPQ5cJ+Yh2Ti9tfh9hnUxxSIHEKX8=; b=j36qYR6SW9r+HqMZjsaNsMsJdYv7TK1Qa+nAHDYSZr2gbfsryYXoPOZkzs/y0jQ//SWSVvDxpiniq5nOnl6LKyRV3cT32sdExtSjDGEYmCwtKXKCCsPRaEwXEJaXZoEuzHS03aSpWXiJmWYUqAqUUre97U8rkpSJLXzFZ8HIUCU=; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:223:7dff:fe9e:6e8a]:12868 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.85 (FreeBSD)) (envelope-from ) id 1ZKuJq-0000sK-8g; Thu, 30 Jul 2015 15:20:46 -0500 Received: from cpe-70-113-56-244.austin.res.rr.com ([70.113.56.244]) by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Thu, 30 Jul 2015 15:20:46 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 30 Jul 2015 15:20:46 -0500 From: Larry Rosenman To: Glen Barber Cc: Benno Rice , freebsd-current@freebsd.org, owner-freebsd-current@freebsd.org Subject: Re: pmspcv panic on boot on this box In-Reply-To: <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> <20150730201517.GI90754@FreeBSD.org> Message-ID: X-Sender: ler@lerctr.org User-Agent: Roundcube Webmail/1.1.2 X-Spam-Score: -1.0 (-) X-LERCTR-Spam-Score: -1.0 (-) X-Spam-Report: SpamScore (-1.0/5.0) ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 X-LERCTR-Spam-Report: SpamScore (-1.0/5.0) ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 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:20:47 -0000 On 2015-07-30 15:15, Glen Barber wrote: > 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 >> > |=================================================================== >> > |--- 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] = { 0, 0, 0, 0 };^M >> >> Hmm. Somehow you ended up with MS DOS EOL... >> >> I'm able to apply the patch without issues. Try this: >> >> vi pmspcv.diff >> :%s:[ctrl-m]::g >> >> It should apply afterward. >> > > Or, fetch the patch from here: > > https://people.freebsd.org/~gjb/pmspcv.diff.txt > > Glen Kernel compiling -- give mr a bit and I'll boot it and make sure it comes up. -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 7011 W Parmer Ln, Apt 1115, Austin, TX 78729-6961