From nobody@FreeBSD.org  Wed Jan 19 23:09:15 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DC6F106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Jan 2011 23:09:15 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E28B8FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Jan 2011 23:09:15 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p0JN9FP6002155
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 19 Jan 2011 23:09:15 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p0JN9F9H002154;
	Wed, 19 Jan 2011 23:09:15 GMT
	(envelope-from nobody)
Message-Id: <201101192309.p0JN9F9H002154@red.freebsd.org>
Date: Wed, 19 Jan 2011 23:09:15 GMT
From: Benjamin Close <benjamin.close@clearchain.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: BKTR memory leak fix, MFC
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         154152
>Category:       kern
>Synopsis:       [bktr] memory leak fix needs MFC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    yongari
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 19 23:10:08 UTC 2011
>Closed-Date:    Thu Jan 20 21:33:47 UTC 2011
>Last-Modified:  Thu Jan 20 21:33:47 UTC 2011
>Originator:     Benjamin Close
>Release:        FreeBSD 8
>Organization:
>Environment:
>Description:
Below is details of an MFC that needs to take place. I have handed in my src commit bit and hence are no longer able to perform the MFC. If a kind src developer is able to perform the MFC it would be great.

Dear Benjamin Close,

As you have requested, I would like to notify you that you have
committed a change that may be MFC'ed now, as a testing period
specified at the time of that commit is over.

For reference purposes following is a copy of your original
commit message.

Regards,

Maxim "MFC Reminder" Sobolev
P.S. Please contact Maxim Sobolev <sobomax@FreeBSD.org> if you
believe that you received this message due to an error.

Author: benjsc
Date: Tue May 26 03:56:56 2009
New Revision: 192784
URL: http://svn.freebsd.org/changeset/base/192784

Log:
  Free the memory correctly in the error case
  
  Submitted by:	frtzkatz at yahoo.com
  Approved by:	sam
  MFC after:	1 month

Modified:
  head/sys/dev/bktr/bktr_os.c

Modified: head/sys/dev/bktr/bktr_os.c
==============================================================================
--- head/sys/dev/bktr/bktr_os.c	Tue May 26 03:45:58 2009	(r192783)
+++ head/sys/dev/bktr/bktr_os.c	Tue May 26 03:56:56 2009	(r192784)
@@ -470,7 +470,7 @@ fail:
 	if (bktr->res_irq)
 		bus_release_resource(dev, SYS_RES_IRQ, bktr->irq_rid, bktr->res_irq);
 	if (bktr->res_mem)
-		bus_release_resource(dev, SYS_RES_IRQ, bktr->mem_rid, bktr->res_mem);
+		bus_release_resource(dev, SYS_RES_MEM, bktr->mem_rid, bktr->res_mem);
 	return error;
 
 }

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: linimon 
State-Changed-When: Thu Jan 20 11:17:42 UTC 2011 
State-Changed-Why:  
Set this as an MFC reminder.  Original committer has returned his bit 
for safekeeping. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/154152: commit references a PR
Date: Thu, 20 Jan 2011 21:25:22 +0000 (UTC)

 Author: yongari
 Date: Thu Jan 20 21:25:16 2011
 New Revision: 217661
 URL: http://svn.freebsd.org/changeset/base/217661
 
 Log:
   MFC r192784,192805:
     Free the memory correctly in the error case
   
     PR:	misc/154152
 
 Modified:
   stable/7/sys/dev/bktr/bktr_os.c
 Directory Properties:
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sys/dev/bktr/bktr_os.c
 ==============================================================================
 --- stable/7/sys/dev/bktr/bktr_os.c	Thu Jan 20 21:11:45 2011	(r217660)
 +++ stable/7/sys/dev/bktr/bktr_os.c	Thu Jan 20 21:25:16 2011	(r217661)
 @@ -470,7 +470,7 @@ fail:
  	if (bktr->res_irq)
  		bus_release_resource(dev, SYS_RES_IRQ, bktr->irq_rid, bktr->res_irq);
  	if (bktr->res_mem)
 -		bus_release_resource(dev, SYS_RES_IRQ, bktr->mem_rid, bktr->res_mem);
 +		bus_release_resource(dev, SYS_RES_MEMORY, bktr->mem_rid, bktr->res_mem);
  	return error;
  
  }
 _______________________________________________
 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: yongari 
State-Changed-When: Thu Jan 20 21:33:05 UTC 2011 
State-Changed-Why:  
Fixed. Since the change is already included in stable/8 so I 
merged the change to stable/7. Also fixed the build breakage 
introduced in r192784. 
Thanks for reminding it. 


Responsible-Changed-From-To: freebsd-bugs->yongari 
Responsible-Changed-By: yongari 
Responsible-Changed-When: Thu Jan 20 21:33:05 UTC 2011 
Responsible-Changed-Why:  
Track. 

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