diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 18:26:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 18:28:57 -0400 |
commit | 64d206d896ff70b828138577d5ff39deda5f1c4d (patch) | |
tree | c73a42f38a22c00d9bc3a9a558770cbbea79877c /arch/x86/mm | |
parent | 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (diff) |
x86: rename CONFIG_NONPROMISC_DEVMEM to CONFIG_PROMISC_DEVMEM
Linus observed:
> The real bug is that we shouldn't have "double negatives", and
> certainly not negative config options. Making that "promiscuous
> /dev/mem" option a negated thing as a config option was bad.
right ... lets rename this option. There should never be a negation
in config options.
[ that reminds me of CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER, but that
is for another commit ;-) ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) |