diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/microblaze/include/asm/pgalloc.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/microblaze/include/asm/pgalloc.h')
| -rw-r--r-- | arch/microblaze/include/asm/pgalloc.h | 3 |
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) | |||
| 165 | 165 | ||
| 166 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, (pte)) | 166 | #define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, (pte)) |
| 167 | 167 | ||
| 168 | #define pmd_populate(mm, pmd, pte) (pmd_val(*(pmd)) = page_address(pte)) | 168 | #define pmd_populate(mm, pmd, pte) \ |
| 169 | (pmd_val(*(pmd)) = (unsigned long)page_address(pte)) | ||
| 169 | 170 | ||
| 170 | #define pmd_populate_kernel(mm, pmd, pte) \ | 171 | #define pmd_populate_kernel(mm, pmd, pte) \ |
| 171 | (pmd_val(*(pmd)) = (unsigned long) (pte)) | 172 | (pmd_val(*(pmd)) = (unsigned long) (pte)) |