]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm/radeon: fix warning due to PAGE_SIZE max
authorDave Airlie <airlied@redhat.com>
Thu, 18 Dec 2008 06:56:11 +0000 (16:56 +1000)
committerDave Airlie <airlied@linux.ie>
Mon, 29 Dec 2008 07:47:24 +0000 (17:47 +1000)
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_cp.c

index 7b37a49063775332dd88daa738517c9fbdfb4305..4f5d1e9962176ab5d8affc12c8bd83ad1ad56bac 100644 (file)
@@ -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) {