summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-03-19 09:08:21 +1100
committerDave Airlie <airlied@linux.ie>2007-03-19 09:08:21 +1100
commit4b560fde06aeb342f3ff0bce924627ab722d251a (patch)
tree0ef357c410d73259731752021c2839420a1b79ad /drivers
parent99da6d861c659bb1a961b70f50fad268b9ed5a5f (diff)
downloadop-kernel-dev-4b560fde06aeb342f3ff0bce924627ab722d251a.zip
op-kernel-dev-4b560fde06aeb342f3ff0bce924627ab722d251a.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/drm/drm_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index afe5f07..314abd9 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;
OpenPOWER on IntegriCloud