From 2190c100fb649f0a1ff029a00695d7535d01ed8c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@pathscale.com>
Date: Fri, 25 Aug 2006 11:24:30 -0700
Subject: [PATCH] --- yaml --- r: 34295 b: refs/heads/master c:
 367fe711c5dc85dbc3265cf01e34d4d6fbd55f06 h: refs/heads/master i:   34293:
 2e2b5b732153f3ace7a6babfcffc585eb00d239e   34291:
 fcae99ee83466e00e1c05cd68560f606c7308cfd   34287:
 b8aa6c2d4ad6752439dae56ad866ad92e0406e62 v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4f7c0199580e..40353a818fa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba11203a11835737df980ef3dd3bd8325b9cc94e
+refs/heads/master: 367fe711c5dc85dbc3265cf01e34d4d6fbd55f06
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 0b6e7679eefd..e999a46bef9b 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -992,15 +992,10 @@ static int mmap_piobufs(struct vm_area_struct *vma,
 	pgprot_val(vma->vm_page_prot) &= ~_PAGE_GUARDED;
 #endif
 
-	if (vma->vm_flags & VM_READ) {
-		dev_info(&dd->pcidev->dev,
-			 "Can't map piobufs as readable (flags=%lx)\n",
-			 vma->vm_flags);
-		ret = -EPERM;
-		goto bail;
-	}
-
-	/* don't allow them to later change to readable with mprotect */
+	/*
+	 * don't allow them to later change to readable with mprotect (for when
+	 * not initially mapped readable, as is normally the case)
+	 */
 	vma->vm_flags &= ~VM_MAYREAD;
 	vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND;