1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c svgalib-1.9.25/kernel/svgalib_helper/main.c
--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c 2020-05-02 09:50:14.751043144 +0300
+++ svgalib-1.9.25/kernel/svgalib_helper/main.c 2020-05-02 09:51:44.564742599 +0300
@@ -171,8 +171,12 @@
#else
static long svgalib_helper_ioctl(struct file *filp,
unsigned int cmd, unsigned long arg) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ struct inode *inode=file_inode(filp);
+#else
struct inode *inode=filp->f_dentry->d_inode;
#endif
+#endif
io_t iov, *user_iov=(io_t *)arg;
pcic_t pciv, *user_pciv=(pcic_t *)arg;
@@ -587,7 +591,11 @@
static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
unsigned long start=vma->vm_start;
unsigned long end=vma->vm_end;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ unsigned long minor = my_minor(file_inode(filp)->i_rdev);
+#else
unsigned long minor = my_minor(filp->f_dentry->d_inode->i_rdev);
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
unsigned long ofs=vma->vm_pgoff*PAGE_SIZE;
#else
|
GitWeb
