[src/netbsd-7]: src/sys/arch/amiga/amiga Pull up following revision(s) (reque...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3970f1eba6c6
branches:  netbsd-7
changeset: 799433:3970f1eba6c6
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jun 10 17:19:28 2015 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #838):
        sys/arch/amiga/amiga/machdep.c: revision 1.244
Fix space calculation for dump header. Round up to clicks to avoid
disk alignment issues.

diffstat:

 sys/arch/amiga/amiga/machdep.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r cfab321112b8 -r 3970f1eba6c6 sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c    Wed Jun 10 17:16:23 2015 +0000
+++ b/sys/arch/amiga/amiga/machdep.c    Wed Jun 10 17:19:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $   */
+/*     $NetBSD: machdep.c,v 1.243.4.1 2015/06/10 17:19:28 snj Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
 #include "empm.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243.4.1 2015/06/10 17:19:28 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -535,7 +535,7 @@
                else if (dumplo == 0)
                        dumplo = nblks - btodb(ctob(dumpsize));
        }
-       --dumplo;       /* XXX assume header fits in one block */
+       dumplo -= btodb(ctob(btoc(MDHDRSIZE + ctob(1) - 1)));
        /*
         * Don't dump on the first PAGE_SIZE (why PAGE_SIZE?)
         * in case the dump device includes a disk label.