diff options
Diffstat (limited to 'arch/x86/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/x86/include/asm/pgtable_32.h | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 31bd120cf2a..01fd9461d32 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -49,13 +49,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);  #endif  #if defined(CONFIG_HIGHPTE) +#define __KM_PTE			\ +	(in_nmi() ? KM_NMI_PTE : 	\ +	 in_irq() ? KM_IRQ_PTE :	\ +	 KM_PTE0)  #define pte_offset_map(dir, address)					\ -	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) +		\ +	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), __KM_PTE) +		\  	 pte_index((address)))  #define pte_offset_map_nested(dir, address)				\  	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) +		\  	 pte_index((address))) -#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0) +#define pte_unmap(pte) kunmap_atomic((pte), __KM_PTE)  #define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)  #else  #define pte_offset_map(dir, address)					\  |