Module Name: src
Committed By: msaitoh
Date: Wed Nov 21 08:03:18 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsocgpp.c
Log Message:
Fix a uvm_fault panic that memory is not allocated for the last few GPIO bits.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/marvell/mvsocgpp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/mvsocgpp.c
diff -u src/sys/arch/arm/marvell/mvsocgpp.c:1.4 src/sys/arch/arm/marvell/mvsocgpp.c:1.5
--- src/sys/arch/arm/marvell/mvsocgpp.c:1.4 Mon Sep 10 08:50:37 2012
+++ src/sys/arch/arm/marvell/mvsocgpp.c Wed Nov 21 08:03:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocgpp.c,v 1.4 2012/09/10 08:50:37 msaitoh Exp $ */
+/* $NetBSD: mvsocgpp.c,v 1.5 2012/11/21 08:03:18 msaitoh 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.4 2012/09/10 08:50:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.5 2012/11/21 08:03:18 msaitoh Exp $");
#include "gpio.h"
@@ -168,7 +168,8 @@ mvsocgpp_attach(device_t parent, device_
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;
