[src/netbsd-6]: src/sys/arch/arm/marvell Pull up revision 1.5 (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/93258fbb51c0
branches:  netbsd-6
changeset: 775529:93258fbb51c0
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sat Nov 24 20:53:13 2012 +0000

description:
Pull up revision 1.5 (requested by msaitoh in ticket #713).

Fix a uvm_fault panic that memory is not allocated for the last few GPIO bits.

diffstat:

 sys/arch/arm/marvell/mvsocgpp.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r af8f50f73447 -r 93258fbb51c0 sys/arch/arm/marvell/mvsocgpp.c
--- a/sys/arch/arm/marvell/mvsocgpp.c   Sat Nov 24 20:50:15 2012 +0000
+++ b/sys/arch/arm/marvell/mvsocgpp.c   Sat Nov 24 20:53:13 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $     */
+/*     $NetBSD: mvsocgpp.c,v 1.3.8.2 2012/11/24 20:53:13 jdc Exp $     */
 /*
  * Copyright (c) 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.3.8.1 2012/10/23 19:50:49 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.3.8.2 2012/11/24 20:53:13 jdc Exp $");
 
 #include "gpio.h"
 
@@ -168,7 +168,8 @@
                MVSOCGPP_WRITE(sc, MVSOCGPP_GPIOIC(i), 0);
 
        sc->sc_pic =
-           kmem_zalloc(sizeof(struct mvsocgpp_pic) * gpp_npins / 8, KM_SLEEP);
+           kmem_zalloc(sizeof(struct mvsocgpp_pic) * howmany(gpp_npins, 8),
+               KM_SLEEP);
        for (i = 0, j = 0; i < gpp_npins; i += 8, j++) {
                gpio_pic = &(sc->sc_pic + j)->gpio_pic;
                gpio_pic->pic_ops = &gpio_pic_ops;