diff options
| -rw-r--r-- | arch/x86/include/asm/set_memory.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/machine_kexec_64.c | 5 | ||||
| -rw-r--r-- | arch/x86/mm/pat/set_memory.c | 13 |
3 files changed, 1 insertions, 18 deletions
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 61f56cdaccb5..4362c26aa992 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/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 201137b98fb8..0590d399d4f1 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -673,10 +673,7 @@ static void kexec_mark_dm_crypt_keys(bool protect) if (protect) set_memory_np((unsigned long)phys_to_virt(start_paddr), nr_pages); else - __set_memory_prot( - (unsigned long)phys_to_virt(start_paddr), - nr_pages, - __pgprot(_PAGE_PRESENT | _PAGE_NX | _PAGE_RW)); + set_memory_p((unsigned long)phys_to_virt(start_paddr), nr_pages); } } diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6c6eb486f7a6..40581a720fe8 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2145,19 +2145,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) { /* |