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

Commit 01de05af authored by Venki Pallipadi's avatar Venki Pallipadi Committed by Ingo Molnar
Browse files

x86: have set_memory_array_{uc,wb} coalesce memtypes, fix 



Fix the start addr for free_memtype calls in the error path.

Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Acked-by: default avatarRene Herman <rene.herman@keyaccess.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5f310b63

arch/x86/mm/pageattr.c

+1 −1
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray) 


		if (tmp == start)

			break;

		for (end = start + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) {

		for (end = tmp + PAGE_SIZE; i < addrinarray - 1; end += PAGE_SIZE) {

			if (end != __pa(addr[i + 1]))

				break;

			i++;