summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Teran <evan.teran@gmail.com>2014-10-11 11:40:41 -0400
committerEvan Teran <evan.teran@gmail.com>2014-10-11 11:40:41 -0400
commit8435434eab0fc7c5d08581822ebda283458578c1 (patch)
tree6c3035447201783d3a1dca1621ae171d1021c402 /app-emulation/vmware-modules/files/279-vmblock.patch
parenta better approach to dealing with deprecated macro redefinition (diff)
downloadvmware-8435434eab0fc7c5d08581822ebda283458578c1.tar.gz
vmware-8435434eab0fc7c5d08581822ebda283458578c1.tar.bz2
vmware-8435434eab0fc7c5d08581822ebda283458578c1.zip
adding vmware-modules-279.2-r1, (workstation 10) which compiles cleanrly on 3.10.0, 3.11.0 and 3.12.0
Diffstat (limited to 'app-emulation/vmware-modules/files/279-vmblock.patch')
-rw-r--r--app-emulation/vmware-modules/files/279-vmblock.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/app-emulation/vmware-modules/files/279-vmblock.patch b/app-emulation/vmware-modules/files/279-vmblock.patch
new file mode 100644
index 0000000..0daf603
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-vmblock.patch
@@ -0,0 +1,23 @@
+diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
+--- work.orig/vmblock-only/linux/control.c 2013-11-02 18:05:39.960226399 +0100
++++ work/vmblock-only/linux/control.c 2013-11-02 18:09:11.760231432 +0100
+@@ -208,17 +208,14 @@
+ VMBlockSetProcEntryOwner(controlProcMountpoint);
+
+ /* Create /proc/fs/vmblock/dev */
+- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+- VMBLOCK_CONTROL_MODE,
+- controlProcDirEntry);
+- if (!controlProcEntry) {
++ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
++ if (controlProcEntry == NULL) {
+ Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
+ remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+ remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
+ return -EINVAL;
+ }
+
+- controlProcEntry->proc_fops = &ControlFileOps;
+ return 0;
+ }
+