lkml.org 
[lkml]   [2002]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: Linux 2.4.20-pre5
From
Date
Marcelo Tosatti <marcelo@conectiva.com.br> writes:

> <hch@lst.de>:
> o update drm to XFree 4.2 version

This patch removes two lines from drm_vm.h that are not removed in the
XFree 4.2 tree. It looks like a merge error to me. Here is a patch for
2.4.20-rc1 to restore the missing lines.

--- linux/drivers/char/drm/drm_vm.h~ Tue Oct 29 19:01:06 2002
+++ linux/drivers/char/drm/drm_vm.h Sun Nov 10 15:06:45 2002
@@ -471,10 +471,12 @@
vma->vm_private_data = (void *)map;
/* Don't let this area swap. Change when
DRM_KERNEL advisory is supported. */
+ vma->vm_flags |= VM_RESERVED;
break;
case _DRM_SCATTER_GATHER:
vma->vm_ops = &DRM(vm_sg_ops);
vma->vm_private_data = (void *)map;
+ vma->vm_flags |= VM_RESERVED;
break;
default:
return -EINVAL; /* This should never happen. */
--
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:30    [W:0.048 / U:2.796 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site