Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:05:17 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_bufs.c
Log Message:
Avoid arithmetic on void * in drm_bufs.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6 \
src/sys/external/bsd/drm2/dist/drm/drm_bufs.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/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.5 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.6
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.5 Wed Jul 24 02:05:01 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Jul 24 02:05:17 2013
@@ -898,7 +898,11 @@ int drm_addbufs_pci(struct drm_device *
buf->order = order;
buf->used = 0;
buf->offset = (dma->byte_count + byte_count + offset);
+#ifdef __NetBSD__
+ buf->address = (void *)((char *)dmah->vaddr + offset);
+#else
buf->address = (void *)(dmah->vaddr + offset);
+#endif
buf->bus_address = dmah->busaddr + offset;
buf->next = NULL;
buf->waiting = 0;