diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-07-12 16:05:13 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-07-12 16:05:13 +0000 |
commit | aa70d4ea0c4b000b47c32cc8290e9fa08dc0ba42 (patch) | |
tree | 0ddd684aec417840c9f0e985dad762c81bf43093 /media-video/nvidia-kernel/files | |
parent | cdb bindings for python (diff) | |
download | gentoo-2-aa70d4ea0c4b000b47c32cc8290e9fa08dc0ba42.tar.gz gentoo-2-aa70d4ea0c4b000b47c32cc8290e9fa08dc0ba42.tar.bz2 gentoo-2-aa70d4ea0c4b000b47c32cc8290e9fa08dc0ba42.zip |
cleanup + type-o fix
Diffstat (limited to 'media-video/nvidia-kernel/files')
-rw-r--r-- | media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff index a4e00117d9e6..106c9cdaf998 100644 --- a/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff +++ b/media-video/nvidia-kernel/files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff @@ -1,43 +1,45 @@ -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 @@ +--- NVIDIA_kernel-1.0-4363.orig/nv-linux.h 2003-07-12 15:06:22.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv-linux.h 2003-07-12 15:18:04.000000000 +0200 +@@ -225,6 +225,16 @@ } #endif +#if defined(pmd_offset_map) -+#define NV_PMD_OFFSET(address, pg_dir) \ -+ pmd_offset_map(pg_dir, address); ++#define NV_PMD_OFFSET(pg_dir, address, pmd) \ ++ pmd = 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) ++#define NV_PMD_OFFSET(pg_dir, address, pmd) \ ++ pmd = pmd_offset(pg_dir, address) ++#undef NV_PMD_OFFSET_UNMAP +#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 +--- NVIDIA_kernel-1.0-4363.orig/nv.c 2003-07-12 15:06:22.000000000 +0200 ++++ NVIDIA_kernel-1.0-4363/nv.c 2003-07-12 15:22:13.000000000 +0200 +@@ -2105,12 +2105,20 @@ 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); +- goto failed; ++ NV_PMD_OFFSET(pg_dir, address, pg_mid_dir); + if (pmd_none(*pg_mid_dir)) { +#if defined(NV_PMD_OFFSET_UNMAP) -+ pmd_unmap(pg_mid_dir); ++ pmd_unmap(pg_mid_dir); +#endif - goto failed; -+ } ++ goto failed; ++ } NV_PTE_OFFSET(address, pg_mid_dir, pte); + +#if defined(NV_PMD_OFFSET_UNMAP) -+ pmd_unmap(pg_mid_dir); ++ pmd_unmap(pg_mid_dir); +#endif - ++ if (!pte_present(pte)) goto failed; + |