commit bdf539ad61a8d4d0f0b0865c030a8ecb1ec2a398
author Dave Airlie <airlied@redhat.com> Thu Dec 18 16:56:11 2008 +1000
committer Dave Airlie <airlied@linux.ie> Mon Dec 29 17:47:24 2008 +1000
tree 01ecad34831fecde1f8d7ddcfba739d10bfcfe39
parent 57a6297e52b32ff402291a7d8fd802f83e746e52

drm/radeon: fix warning due to PAGE_SIZE max

Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/radeon/radeon_cp.c

diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 7b37a49..4f5d1e9 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1777,7 +1777,7 @@
 		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) {