mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Peter Osterlund <petero2@telia.com>
To: Marcelo Tosatti <marcelo@conectiva.com.br>, hch@lst.de
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.4.20-pre5
Date: 10 Nov 2002 15:10:12 +0100	[thread overview]
Message-ID: <m23cq9ikhn.fsf@p4.localdomain> (raw)
In-Reply-To: <Pine.LNX.4.44.0208281946150.5234-100000@freak.distro.conectiva>

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

      parent reply	other threads:[~2002-11-10 14:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-08-28 22:46 Marcelo Tosatti
2002-08-29  0:45 ` Linux 2.4.20-pre5: compile failures Eyal Lebedinsky
2002-08-29  1:18 ` Linux 2.4.20-pre5 Alex Romosan
2002-09-10 22:51 ` Adrian Bunk
2002-11-10 14:10 ` Peter Osterlund [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m23cq9ikhn.fsf@p4.localdomain \
    --to=petero2@telia.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo@conectiva.com.br \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®