aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-08-08 19:36:46 -0400
committerDave Airlie <airlied@redhat.com>2008-08-14 09:19:02 +1000
commit7677c2dba5d06e888c742a607bc7f42d934043c6 (patch)
tree52ec2678aaa34de4efa2b58b1852e3d9f8177404
parentb167ccf10fffb3e0ae0be14fc3b168fcacc373d8 (diff)
on_each_cpu() compat fixup from krh
-rw-r--r--linux-core/drm_compat.h8
-rw-r--r--linux-core/drm_ttm.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 19dc1f67..f1efc1fe 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -389,4 +389,12 @@ extern struct page *drm_vm_sg_nopage(struct vm_area_struct *vma,
unsigned long address, int *type);
#endif
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
+#define drm_on_each_cpu(handler, data, wait) \
+ on_each_cpu(handler, data, wait)
+#else
+#define drm_on_each_cpu(handler, data, wait) \
+ on_each_cpu(handler, data, wait, 1)
+#endif
+
#endif
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index b58a1ada..aa137dda 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -72,7 +72,7 @@ void drm_ttm_cache_flush(struct page *pages[], unsigned long num_pages)
return;
}
#endif
- if (on_each_cpu(drm_ttm_ipi_handler, NULL,1) != 0)
+ if (drm_on_each_cpu(drm_ttm_ipi_handler, NULL, 1) != 0)
DRM_ERROR("Timed out waiting for drm cache flush.\n");
}
EXPORT_SYMBOL(drm_ttm_cache_flush);