vmware-patch/vmmon-2.6.39.diff

   1 diff -u -r vmmon-only/linux/driver.c vmmon-only/linux/driver.c
   2 --- vmmon-only/linux/driver.c   2011-03-26 06:37:28.000000000 +0100
   3 +++ vmmon-only/linux/driver.c   2011-04-02 13:26:59.000000000 +0200
   4 @@ -780,7 +780,7 @@
   5
   6
   7  #define POLLQUEUE_MAX_TASK 1000
   8 -static spinlock_t pollQueueLock __attribute__((unused)) = SPIN_LOCK_UNLOCKED;
   9 +static DEFINE_SPINLOCK(pollQueueLock);
  10  static void *pollQueue[POLLQUEUE_MAX_TASK];
  11  static unsigned int pollQueueCount = 0;
  12
  13 @@ -1041,7 +1041,8 @@
  14                 * but unfortunately there is no way how to detect that
  15                 * we are building for RedHat's kernel...
  16                 */
  17 -              static spinlock_t timerLock = SPIN_LOCK_UNLOCKED;
  18 +
  19 +              static DEFINE_SPINLOCK(timerLock);
  20
  21                spin_lock(&timerLock);
  22                mod_timer(&linuxState.pollTimer, jiffies + 1);
  23 diff -u -r source-original/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
  24 --- vmmon-only/linux/hostif.c   2011-03-26 06:37:27.000000000 +0100
  25 +++ vmmon-only/linux/hostif.c   2011-04-02 13:27:58.000000000 +0200
  26 @@ -46,7 +46,6 @@
  27  #include <linux/mman.h>
  28
  29  #include <linux/smp.h>
  30 -#include <linux/smp_lock.h>
  31
  32  #include <asm/io.h>
  33  #include <linux/mc146818rtc.h>
  34 diff -u -r vmmon-only/linux/iommu.c vmmon-only/linux/iommu.c
  35 --- vmmon-only/linux/iommu.c    2011-03-26 06:37:27.000000000 +0100
  36 +++ vmmon-only/linux/iommu.c    2011-04-02 13:28:58.000000000 +0200
  37 @@ -44,7 +44,7 @@
  38
  39
  40  static LIST_HEAD(passthruDeviceList);
  41 -static spinlock_t passthruDeviceListLock = SPIN_LOCK_UNLOCKED;
  42 +static DEFINE_SPINLOCK(passthruDeviceListLock);
  43  static void *pciHolePage = NULL;
  44
  45  /*