summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-07-22 14:24:32 -0400
committerKristian Høgsberg <krh@redhat.com>2008-07-30 16:34:37 -0400
commit6d4e147480a334d32fa59c7fde53e10d7ab6e106 (patch)
tree3922ba7d8b20241c8a6718b4f9a3091abe3eb45a
parent5282a505b6fd1f0e2bb772b15daf652f7149f370 (diff)
Make it compile again.
-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 cfa4fc6d..564a9438 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -386,4 +386,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 80a8ff5d..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, 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);