Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 279-vmblock.patch
Date: Sat, 02 Nov 2013 17:15:45
Message-Id: 20131102171535.DB9AD2004B@flycatcher.gentoo.org
1 dilfridge 13/11/02 17:15:35
2
3 Modified: 279-vmblock.patch
4 Log:
5 Apply proper patches. Tested with 3.10.7-gentoo-r1.
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
8
9 Revision Changes Path
10 1.2 app-emulation/vmware-modules/files/279-vmblock.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/279-vmblock.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/279-vmblock.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/279-vmblock.patch?r1=1.1&r2=1.2
15
16 Index: 279-vmblock.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/files/279-vmblock.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- 279-vmblock.patch 19 Oct 2013 11:42:46 -0000 1.1
23 +++ 279-vmblock.patch 2 Nov 2013 17:15:35 -0000 1.2
24 @@ -1,16 +1,14 @@
25 -diff -ur vmblock-onlya/linux/control.c vmblock-only/linux/control.c
26 ---- vmblock-only/linux/control.c 2013-02-26 10:17:29.000000000 +0200
27 -+++ vmblock-only/linux/control.c 2013-07-05 19:56:48.298553173 +0300
28 -@@ -208,17 +208,18 @@
29 +diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
30 +--- work.orig/vmblock-only/linux/control.c 2013-11-02 18:05:39.960226399 +0100
31 ++++ work/vmblock-only/linux/control.c 2013-11-02 18:09:11.760231432 +0100
32 +@@ -208,17 +208,14 @@
33 VMBlockSetProcEntryOwner(controlProcMountpoint);
34
35 /* Create /proc/fs/vmblock/dev */
36 - controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
37 -+ /*controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
38 - VMBLOCK_CONTROL_MODE,
39 +- VMBLOCK_CONTROL_MODE,
40 - controlProcDirEntry);
41 - if (!controlProcEntry) {
42 -+ controlProcDirEntry);*/
43 + controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
44 + if (controlProcEntry == NULL) {
45 Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
46 @@ -20,8 +18,6 @@
47 }
48
49 - controlProcEntry->proc_fops = &ControlFileOps;
50 -+ /* controlProcEntry->proc_fops = &ControlFileOps; */
51 return 0;
52 - }
53 -
54 + }