Commit e1e6cd01 authored by Coiby Xu's avatar Coiby Xu Committed by Andrew Morton
Browse files

Revert "x86/mm: Remove unused __set_memory_prot()" 

This reverts commit 693bbf2a as kdump LUKS
support (CONFIG_CRASH_DM_CRYPT) depends on __set_memory_prot.

[akpm@linux-foundation.org: x86 set_memory.h needs pgtable_types.h]
Link: https://lkml.kernel.org/r/20250502011246.99238-7-coxu@redhat.com


Signed-off-by: default avatarCoiby Xu <coxu@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: "Daniel P. Berrange" <berrange@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Jan Pazdziora <jpazdziora@redhat.com>
Cc: Liu Pingfan <kernelfans@gmail.com>
Cc: Milan Broz <gmazyland@gmail.com>
Cc: Ondrej Kozina <okozina@redhat.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 62f17d9d

arch/x86/include/asm/set_memory.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <asm/page.h>

#include <asm-generic/set_memory.h>

#include <asm/pgtable.h>



#define set_memory_rox set_memory_rox

int set_memory_rox(unsigned long addr, int numpages);
@@ -37,6 +38,7 @@ 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);

arch/x86/mm/pat/set_memory.c

+13 −0
Original line number Diff line number Diff line
@@ -2148,6 +2148,19 @@ 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)

{

	/*