Date: Fri, 30 May 2003 15:56:04 +0300 From: Marian Dobre <mari@onix.ro> To: Thomas Moestl <t.moestl@tu-bs.de> Cc: freebsd-sparc64@freebsd.org Subject: Re: PLEASE TEST: interrupt assignment patch Message-ID: <3ED754E4.90001@onix.ro> References: <20030529113731.GB630@crow.dom2ip.de> <3ED74D99.7080308@onix.ro> <20030530124551.GC654@crow.dom2ip.de>
next in thread | previous in thread | raw e-mail | index | archive | help
I just updated the kernel source and the patch for ofw_pci.c fails. |Index: pci/ofw_pci.c |=================================================================== |RCS file: /vol/ncvs/src/sys/sparc64/pci/ofw_pci.c,v |retrieving revision 1.10 |diff -u -r1.10 ofw_pci.c |--- pci/ofw_pci.c 27 Mar 2003 02:01:59 -0000 1.10 |+++ pci/ofw_pci.c 27 May 2003 11:55:48 -0000 -------------------------- Patching file pci/ofw_pci.c using Plan A... Hunk #1 failed at 46. Hunk #2 succeeded at 135 (offset -2 lines). Hunk #3 succeeded at 308 (offset -13 lines). 1 out of 3 hunks failed--saving rejects to pci/ofw_pci.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: I'm probably using the wrong kernel sources. I've used cvsup to update the sources but it looks like its 5.0 This is what i have in my standard-supfile: *default release=cvs tag=RELENG_5_0 Marian Thomas Moestl wrote: > On Fri, 2003/05/30 at 15:24:57 +0300, Marian Dobre wrote: > >>Hello, >> >>I can't compile the kernel after I applied the patch on my E450. >>This is the error I'm getting. >> >>rib/ipfilter -D_KERNEL -include opt_global.h -mcmodel=medlow >>-msoft-float -fno-common -ffreestanding -Werror >>/usr/src/sys/sparc64/pci/ofw_pci.c >>/usr/src/sys/sparc64/pci/ofw_pci.c:76: conflicting types for >>`ofw_pci_orb_callback' >>/usr/src/sys/sparc64/pci/ofw_pci.h:74: previous declaration of >>`ofw_pci_orb_callback' >>/usr/src/sys/sparc64/pci/ofw_pci.c: In function `ofw_pci_orb_callback': >>/usr/src/sys/sparc64/pci/ofw_pci.c:92: `slot' undeclared (first use in >>this function) >>/usr/src/sys/sparc64/pci/ofw_pci.c:92: (Each undeclared identifier is >>reported only once >>/usr/src/sys/sparc64/pci/ofw_pci.c:92: for each function it appears in.) >>/usr/src/sys/sparc64/pci/ofw_pci.c:94: `found' undeclared (first use in >>this function) >>cc1: warnings being treated as errors >>/usr/src/sys/sparc64/pci/ofw_pci.c: In function `ofw_pci_route_intr': >>/usr/src/sys/sparc64/pci/ofw_pci.c:110: warning: passing arg 3 of >>`ofw_bus_route_intr' from incompatible pointer type >>*** Error code 1 >> >>Stop in /usr/obj/usr/src/sys/CUSTOM. >>*** Error code 1 >> >>Stop in /usr/src. >>*** Error code 1 >> >>Stop in /usr/src. > > > This looks like a hosed source tree; the declaration of > ofw_pci_orb_callback, for example, is not touched at all by the > patch. > > - Thomas >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3ED754E4.90001>