From: Andrew Morton <akpm@linux-foundation.org>
Date: Sun, 18 Mar 2007 22:08:21 +0000 (+1100)
Subject: drm: fix warning in drm_fops.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4b560fde06aeb342f3ff0bce924627ab722d251a;p=linux-beck.git

drm: fix warning in drm_fops.c

drivers/char/drm/drm_fops.c: In function 'drm_setup':
drivers/char/drm/drm_fops.c:60: warning: comparison of distinct pointer types lacks a cast

Unfortunately PAGE_SIZE has different types on different architectures.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index afe5f07f2e17..314abd9d6510 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -57,7 +57,7 @@ static int drm_setup(drm_device_t * dev)
 	dev->magicfree.next = NULL;
 
 	/* prebuild the SAREA */
-	sareapage = max(SAREA_MAX, PAGE_SIZE);
+	sareapage = max_t(unsigned, SAREA_MAX, PAGE_SIZE);
 	i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
 	if (i != 0)
 		return i;