From owner-svn-src-all@FreeBSD.ORG Sat Mar 1 21:50:24 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 7ED47255; Sat, 1 Mar 2014 21:50:24 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AB851237; Sat, 1 Mar 2014 21:50:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s21LoO8B084786; Sat, 1 Mar 2014 21:50:24 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s21LoOQX084784; Sat, 1 Mar 2014 21:50:24 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201403012150.s21LoOQX084784@svn.freebsd.org> From: Justin Hibbits Date: Sat, 1 Mar 2014 21:50:24 +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: r262668 - stable/10/sys/dev/adb 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.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: Sat, 01 Mar 2014 21:50:24 -0000 Author: jhibbits Date: Sat Mar 1 21:50:23 2014 New Revision: 262668 URL: http://svnweb.freebsd.org/changeset/base/262668 Log: MFC r261068 Properly sort the arguments to mtx_init(9). PR: misc/186020 Submitted by: alfred Modified: stable/10/sys/dev/adb/adb_kbd.c stable/10/sys/dev/adb/adb_mouse.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/adb/adb_kbd.c ============================================================================== --- stable/10/sys/dev/adb/adb_kbd.c Sat Mar 1 21:22:20 2014 (r262667) +++ stable/10/sys/dev/adb/adb_kbd.c Sat Mar 1 21:50:23 2014 (r262668) @@ -304,7 +304,7 @@ adb_kbd_attach(device_t dev) /* Try stepping forward to the extended keyboard protocol */ adb_set_device_handler(dev,3); - mtx_init(&sc->sc_mutex,KBD_DRIVER_NAME,MTX_DEF,0); + mtx_init(&sc->sc_mutex, KBD_DRIVER_NAME, NULL, MTX_DEF); cv_init(&sc->sc_cv,KBD_DRIVER_NAME); callout_init(&sc->sc_repeater, 0); Modified: stable/10/sys/dev/adb/adb_mouse.c ============================================================================== --- stable/10/sys/dev/adb/adb_mouse.c Sat Mar 1 21:22:20 2014 (r262667) +++ stable/10/sys/dev/adb/adb_mouse.c Sat Mar 1 21:50:23 2014 (r262668) @@ -154,7 +154,7 @@ adb_mouse_attach(device_t dev) sc = device_get_softc(dev); sc->sc_dev = dev; - mtx_init(&sc->sc_mtx,"ams",MTX_DEF,0); + mtx_init(&sc->sc_mtx, "ams", NULL, MTX_DEF); cv_init(&sc->sc_cv,"ams"); sc->flags = 0;