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/mips | |
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/mips')
-rw-r--r-- | arch/mips/include/asm/pgtable-32.h | 3 | ||||
-rw-r--r-- | arch/mips/include/asm/pgtable-64.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h index ae90412556d0..8a153d2fa62a 100644 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h | |||
@@ -154,10 +154,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) | |||
154 | 154 | ||
155 | #define pte_offset_map(dir, address) \ | 155 | #define pte_offset_map(dir, address) \ |
156 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) | 156 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) |
157 | #define pte_offset_map_nested(dir, address) \ | ||
158 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) | ||
159 | #define pte_unmap(pte) ((void)(pte)) | 157 | #define pte_unmap(pte) ((void)(pte)) |
160 | #define pte_unmap_nested(pte) ((void)(pte)) | ||
161 | 158 | ||
162 | #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) | 159 | #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) |
163 | 160 | ||
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 1be4b0fa30da..f00896087dda 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h | |||
@@ -257,10 +257,7 @@ static inline pmd_t *pmd_offset(pud_t * pud, unsigned long address) | |||
257 | ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) | 257 | ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) |
258 | #define pte_offset_map(dir, address) \ | 258 | #define pte_offset_map(dir, address) \ |
259 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) | 259 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) |
260 | #define pte_offset_map_nested(dir, address) \ | ||
261 | ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) | ||
262 | #define pte_unmap(pte) ((void)(pte)) | 260 | #define pte_unmap(pte) ((void)(pte)) |
263 | #define pte_unmap_nested(pte) ((void)(pte)) | ||
264 | 261 | ||
265 | /* | 262 | /* |
266 | * Initialize a new pgd / pmd table with invalid pointers. | 263 | * Initialize a new pgd / pmd table with invalid pointers. |