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

Commit 84f12e39 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Rusty Russell
Browse files

lguest: use __PAGE_KERNEL instead of _PAGE_KERNEL 



x86_64 don't expose the intermediate representation with one underline,
_PAGE_KERNEL, just the double-underlined one.

Use it, to get a common ground between 32 and 64-bit

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent ca94f2bd

drivers/lguest/page_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages) 


	/* Make the last PGD entry for this Guest point to the Switcher's PTE

	 * page for this CPU (with appropriate flags). */

	switcher_pgd = __pgd(__pa(switcher_pte_page) | _PAGE_KERNEL);

	switcher_pgd = __pgd(__pa(switcher_pte_page) | __PAGE_KERNEL);



	cpu->lg->pgdirs[cpu->cpu_pgd].pgdir[SWITCHER_PGD_INDEX] = switcher_pgd;
@@ -658,7 +658,7 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages) 
	 * page is already mapped there, we don't have to copy them out

	 * again. */

	pfn = __pa(cpu->regs_page) >> PAGE_SHIFT;

	regs_pte = pfn_pte(pfn, __pgprot(_PAGE_KERNEL));

	regs_pte = pfn_pte(pfn, __pgprot(__PAGE_KERNEL));

	switcher_pte_page[(unsigned long)pages/PAGE_SIZE%PTRS_PER_PTE] = regs_pte;

}

/*:*/