diff options
| author |   Pavel Machek <pavel@ucw.cz> | 2014-12-28 17:15:24 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2015-02-19 02:09:49 +0100 |
| commit | 1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad (patch) | |
| tree | 6f7d30d99e00a02626e496a5006f9af2f0b163fb /arch/x86/mm/pat.c | |
| parent | x86/mm: Reduce PAE-mode per task pgd allocation overhead from 4K to 32 bytes (diff) | |
| download | linux-dev-1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad.tar.xz linux-dev-1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad.zip | |
x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases
STRICT_DEVMEM and PAT produce same failure accessing /dev/mem,
which is quite confusing to the user. Make printk messages
different to lessen confusion.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/pat.c')
| -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 7ac68698406c..35af6771a95a 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -610,7 +610,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, } #ifdef CONFIG_STRICT_DEVMEM -/* This check is done in drivers/char/mem.c in case of STRICT_DEVMEM*/ +/* This check is done in drivers/char/mem.c in case of STRICT_DEVMEM */ static inline int range_is_allowed(unsigned long pfn, unsigned long size) { return 1; @@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) while (cursor < to) { if (!devmem_is_allowed(pfn)) { - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n", - current->comm, from, to - 1); + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n", + current->comm, from, to - 1); return 0; } cursor += PAGE_SIZE; |