Commit edde0606 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/set_memory' into for-next/core 

* for-next/set_memory:
  : Fix + documentation for the arm64 change_memory_common()
  arm64/mm: Document why linear map split failure upon vm_reset_perms is not problematic
  arm64/pageattr: Propagate return value from __change_memory_common
parents 52c4d1d6 0c2988aa

arch/arm64/mm/pageattr.c

+5 −2
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static int change_memory_common(unsigned long addr, int numpages, 
	unsigned long size = PAGE_SIZE * numpages;

	unsigned long end = start + size;

	struct vm_struct *area;

	int ret;



	if (!PAGE_ALIGNED(addr)) {

		start &= PAGE_MASK;
@@ -186,8 +187,10 @@ static int change_memory_common(unsigned long addr, int numpages, 
		unsigned long idx = (start - (unsigned long)kasan_reset_tag(area->addr))

				    >> PAGE_SHIFT;

		for (; numpages; idx++, numpages--) {

			__change_memory_common((u64)page_address(area->pages[idx]),

			ret = __change_memory_common((u64)page_address(area->pages[idx]),

						     PAGE_SIZE, set_mask, clear_mask);

			if (ret)

				return ret;

		}

	}