Module Name: src
Committed By: riastradh
Date: Sun Sep 8 16:10:23 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_bufs.c
Log Message:
Unconditionally avoid arithmetic on void * in drm_bufs.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \
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.12 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.13
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.1.1.1.2.12 Wed Jul 24 03:11:06 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Sun Sep 8 16:10:23 2013
@@ -942,11 +942,7 @@ 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;