diff -urN a/vmmon-only/include/compat_semaphore.h b/vmmon-only/include/compat_semaphore.h
--- a/vmmon-only/include/compat_semaphore.h	2008-10-18 21:09:58.000000000 +0800
+++ b/vmmon-only/include/compat_semaphore.h	2008-10-18 21:16:35.000000000 +0800
@@ -2,7 +2,7 @@
 #   define __COMPAT_SEMAPHORE_H__
 
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 /*
diff -urN a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
--- a/vmmon-only/linux/hostif.c	2008-10-18 21:09:58.000000000 +0800
+++ b/vmmon-only/linux/hostif.c	2008-10-18 22:07:29.000000000 +0800
@@ -3421,7 +3421,7 @@
       }
    } else {
       if (linuxState.fastClockThread) {
-         kill_proc(linuxState.fastClockThread, SIGKILL, 1);
+         kill_pid(linuxState.fastClockThread, SIGKILL, 1);
          linuxState.fastClockThread = 0;
          compat_wait_for_completion(&fastClockExited);
       }
diff -urN a/vmnet-only/compat_semaphore.h b/vmnet-only/compat_semaphore.h
--- a/vmnet-only/compat_semaphore.h	2008-10-18 21:09:58.000000000 +0800
+++ b/vmnet-only/compat_semaphore.h	2008-10-18 22:13:21.000000000 +0800
@@ -2,7 +2,7 @@
 #   define __COMPAT_SEMAPHORE_H__
 
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 /*