Re: patch to NVIDIA_kernel & kernel 2.5.5

[J.A. Magallon]

On 20020220 Nicholas Petreley wrote:
>I think you may not have meant to do this part of the patch in nv.c:
>
>+/*         
>             if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED))
>+*/
>+           if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))
>                return -EAGAIN;
>
>
>How about this instead:
>
>+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
>             if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED))
>                  return -EAGAIN;
>+#else
>+            if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))
>+                 return -EAGAIN;
>+#endif
>

and why not:

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
#define NV_IS_CTRL_DEV(inode) NV_DEVICE_IS_CONTROL_DEVICE(inode->i_rdev)
#define REMAP_PR(vma, start, page, size, flags) \
		remap_page_range(start, page, size, flags)
#else
#define NV_IS_CTRL_DEV(inode) NV_DEVICE_IS_CONTROL_DEVICE(kdev_val(inode->i_rdev)
#define REMAP_PR(vma, start, page, size, flags) \
		remap_page_range(vma,start, page, size, flags)
#endif

so you just leave the code readable:

-    if (NV_DEVICE_IS_CONTROL_DEVICE(inode->i_rdev))
+    if (NV_IS_CTRL_DEV(inode))

and

-            if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED))
+            if (REMAP_PR(vma,start, page, PAGE_SIZE, PAGE_SHARED))

instead of polluted by tons of #ifdefs....

-- 
J.A. Magallon                           #  Let the source be with you...        
mailto:[e-mail]
Mandrake Linux release 8.2 (Cooker) for i586
Linux werewolf 2.4.18-rc2-jam1 #1 SMP Tue Feb 19 00:35:21 CET 2002 i686