x86, PAT: Change order of cpa and free in set_memory_wb (a5593e0b) · Commits · 戴 / test

arch/x86/mm/pageattr.c

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1021,15 +1021,19 @@ int _set_memory_wb(unsigned long addr, int numpages)

	int set_memory_wb(unsigned long addr, int numpages)		int set_memory_wb(unsigned long addr, int numpages)
	{		{
			int ret = _set_memory_wb(addr, numpages);
	free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);		free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
			return ret;
	return _set_memory_wb(addr, numpages);
	}		}
	EXPORT_SYMBOL(set_memory_wb);		EXPORT_SYMBOL(set_memory_wb);

	int set_memory_array_wb(unsigned long *addr, int addrinarray)		int set_memory_array_wb(unsigned long *addr, int addrinarray)
	{		{
	int i;		int i;
			int ret;

			ret = change_page_attr_clear(addr, addrinarray,
			__pgprot(_PAGE_CACHE_MASK), 1);

	for (i = 0; i < addrinarray; i++) {		for (i = 0; i < addrinarray; i++) {
	unsigned long start = __pa(addr[i]);		unsigned long start = __pa(addr[i]);
	@@ -1042,8 +1046,7 @@ int set_memory_array_wb(unsigned long *addr, int addrinarray)
	}		}
	free_memtype(start, end);		free_memtype(start, end);
	}		}
	return change_page_attr_clear(addr, addrinarray,		return ret;
	__pgprot(_PAGE_CACHE_MASK), 1);
	}		}
	EXPORT_SYMBOL(set_memory_array_wb);		EXPORT_SYMBOL(set_memory_array_wb);