diff -cr ../org2/vmmon-only/include/compat_semaphore.h ./vmmon-only/include/compat_semaphore.h
*** ../org2/vmmon-only/include/compat_semaphore.h	2008-10-31 10:17:48.000000000 +0900
--- ./vmmon-only/include/compat_semaphore.h	2008-12-03 00:57:42.000000000 +0900
***************
*** 2,8 ****
  #   define __COMPAT_SEMAPHORE_H__
  
  
! #include <asm/semaphore.h>
  
  
  /*
--- 2,8 ----
  #   define __COMPAT_SEMAPHORE_H__
  
  
! #include <linux/semaphore.h>
  
  
  /*
diff -cr ../org2/vmmon-only/linux/driver.c ./vmmon-only/linux/driver.c
*** ../org2/vmmon-only/linux/driver.c	2008-12-03 01:11:31.000000000 +0900
--- ./vmmon-only/linux/driver.c	2008-12-03 00:59:18.000000000 +0900
***************
*** 1732,1738 ****
        break;
  
     case IOCTLCMD_BROADCAST_IPI:
!       retval = compat_smp_call_function(LinuxDriverIPIHandler, NULL, 1, 1);
        break;
  
  #ifdef USE_PERFCTRS_HOSTED
--- 1732,1738 ----
        break;
  
     case IOCTLCMD_BROADCAST_IPI:
!       retval = compat_smp_call_function(LinuxDriverIPIHandler, NULL, 1);
        break;
  
  #ifdef USE_PERFCTRS_HOSTED
diff -cr ../org2/vmmon-only/linux/hostif.c ./vmmon-only/linux/hostif.c
*** ../org2/vmmon-only/linux/hostif.c	2008-10-31 10:17:48.000000000 +0900
--- ./vmmon-only/linux/hostif.c	2008-12-03 01:00:49.000000000 +0900
***************
*** 602,608 ****
  #else
        pte_val(*pte) &= ~_PAGE_NX;
  #endif
!       smp_call_function (TLBInvalidatePage, (void *)vaddr, 1, 1);
        TLBInvalidatePage((void *)vaddr);
     }
     if (ptemap) {
--- 602,608 ----
  #else
        pte_val(*pte) &= ~_PAGE_NX;
  #endif
!       smp_call_function (TLBInvalidatePage, (void *)vaddr, 1);
        TLBInvalidatePage((void *)vaddr);
     }
     if (ptemap) {
***************
*** 2950,2956 ****
        if (targetHostCpu != INVALID_HOST_CPU) {
  	 ASSERT(targetHostCpu < MAX_PROCESSORS);
           (void) compat_smp_call_function(LinuxDriverIPIHandler,
!                                          NULL, 1, 1);
           return TRUE;
        }
     }
--- 2950,2956 ----
        if (targetHostCpu != INVALID_HOST_CPU) {
  	 ASSERT(targetHostCpu < MAX_PROCESSORS);
           (void) compat_smp_call_function(LinuxDriverIPIHandler,
!                                          NULL, 1);
           return TRUE;
        }
     }
***************
*** 3133,3139 ****
  {
     compat_preempt_disable();
     HostIFFillCPUID((void*)info);
!    (void)compat_smp_call_function(HostIFFillCPUID, (void*)info, 1, 1);
     compat_preempt_enable();
  }
  
--- 3133,3139 ----
  {
     compat_preempt_disable();
     HostIFFillCPUID((void*)info);
!    (void)compat_smp_call_function(HostIFFillCPUID, (void*)info, 1);
     compat_preempt_enable();
  }
  
***************
*** 3480,3486 ****
        }
     } else {
        if (linuxState.fastClockThread) {
!          kill_proc(linuxState.fastClockThread, SIGKILL, 1);
           linuxState.fastClockThread = 0;
           compat_wait_for_completion(&fastClockExited);
        }
--- 3480,3486 ----
        }
     } else {
        if (linuxState.fastClockThread) {
!          send_sig(SIGKILL,linuxState.fastClockThread, 1);
           linuxState.fastClockThread = 0;
           compat_wait_for_completion(&fastClockExited);
        }
diff -cr ../org2/vmnet-only/compat_semaphore.h ./vmnet-only/compat_semaphore.h
*** ../org2/vmnet-only/compat_semaphore.h	2008-10-31 10:17:48.000000000 +0900
--- ./vmnet-only/compat_semaphore.h	2008-12-03 00:57:42.000000000 +0900
***************
*** 2,8 ****
  #   define __COMPAT_SEMAPHORE_H__
  
  
! #include <asm/semaphore.h>
  
  
  /*
--- 2,8 ----
  #   define __COMPAT_SEMAPHORE_H__
  
  
! #include <linux/semaphore.h>
  
  
  /*