[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <174076223359.10177.192242044439144224.tip-bot2@tip-bot2>
Date: Fri, 28 Feb 2025 17:03:53 -0000
From: "tip-bot2 for Kevin Brodsky" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Kevin Brodsky <kevin.brodsky@....com>, Ingo Molnar <mingo@...nel.org>,
David Hildenbrand <david@...hat.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/headers] x86/mm: Remove unused __set_memory_prot()
The following commit has been merged into the x86/headers branch of tip:
Commit-ID: 693bbf2a50447353c6a47961e6a7240a823ace02
Gitweb: https://git.kernel.org/tip/693bbf2a50447353c6a47961e6a7240a823ace02
Author: Kevin Brodsky <kevin.brodsky@....com>
AuthorDate: Thu, 12 Dec 2024 08:09:03
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Fri, 28 Feb 2025 17:35:14 +01:00
x86/mm: Remove unused __set_memory_prot()
__set_memory_prot() is unused since:
5c11f00b09c1 ("x86: remove memory hotplug support on X86_32")
Let's remove it.
Signed-off-by: Kevin Brodsky <kevin.brodsky@....com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Acked-by: David Hildenbrand <david@...hat.com>
Link: https://lore.kernel.org/r/20241212080904.2089632-2-kevin.brodsky@arm.com
---
arch/x86/include/asm/set_memory.h | 1 -
arch/x86/mm/pat/set_memory.c | 13 -------------
2 files changed, 14 deletions(-)
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index cc62ef7..6586d53 100644
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -38,7 +38,6 @@ int set_memory_rox(unsigned long addr, int numpages);
* The caller is required to take care of these.
*/
-int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot);
int _set_memory_uc(unsigned long addr, int numpages);
int _set_memory_wc(unsigned long addr, int numpages);
int _set_memory_wt(unsigned long addr, int numpages);
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index ef4514d..b289667 100644
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -1942,19 +1942,6 @@ static inline int cpa_clear_pages_array(struct page **pages, int numpages,
CPA_PAGES_ARRAY, pages);
}
-/*
- * __set_memory_prot is an internal helper for callers that have been passed
- * a pgprot_t value from upper layers and a reservation has already been taken.
- * If you want to set the pgprot to a specific page protocol, use the
- * set_memory_xx() functions.
- */
-int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot)
-{
- return change_page_attr_set_clr(&addr, numpages, prot,
- __pgprot(~pgprot_val(prot)), 0, 0,
- NULL);
-}
-
int _set_memory_uc(unsigned long addr, int numpages)
{
/*
Powered by blists - more mailing lists