From owner-svn-src-all@FreeBSD.ORG  Sat Aug 13 12:43:35 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8667F106564A;
	Sat, 13 Aug 2011 12:43:35 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 74EA78FC0C;
	Sat, 13 Aug 2011 12:43:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7DChZp0016179;
	Sat, 13 Aug 2011 12:43:35 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7DChZ6t016177;
	Sat, 13 Aug 2011 12:43:35 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201108131243.p7DChZ6t016177@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 13 Aug 2011 12:43:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224823 - stable/7/sys/sparc64/sparc64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Aug 2011 12:43:35 -0000

Author: marius
Date: Sat Aug 13 12:43:35 2011
New Revision: 224823
URL: http://svn.freebsd.org/changeset/base/224823

Log:
  MFC: r224682 (partial)
  
  - Merge from r147740:
    When the last, possibly partially filled buffer is flushed, we didn't
    reset fragsz to 0 and as such would stop reflecting reality.
  - Use __FBSDID.

Modified:
  stable/7/sys/sparc64/sparc64/dump_machdep.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/sparc64/sparc64/dump_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/dump_machdep.c	Sat Aug 13 12:43:33 2011	(r224822)
+++ stable/7/sys/sparc64/sparc64/dump_machdep.c	Sat Aug 13 12:43:35 2011	(r224823)
@@ -23,10 +23,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -113,6 +114,7 @@ buf_flush(struct dumperinfo *di)
 
 	error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE);
 	dumplo += DEV_BSIZE;
+	fragsz = 0;
 	return (error);
 }