aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-10-26 17:21:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 19:52:08 -0400
commitece0e2b6406a995c371e0311190631ea34ad851a (patch)
tree726a516a91f5f7efe9dbb247ba28d019981d456e /arch/microblaze
parent3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73 (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/microblaze')
-rw-r--r--arch/microblaze/include/asm/pgtable.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
index d4f421672d3b..cae268c22ba2 100644
--- a/arch/microblaze/include/asm/pgtable.h
+++ b/arch/microblaze/include/asm/pgtable.h
@@ -504,12 +504,9 @@ static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address)
504#define pte_offset_kernel(dir, addr) \ 504#define pte_offset_kernel(dir, addr) \
505 ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr)) 505 ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr))
506#define pte_offset_map(dir, addr) \ 506#define pte_offset_map(dir, addr) \
507 ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr)) 507 ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr))
508#define pte_offset_map_nested(dir, addr) \
509 ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_index(addr))
510 508
511#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0) 509#define pte_unmap(pte) kunmap_atomic(pte)
512#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
513 510
514/* Encode and decode a nonlinear file mapping entry */ 511/* Encode and decode a nonlinear file mapping entry */
515#define PTE_FILE_MAX_BITS 29 512#define PTE_FILE_MAX_BITS 29