From owner-svn-src-all@FreeBSD.ORG Sat May 17 17:18:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 615E7EB8; Sat, 17 May 2014 17:18:36 +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 3462A2607; Sat, 17 May 2014 17:18:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HHIaT1053073; Sat, 17 May 2014 17:18:36 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HHIZSB053069; Sat, 17 May 2014 17:18:35 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201405171718.s4HHIZSB053069@svn.freebsd.org> From: Ian Lepore Date: Sat, 17 May 2014 17:18:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266330 - in stable/10/sys: kern powerpc/conf X-SVN-Group: stable-10 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.18 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: Sat, 17 May 2014 17:18:36 -0000 Author: ian Date: Sat May 17 17:18:35 2014 New Revision: 266330 URL: http://svnweb.freebsd.org/changeset/base/266330 Log: MFC 261357, 261358, 261421: Enable SCHED_ULE for ppc book-e. Add driver for the ADT7460/ADT7467 fan controller found in later PowerBooks and iBooks. Modified: stable/10/sys/kern/sched_ule.c stable/10/sys/powerpc/conf/GENERIC stable/10/sys/powerpc/conf/MPC85XX Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/sched_ule.c ============================================================================== --- stable/10/sys/kern/sched_ule.c Sat May 17 16:57:17 2014 (r266329) +++ stable/10/sys/kern/sched_ule.c Sat May 17 17:18:35 2014 (r266330) @@ -77,10 +77,6 @@ dtrace_vtime_switch_func_t dtrace_vtime_ #include #include -#if defined(__powerpc__) && defined(BOOKE_E500) -#error "This architecture is not currently compatible with ULE" -#endif - #define KTR_ULE 0 #define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX))) Modified: stable/10/sys/powerpc/conf/GENERIC ============================================================================== --- stable/10/sys/powerpc/conf/GENERIC Sat May 17 16:57:17 2014 (r266329) +++ stable/10/sys/powerpc/conf/GENERIC Sat May 17 17:18:35 2014 (r266330) @@ -126,6 +126,11 @@ device scc device uart device uart_z8530 +# FireWire support +device firewire # FireWire bus code +device sbp # SCSI over FireWire (Requires scbus and da) +device fwe # Ethernet over FireWire (non-standard!) + # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support device bge # Broadcom BCM570xx Gigabit Ethernet Modified: stable/10/sys/powerpc/conf/MPC85XX ============================================================================== --- stable/10/sys/powerpc/conf/MPC85XX Sat May 17 16:57:17 2014 (r266329) +++ stable/10/sys/powerpc/conf/MPC85XX Sat May 17 17:18:35 2014 (r266330) @@ -48,7 +48,9 @@ options NFSCL options NFSLOCKD options PROCFS options PSEUDOFS -options SCHED_4BSD +options SCHED_ULE +options CAPABILITIES +options CAPABILITY_MODE options SMP options SYSVMSG options SYSVSEM @@ -64,6 +66,7 @@ device cryptodev device da device ds1553 device em +device alc device ether device fxp device iic