[src/netbsd-3]: src/sys/arch/alpha/common Pull up revision 1.30 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/823c1971d4d4
branches:  netbsd-3
changeset: 576814:823c1971d4d4
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 30 17:50:14 2005 +0000

description:
Pull up revision 1.30 (requested by thorpej in ticket #627):
load_mbuf: Don't increase the segment index if we skipped a zero-length
mbuf.  From Michael Hitch.

diffstat:

 sys/arch/alpha/common/sgmap_typedep.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r c0e0770e19ca -r 823c1971d4d4 sys/arch/alpha/common/sgmap_typedep.c
--- a/sys/arch/alpha/common/sgmap_typedep.c     Sat Jul 30 17:43:39 2005 +0000
+++ b/sys/arch/alpha/common/sgmap_typedep.c     Sat Jul 30 17:50:14 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap_typedep.c,v 1.29 2004/11/28 17:34:45 thorpej Exp $ */
+/* $NetBSD: sgmap_typedep.c,v 1.29.10.1 2005/07/30 17:50:14 tron Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.29 2004/11/28 17:34:45 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sgmap_typedep.c,v 1.29.10.1 2005/07/30 17:50:14 tron Exp $");
 
 #include "opt_ddb.h"
 
@@ -272,11 +272,12 @@
 
        seg = 0;
        error = 0;
-       for (m = m0; m != NULL && error == 0; m = m->m_next, seg++) {
+       for (m = m0; m != NULL && error == 0; m = m->m_next) {
                if (m->m_len == 0)
                        continue;
                error = __C(SGMAP_TYPE,_load_buffer)(t, map,
                    m->m_data, m->m_len, NULL, flags, seg, sgmap);
+               seg++;
        }
 
        alpha_mb();