Skip to content

Commit 94e37e8

Browse files
committed
Merge tag 'x86_cleanups_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanup from Borislav Petkov: - A single CONFIG_ symbol correction in a comment * tag 'x86_cleanups_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm: Refer to the intended config STRICT_DEVMEM in a comment
2 parents dbc1f5a + 9de76f4 commit 94e37e8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ int devmem_is_allowed(unsigned long pagenr)
856856

857857
/*
858858
* This must follow RAM test, since System RAM is considered a
859-
* restricted resource under CONFIG_STRICT_IOMEM.
859+
* restricted resource under CONFIG_STRICT_DEVMEM.
860860
*/
861861
if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) {
862862
/* Low 1MB bypasses iomem restrictions. */

0 commit comments

Comments
 (0)