From: Jamie Gennis <jgennis@google.com>
Date: Mon, 9 Aug 2010 19:46:58 +0000 (-0700)
Subject: Allow multiple pmem master mmap()s.
X-Git-Tag: firefly_0821_release~9833^2~5^2~148
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d799633c994ee44f4aca740c61be24daf573b8c;p=firefly-linux-kernel-4.4.55.git

Allow multiple pmem master mmap()s.

Signed-off-by: Jamie Gennis <jgennis@google.com>
Change-Id: Icbe619c92e0ebb391f0a93f81937705452a67d87
---

diff --git a/drivers/misc/pmem.c b/drivers/misc/pmem.c
index 7f3b53217560..890831e2deb7 100644
--- a/drivers/misc/pmem.c
+++ b/drivers/misc/pmem.c
@@ -594,8 +594,7 @@ static int pmem_mmap(struct file *file, struct vm_area_struct *vma)
 	down_write(&data->sem);
 	/* check this file isn't already mmaped, for submaps check this file
 	 * has never been mmaped */
-	if ((data->flags & PMEM_FLAGS_MASTERMAP) ||
-	    (data->flags & PMEM_FLAGS_SUBMAP) ||
+	if ((data->flags & PMEM_FLAGS_SUBMAP) ||
 	    (data->flags & PMEM_FLAGS_UNSUBMAP)) {
 #if PMEM_DEBUG
 		printk(KERN_ERR "pmem: you can only mmap a pmem file once, "