Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:42:03 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios:
nouveau_nvkm_subdev_bios_shadowpci.c
Log Message:
No arithmetic on void *.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.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/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c:1.2 Mon Aug 27 04:58:33 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowpci.c Mon Aug 27 07:42:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.3 2018/08/27 07:42:02 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -23,7 +23,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.2 2018/08/27 04:58:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowpci.c,v 1.3 2018/08/27 07:42:02 riastradh Exp $");
#include "priv.h"
@@ -44,7 +44,8 @@ pcirom_read(void *data, u32 offset, u32
{
struct priv *priv = data;
if (offset + length <= priv->size) {
- memcpy_fromio(bios->data + offset, priv->rom + offset, length);
+ memcpy_fromio(bios->data + offset,
+ (const char __iomem *)priv->rom + offset, length);
return length;
}
return 0;
