From owner-cvs-src@FreeBSD.ORG Fri Sep 22 19:04:52 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B88916A412; Fri, 22 Sep 2006 19:04:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3EC143D49; Fri, 22 Sep 2006 19:04:51 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8MJ4p4m048033; Fri, 22 Sep 2006 19:04:51 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MJ4pGP048032; Fri, 22 Sep 2006 19:04:51 GMT (envelope-from jhb) Message-Id: <200609221904.k8MJ4pGP048032@repoman.freebsd.org> From: John Baldwin Date: Fri, 22 Sep 2006 19:04:51 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/amd64/amd64 nexus.c src/sys/i386/i386 nexus.c src/sys/kern subr_rman.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 19:04:52 -0000 jhb 2006-09-22 19:04:51 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/amd64/amd64 nexus.c sys/i386/i386 nexus.c sys/kern subr_rman.c Log: MFC: Fix rman_manage_region() to detect overlaps and coallesce adjacent free regions. Approved by: re (mux) Revision Changes Path 1.66.2.1 +3 -11 src/sys/amd64/amd64/nexus.c 1.62.2.1 +3 -11 src/sys/i386/i386/nexus.c 1.43.2.2 +41 -3 src/sys/kern/subr_rman.c