From owner-svn-src-all@FreeBSD.ORG Wed Apr 30 06:03:02 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EC755C7; Wed, 30 Apr 2014 06:03:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6169111FC; Wed, 30 Apr 2014 06:03:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3U632w7068825; Wed, 30 Apr 2014 06:03:02 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3U631sC068820; Wed, 30 Apr 2014 06:03:01 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201404300603.s3U631sC068820@svn.freebsd.org> From: Devin Teske Date: Wed, 30 Apr 2014 06:03:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org Subject: svn commit: r265131 - in stable/4/sys: conf i386/conf modules X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2014 06:03:02 -0000 Author: dteske Date: Wed Apr 30 06:03:01 2014 New Revision: 265131 URL: http://svnweb.freebsd.org/changeset/base/265131 Log: Merge r144423 with r144497 in-mind. Glue the arcmsr driver into the stable/4 branch -- but don't build arcmsr on pc98. This is a direct commit to stable/4 as arcmsr is already hooked into stable/5 and up. Modified: stable/4/sys/conf/files.i386 stable/4/sys/i386/conf/GENERIC stable/4/sys/i386/conf/LINT stable/4/sys/modules/Makefile Modified: stable/4/sys/conf/files.i386 ============================================================================== --- stable/4/sys/conf/files.i386 Wed Apr 30 05:59:31 2014 (r265130) +++ stable/4/sys/conf/files.i386 Wed Apr 30 06:03:01 2014 (r265131) @@ -91,6 +91,7 @@ crypto/des/des_setkey.c optional crypt dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/ar/if_ar_isa.c optional ar isa +dev/arcmsr/arcmsr.c optional arcmsr pci dev/arl/if_arl.c optional arl dev/arl/if_arl_isa.c optional arl isa dev/dgb/dgm.c optional dgm Modified: stable/4/sys/i386/conf/GENERIC ============================================================================== --- stable/4/sys/i386/conf/GENERIC Wed Apr 30 05:59:31 2014 (r265130) +++ stable/4/sys/i386/conf/GENERIC Wed Apr 30 06:03:01 2014 (r265131) @@ -131,6 +131,7 @@ device aac # Adaptec FSA RAID, Dell PE device ida # Compaq Smart RAID device ips # IBM/Adaptec ServeRAID device amr # AMI MegaRAID +device arcmsr # Areca SATA II RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family device pst # Promise Supertrak SX6000 Modified: stable/4/sys/i386/conf/LINT ============================================================================== --- stable/4/sys/i386/conf/LINT Wed Apr 30 05:59:31 2014 (r265130) +++ stable/4/sys/i386/conf/LINT Wed Apr 30 06:03:01 2014 (r265131) @@ -1276,6 +1276,12 @@ device pst # Promise Supertrak SX6000 device amr # AMI MegaRAID # +# Areca 11xx and 12xx series of SATA II RAID controllers. +# CAM is required. +# +device arcmsr # Areca SATA II RAID + +# # 3ware ATA RAID # device twe # 3ware ATA RAID Modified: stable/4/sys/modules/Makefile ============================================================================== --- stable/4/sys/modules/Makefile Wed Apr 30 05:59:31 2014 (r265130) +++ stable/4/sys/modules/Makefile Wed Apr 30 06:03:01 2014 (r265131) @@ -149,6 +149,7 @@ SUBDIR+=ar \ .if ${MACHINE} == "i386" SUBDIR+=aac \ + arcmsr \ arl \ asr \ ciss \