---

yaml --- r: 123431 b: refs/heads/master c: bdf539a h: refs/heads/master i: 123429: 6990f82 123427: a694e09 123423: 92acaf7 v: v3
git-mirror · Dec 29, 2008 · 89e0c19 · 89e0c19
1 parent a3f135e
commit 89e0c19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {