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/xtensa/include/asm/pgtable.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/xtensa/include/asm/pgtable.h')
| -rw-r--r-- | arch/xtensa/include/asm/pgtable.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 76bf35554117..b03c043ce75b 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h | |||
| @@ -324,10 +324,7 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | |||
| 324 | #define pte_offset_kernel(dir,addr) \ | 324 | #define pte_offset_kernel(dir,addr) \ |
| 325 | ((pte_t*) pmd_page_vaddr(*(dir)) + pte_index(addr)) | 325 | ((pte_t*) pmd_page_vaddr(*(dir)) + pte_index(addr)) |
| 326 | #define pte_offset_map(dir,addr) pte_offset_kernel((dir),(addr)) | 326 | #define pte_offset_map(dir,addr) pte_offset_kernel((dir),(addr)) |
| 327 | #define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir),(addr)) | ||
| 328 | |||
| 329 | #define pte_unmap(pte) do { } while (0) | 327 | #define pte_unmap(pte) do { } while (0) |
| 330 | #define pte_unmap_nested(pte) do { } while (0) | ||
| 331 | 328 | ||
| 332 | 329 | ||
| 333 | /* | 330 | /* |