SHARE
TWEET

4.11-rc1 vmmon.patch

a guest Mar 6th, 2017 290 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
  2. --- old/vmmon-only/linux/driver.c     2016-11-12 09:15:52.000000000 +0200
  3. +++ vmmon-only/linux/driver.c      2017-03-06 10:46:33.347053458 +0200
  4. @@ -105,7 +105,7 @@
  5.  static int LinuxDriver_Close(struct inode *inode, struct file *filp);
  6.  static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
  7.  #if defined(VMW_NOPAGE_2624)
  8. -static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
  9. +static int LinuxDriverFault(struct vm_fault *fault);
  10.  #else
  11.  static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
  12.                                        unsigned long address,
  13. @@ -882,15 +882,14 @@
  14.   */
  15.  
  16.  #if defined(VMW_NOPAGE_2624)
  17. -static int LinuxDriverFault(struct vm_area_struct *vma, //IN
  18. -                            struct vm_fault *fault)     //IN/OUT
  19. +static int LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
  20.  #else
  21.  static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
  22.                                        unsigned long address,      //IN
  23.                                        int *type)                  //OUT: Fault type
  24.  #endif
  25.  {
  26. -   VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
  27. +   VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
  28.     unsigned long pg;
  29.     struct page* page;
  30.  
  31. diff -ur old/vmmon-only/linux/hostif.c vmmon-only/linux/hostif.c
  32. --- old/vmmon-only/linux/hostif.c     2016-11-16 16:24:13.000000000 +0200
  33. +++ vmmon-only/linux/hostif.c      2017-03-06 10:36:14.430428787 +0200
  34. @@ -37,6 +37,7 @@
  35.  
  36.  #include <linux/vmalloc.h>
  37.  #include <linux/slab.h>
  38. +#include <linux/sched/signal.h>
  39.  
  40.  #include <linux/preempt.h>
  41.  #include <linux/poll.h>
RAW Paste Data
Top