Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ansus:KDE3
virtualbox-ose
virtualbox-ioctl-fix.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File virtualbox-ioctl-fix.patch of Package virtualbox-ose
diff -wruN VirtualBox-2.1.4_OSE.orig/src/VBox/Additions/linux/module/vboxmod.c VirtualBox-2.1.4_OSE/src/VBox/Additions/linux/module/vboxmod.c --- VirtualBox-2.1.4_OSE.orig/src/VBox/Additions/linux/module/vboxmod.c 2009-02-16 18:52:54.000000000 +0300 +++ VirtualBox-2.1.4_OSE/src/VBox/Additions/linux/module/vboxmod.c 2012-03-08 17:36:28.843151643 +0400 @@ -668,7 +668,7 @@ * IOCTL handler * */ -static int vboxadd_ioctl(struct inode *inode, struct file *filp, +static long vboxadd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { int rc = 0; @@ -905,7 +905,7 @@ { .owner = THIS_MODULE, .open = vboxadd_open, - .ioctl = vboxadd_ioctl, + .unlocked_ioctl = vboxadd_ioctl, .poll = vboxadd_poll, .fasync = vboxadd_fasync, .read = vboxadd_read, diff -wruN VirtualBox-2.1.4_OSE.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c VirtualBox-2.1.4_OSE/src/VBox/Additions/linux/sharedfolders/vfsmod.c --- VirtualBox-2.1.4_OSE.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2009-02-16 18:52:55.000000000 +0300 +++ VirtualBox-2.1.4_OSE/src/VBox/Additions/linux/sharedfolders/vfsmod.c 2012-03-08 18:28:15.611152354 +0400 @@ -326,6 +326,7 @@ /* this is called when vfs is about to destroy the [inode]. all resources associated with this [inode] must be cleared here */ +/* static void sf_clear_inode (struct inode *inode) { @@ -341,7 +342,7 @@ kfree (sf_i->path); kfree (sf_i); SET_INODE_INFO (inode, NULL); -} +} */ /* this is called by vfs when it wants to populate [inode] with data. the only thing that is known about inode at this point is its index @@ -389,7 +390,7 @@ } static struct super_operations sf_super_ops = { - .clear_inode = sf_clear_inode, +// .clear_inode = sf_clear_inode, #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25) .read_inode = sf_read_inode, #endif @@ -414,7 +415,7 @@ return err; } -#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 18) +/* #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 18) static struct super_block * sf_get_sb (struct file_system_type *fs_type, int flags, const char *dev_name, void *data) @@ -430,12 +431,12 @@ TRACE (); return get_sb_nodev (fs_type, flags, data, sf_read_super_26, mnt); } -#endif +#endif */ static struct file_system_type vboxsf_fs_type = { .owner = THIS_MODULE, .name = "vboxsf", - .get_sb = sf_get_sb, +// .get_sb = sf_get_sb, .kill_sb = kill_anon_super }; #endif diff -wruN VirtualBox-2.1.4_OSE.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c VirtualBox-2.1.4_OSE/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c --- VirtualBox-2.1.4_OSE.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2009-02-16 18:54:32.000000000 +0300 +++ VirtualBox-2.1.4_OSE/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2012-03-08 19:00:16.393152849 +0400 @@ -481,7 +481,7 @@ /* * Permanent IO_APIC mode active? No way to handle this! */ - if (nmi_watchdog == NMI_IO_APIC) +/* if (nmi_watchdog == NMI_IO_APIC) { printk(KERN_ERR DEVICE_NAME ": NMI watchdog in IO_APIC mode active -- refused to load the kernel module!\n" @@ -490,13 +490,13 @@ DEVICE_NAME ": command line.\n"); return -EINVAL; - } + } */ /* * See arch/i386/kernel/nmi.c on >= 2.6.19: -1 means it can never enabled again */ - nmi_atomic_set(&nmi_active, -1); - printk(KERN_DEBUG DEVICE_NAME ": Trying to deactivate the NMI watchdog permanently...\n"); +// nmi_atomic_set(&nmi_active, -1); +// printk(KERN_DEBUG DEVICE_NAME ": Trying to deactivate the NMI watchdog permanently...\n"); /* * Now fall through and see if it actually was enabled before. If so, fail
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor