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

Commit 6eade8ff authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: cpa: clean up change_page_attr_set/clear() 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4692a145

arch/x86/mm/pageattr.c

+9 −8
Original line number Diff line number Diff line
@@ -312,10 +312,10 @@ static int change_page_attr_set(unsigned long addr, int numpages, 
	for (i = 0; i < numpages ; i++) {



		pte = lookup_address(addr, &level);

		if (pte)

		if (!pte)

			return -EINVAL;



		current_prot = pte_pgprot(*pte);

		else

			pgprot_val(current_prot) = 0;



		pgprot_val(new_prot) =

			pgprot_val(current_prot) | pgprot_val(prot);
@@ -356,11 +356,12 @@ static int change_page_attr_clear(unsigned long addr, int numpages, 
	int i, ret;



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



		pte = lookup_address(addr, &level);

		if (pte)

		if (!pte)

			return -EINVAL;



		current_prot = pte_pgprot(*pte);

		else

			pgprot_val(current_prot) = 0;



		pgprot_val(new_prot) =

				pgprot_val(current_prot) & ~pgprot_val(prot);