diff options
| author |   Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-04 13:02:18 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-03-30 09:25:24 -0700 |
| commit | 6ed6bf428aff64fe37cdc54b239d598fee6016f1 (patch) | |
| tree | d1388003b44c0ad597f805ba87263e94aa3c3153 /arch/x86/xen/enlighten.c | |
| parent | xen: split construction of p2m mfn tables from registration (diff) | |
| download | linux-dev-6ed6bf428aff64fe37cdc54b239d598fee6016f1.tar.xz linux-dev-6ed6bf428aff64fe37cdc54b239d598fee6016f1.zip | |
xen: clean up xen_load_gdt
Makes the logic a bit clearer.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 70b355d3a86c..5776dc270297 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -301,10 +301,21 @@ static void xen_load_gdt(const struct desc_ptr *dtr) frames = mcs.args; for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) { - frames[f] = arbitrary_virt_to_mfn((void *)va); + int level; + pte_t *ptep = lookup_address(va, &level); + unsigned long pfn, mfn; + void *virt; + + BUG_ON(ptep == NULL); + + pfn = pte_pfn(*ptep); + mfn = pfn_to_mfn(pfn); + virt = __va(PFN_PHYS(pfn)); + + frames[f] = mfn; make_lowmem_page_readonly((void *)va); - make_lowmem_page_readonly(mfn_to_virt(frames[f])); + make_lowmem_page_readonly(virt); } MULTI_set_gdt(mcs.mc, frames, size / sizeof(struct desc_struct)); |