aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/lguest_hcall.h2
-rw-r--r--arch/x86/lguest/boot.c2
-rw-r--r--drivers/lguest/hypercalls.c4
-rw-r--r--drivers/lguest/lg.h2
-rw-r--r--drivers/lguest/page_tables.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/include/asm/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h
index f9a9f7811248..05b9c198e4ba 100644
--- a/arch/x86/include/asm/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
@@ -13,7 +13,7 @@
13#define LHCALL_SET_CLOCKEVENT 9 13#define LHCALL_SET_CLOCKEVENT 9
14#define LHCALL_HALT 10 14#define LHCALL_HALT 10
15#define LHCALL_SET_PTE 14 15#define LHCALL_SET_PTE 14
16#define LHCALL_SET_PMD 15 16#define LHCALL_SET_PGD 15
17#define LHCALL_LOAD_TLS 16 17#define LHCALL_LOAD_TLS 16
18#define LHCALL_NOTIFY 17 18#define LHCALL_NOTIFY 17
19#define LHCALL_LOAD_GDT_ENTRY 18 19#define LHCALL_LOAD_GDT_ENTRY 18
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 4f311e40d0aa..943a75ef70b9 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -535,7 +535,7 @@ static void lguest_set_pte_at(struct mm_struct *mm, unsigned long addr,
535static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval) 535static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval)
536{ 536{
537 native_set_pmd(pmdp, pmdval); 537 native_set_pmd(pmdp, pmdval);
538 lazy_hcall2(LHCALL_SET_PMD, __pa(pmdp) & PAGE_MASK, 538 lazy_hcall2(LHCALL_SET_PGD, __pa(pmdp) & PAGE_MASK,
539 (__pa(pmdp) & (PAGE_SIZE - 1)) / sizeof(pmd_t)); 539 (__pa(pmdp) & (PAGE_SIZE - 1)) / sizeof(pmd_t));
540} 540}
541 541
diff --git a/drivers/lguest/hypercalls.c b/drivers/lguest/hypercalls.c
index f252b71ae79e..51149ca14617 100644
--- a/drivers/lguest/hypercalls.c
+++ b/drivers/lguest/hypercalls.c
@@ -79,8 +79,8 @@ static void do_hcall(struct lg_cpu *cpu, struct hcall_args *args)
79 case LHCALL_SET_PTE: 79 case LHCALL_SET_PTE:
80 guest_set_pte(cpu, args->arg1, args->arg2, __pte(args->arg3)); 80 guest_set_pte(cpu, args->arg1, args->arg2, __pte(args->arg3));
81 break; 81 break;
82 case LHCALL_SET_PMD: 82 case LHCALL_SET_PGD:
83 guest_set_pmd(cpu->lg, args->arg1, args->arg2); 83 guest_set_pgd(cpu->lg, args->arg1, args->arg2);
84 break; 84 break;
85 case LHCALL_SET_CLOCKEVENT: 85 case LHCALL_SET_CLOCKEVENT:
86 guest_set_clockevent(cpu, args->arg1); 86 guest_set_clockevent(cpu, args->arg1);
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 74af503ad63c..cacc2da2058d 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -169,7 +169,7 @@ void copy_gdt_tls(const struct lg_cpu *cpu, struct desc_struct *gdt);
169int init_guest_pagetable(struct lguest *lg); 169int init_guest_pagetable(struct lguest *lg);
170void free_guest_pagetable(struct lguest *lg); 170void free_guest_pagetable(struct lguest *lg);
171void guest_new_pagetable(struct lg_cpu *cpu, unsigned long pgtable); 171void guest_new_pagetable(struct lg_cpu *cpu, unsigned long pgtable);
172void guest_set_pmd(struct lguest *lg, unsigned long gpgdir, u32 i); 172void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 i);
173void guest_pagetable_clear_all(struct lg_cpu *cpu); 173void guest_pagetable_clear_all(struct lg_cpu *cpu);
174void guest_pagetable_flush_user(struct lg_cpu *cpu); 174void guest_pagetable_flush_user(struct lg_cpu *cpu);
175void guest_set_pte(struct lg_cpu *cpu, unsigned long gpgdir, 175void guest_set_pte(struct lg_cpu *cpu, unsigned long gpgdir,
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index ffba723cd98d..6a54d76b6236 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -568,7 +568,7 @@ void guest_set_pte(struct lg_cpu *cpu,
568 * 568 *
569 * So with that in mind here's our code to to update a (top-level) PGD entry: 569 * So with that in mind here's our code to to update a (top-level) PGD entry:
570 */ 570 */
571void guest_set_pmd(struct lguest *lg, unsigned long gpgdir, u32 idx) 571void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx)
572{ 572{
573 int pgdir; 573 int pgdir;
574 574