svn commit: r224682 - head/sys/sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Sat Aug  6 17:45:52 2011
New Revision: 224682
URL: http://svn.freebsd.org/changeset/base/224682

Log:
  - 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.
  - Wrap a too long line.
  
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/sparc64/sparc64/dump_machdep.c

Modified: head/sys/sparc64/sparc64/dump_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/dump_machdep.c	Sat Aug  6 17:45:11 2011	(r224681)
+++ head/sys/sparc64/sparc64/dump_machdep.c	Sat Aug  6 17:45:52 2011	(r224682)
@@ -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>
@@ -92,6 +93,7 @@ buf_flush(struct dumperinfo *di)
 
 	error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE);
 	dumplo += DEV_BSIZE;
+	fragsz = 0;
 	return (error);
 }
 
@@ -169,7 +171,8 @@ dumpsys(struct dumperinfo *di)
 	/* Determine dump offset on device. */
 	dumplo = di->mediaoffset + di->mediasize - totsize;
 
-	mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, size, di->blocksize);
+	mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, size,
+	    di->blocksize);
 
 	printf("Dumping %lu MB (%d chunks)\n", (u_long)(size >> 20), nreg);