From owner-svn-src-stable-7@FreeBSD.ORG Mon Feb 9 22:21:39 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12DA410656BF; Mon, 9 Feb 2009 22:21:39 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F39CA8FC26; Mon, 9 Feb 2009 22:21:38 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n19MLcjF073260; Mon, 9 Feb 2009 22:21:38 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n19MLcHb073259; Mon, 9 Feb 2009 22:21:38 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <200902092221.n19MLcHb073259@svn.freebsd.org> From: Olivier Houchard Date: Mon, 9 Feb 2009 22:21:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188420 - stable/7/sys/arm/arm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Feb 2009 22:21:40 -0000 Author: cognet Date: Mon Feb 9 22:21:38 2009 New Revision: 188420 URL: http://svn.freebsd.org/changeset/base/188420 Log: MFC r188112 r188112 | cognet | 2009-02-04 02:14:06 +0100 (Wed, 04 Feb 2009) | 8 lines Erm... Report the buffer as being bounced even when it's the entire buffer, or we would end up invalidating the cache line for what we just copied... Modified: stable/7/sys/arm/arm/busdma_machdep.c Modified: stable/7/sys/arm/arm/busdma_machdep.c ============================================================================== --- stable/7/sys/arm/arm/busdma_machdep.c Mon Feb 9 22:18:11 2009 (r188419) +++ stable/7/sys/arm/arm/busdma_machdep.c Mon Feb 9 22:21:38 2009 (r188420) @@ -1164,7 +1164,7 @@ _bus_dma_buf_is_in_bp(bus_dmamap_t map, STAILQ_FOREACH(bpage, &map->bpages, links) { if ((vm_offset_t)buf >= bpage->datavaddr && - (vm_offset_t)buf + len < bpage->datavaddr + + (vm_offset_t)buf + len <= bpage->datavaddr + bpage->datacount) return (1); }