Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a919198b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ingo Molnar
Browse files

x86/mm: Remove the unused set_memory_array_*() functions 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190826075558.8125-3-hch@lst.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ec46133d

arch/x86/include/asm/set_memory.h

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ int set_memory_encrypted(unsigned long addr, int numpages); 
int set_memory_decrypted(unsigned long addr, int numpages);

int set_memory_np_noalias(unsigned long addr, int numpages);



int set_memory_array_uc(unsigned long *addr, int addrinarray);

int set_memory_array_wc(unsigned long *addr, int addrinarray);

int set_memory_array_wt(unsigned long *addr, int addrinarray);

int set_memory_array_wb(unsigned long *addr, int addrinarray);



int set_pages_array_uc(struct page **pages, int addrinarray);

int set_pages_array_wc(struct page **pages, int addrinarray);

int set_pages_array_wt(struct page **pages, int addrinarray);

arch/x86/mm/pageattr.c

+0 −75
Original line number Diff line number Diff line
@@ -1819,63 +1819,6 @@ int set_memory_uc(unsigned long addr, int numpages) 
}

EXPORT_SYMBOL(set_memory_uc);



static int _set_memory_array(unsigned long *addr, int numpages,

		enum page_cache_mode new_type)

{

	enum page_cache_mode set_type;

	int i, j;

	int ret;



	for (i = 0; i < numpages; i++) {

		ret = reserve_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE,

					new_type, NULL);

		if (ret)

			goto out_free;

	}



	/* If WC, set to UC- first and then WC */

	set_type = (new_type == _PAGE_CACHE_MODE_WC) ?

				_PAGE_CACHE_MODE_UC_MINUS : new_type;



	ret = change_page_attr_set(addr, numpages,

				   cachemode2pgprot(set_type), 1);



	if (!ret && new_type == _PAGE_CACHE_MODE_WC)

		ret = change_page_attr_set_clr(addr, numpages,

					       cachemode2pgprot(

						_PAGE_CACHE_MODE_WC),

					       __pgprot(_PAGE_CACHE_MASK),

					       0, CPA_ARRAY, NULL);

	if (ret)

		goto out_free;



	return 0;



out_free:

	for (j = 0; j < i; j++)

		free_memtype(__pa(addr[j]), __pa(addr[j]) + PAGE_SIZE);



	return ret;

}



int set_memory_array_uc(unsigned long *addr, int numpages)

{

	return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_UC_MINUS);

}

EXPORT_SYMBOL(set_memory_array_uc);



int set_memory_array_wc(unsigned long *addr, int numpages)

{

	return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_WC);

}

EXPORT_SYMBOL(set_memory_array_wc);



int set_memory_array_wt(unsigned long *addr, int numpages)

{

	return _set_memory_array(addr, numpages, _PAGE_CACHE_MODE_WT);

}

EXPORT_SYMBOL_GPL(set_memory_array_wt);



int _set_memory_wc(unsigned long addr, int numpages)

{

	int ret;
@@ -1952,24 +1895,6 @@ int set_memory_wb(unsigned long addr, int numpages) 
}

EXPORT_SYMBOL(set_memory_wb);



int set_memory_array_wb(unsigned long *addr, int numpages)

{

	int i;

	int ret;



	/* WB cache mode is hard wired to all cache attribute bits being 0 */

	ret = change_page_attr_clear(addr, numpages,

				      __pgprot(_PAGE_CACHE_MASK), 1);

	if (ret)

		return ret;



	for (i = 0; i < numpages; i++)

		free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE);



	return 0;

}

EXPORT_SYMBOL(set_memory_array_wb);



int set_memory_x(unsigned long addr, int numpages)

{

	if (!(__supported_pte_mask & _PAGE_NX))