Skip to contentSkip to conversation

x86/mm: Rename set_memory_present() to set_memory_p()

PATCH Applied Borislav Petkov 2 participants 2 messages Aug 5, 2022 – Aug 6, 2022

Subsystems (2)
lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/mm: Rename set_memory_present() to set_memory_p()

From: Borislav Petkov <[email protected]>

Have it adhere to the naming convention for those helpers.

No functional changes.

---
 arch/x86/mm/pat/set_memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/pat/set_memory.c +2 -2
index 1abd5438f126..6a9043b6b8f6 100644
@@ -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 */
Signature · 1 line
2.35.1
#1 lore raw
The following commit has been merged into the x86/mm branch of tip:

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 <[email protected]>
AuthorDate:    Fri, 05 Aug 2022 16:07:02 +02:00
Committer:     Ingo Molnar <[email protected]>
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.

---
 arch/x86/mm/pat/set_memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/pat/set_memory.c +2 -2
index 1abd543..6a9043b 100644
@@ -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 */