From d9c17c40880b6bf9b8d2bb297d7474d369076039 Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Sat, 26 Jul 2014 14:27:40 +0000
Subject: [PATCH] Avoid needless #ifdef __i386__ with judicious use of MIN.

---
 sys/external/bsd/drm2/include/drm/bus_dma_hacks.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h b/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
index 65f34753f6a8..f06805129cb1 100644
--- a/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
+++ b/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
@@ -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, bus_dmamap_t map,
 
 	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++;
 	}