From 0feca5f79b00d6b9fd74b8656c1069654bdda752 Mon Sep 17 00:00:00 2001 From: Seppo Yli-Olli Date: Thu, 22 Jan 2009 09:18:55 +0200 Subject: [PATCH] [PATCH] [Bug 19648] Drm fails to build with kernel 2.6.29 --- linux-core/drm_compat.c | 4 ++++ linux-core/drm_fops.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index c4ebc2f..6b103af 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -75,6 +75,10 @@ pgprot_t vm_get_page_prot(unsigned long vm_flags) }; #endif +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) +#define current_euid() (current__xxx(euid)) +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index ec52110..837645a 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -250,7 +250,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, memset(priv, 0, sizeof(*priv)); filp->private_data = priv; priv->filp = filp; - priv->uid = current->euid; + priv->uid = current_euid(); priv->pid = current->pid; priv->minor = idr_find(&drm_minors_idr, minor_id); priv->ioctl_count = 0; -- 1.5.6.3