Update for 2.6 kernel

5 files changed, 134 insertions, 125 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index e3f74005d609..110ae7d9765e 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,17 +1,20 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.39 2003/07/14 11:54:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.40 2003/07/14 22:10:42 azarah Exp $
+
+  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4363-r3.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff:
+  Update 2.5 patch once again for 2.6.0 kernel.
 
 *nvidia-kernel-1.0.4363-r3 (14 Jul 2003)
 
-  14 Jul 2003; ,,, <root@gentoo.org> Manifest,
-  nvidia-kernel-1.0.4363-r3.ebuild,
+  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
   files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff,
   files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff:
-  Update the 2.5 patch.  Fixup highpmd stuff, as it could be
-  a problem in the way the patch does it (according to AKPM);
-  currently it maps an offset, copy the struct over, then
-  unmap it again, and then try to use it ?!?!
+  Update the 2.5 patch.  Fixup highpmd stuff, as it could be a problem in the
+  way the patch does it (according to AKPM);  currently it maps an offset,
+  copy the struct over, then unmap it again, and then try to use it ?!?!
 
   12 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
   files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff:
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index ea3f2b2b0d36..61f89d7a527a 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,31 +1,30 @@
+MD5 f5ac20e245dd77f0555ffef3f1a1f2f4 ChangeLog 8565
 MD5 04b1f361d40708ab81631bea5e46a632 nvidia-kernel-1.0.2880-r1.ebuild 1970
-MD5 0067738cc0705d9823ed5f5d622e260d ChangeLog 8367
 MD5 5177ed76121fb4bc1aa220c62319d196 nvidia-kernel-1.0.2960-r1.ebuild 2081
-MD5 47a622c47c5a073a5969ef9e56886091 nvidia-kernel-1.0.4363-r3.ebuild 4325
 MD5 16a9003f79bea31eeec6f03ae64cd8ef nvidia-kernel-1.0.3123-r2.ebuild 3229
+MD5 fb3a9bb943c61b9b3b43cd73fc9d24ca nvidia-kernel-1.0.4191-r2.ebuild 3867
 MD5 cdcf177830becdf3c2cb628e1d6a6749 nvidia-kernel-1.0.4363-r2.ebuild 4180
 MD5 0646bd1f1f1109063862d1475aaccab4 nvidia-kernel-1.0.4349-r2.ebuild 3702
-MD5 fb3a9bb943c61b9b3b43cd73fc9d24ca nvidia-kernel-1.0.4191-r2.ebuild 3867
-MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122
-MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
-MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
-MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
-MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825
+MD5 2be980ccf2a1f169e14e80d8887e42a5 nvidia-kernel-1.0.4363-r3.ebuild 4206
+MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
 MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
 MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
-MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
-MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
+MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825
 MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
 MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228
-MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
-MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
+MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
+MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122
+MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
 MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74
+MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
+MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
+MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
+MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
 MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r2 74
 MD5 31565678620709b117139345323051fd files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70350
 MD5 439563bcf7fa96c91361226fae454e0e files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5.68.diff 1467
 MD5 c8b6a9308eb71e5679a7b036128a4d84 files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff 1328
 MD5 e08e015c157458037c079e0259cf16a6 files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030614.diff 74562
-MD5 8a83ea4e8e7bdecc39081fbd48d152a4 files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff 78162
-MD5 7939bbc6f45d128c0ddcaf690479b778 files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff 1601
+MD5 55a418e3a16875434624b975592c82dc files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff 79479
diff --git a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff
index 5d77c901b0f7..1bb862725c65 100644
--- a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff
+++ b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff
@@ -675,8 +675,8 @@ diff -ruN NVIDIA_kernel-1.0-4363/conftest.sh NVIDIA_kernel-1.0-4363-2.5/conftest
  
 diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.h
 --- NVIDIA_kernel-1.0-4363/nv-linux.h	2003-04-20 03:57:19.000000000 +0200
-+++ NVIDIA_kernel-1.0-4363-2.5/nv-linux.h	2003-07-13 14:07:33.000000000 +0200
-@@ -20,35 +20,20 @@
++++ NVIDIA_kernel-1.0-4363-2.5/nv-linux.h	2003-07-14 19:50:22.000000000 +0200
+@@ -20,35 +20,23 @@
  #  define MODVERSIONS
  #endif
  
@@ -710,13 +710,16 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
  #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 -#  error This driver does not support 2.5.x development kernels!
  #  define KERNEL_2_5
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
++#  define KERNEL_2_6
++#  define KERNEL_2_5 /* XXX temporary kludge */
  #else
 -#  error This driver does not support 2.6.x or newer kernels!
 +#  error This driver does not support development kernels!
  #endif
  
  #if defined (__ia64)
-@@ -61,12 +46,15 @@
+@@ -61,12 +49,15 @@
  #define __SMP__
  #endif
  
@@ -733,7 +736,7 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
  
  #include <linux/slab.h>             /* kmalloc, kfree, etc              */
  #include <linux/vmalloc.h>          /* vmalloc, vfree, etc              */
-@@ -74,9 +62,15 @@
+@@ -74,9 +65,15 @@
  #include <linux/poll.h>             /* poll_wait                        */
  #include <linux/delay.h>            /* mdelay, udelay                   */
  
@@ -751,7 +754,7 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
  #include <linux/timer.h>
  
  #include <asm/system.h>             /* cli, sli, save_flags             */
-@@ -85,14 +79,9 @@
+@@ -85,14 +82,9 @@
  #include <asm/page.h>               /* PAGE_OFFSET                      */
  #include <asm/pgtable.h>            /* pte bit definitions              */
  
@@ -766,7 +769,7 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
  
  #ifdef CONFIG_PROC_FS
  #include <linux/proc_fs.h>
-@@ -132,70 +121,125 @@
+@@ -132,70 +124,165 @@
          for (pos = (head)->next; pos != (head); pos = (pos)->next)
  #endif
  
@@ -883,58 +886,102 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
  #endif
 +#endif /* KERNEL_2_5 */
  
- #if defined(pte_offset_atomic)
+-#if defined(pte_offset_atomic)
 -#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
-+#define NV_PTE_OFFSET(addres, pmd, pte) \
++#if defined(pmd_offset_map)
++#define NV_PMD_OFFSET(address, pgd, pmd) \
      { \
 -        pte_t *pte__ = pte_offset_atomic(pg_mid_dir, address); \
-+        pte_t *pte__ = pte_offset_atomic(pmd, address); \
-         pte = *pte__; \
-         pte_kunmap(pte__); \
--    }
-+    } 
- #elif defined(pte_offset)
+-        pte = *pte__; \
+-        pte_kunmap(pte__); \
++        pmd = pmd_offset_map(pgd, address); \
++    }
++#define NV_PMD_UNMAP(pmd) \
++    { \
++        pmd_unmap(pmd); \
+     }
+-#elif defined(pte_offset)
 -#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
 -    pte = *pte_offset(pg_mid_dir, address)
-+#define NV_PTE_OFFSET(addres, pmd, pte) \
-+    pte = *pte_offset(pmd, address)
  #else
 -#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
-+#define NV_PTE_OFFSET(addres, pmd, pte) \
++#define NV_PMD_OFFSET(address, pgd, pmd) \
      { \
 -        pte_t *pte__ = pte_offset_map(pg_mid_dir, address); \
-+        pte_t *pte__ = pte_offset_map(pmd, address); \
-         pte = *pte__; \
-         pte_unmap(pte__); \
+-        pte = *pte__; \
+-        pte_unmap(pte__); \
++        pmd = pmd_offset(pgd, address); \
      }
++#define NV_PMD_UNMAP(pmd)
  #endif
  
 -#define NV_PAGE_ALIGN(addr)             ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
 -#define NV_MASK_OFFSET(addr)            ( (addr) & (PAGE_SIZE - 1) )
--
++#define NV_PMD_PRESENT(pmd) \
++    ({ \
++        if (pmd) { \
++            if (pmd_none(*pmd)) { \
++                NV_PMD_UNMAP(pmd); pmd = NULL; \
++            } \
++        } pmd != NULL; \
++    })
+ 
 -#ifndef MAXMEM  /* temporary define for 2.2 kernels */
 -#define MAXMEM  (-PAGE_OFFSET - (64 * 1024 * 1024))
-+#if defined(pmd_offset_map)
-+#define NV_PMD_OFFSET(address, pgd, pmd) \
++#if defined (pte_offset_atomic)
++#define NV_PTE_OFFSET(address, pmd, pte) \
++    { \
++        pte = pte_offset_atomic(pmd, address); \
++        NV_PMD_UNMAP(pmd); \
++    }
++#define NV_PTE_UNMAP(pte) \
++    { \
++        pte_kunmap(pte); \
++    }
++#elif defined (pte_offset)
++#define NV_PTE_OFFSET(address, pmd, pte) \
 +    { \
-+        pmd_t *pmd__ = pmd_offset_map(pgd, address); \
-+        pmd = *pmd__; \
-+        pmd_unmap(pgd__); \
++        pte = pte_offset(pmd, address); \
++        NV_PMD_UNMAP(pmd); \
 +    }
++#define NV_PTE_UNMAP(pte)
 +#else
-+#define NV_PMD_OFFSET(address, pgd, pmd) \
-+    pmd = *pmd_offset(pgd, address)
++#define NV_PTE_OFFSET(address, pmd, pte) \
++    { \
++        pte = pte_offset_map(pmd, address); \
++        NV_PMD_UNMAP(pmd); \
++    }
++#define NV_PTE_UNMAP(pte) \
++    { \
++        pte_unmap(pte); \
++    }
  #endif
  
 -#ifndef NV01_ROOT
 -#define NV01_ROOT 0x00000000
 -#endif 
++#define NV_PTE_PRESENT(pte) \
++    ({ \
++        if (pte) { \
++            if (!pte_present(*pte)) { \
++                NV_PTE_UNMAP(pte); pte = NULL; \
++            } \
++        } pte != NULL; \
++    })
++
++#define NV_PTE_VALUE(pte) \
++    ({ \
++        unsigned long __pte_value = pte_val(*pte); \
++        NV_PTE_UNMAP(pte); \
++        __pte_value; \
++    })
++
 +#define NV_PAGE_ALIGN(addr)             ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
 +#define NV_MASK_OFFSET(addr)            ( (addr) & (PAGE_SIZE - 1) )
  
  #if defined(NVCPU_IA64)
  #define NV_GFP_HW (GFP_KERNEL | __GFP_DMA)
-@@ -252,7 +296,7 @@
+@@ -252,7 +339,7 @@
  static inline int NV_IRQL_IS_RAISED()
      {
          unsigned long int eflags;
@@ -943,7 +990,7 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
          return !(eflags & NV_CPU_INTERRUPT_FLAGS_BIT);
      }
   
-@@ -310,16 +354,17 @@
+@@ -310,16 +397,17 @@
  
      nv_alloc_t *alloc_queue;
  
@@ -967,7 +1014,7 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363-2.5/nv-linux.
      struct timer_list rc_timer;
 diff -ruN NVIDIA_kernel-1.0-4363/nv.c NVIDIA_kernel-1.0-4363-2.5/nv.c
 --- NVIDIA_kernel-1.0-4363/nv.c	2003-04-20 03:57:19.000000000 +0200
-+++ NVIDIA_kernel-1.0-4363-2.5/nv.c	2003-07-13 13:54:18.000000000 +0200
++++ NVIDIA_kernel-1.0-4363-2.5/nv.c	2003-07-14 19:51:20.000000000 +0200
 @@ -16,11 +16,14 @@
  #include "os-agp.h"
  
@@ -1772,12 +1819,12 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv.c NVIDIA_kernel-1.0-4363-2.5/nv.c
 -    pmd_t *pg_mid_dir;
 -    pte_t pte;
 +    pgd_t *pgd;
-+    pmd_t pmd;
-+    pte_t pte; 
++    pmd_t *pmd;
++    pte_t *pte; 
  
  #if defined(NVCPU_IA64)
      if (address > __IA64_UNCACHED_OFFSET)
-@@ -2184,18 +2101,19 @@
+@@ -2184,23 +2101,24 @@
          return __pa(address);
  
      if (address > VMALLOC_START)
@@ -1788,21 +1835,29 @@ diff -ruN NVIDIA_kernel-1.0-4363/nv.c NVIDIA_kernel-1.0-4363-2.5/nv.c
 +       pgd = pgd_offset(current->mm, address);
  
 -    if (pgd_none(*pg_dir))
-+    if (pgd_none(*pgd))
++    if (!pgd || pgd_none(*pgd))
          goto failed;
  
 -    pg_mid_dir = pmd_offset(pg_dir, address);
 -    if (pmd_none(*pg_mid_dir))
 +    NV_PMD_OFFSET(address, pgd, pmd);
-+
-+    if (pmd_none(pmd))
++ 
++    if (!NV_PMD_PRESENT(pmd))
          goto failed;
  
 -    NV_PTE_OFFSET(address, pg_mid_dir, pte);
-+    NV_PTE_OFFSET(address, &pmd, pte);
++    NV_PTE_OFFSET(address, pmd, pte);
  
-     if (!pte_present(pte))
+-    if (!pte_present(pte))
++    if (!NV_PTE_PRESENT(pte))
          goto failed;
+-
+-    return ((pte_val(pte) & KERN_PAGE_MASK) | NV_MASK_OFFSET(address));
++ 
++    return (NV_PTE_VALUE(pte) & KERN_PAGE_MASK) | NV_MASK_OFFSET(address);
+ 
+   failed:
+     return (unsigned long) NULL;
 @@ -2567,7 +2485,7 @@
  
      nvfp->any_fired_notifiers++;
diff --git a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff
deleted file mode 100644
index c24f7659e7ed..000000000000
--- a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urpN NVIDIA_kernel-1.0-4363/nv-linux.h NVIDIA_kernel-1.0-4363.highpmd-fixup/nv-linux.h
---- NVIDIA_kernel-1.0-4363/nv-linux.h	2003-07-14 12:42:00.000000000 +0200
-+++ NVIDIA_kernel-1.0-4363.highpmd-fixup/nv-linux.h	2003-07-14 13:38:02.000000000 +0200
-@@ -228,14 +228,14 @@
- 
- #if defined(pmd_offset_map)
- #define NV_PMD_OFFSET(address, pgd, pmd) \
--    { \
--        pmd_t *pmd__ = pmd_offset_map(pgd, address); \
--        pmd = *pmd__; \
--        pmd_unmap(pgd__); \
--    }
-+    pmd = pmd_offset_map(pgd, address)
-+#define NV_PMD_UNMAP(pmd) \
-+    pmd_unmap(pmd)
- #else
- #define NV_PMD_OFFSET(address, pgd, pmd) \
--    pmd = *pmd_offset(pgd, address)
-+    pmd = pmd_offset(pgd, address)
-+#define NV_PMD_UNMAP(pmd) \
-+    ;
- #endif
- 
- #define NV_PAGE_ALIGN(addr)             ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
-diff -urpN NVIDIA_kernel-1.0-4363/nv.c NVIDIA_kernel-1.0-4363.highpmd-fixup/nv.c
---- NVIDIA_kernel-1.0-4363/nv.c	2003-07-14 12:42:00.000000000 +0200
-+++ NVIDIA_kernel-1.0-4363.highpmd-fixup/nv.c	2003-07-14 13:38:43.000000000 +0200
-@@ -2087,7 +2087,7 @@ unsigned long
- nv_get_phys_address(unsigned long address)
- {
-     pgd_t *pgd;
--    pmd_t pmd;
-+    pmd_t *pmd;
-     pte_t pte; 
- 
- #if defined(NVCPU_IA64)
-@@ -2110,10 +2110,14 @@ nv_get_phys_address(unsigned long addres
- 
-     NV_PMD_OFFSET(address, pgd, pmd);
- 
--    if (pmd_none(pmd))
-+    if (pmd_none(*pmd)) {
-+        NV_PMD_UNMAP(pmd);
-         goto failed;
-+    }
-+
-+    NV_PTE_OFFSET(address, pmd, pte);
- 
--    NV_PTE_OFFSET(address, &pmd, pte);
-+    NV_PMD_UNMAP(pmd);
- 
-     if (!pte_present(pte))
-         goto failed;
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
index 40d4ec12a40d..cfc5b3f7e236 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.1 2003/07/14 11:54:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.2 2003/07/14 22:10:42 azarah Exp $
 
 inherit eutils
 
@@ -75,6 +75,17 @@ is_2_5_kernel() {
 	fi
 }
 
+is_2_6_kernel() {
+	get_KV_info
+
+	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -91,16 +102,10 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 	
-	if is_2_5_kernel
+	if is_2_5_kernel || is_2_6_kernel
 	then
-		EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.5..." \
-		epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030713.diff
-
-		# As Andrew Morton pointed out, it is not good practice to
-		# unmap something and then use a copy of the structure that
-		# was unmapped.
-		EPATCH_SINGLE_MSG="Applying highpmd cleanup patch..." \
-		epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-highpmd-20030713.diff
+		EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.[56]..." \
+		epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030714.diff
 
 		# Kbuild have issues currently (sandbox related).
 		ln -snf Makefile.nvidia Makefile