? sys/cscope.out Index: sys/arch/arm/arm32/arm32_kvminit.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/arm32/arm32_kvminit.c,v retrieving revision 1.59 diff -u -p -r1.59 arm32_kvminit.c --- sys/arch/arm/arm32/arm32_kvminit.c 20 Jun 2020 07:10:36 -0000 1.59 +++ sys/arch/arm/arm32/arm32_kvminit.c 26 Jun 2020 08:18:18 -0000 @@ -495,7 +495,7 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b pv_addr_t msgbuf; pv_addr_t text; pv_addr_t data; - pv_addr_t chunks[KERNEL_L2PT_KERNEL_NUM + KERNEL_L2PT_VMDATA_NUM + 11]; + pv_addr_t chunks[__arraycount(bmi->bmi_l2pts) + 11]; #if ARM_MMU_XSCALE == 1 pv_addr_t minidataclean; #endif Index: sys/arch/arm/broadcom/bcm283x_platform.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/broadcom/bcm283x_platform.c,v retrieving revision 1.38 diff -u -p -r1.38 bcm283x_platform.c --- sys/arch/arm/broadcom/bcm283x_platform.c 21 Jun 2020 07:17:25 -0000 1.38 +++ sys/arch/arm/broadcom/bcm283x_platform.c 26 Jun 2020 08:18:18 -0000 @@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat #include #include #include +#include #include #include @@ -881,11 +882,12 @@ rpi_fb_parse_mode(const char *s, uint32_ return true; } +#define RPI_EDIDSIZE 1024 + static bool rpi_fb_get_edid_mode(uint32_t *pwidth, uint32_t *pheight) { struct edid_info ei; - uint8_t edid_data[1024]; uint32_t res; int error; @@ -901,7 +903,9 @@ rpi_fb_get_edid_mode(uint32_t *pwidth, u vb_edid.vbt_edid.status != 0) return false; - memset(edid_data, 0, sizeof(edid_data)); + uint8_t *edid_data = kmem_alloc(RPI_EDIDSIZE, KM_SLEEP); + + memset(edid_data, 0, RPI_EDIDSIZE); memcpy(edid_data, vb_edid.vbt_edid.data, sizeof(vb_edid.vbt_edid.data)); edid_parse(edid_data, &ei); @@ -914,6 +918,8 @@ rpi_fb_get_edid_mode(uint32_t *pwidth, u *pheight = ei.edid_preferred_mode->vdisplay; } + kmem_free(edid_data, RPI_EDIDSIZE); + return true; }