From owner-freebsd-current@FreeBSD.ORG Mon Jun 29 08:31:52 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C9051065673; Mon, 29 Jun 2009 08:31:52 +0000 (UTC) (envelope-from spambox@haruhiism.net) Received: from fujibayashi.jp (karas.fujibayashi.jp [77.221.159.4]) by mx1.freebsd.org (Postfix) with ESMTP id 52FD28FC0C; Mon, 29 Jun 2009 08:31:52 +0000 (UTC) (envelope-from spambox@haruhiism.net) Received: from [192.168.0.2] (ppp91-122-47-189.pppoe.avangarddsl.ru [91.122.47.189]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by fujibayashi.jp (Postfix) with ESMTPSA id 0F0BD78FA9; Mon, 29 Jun 2009 12:31:51 +0400 (MSD) Message-ID: <4A487BF7.8060103@haruhiism.net> Date: Mon, 29 Jun 2009 12:31:51 +0400 From: Kamigishi Rei User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: Alexander Motin References: <1246206181.00132972.1246192801@10.7.7.3> <1246206186.00132982.1246194002@10.7.7.3> <1246209783.00133001.1246197001@10.7.7.3> <1246260183.00133237.1246247402@10.7.7.3> <4A48798A.5070604@FreeBSD.org> In-Reply-To: <4A48798A.5070604@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Goran Lowkrantz , freebsd-current@freebsd.org, Alexander Best Subject: Re: RFC: ATA to CAM integration patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 29 Jun 2009 08:31:52 -0000 Alexander Motin wrote: >> Kernel builds fine for me after "sed >> 's/AHCI_DMA_ENTRIES/AHCI_SG_ENTRIES/' /usr/src/sys/dev/ahci/ahci.c" >> (only one occurrence of that macro, aside from the .h file, anyway). > You are right. Thank you. Committed to P4. On a side note: the two secondary patches mentioned in the discussion (camcontrol and the other one) do not apply cleanly to r195137, even though the files' contents match. I had to edit the files manually, however, kernel still panics in xpt during boot right after the AHCI bus poll. I didn't remove atapicam from the kernel configuration, because according to your post with that patch earlier the patch should have fixed that behaviour. -- Kamigishi Rei KREI-RIPE