summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-08-16 11:02:18 +0200
committerMichal Simek <monstr@monstr.eu>2010-10-21 07:51:20 +0200
commit5f0cb3e01ec41b35b8452856f2ddd7a9f36fb80b (patch)
treece6a7ddfc6b4957281f7ed156447661e01d38a33 /arch
parentmicroblaze: kgdb: Remove unused variable and fix return value (diff)
downloadlinux-5f0cb3e01ec41b35b8452856f2ddd7a9f36fb80b.tar.xz
linux-5f0cb3e01ec41b35b8452856f2ddd7a9f36fb80b.zip
microblaze: Fix pmd_populate macro
Compilation warning: mm/memory.c: In function '__pte_alloc': mm/memory.c:421: warning: assignment makes integer from pointer without a cast Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/asm/pgalloc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h
index c614a893f8a3..ebd35792482c 100644
--- a/arch/microblaze/include/asm/pgalloc.h
+++ b/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))