leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'x86_cleanups_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-08-01 09:33:17 -07:00
parent dbc1f5a9f4 9de76f41ea
commit 94e37e8489
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/init.c
View File

@@ -856,7 +856,7 @@ int devmem_is_allowed(unsigned long pagenr)
/* /*
* This must follow RAM test, since System RAM is considered a * 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)) { if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) {
/* Low 1MB bypasses iomem restrictions. */ /* Low 1MB bypasses iomem restrictions. */