updated on Wed Jan 25 16:08:47 UTC 2012
[aur-mirror.git] / psb-kmod / 2.6.36-ioctl.dpatch
blobc01ecaefcd9d572d6cc0178b2dd18302e87b244a
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 2.6.36-ioctl.dpatch by <luca@tower>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: No description.
7 @DPATCH@
8 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/drmP.h psb-kernel-source/drmP.h
9 --- psb-kernel-source~/drmP.h 2010-10-26 21:26:02.400681105 +0200
10 +++ psb-kernel-source/drmP.h 2010-10-26 21:27:28.636681105 +0200
11 @@ -944,7 +944,7 @@
12 struct pci_device_id *pciidlist);
13 extern void psb_drm_exit(struct drm_driver *driver);
14 extern void psb_drm_cleanup_pci(struct pci_dev *pdev);
15 -extern int psb_drm_ioctl(struct inode *inode, struct file *filp,
16 +extern long psb_drm_ioctl(struct file *filp,
17 unsigned int cmd, unsigned long arg);
18 extern long psb_drm_unlocked_ioctl(struct file *filp,
19 unsigned int cmd, unsigned long arg);
20 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/drm_drv.c psb-kernel-source/drm_drv.c
21 --- psb-kernel-source~/drm_drv.c 2010-10-26 21:26:02.388681105 +0200
22 +++ psb-kernel-source/drm_drv.c 2010-10-26 21:26:40.996681104 +0200
23 @@ -593,7 +593,7 @@
24 * byte stack buffer to store the ioctl arguments in kernel space. Should we
25 * ever need much larger ioctl arguments, we may need to allocate memory.
27 -int psb_drm_ioctl(struct inode *inode, struct file *filp,
28 +long psb_drm_ioctl(struct file *filp,
29 unsigned int cmd, unsigned long arg)
31 return psb_drm_unlocked_ioctl(filp, cmd, arg);
32 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/i915_drv.c psb-kernel-source/i915_drv.c
33 --- psb-kernel-source~/i915_drv.c 2010-10-26 21:26:02.404681105 +0200
34 +++ psb-kernel-source/i915_drv.c 2010-10-26 21:28:02.252681105 +0200
35 @@ -555,7 +555,7 @@
36 .owner = THIS_MODULE,
37 .open = psb_drm_open,
38 .release = psb_drm_release,
39 - .ioctl = psb_drm_ioctl,
40 + .unlocked_ioctl = psb_drm_ioctl,
41 .mmap = psb_drm_mmap,
42 .poll = psb_drm_poll,
43 .fasync = psb_drm_fasync,
44 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/i915_ioc32.c psb-kernel-source/i915_ioc32.c
45 --- psb-kernel-source~/i915_ioc32.c 2010-10-26 21:26:02.408681105 +0200
46 +++ psb-kernel-source/i915_ioc32.c 2010-10-26 21:29:01.392681108 +0200
47 @@ -66,7 +66,7 @@
48 &batchbuffer->cliprects))
49 return -EFAULT;
51 - return psb_drm_ioctl(file->f_dentry->d_inode, file,
52 + return psb_drm_ioctl(file,
53 DRM_IOCTL_I915_BATCHBUFFER,
54 (unsigned long) batchbuffer);
56 @@ -102,7 +102,7 @@
57 &cmdbuffer->cliprects))
58 return -EFAULT;
60 - return psb_drm_ioctl(file->f_dentry->d_inode, file,
61 + return psb_drm_ioctl(file,
62 DRM_IOCTL_I915_CMDBUFFER, (unsigned long) cmdbuffer);
65 @@ -125,7 +125,7 @@
66 &request->irq_seq))
67 return -EFAULT;
69 - return psb_drm_ioctl(file->f_dentry->d_inode, file,
70 + return psb_drm_ioctl(file,
71 DRM_IOCTL_I915_IRQ_EMIT, (unsigned long) request);
73 typedef struct drm_i915_getparam32 {
74 @@ -149,7 +149,7 @@
75 &request->value))
76 return -EFAULT;
78 - return psb_drm_ioctl(file->f_dentry->d_inode, file,
79 + return psb_drm_ioctl(file,
80 DRM_IOCTL_I915_GETPARAM, (unsigned long) request);
83 @@ -178,7 +178,7 @@
84 &request->region_offset))
85 return -EFAULT;
87 - return psb_drm_ioctl(file->f_dentry->d_inode, file,
88 + return psb_drm_ioctl(file,
89 DRM_IOCTL_I915_ALLOC, (unsigned long) request);
92 @@ -216,7 +216,7 @@
93 if (fn != NULL)
94 ret = (*fn)(filp, cmd, arg);
95 else
96 - ret = psb_drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
97 + ret = psb_drm_ioctl(filp, cmd, arg);
98 unlock_kernel();
100 return ret;
101 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/psb_drv.c psb-kernel-source/psb_drv.c
102 --- psb-kernel-source~/psb_drv.c 2010-10-26 21:26:02.460681105 +0200
103 +++ psb-kernel-source/psb_drv.c 2010-10-26 21:29:42.792681105 +0200
104 @@ -985,7 +985,7 @@
105 .owner = THIS_MODULE,
106 .open = psb_drm_open,
107 .release = psb_release,
108 - .ioctl = psb_drm_ioctl,
109 + .unlocked_ioctl = psb_drm_ioctl,
110 .mmap = psb_drm_mmap,
111 .poll = psb_poll,
112 .fasync = psb_drm_fasync,