The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 9de76f41ea2188f2784f48352f9278819d249afc
Gitweb: https://git.kernel.org/tip/9de76f41ea2188f2784f48352f9278819d249afc
Author: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
AuthorDate: Thu, 07 Jul 2022 13:54:42 +02:00
Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
CommitterDate: Thu, 07 Jul 2022 09:51:36 -07:00
x86/mm: Refer to the intended config STRICT_DEVMEM in a comment
Commit a4866aa81251 ("mm: Tighten x86 /dev/mem with zeroing reads") adds a
comment to the function devmem_is_allowed() referring to a non-existing
config STRICT_IOMEM, whereas the comment very likely intended to refer to
the config STRICT_DEVMEM, as the commit adds some behavior for the config
STRICT_DEVMEM.
Most of the initial analysis was actually done by Dave Hansen in the
email thread below (see Link).
Refer to the intended and existing config STRICT_DEVMEM.
Suggested-by: Dave Hansen <dave.hansen@xxxxxxxxx>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/f9074e8d-9314-9d7d-7bf5-5b5538c8be8d@xxxxxxxxx/
Link: https://lkml.kernel.org/r/20220707115442.21107-1-lukas.bulwahn@xxxxxxxxx
---
arch/x86/mm/init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index d8cfce2..5d747a1 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -846,7 +846,7 @@ int devmem_is_allowed(unsigned long pagenr)
/*
* This must follow RAM test, since System RAM is considered a
- * restricted resource under CONFIG_STRICT_IOMEM.
+ * restricted resource under CONFIG_STRICT_DEVMEM.
*/
if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) {
/* Low 1MB bypasses iomem restrictions. */
|