---

yaml --- r: 217121 b: refs/heads/master c: 5f0cb3e h: refs/heads/master i: 217119: da2c86d v: v3
git-mirror · Oct 21, 2010 · 6f3326a · 6f3326a
1 parent 42067bc
commit 6f3326a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f859f0a235d4d9e7eae49bf10bab6b0967d328f6
+refs/heads/master: 5f0cb3e01ec41b35b8452856f2ddd7a9f36fb80b
diff --git a/trunk/arch/microblaze/include/asm/pgalloc.h b/trunk/arch/microblaze/include/asm/pgalloc.h
@@ -165,7 +165,8 @@ extern inline void pte_free(struct mm_struct *mm, struct page *ptepage)
 
 #define __pte_free_tlb(tlb, pte, addr)	pte_free((tlb)->mm, (pte))
 
-#define pmd_populate(mm, pmd, pte)	(pmd_val(*(pmd)) = page_address(pte))
+#define pmd_populate(mm, pmd, pte) \
+			(pmd_val(*(pmd)) = (unsigned long)page_address(pte))
 
 #define pmd_populate_kernel(mm, pmd, pte) \
 		(pmd_val(*(pmd)) = (unsigned long) (pte))