Module Name: src
Committed By: riastradh
Date: Sat Jul 26 14:27:40 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h
Log Message:
Avoid needless #ifdef __i386__ with judicious use of MIN.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
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/include/drm/bus_dma_hacks.h
diff -u src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.6 src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.7
--- src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.6 Tue Jul 22 22:14:22 2014
+++ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h Sat Jul 26 14:27:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma_hacks.h,v 1.6 2014/07/22 22:14:22 riastradh Exp $ */
+/* $NetBSD: bus_dma_hacks.h,v 1.7 2014/07/26 14:27:40 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -131,12 +131,8 @@ bus_dmamap_load_pglist(bus_dma_tag_t tag
nsegs = 0;
TAILQ_FOREACH(page, pglist, pageq.queue) {
- if (nsegs == INT_MAX)
+ if (nsegs == MIN(INT_MAX, (SIZE_MAX / sizeof(segs[0]))))
return ENOMEM;
-#if __i386__
- if (nsegs == (SIZE_MAX / sizeof(segs[0])))
- return ENOMEM;
-#endif
nsegs++;
}
