diff options
| author | Linus Torvalds | 2022-08-01 09:33:17 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-08-01 09:33:17 -0700 |
| commit | 94e37e84891900f56a01f49ac173bcb15e42e461 (patch) | |
| tree | 3e2f559cfd593b0538d62cce3fab5295e6211c20 /arch/x86 | |
| parent | dbc1f5a9f42a9bb31b84bba4d40ced21952d505a (diff) | |
| parent | 9de76f41ea2188f2784f48352f9278819d249afc (diff) | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 57ba5502aecf..82a042c03824 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -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. */ |