Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Dec 2009 17:42:48 +0000
From:      Anton Shterenlikht <mexas@bristol.ac.uk>
To:        Anton Shterenlikht <mexas@bristol.ac.uk>
Cc:        Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= <des@des.no>, freebsd-current@freebsd.org, "b. f." <bf1783@googlemail.com>
Subject:   Re: still trouble with pci.c on i386
Message-ID:  <20091222174248.GA61700@mech-cluster241.men.bris.ac.uk>
In-Reply-To: <20091222153638.GB61098@mech-cluster241.men.bris.ac.uk>
References:  <d873d5be0912201722v6269800bx989510d47ace1888@mail.gmail.com> <20091222141939.GA60890@mech-cluster241.men.bris.ac.uk> <86iqbz5bju.fsf@ds4.des.no> <20091222153638.GB61098@mech-cluster241.men.bris.ac.uk>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Dec 22, 2009 at 03:36:38PM +0000, Anton Shterenlikht wrote:
> On Tue, Dec 22, 2009 at 03:27:17PM +0100, Dag-Erling Smørgrav wrote:
> > Anton Shterenlikht <mexas@bristol.ac.uk> writes:
> > > However, I'm not sure
> > > what the strategy is for reverting to previous revisions.
> > > For example if I know (from previous posts) that r 200341
> > > breaks src/sys/dev/pci/pci.c and pci_pci.c, then which
> > > revision should I sync with?
> > 
> > r200340, of course.
> > 
> > > First I updated all src:
> > >
> > > svn update svn://svn.freebsd.org/base/head /usr/src
> > >
> > > then I reverted to r 200315, but only for pci src:
> > >
> > > svn update -r 200315 svn://svn.freebsd.org/base/head/sys/dev/pci /usr/src/sys/dev/pci
> > 
> > Umm, is your /usr/src actually a Subversion working copy?
> > 
> > Both svn commands are wrong, didn't you notice the error messages?
> 
> no, I don't think so.
> 
> I tried to follow this guide: http://wiki.freebsd.org/SubversionPrimer
> 
> and this book: http://svnbook.red-bean.com/
> 
> Are these adequate? 
> 
> > The easiest way to do this is to apply the problematic revision in
> > reverse:
> > 
> > % cd /usr/src/sys
> > % svn diff -c200341 http://svn.freebsd.org/base/head/sys | patch -R

I did just that, rebuilt kernel, but still get panic.

Perhaps I misunderstand svn, but isn't it possible that the changes
which cause panic are not between 200341 and 200340, but have to be
recovered from an earlier revision. For example, looking at
http://svn.freebsd.org/viewvc/base/head/sys/dev/pci/pci.c?view=log&pathrev=200341
the previous version of pci.c was in r 200315, and the previous version of
pci_pci.c was in r192481. So shouldn't I revert to 192481?

I'll try to roll back to r192481, and see if this helps.

If this is not the right list for these quiestions, just tell me off.

many thanks

-- 
Anton Shterenlikht
Room 2.6, Queen's Building
Mech Eng Dept
Bristol University
University Walk, Bristol BS8 1TR, UK
Tel: +44 (0)117 331 5944
Fax: +44 (0)117 929 4423



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