OSDN Git Service

Make it compile again.
authorKristian Høgsberg <krh@redhat.com>
Tue, 22 Jul 2008 18:24:32 +0000 (14:24 -0400)
committerKristian Høgsberg <krh@redhat.com>
Wed, 30 Jul 2008 20:34:37 +0000 (16:34 -0400)
linux-core/drm_compat.h
linux-core/drm_ttm.c

index cfa4fc6..564a943 100644 (file)
@@ -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
index 80a8ff5..aa137dd 100644 (file)
@@ -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);