diff --unified -r ./vmmon-only.orig/include/vm_basic_types.h ./vmmon-only/include/vm_basic_types.h
--- ./vmmon-only.orig/include/vm_basic_types.h	2007-11-26 07:56:48.000000000 +0100
+++ ./vmmon-only/include/vm_basic_types.h	2008-04-30 13:29:12.000000000 +0200
@@ -176,11 +176,14 @@
 #      endif
 
 #      ifndef _STDINT_H
-#         ifdef VM_I386
-#            ifdef VM_X86_64
+#         include <linux/version.h>
+#         if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+#            ifdef VM_I386
+#               ifdef VM_X86_64
 typedef uint64    uintptr_t;
-#            else
+#               else
 typedef uint32    uintptr_t;
+#               endif
 #            endif
 #         endif
 #      endif
@@ -310,6 +313,7 @@
 #define CHOOSE_PERCENT  asPercent(-1)
 
 
+#include <linux/types.h>
 typedef uintptr_t VA;
 typedef uintptr_t VPN;
 
diff --unified -r ./vmmon-only.orig/linux/driver.c ./vmmon-only/linux/driver.c
--- ./vmmon-only.orig/linux/driver.c	2007-11-28 11:59:26.000000000 +0100
+++ ./vmmon-only/linux/driver.c	2008-04-30 13:26:05.000000000 +0200
@@ -1766,12 +1766,18 @@
          /* Dump core, readable by user. */
          set_bit(MMF_DUMPABLE, &current->mm->flags);
          clear_bit(MMF_DUMP_SECURELY, &current->mm->flags);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 7)
-	 current->mm->dumpable = 1;
-#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
 	 current->dumpable = 1;
-#endif
+# else
+	 current->mm->dumpable = 1;
+# endif  /* < 2.6.24 */
          retval = 0;
+
+#else    /* >= 2.6.24, due to set_dumpable () not being exported to non-GPL modules */
+         retval = -ENOSYS;
+#endif
+#endif
       } else {
          retval = -EPERM;
       }
diff --unified -r ./vmmon-only.orig/Makefile ./vmmon-only/Makefile
--- ./vmmon-only.orig/Makefile	2007-11-28 11:39:37.000000000 +0100
+++ ./vmmon-only/Makefile	2008-04-30 13:11:37.000000000 +0200
@@ -137,7 +137,7 @@
 VMWARE_DEBUG_REDIRECT := >&2
 endif
 endif
-vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \
+vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
 	$(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
 	$(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \
 	-DKBUILD_BASENAME=\"$(DRIVER)\" \
Only in ./vmmon-only: modules.order