Linux kernel modules: remove pre 2.3.11 cruft from pgtbl.h

The cutoff for the non-legacy drivers in 2.6.9 so we do not need
compat definitions for older kernels.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmci/shared/pgtbl.h b/open-vm-tools/modules/linux/vmci/shared/pgtbl.h
index 754321d2bd28f9a8c68d193a985a49a15ecf5a76..0f0faee26cd9b9fdfa60031235faa47de6f6ea88 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/shared/pgtbl.h
+++ b/open-vm-tools/modules/linux/vmci/shared/pgtbl.h
@@ -26,13 +26,6 @@
 #include "compat_spinlock.h"
 #include "compat_page.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 11)
-# define compat_active_mm  mm
-#else
-# define compat_active_mm  active_mm
-#endif
-
-
 /*
  *-----------------------------------------------------------------------------
  *
@@ -299,7 +292,7 @@ PgtblVa2MPN(VA addr)  // IN
    MPN mpn;
 
    /* current->mm is NULL for kernel threads, so use active_mm. */
-   mm = current->compat_active_mm;
+   mm = current->active_mm;
    if (compat_get_page_table_lock(mm)) {
       spin_lock(compat_get_page_table_lock(mm));
    }
@@ -332,10 +325,9 @@ PgtblVa2MPN(VA addr)  // IN
 static INLINE int
 PgtblKVa2MPN(VA addr)  // IN
 {
-   struct mm_struct *mm;
+   struct mm_struct *mm = current->active_mm;
    MPN mpn;
 
-   mm = current->compat_active_mm;
    if (compat_get_page_table_lock(mm)) {
       spin_lock(compat_get_page_table_lock(mm));
    }
@@ -368,10 +360,9 @@ PgtblKVa2MPN(VA addr)  // IN
 static INLINE struct page *
 PgtblVa2Page(VA addr) // IN
 {
-   struct mm_struct *mm;
+   struct mm_struct *mm = current->active_mm;
    struct page *page;
 
-   mm = current->compat_active_mm;
    if (compat_get_page_table_lock(mm)) {
       spin_lock(compat_get_page_table_lock(mm));
    }