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/ia64/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/ia64/include/asm/pgtable.h')
| -rw-r--r-- | arch/ia64/include/asm/pgtable.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index c3286f42e501..1a97af31ef17 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h | |||
| @@ -406,9 +406,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) | |||
| 406 | #define pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | 406 | #define pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) |
| 407 | #define pte_offset_kernel(dir,addr) ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr)) | 407 | #define pte_offset_kernel(dir,addr) ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr)) |
| 408 | #define pte_offset_map(dir,addr) pte_offset_kernel(dir, addr) | 408 | #define pte_offset_map(dir,addr) pte_offset_kernel(dir, addr) |
| 409 | #define pte_offset_map_nested(dir,addr) pte_offset_map(dir, addr) | ||
| 410 | #define pte_unmap(pte) do { } while (0) | 409 | #define pte_unmap(pte) do { } while (0) |
| 411 | #define pte_unmap_nested(pte) do { } while (0) | ||
| 412 | 410 | ||
| 413 | /* atomic versions of the some PTE manipulations: */ | 411 | /* atomic versions of the some PTE manipulations: */ |
| 414 | 412 | ||