From 9583c099b4a08b49e03f7b461c344b6d277fd262 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 10 Dec 2008 15:47:28 -0800 Subject: Revert "Merge branch 'modesetting-gem'" This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff. --- linux-core/drm_compat.h | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'linux-core/drm_compat.h') diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index 585350f4..bc4d2e58 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -60,13 +60,6 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) #undef DRM_IRQ_ARGS #define DRM_IRQ_ARGS int irq, void *arg, struct pt_regs *regs - -typedef _Bool bool; -enum { - false = 0, - true = 1 -}; - #endif #ifndef list_for_each_safe @@ -159,7 +152,7 @@ static __inline__ void *kcalloc(size_t nmemb, size_t size, int flags) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #define vmalloc_user(_size) ({void * tmp = vmalloc(_size); \ - if (tmp) memset(tmp, 0, _size); \ + if (tmp) memset(tmp, 0, size); \ (tmp);}) #endif @@ -335,24 +328,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id); #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) -extern unsigned long round_jiffies_relative(unsigned long j); -#endif - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) -extern struct pci_dev * pci_get_bus_and_slot(unsigned int bus, unsigned int devfn); -#endif - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) -static inline int kobject_uevent_env(struct kobject *kobj, - enum kobject_action action, - char *envp[]) -{ - return 0; -} -#endif - -#ifndef PM_EVENT_PRETHAW -#define PM_EVENT_PRETHAW 3 +typedef _Bool bool; #endif @@ -404,14 +380,6 @@ 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 - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) #define drm_core_ioremap_wc drm_core_ioremap #endif -- cgit v1.2.3