From nobody@FreeBSD.org  Wed Jan 22 22:31:20 2014
Return-Path: <nobody@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 62B79F71
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Jan 2014 22:31:20 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 4FCC21ADC
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Jan 2014 22:31:20 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s0MMVKgJ046593
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 22 Jan 2014 22:31:20 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s0MMVKKY046589;
	Wed, 22 Jan 2014 22:31:20 GMT
	(envelope-from nobody)
Message-Id: <201401222231.s0MMVKKY046589@oldred.freebsd.org>
Date: Wed, 22 Jan 2014 22:31:20 GMT
From: Alfred Perlstein <alfred@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: adb has params to mtx_init reversed
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186020
>Category:       bin
>Synopsis:       adb has params to mtx_init reversed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhibbits
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 22 22:40:00 UTC 2014
>Closed-Date:    Sun Mar 02 16:57:00 UTC 2014
>Last-Modified:  Sun Mar 02 16:57:00 UTC 2014
>Originator:     Alfred Perlstein
>Release:        current
>Organization:
Norse Corporation
>Environment:
current
>Description:
Args are in wrong order to mtx_init(9)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: adb_kbd.c
===================================================================
--- adb_kbd.c	(revision 261037)
+++ adb_kbd.c	(working copy)
@@ -304,7 +304,7 @@
 	/* 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);
 
Index: adb_mouse.c
===================================================================
--- adb_mouse.c	(revision 261037)
+++ adb_mouse.c	(working copy)
@@ -154,7 +154,7 @@
 	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;


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->jhibbits 
Responsible-Changed-By: alfred 
Responsible-Changed-When: Wed Jan 22 22:46:08 UTC 2014 
Responsible-Changed-Why:  
Please review. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186020 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/186020: commit references a PR
Date: Thu, 23 Jan 2014 01:09:40 +0000 (UTC)

 Author: jhibbits
 Date: Thu Jan 23 01:09:33 2014
 New Revision: 261068
 URL: http://svnweb.freebsd.org/changeset/base/261068
 
 Log:
   Properly sort the arguments to mtx_init(9).
   
   PR:		misc/186020
   Submitted by:	alfred
   MFC after:	1 week
 
 Modified:
   head/sys/dev/adb/adb_kbd.c
   head/sys/dev/adb/adb_mouse.c
 
 Modified: head/sys/dev/adb/adb_kbd.c
 ==============================================================================
 --- head/sys/dev/adb/adb_kbd.c	Thu Jan 23 00:46:29 2014	(r261067)
 +++ head/sys/dev/adb/adb_kbd.c	Thu Jan 23 01:09:33 2014	(r261068)
 @@ -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: head/sys/dev/adb/adb_mouse.c
 ==============================================================================
 --- head/sys/dev/adb/adb_mouse.c	Thu Jan 23 00:46:29 2014	(r261067)
 +++ head/sys/dev/adb/adb_mouse.c	Thu Jan 23 01:09:33 2014	(r261068)
 @@ -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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jhibbits 
State-Changed-When: Thu Jan 23 01:53:21 UTC 2014 
State-Changed-Why:  
Patch committed, thanks! Will be MFC'd. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186020 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/186020: commit references a PR
Date: Sun,  2 Mar 2014 11:23:20 +0000 (UTC)

 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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/186020: commit references a PR
Date: Sun,  2 Mar 2014 11:37:05 +0000 (UTC)

 Author: jhibbits
 Date: Sun Mar  2 00:20:00 2014
 New Revision: 262671
 URL: http://svnweb.freebsd.org/changeset/base/262671
 
 Log:
   MFC r261068
   
   Properly sort the arguments to mtx_init(9).
   
   PR:		misc/186020
   Submitted by:	alfred
 
 Modified:
   stable/9/sys/dev/adb/adb_kbd.c
   stable/9/sys/dev/adb/adb_mouse.c
 Directory Properties:
   stable/9/   (props changed)
   stable/9/sys/   (props changed)
   stable/9/sys/dev/   (props changed)
 
 Modified: stable/9/sys/dev/adb/adb_kbd.c
 ==============================================================================
 --- stable/9/sys/dev/adb/adb_kbd.c	Sun Mar  2 00:14:57 2014	(r262670)
 +++ stable/9/sys/dev/adb/adb_kbd.c	Sun Mar  2 00:20:00 2014	(r262671)
 @@ -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/9/sys/dev/adb/adb_mouse.c
 ==============================================================================
 --- stable/9/sys/dev/adb/adb_mouse.c	Sun Mar  2 00:14:57 2014	(r262670)
 +++ stable/9/sys/dev/adb/adb_mouse.c	Sun Mar  2 00:20:00 2014	(r262671)
 @@ -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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: jhibbits 
State-Changed-When: Sun Mar 2 16:56:37 UTC 2014 
State-Changed-Why:  
Fix merged to stable/10 and stable/9. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186020 
>Unformatted:
