diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-15 10:42:47 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-15 10:42:47 +0100 |
| commit | d1b0258b32ad2af99f3aff4f0aedea676d0ff421 (patch) | |
| tree | 7ad39b748396e0ccbf12043c0a8f879b4f9e6503 /linux-core/drm_bo.c | |
| parent | ca499f4d14ae29159f13957f2adc0536c71bf6d4 (diff) | |
| parent | 6206091e5f300616c27dc834922f2976d97f72d4 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/drm_bo.c')
| -rw-r--r-- | linux-core/drm_bo.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index a2918757..e912eb21 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -2213,9 +2213,7 @@ int drm_bo_driver_finish(struct drm_device *dev) if (list_empty(&bm->unfenced)) DRM_DEBUG("Unfenced list was clean\n"); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) - unlock_page(bm->dummy_read_page); -#else +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) ClearPageReserved(bm->dummy_read_page); #endif __free_page(bm->dummy_read_page); @@ -2251,9 +2249,7 @@ int drm_bo_driver_init(struct drm_device *dev) goto out_unlock; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) - SetPageLocked(bm->dummy_read_page); -#else +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) SetPageReserved(bm->dummy_read_page); #endif |