---

yaml --- r: 217479 b: refs/heads/master c: 1b36ba8 h: refs/heads/master i: 217477: 773c65d 217475: 1d61bf7 217471: 094a9c4 v: v3
git-mirror · Oct 26, 2010 · 0a9e11e · 0a9e11e
1 parent 944a8ae
commit 0a9e11e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6219ec8195efd5640765e657810f262ad9d1a92
+refs/heads/master: 1b36ba815bd91f17e31277a44dd5c6b6a5a8d97e
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -3351,7 +3351,7 @@ int in_gate_area_no_task(unsigned long addr)
 
 #endif	/* __HAVE_ARCH_GATE_AREA */
 
-static int follow_pte(struct mm_struct *mm, unsigned long address,
+static int __follow_pte(struct mm_struct *mm, unsigned long address,
 		pte_t **ptepp, spinlock_t **ptlp)
 {
 	pgd_t *pgd;
@@ -3388,6 +3388,17 @@ static int follow_pte(struct mm_struct *mm, unsigned long address,
 	return -EINVAL;
 }
 
+static inline int follow_pte(struct mm_struct *mm, unsigned long address,
+			     pte_t **ptepp, spinlock_t **ptlp)
+{
+	int res;
+
+	/* (void) is needed to make gcc happy */
+	(void) __cond_lock(*ptlp,
+			   !(res = __follow_pte(mm, address, ptepp, ptlp)));
+	return res;
+}
+
 /**
  * follow_pfn - look up PFN at a user virtual address
  * @vma: memory mapping