Messages in this thread Patch in this message | | | Subject | Re: 2.5.74-mm2 + nvidia (and others) | From | Martin Schlemmer <> | Date | 08 Jul 2003 09:03:39 +0200 |
| |
On Mon, 2003-07-07 at 21:30, Andrew Morton wrote:
> Well that will explode if someone enables highpmd and has highmem. > This would be better: > > --- nv.c.orig 2003-07-05 22:55:10.000000000 -0700 > +++ nv.c 2003-07-05 22:55:58.000000000 -0700 > @@ -2105,11 +2105,14 @@ > if (pgd_none(*pg_dir)) > goto failed; > > - pg_mid_dir = pmd_offset(pg_dir, address); > - if (pmd_none(*pg_mid_dir)) > + pg_mid_dir = pmd_offset_map(pg_dir, address); > + if (pmd_none(*pg_mid_dir)) { > + pmd_unmap(pg_mid_dir); > goto failed; > + } > > NV_PTE_OFFSET(address, pg_mid_dir, pte); > + pmd_unmap(pg_mid_dir); > > if (!pte_present(pte)) > goto failed; > > -
Bit too specific to -mm2, what about the the attached?
Regards,
-- Martin Schlemmer
diff -urpN NVIDIA_kernel-1.0-4363.orig/nv-linux.h NVIDIA_kernel-1.0-4363/nv-linux.h --- NVIDIA_kernel-1.0-4363.orig/nv-linux.h 2003-04-20 03:57:19.000000000 +0200 +++ NVIDIA_kernel-1.0-4363/nv-linux.h 2003-07-08 07:53:49.000000000 +0200 @@ -186,6 +186,15 @@ } #endif +#if defined(pmd_offset_map) +#define NV_PMD_OFFSET(address, pg_dir) \ + pmd_offset_map(pg_dir, address); +#define NV_PMD_OFFSET_UNMAP 1 +#else +#define NV_PMD_OFFSET(address, pg_dir) \ + pmd_offset(pg_dir, address) +#endif + #define NV_PAGE_ALIGN(addr) ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE) #define NV_MASK_OFFSET(addr) ( (addr) & (PAGE_SIZE - 1) ) diff -urpN NVIDIA_kernel-1.0-4363.orig/nv.c NVIDIA_kernel-1.0-4363/nv.c --- NVIDIA_kernel-1.0-4363.orig/nv.c 2003-04-20 03:57:19.000000000 +0200 +++ NVIDIA_kernel-1.0-4363/nv.c 2003-07-08 07:55:09.000000000 +0200 @@ -2191,11 +2191,18 @@ nv_get_phys_address(unsigned long addres if (pgd_none(*pg_dir)) goto failed; - pg_mid_dir = pmd_offset(pg_dir, address); - if (pmd_none(*pg_mid_dir)) + pg_mid_dir = NV_PMD_OFFSET(pg_dir, address); + if (pmd_none(*pg_mid_dir)) { +#if defined(NV_PMD_OFFSET_UNMAP) + pmd_unmap(pg_mid_dir); +#endif goto failed; + } NV_PTE_OFFSET(address, pg_mid_dir, pte); +#if defined(NV_PMD_OFFSET_UNMAP) + pmd_unmap(pg_mid_dir); +#endif if (!pte_present(pte)) goto failed; | |