Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 249930 Details for
Bug 335456
app-emulation/vmware-modules-1.0.0.2[4-6] doesn't compile with kernel >=2.6.36
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fabio Rossi`s patch modified to work with vmware-modules-1.0.0.25-r1
1.0.0.25-ioctl.patch (text/plain), 2.82 KB, created by
Oliver Kleinecke
on 2010-10-08 13:19:12 UTC
(
hide
)
Description:
Fabio Rossi`s patch modified to work with vmware-modules-1.0.0.25-r1
Filename:
MIME Type:
Creator:
Oliver Kleinecke
Created:
2010-10-08 13:19:12 UTC
Size:
2.82 KB
patch
obsolete
>*** vmmon-only/linux/driver.c.orig 2010-10-08 14:58:53.448000080 +0200 >--- vmmon-only/linux/driver.c 2010-10-08 14:59:28.900000082 +0200 >*************** >*** 169,178 **** > > static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp, > u_int iocmd, unsigned long ioarg); >! #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL) > static long LinuxDriver_UnlockedIoctl(struct file *filp, > u_int iocmd, unsigned long ioarg); >! #endif > > static int LinuxDriver_Close(struct inode *inode, struct file *filp); > static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); >--- 169,178 ---- > > static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp, > u_int iocmd, unsigned long ioarg); >! > static long LinuxDriver_UnlockedIoctl(struct file *filp, > u_int iocmd, unsigned long ioarg); >! > > static int LinuxDriver_Close(struct inode *inode, struct file *filp); > static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); >*************** >*** 421,431 **** > memset(&vmuser_fops, 0, sizeof vmuser_fops); > compat_fop_set_owner(&vmuser_fops); > vmuser_fops.poll = LinuxDriverPoll; >- #ifdef VMW_HAVE_UNLOCKED_IOCTL > vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; >- #else >- vmuser_fops.ioctl = LinuxDriver_Ioctl; >- #endif > #ifdef HAVE_COMPAT_IOCTL > vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; > #endif >--- 421,427 ---- >*************** >*** 2411,2417 **** > } > > >! #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL) > /* > *----------------------------------------------------------------------------- > * >--- 2407,2413 ---- > } > > >! > /* > *----------------------------------------------------------------------------- > * >*************** >*** 2444,2450 **** > unlock_kernel(); > return err; > } >! #endif > > > /* >--- 2440,2446 ---- > unlock_kernel(); > return err; > } >! > > > /* >*** vmmon-only/linux/hostif.c.orig 2010-10-08 14:59:11.114000081 +0200 >--- vmmon-only/linux/hostif.c 2010-10-08 14:59:39.204000081 +0200 >*************** >*** 3409,3427 **** > u_int iocmd, > unsigned long ioarg) > { >! #ifdef HAVE_UNLOCKED_IOCTL > if (filp->f_op->unlocked_ioctl) { > return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg); > } >- #endif >- if (filp->f_op->ioctl) { >- long err; > >- lock_kernel(); >- err = filp->f_op->ioctl(filp->f_dentry->d_inode, filp, iocmd, ioarg); >- unlock_kernel(); >- return err; >- } > return -ENOIOCTLCMD; > } > >--- 3409,3419 ---- > u_int iocmd, > unsigned long ioarg) > { >! > if (filp->f_op->unlocked_ioctl) { > return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg); > } > > return -ENOIOCTLCMD; > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 335456
:
245540
|
245542
| 249930