diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-10-26 17:21:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 19:52:08 -0400 |
commit | ece0e2b6406a995c371e0311190631ea34ad851a (patch) | |
tree | 726a516a91f5f7efe9dbb247ba28d019981d456e /arch/frv | |
parent | 3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73 (diff) |
mm: remove pte_*map_nested()
Since we no longer need to provide KM_type, the whole pte_*map_nested()
API is now redundant, remove it.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Miller <davem@davemloft.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/include/asm/pgtable.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h index c18b0d32e636..6bc241e4b4f8 100644 --- a/arch/frv/include/asm/pgtable.h +++ b/arch/frv/include/asm/pgtable.h | |||
@@ -451,17 +451,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | |||
451 | 451 | ||
452 | #if defined(CONFIG_HIGHPTE) | 452 | #if defined(CONFIG_HIGHPTE) |
453 | #define pte_offset_map(dir, address) \ | 453 | #define pte_offset_map(dir, address) \ |
454 | ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) | 454 | ((pte_t *)kmap_atomic(pmd_page(*(dir))) + pte_index(address)) |
455 | #define pte_offset_map_nested(dir, address) \ | 455 | #define pte_unmap(pte) kunmap_atomic(pte) |
456 | ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address)) | ||
457 | #define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0) | ||
458 | #define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1) | ||
459 | #else | 456 | #else |
460 | #define pte_offset_map(dir, address) \ | 457 | #define pte_offset_map(dir, address) \ |
461 | ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) | 458 | ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) |
462 | #define pte_offset_map_nested(dir, address) pte_offset_map((dir), (address)) | ||
463 | #define pte_unmap(pte) do { } while (0) | 459 | #define pte_unmap(pte) do { } while (0) |
464 | #define pte_unmap_nested(pte) do { } while (0) | ||
465 | #endif | 460 | #endif |
466 | 461 | ||
467 | /* | 462 | /* |