aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-17 18:26:59 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-20 02:35:55 -0400
commitd092633bff3b19faffc480fe9810805e7792a029 (patch)
tree5202dc786557858d016b090b9d025ecc3d4a1b97 /arch/x86/mm/pat.c
parent723edb5060855ef36ddeca51a070784b0e0d16df (diff)
Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM
From: Arjan van de Ven <arjan@infradead.org> Date: Sat, 19 Jul 2008 15:47:17 -0700 CONFIG_NONPROMISC_DEVMEM was a rather confusing name - but renaming it to CONFIG_PROMISC_DEVMEM causes problems on architectures that do not support this feature; this patch renames it to CONFIG_STRICT_DEVMEM, so that architectures can opt-in into it. ( the polarity of the option is still the same as it was originally; it needs to be for now to not break architectures that don't have the infastructure yet to support this feature) Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: "V.Radhakrishnan" <rk@atr-labs.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> ---
Diffstat (limited to 'arch/x86/mm/pat.c')
-rw-r--r--arch/x86/mm/pat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index c34dc483839c..6bb597f4d701 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#ifndef CONFIG_PROMISC_DEVMEM 376#ifdef CONFIG_STRICT_DEVMEM
377/* This check is done in drivers/char/mem.c in case of !PROMISC_DEVMEM*/ 377/* This check is done in drivers/char/mem.c in case of STRICT_DEVMEM*/
378static inline int range_is_allowed(unsigned long pfn, unsigned long size) 378static 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_PROMISC_DEVMEM */ 401#endif /* CONFIG_STRICT_DEVMEM */
402 402
403int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, 403int 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)