diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /arch/parisc/include/asm/pgtable.h | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'arch/parisc/include/asm/pgtable.h')
| -rw-r--r-- | arch/parisc/include/asm/pgtable.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index 01c15035e783..865f37a8a881 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h | |||
| @@ -397,9 +397,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | |||
| 397 | #define pte_offset_kernel(pmd, address) \ | 397 | #define pte_offset_kernel(pmd, address) \ |
| 398 | ((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address)) | 398 | ((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address)) |
| 399 | #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address) | 399 | #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address) |
| 400 | #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address) | ||
| 401 | #define pte_unmap(pte) do { } while (0) | 400 | #define pte_unmap(pte) do { } while (0) |
| 402 | #define pte_unmap_nested(pte) do { } while (0) | ||
| 403 | 401 | ||
| 404 | #define pte_unmap(pte) do { } while (0) | 402 | #define pte_unmap(pte) do { } while (0) |
| 405 | #define pte_unmap_nested(pte) do { } while (0) | 403 | #define pte_unmap_nested(pte) do { } while (0) |