aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-18 20:59:08 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-01-30 06:50:19 -0500
commit84f12e39c856a8b1ab407f8216ecebaf4204b94d (patch)
tree908c7dd63fb65eda3ff660913e9bc28438871e16 /drivers
parentca94f2bdd1be626361fcfbd474d6b8823ed39f74 (diff)
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: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/lguest/page_tables.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index 983e9020cef8..74b4cf2a6c41 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -646,7 +646,7 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
646 646
647 /* Make the last PGD entry for this Guest point to the Switcher's PTE 647 /* Make the last PGD entry for this Guest point to the Switcher's PTE
648 * page for this CPU (with appropriate flags). */ 648 * page for this CPU (with appropriate flags). */
649 switcher_pgd = __pgd(__pa(switcher_pte_page) | _PAGE_KERNEL); 649 switcher_pgd = __pgd(__pa(switcher_pte_page) | __PAGE_KERNEL);
650 650
651 cpu->lg->pgdirs[cpu->cpu_pgd].pgdir[SWITCHER_PGD_INDEX] = switcher_pgd; 651 cpu->lg->pgdirs[cpu->cpu_pgd].pgdir[SWITCHER_PGD_INDEX] = switcher_pgd;
652 652
@@ -658,7 +658,7 @@ void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
658 * page is already mapped there, we don't have to copy them out 658 * page is already mapped there, we don't have to copy them out
659 * again. */ 659 * again. */
660 pfn = __pa(cpu->regs_page) >> PAGE_SHIFT; 660 pfn = __pa(cpu->regs_page) >> PAGE_SHIFT;
661 regs_pte = pfn_pte(pfn, __pgprot(_PAGE_KERNEL)); 661 regs_pte = pfn_pte(pfn, __pgprot(__PAGE_KERNEL));
662 switcher_pte_page[(unsigned long)pages/PAGE_SIZE%PTRS_PER_PTE] = regs_pte; 662 switcher_pte_page[(unsigned long)pages/PAGE_SIZE%PTRS_PER_PTE] = regs_pte;
663} 663}
664/*:*/ 664/*:*/