summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-12-18 16:56:11 +1000
committerDave Airlie <airlied@linux.ie>2008-12-29 17:47:24 +1000
commitbdf539ad61a8d4d0f0b0865c030a8ecb1ec2a398 (patch)
tree01ecad34831fecde1f8d7ddcfba739d10bfcfe39
parent57a6297e52b32ff402291a7d8fd802f83e746e52 (diff)
downloadlinux-bdf539ad61a8d4d0f0b0865c030a8ecb1ec2a398.tar.bz2
drm/radeon: fix warning due to PAGE_SIZE max
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 7b37a4906377..4f5d1e996217 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1777,7 +1777,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master)
return -ENOMEM;
/* prebuild the SAREA */
- sareapage = max(SAREA_MAX, PAGE_SIZE);
+ sareapage = max_t(unsigned long, SAREA_MAX, PAGE_SIZE);
ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
&master_priv->sarea);
if (ret) {