summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom-at-vmware-dot-com>2009-02-03 20:01:35 +0100
committerThomas Hellstrom <thomas-at-shipmail-dot-org>2009-02-03 21:56:52 +0100
commit2e3f86c2a07ac2329fe1ddaff62af5285c13f2f6 (patch)
tree96140e30d590221abdf6496cc5367168ca69a4b0
parent3eb288903c786939a5692ebcdf3506df1eb9b10b (diff)
Fix for 2.6.29
-rw-r--r--linux-core/drm_compat.h4
-rw-r--r--linux-core/drm_fops.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 92ddd401..37b0d0f2 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -286,4 +286,8 @@ static inline void set_page_locked(struct page *page)
}
#endif
+#ifndef current_euid
+#define current_euid() (current->euid)
+#endif
+
#endif
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 7bc73d26..1f3c0398 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -237,7 +237,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;