From owner-cvs-src@FreeBSD.ORG Fri Nov 9 09:58:09 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A0BD16A421; Fri, 9 Nov 2007 09:58:09 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A86313C4E3; Fri, 9 Nov 2007 09:58:09 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA99w9la099092; Fri, 9 Nov 2007 09:58:09 GMT (envelope-from delphij@repoman.freebsd.org) Received: (from delphij@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA99w9c3099091; Fri, 9 Nov 2007 09:58:09 GMT (envelope-from delphij) Message-Id: <200711090958.lA99w9c3099091@repoman.freebsd.org> From: Xin LI Date: Fri, 9 Nov 2007 09:58:08 +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/dev/ata ata-all.c ata-all.h ata-chipset.c ata-pci.c ata-pci.h atapi-cd.c atapi-cd.h 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, 09 Nov 2007 09:58:09 -0000 delphij 2007-11-09 09:58:08 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/ata ata-all.c ata-all.h ata-chipset.c ata-pci.c ata-pci.h atapi-cd.c atapi-cd.h Log: MFC: Sync the -HEAD state of ata(4) back to RELENG_6, except interrupt filtering, CAM MPSAFE, BIO_FLUSH and alpha support removal, which are not suitable for RELENG_6. This makes RELENG_6 to support the same set of ATA devices as RELENG_7 and -CURRENT did. Reviewed by: sos Revision Changes Path 1.252.2.12 +2 -4 src/sys/dev/ata/ata-all.c 1.103.2.12 +25 -1 src/sys/dev/ata/ata-all.h 1.126.2.22 +768 -415 src/sys/dev/ata/ata-chipset.c 1.105.2.6 +15 -11 src/sys/dev/ata/ata-pci.c 1.49.2.14 +16 -3 src/sys/dev/ata/ata-pci.h 1.179.2.8 +25 -27 src/sys/dev/ata/atapi-cd.c 1.44.2.2 +2 -1 src/sys/dev/ata/atapi-cd.h