diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-09-26 15:37:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:13:49 +1000 |
| commit | 972f6572652bc4a2f6c44c525e5e91f2becdb62a (patch) | |
| tree | 60af3dc7e8a7c0f8bef7a3927dae161093b10dbe /linux-core/drm_ttm.c | |
| parent | 89126bb58ec82511758bed36a28e698b721fb435 (diff) | |
| parent | 2db8e0c8ef8c7a66460fceda129533b364f6418c (diff) | |
Merge remote branch 'origin/master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/dri_bufmgr.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/drm_ttm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/radeon_cp.c
Diffstat (limited to 'linux-core/drm_ttm.c')
| -rw-r--r-- | linux-core/drm_ttm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index aa137dda..054a7ce8 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -72,7 +72,11 @@ void drm_ttm_cache_flush(struct page *pages[], unsigned long num_pages) return; } #endif - if (drm_on_each_cpu(drm_ttm_ipi_handler, NULL, 1) != 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + if (on_each_cpu(drm_ttm_ipi_handler, NULL, 1)) +#else + if (on_each_cpu(drm_ttm_ipi_handler, NULL, 1, 1) != 0) +#endif DRM_ERROR("Timed out waiting for drm cache flush.\n"); } EXPORT_SYMBOL(drm_ttm_cache_flush); |