Commit 94e37e84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dbc1f5a9 9de76f41

arch/x86/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,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. */