diff options
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index d4585077977a..c34dc483839c 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -373,8 +373,8 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, | |||
| 373 | return vma_prot; | 373 | return vma_prot; |
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | #ifdef CONFIG_NONPROMISC_DEVMEM | 376 | #ifndef CONFIG_PROMISC_DEVMEM |
| 377 | /* This check is done in drivers/char/mem.c in case of NONPROMISC_DEVMEM*/ | 377 | /* This check is done in drivers/char/mem.c in case of !PROMISC_DEVMEM*/ |
| 378 | static inline int range_is_allowed(unsigned long pfn, unsigned long size) | 378 | static inline int range_is_allowed(unsigned long pfn, unsigned long size) |
| 379 | { | 379 | { |
| 380 | return 1; | 380 | return 1; |
| @@ -398,7 +398,7 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) | |||
| 398 | } | 398 | } |
| 399 | return 1; | 399 | return 1; |
| 400 | } | 400 | } |
| 401 | #endif /* CONFIG_NONPROMISC_DEVMEM */ | 401 | #endif /* CONFIG_PROMISC_DEVMEM */ |
| 402 | 402 | ||
| 403 | int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | 403 | int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, |
| 404 | unsigned long size, pgprot_t *vma_prot) | 404 | unsigned long size, pgprot_t *vma_prot) |