From d0f7ea7bf4215d59aaad48c4513fcb8b788b1ac6 Mon Sep 17 00:00:00 2001 From: Glauber de Oliveira Costa Date: Fri, 18 Jan 2008 23:59:08 -0200 Subject: [PATCH] --- yaml --- r: 80925 b: refs/heads/master c: 84f12e39c856a8b1ab407f8216ecebaf4204b94d h: refs/heads/master i: 80923: 07d41d54b30ea30109f228feabf13c096b7d02d6 v: v3 --- [refs] | 2 +- trunk/drivers/lguest/page_tables.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 64138c822763..007de2711e2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca94f2bdd1be626361fcfbd474d6b8823ed39f74 +refs/heads/master: 84f12e39c856a8b1ab407f8216ecebaf4204b94d diff --git a/trunk/drivers/lguest/page_tables.c b/trunk/drivers/lguest/page_tables.c index 983e9020cef8..74b4cf2a6c41 100644 --- a/trunk/drivers/lguest/page_tables.c +++ b/trunk/drivers/lguest/page_tables.c @@ -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; } /*:*/