public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
From: Keith Owens <kaos@ocs.com.au>
To: linux-ia64@vger.kernel.org
Subject: [Linux-ia64] ia64 patch breaks ix86 compile
Date: Wed, 06 Dec 2000 00:40:42 +0000	[thread overview]
Message-ID: <marc-linux-ia64-105590678205795@msgid-missing> (raw)

linux-2.4.0-test10-ia64-001115.diff includes this patch which breaks
ix86 compiles from the same source tree, no definition for
pgprot_writecombine.  Anybody care to fix this for ix86?

Index: 0-test11.1/drivers/char/mem.c
--- 0-test11.1/drivers/char/mem.c Wed, 15 Nov 2000 12:00:34 +1100 kaos (linux-2.4/N/b/49_mem.c 1.3.1.5 644)
+++ 0-test11.13(w)/drivers/char/mem.c Mon, 20 Nov 2000 16:50:00 +1100 kaos (linux-2.4/N/b/49_mem.c 1.3.1.6 644)
@@ -198,8 +198,12 @@ static int mmap_mem(struct file * file, 
 	 * through a file pointer that was marked O_SYNC will be
 	 * done non-cached.
 	 */
-	if (noncached_address(offset) || (file->f_flags & O_SYNC))
+	if (noncached_address(offset) || (file->f_flags & O_SYNC)
+	    || vma->vm_flags & VM_NONCACHED)
 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+	if (vma->vm_flags & VM_WRITECOMBINED)
+		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 
 	/*
 	 * Don't dump addresses that are not real memory to a core file.



                 reply	other threads:[~2000-12-06  0:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=marc-linux-ia64-105590678205795@msgid-missing \
    --to=kaos@ocs.com.au \
    --cc=linux-ia64@vger.kernel.org \
    /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