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) {