From owner-freebsd-sparc64@FreeBSD.ORG Fri May 30 05:56:29 2003 Return-Path: Delivered-To: freebsd-sparc64@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE63C37B401 for ; Fri, 30 May 2003 05:56:29 -0700 (PDT) Received: from main.onix.ro (main.onix.ro [194.102.104.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A68143F75 for ; Fri, 30 May 2003 05:56:27 -0700 (PDT) (envelope-from mari@onix.ro) Received: from onix.ro (mari.work.onix.ro [194.102.104.20]) by main.onix.ro (8.11.6/8.11.6) with ESMTP id h4UC3FK27413; Fri, 30 May 2003 15:03:15 +0300 Message-ID: <3ED754E4.90001@onix.ro> Date: Fri, 30 May 2003 15:56:04 +0300 From: Marian Dobre Organization: Onix User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.0.2) Gecko/20021120 Netscape/7.01 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Thomas Moestl References: <20030529113731.GB630@crow.dom2ip.de> <3ED74D99.7080308@onix.ro> <20030530124551.GC654@crow.dom2ip.de> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-RAVMilter-Version: 8.4.2(snapshot 20021217) (main) cc: freebsd-sparc64@freebsd.org Subject: Re: PLEASE TEST: interrupt assignment patch X-BeenThere: freebsd-sparc64@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting FreeBSD to the Sparc List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2003 12:56:30 -0000 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 >