Messages in this thread Patch in this message | | | Date | Sat, 06 Aug 2022 18:50:08 -0000 | From | "tip-bot2 for Borislav Petkov" <> | Subject | [tip: x86/mm] x86/mm: Rename set_memory_present() to set_memory_p() |
| |
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 86af8230ce138e0423f43f6b104f3fa050aced6d Gitweb: https://git.kernel.org/tip/86af8230ce138e0423f43f6b104f3fa050aced6d Author: Borislav Petkov <bp@suse.de> AuthorDate: Fri, 05 Aug 2022 16:07:02 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Sat, 06 Aug 2022 20:46:13 +02:00
x86/mm: Rename set_memory_present() to set_memory_p()
Have it adhere to the naming convention for those helpers.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20220805140702.31538-1-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/mm/pat/set_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 1abd543..6a9043b 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1944,7 +1944,7 @@ int set_mce_nospec(unsigned long pfn) return rc; } -static int set_memory_present(unsigned long *addr, int numpages) +static int set_memory_p(unsigned long *addr, int numpages) { return change_page_attr_set(addr, numpages, __pgprot(_PAGE_PRESENT), 0); } @@ -1954,7 +1954,7 @@ int clear_mce_nospec(unsigned long pfn) { unsigned long addr = (unsigned long) pfn_to_kaddr(pfn); - return set_memory_present(&addr, 1); + return set_memory_p(&addr, 1); } EXPORT_SYMBOL_GPL(clear_mce_nospec); #endif /* CONFIG_X86_64 */
| |