aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/pgtable_32.h
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-06-15 06:40:41 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-15 09:57:52 -0400
commit3ff0141aa3a03ca3388b40b36167d0a37919f3fd (patch)
tree9101842f3cf1ca5f69857586bc6feb247ff6d494 /arch/x86/include/asm/pgtable_32.h
parent465a454f254ee2ff7acc4aececbe31f8af046bc0 (diff)
x86: Add NMI types for kmap_atomic
Two new kmap_atomic slots for NMI context. And teach pte_offset_map() about NMI context. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> CC: Nick Piggin <npiggin@suse.de> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/pgtable_32.h')
-rw-r--r--arch/x86/include/asm/pgtable_32.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index 31bd120cf2a2..85464971bca0 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -49,13 +49,14 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
49#endif 49#endif
50 50
51#if defined(CONFIG_HIGHPTE) 51#if defined(CONFIG_HIGHPTE)
52#define __KM_PTE (in_nmi() ? KM_NMI_PTE : KM_PTE0)
52#define pte_offset_map(dir, address) \ 53#define pte_offset_map(dir, address) \
53 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \ 54 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), __KM_PTE) + \
54 pte_index((address))) 55 pte_index((address)))
55#define pte_offset_map_nested(dir, address) \ 56#define pte_offset_map_nested(dir, address) \
56 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) + \ 57 ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) + \
57 pte_index((address))) 58 pte_index((address)))
58#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0) 59#define pte_unmap(pte) kunmap_atomic((pte), __KM_PTE)
59#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1) 60#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
60#else 61#else
61#define pte_offset_map(dir, address) \ 62#define pte_offset_map(dir, address) \