From owner-svn-src-head@FreeBSD.ORG  Thu Nov  7 21:02:58 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 02A6CB7D;
 Thu,  7 Nov 2013 21:02:58 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
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 E25FB2E09;
 Thu,  7 Nov 2013 21:02:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7L2vWf056278;
 Thu, 7 Nov 2013 21:02:57 GMT (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7L2vqw056277;
 Thu, 7 Nov 2013 21:02:57 GMT (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201311072102.rA7L2vqw056277@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Thu, 7 Nov 2013 21:02:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257813 - head/sys/powerpc/powerpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 21:02:58 -0000

Author: jhibbits
Date: Thu Nov  7 21:02:57 2013
New Revision: 257813
URL: http://svnweb.freebsd.org/changeset/base/257813

Log:
  Clamp the dump block size to the dump device max I/O size.

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

Modified: head/sys/powerpc/powerpc/dump_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/dump_machdep.c	Thu Nov  7 20:54:52 2013	(r257812)
+++ head/sys/powerpc/powerpc/dump_machdep.c	Thu Nov  7 21:02:57 2013	(r257813)
@@ -114,7 +114,7 @@ cb_dumpdata(struct pmap_md *md, int seqn
 {
 	struct dumperinfo *di = (struct dumperinfo*)arg;
 	vm_offset_t va;
-	size_t counter, ofs, resid, sz;
+	size_t counter, ofs, resid, sz, maxsz;
 	int c, error, twiddle;
 
 	error = 0;
@@ -123,11 +123,12 @@ cb_dumpdata(struct pmap_md *md, int seqn
 
 	ofs = 0;	/* Logical offset within the chunk */
 	resid = md->md_size;
+	maxsz = min(DFLTPHYS, di->maxiosize);
 
 	printf("  chunk %d: %lu bytes ", seqnr, (u_long)resid);
 
 	while (resid) {
-		sz = (resid > DFLTPHYS) ? DFLTPHYS : resid;
+		sz = min(resid, maxsz);
 		va = pmap_dumpsys_map(md, ofs, &sz);
 		counter += sz;
 		if (counter >> 24) {