From 89e0c19aab834c12066e990e79472af71049559a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 18 Dec 2008 16:56:11 +1000
Subject: [PATCH] --- yaml --- r: 123431 b: refs/heads/master c:
 bdf539ad61a8d4d0f0b0865c030a8ecb1ec2a398 h: refs/heads/master i:   123429:
 6990f825b22bf2b44628531ad9b3e823f739b22b   123427:
 a694e09c50c786b883334d7e05207642a157b605   123423:
 92acaf711045b323c1d86c8317db0b22c01a0b35 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_cp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7654fab12bff..2b4ac80408c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57a6297e52b32ff402291a7d8fd802f83e746e52
+refs/heads/master: bdf539ad61a8d4d0f0b0865c030a8ecb1ec2a398
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cp.c b/trunk/drivers/gpu/drm/radeon/radeon_cp.c
index 7b37a4906377..4f5d1e996217 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/trunk/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) {