From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 8 03:42:20 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D91E466A; Sat, 8 Nov 2014 03:42:20 +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 C4933774; Sat, 8 Nov 2014 03:42:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA83gKUJ045216; Sat, 8 Nov 2014 03:42:20 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA83gKCO045213; Sat, 8 Nov 2014 03:42:20 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201411080342.sA83gKCO045213@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 8 Nov 2014 03:42:20 +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: r274268 - in stable/10/sys: arm/arm arm/at91 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-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Nov 2014 03:42:21 -0000 Author: ian Date: Sat Nov 8 03:42:19 2014 New Revision: 274268 URL: https://svnweb.freebsd.org/changeset/base/274268 Log: MFC r273703: Remove the ARM_DEVICE_MULTIPASS option and make its effect be the default. Modified: stable/10/sys/arm/arm/nexus.c stable/10/sys/arm/at91/std.atmel stable/10/sys/conf/options.arm Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/arm/nexus.c ============================================================================== --- stable/10/sys/arm/arm/nexus.c Sat Nov 8 03:20:56 2014 (r274267) +++ stable/10/sys/arm/arm/nexus.c Sat Nov 8 03:42:19 2014 (r274268) @@ -125,12 +125,8 @@ static driver_t nexus_driver = { nexus_methods, 1 /* no softc */ }; -#ifdef ARM_DEVICE_MULTIPASS EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_EARLY); -#else -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); -#endif static int nexus_probe(device_t dev) Modified: stable/10/sys/arm/at91/std.atmel ============================================================================== --- stable/10/sys/arm/at91/std.atmel Sat Nov 8 03:20:56 2014 (r274267) +++ stable/10/sys/arm/at91/std.atmel Sat Nov 8 03:42:19 2014 (r274268) @@ -11,3 +11,4 @@ device at91sam9x5 # bring in the sam specific timers and such device at91sam9 + Modified: stable/10/sys/conf/options.arm ============================================================================== --- stable/10/sys/conf/options.arm Sat Nov 8 03:20:56 2014 (r274267) +++ stable/10/sys/conf/options.arm Sat Nov 8 03:42:19 2014 (r274268) @@ -1,7 +1,6 @@ #$FreeBSD$ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h -ARM_DEVICE_MULTIPASS opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPT opt_global.h ARM_MANY_BOARD opt_global.h