ia64/xen-unstable
changeset 6983:659ad553199e
merge?
author | cl349@firebug.cl.cam.ac.uk |
---|---|
date | Tue Sep 20 14:18:23 2005 +0000 (2005-09-20) |
parents | ee8226e15e9f c174ac96a69d |
children | d3bc8314b6f5 |
files | buildconfigs/Rules.mk buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h linux-2.6-xen-sparse/mkbuildtree xen/arch/x86/vmx.c |
line diff
6.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c Tue Sep 20 14:18:01 2005 +0000 6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c Tue Sep 20 14:18:23 2005 +0000 6.3 @@ -36,13 +36,12 @@ struct ring_head 6.4 6.5 static inline struct ring_head *outring(void) 6.6 { 6.7 - return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT); 6.8 + return mfn_to_virt(xen_start_info->console_mfn); 6.9 } 6.10 6.11 static inline struct ring_head *inring(void) 6.12 { 6.13 - return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT) 6.14 - + PAGE_SIZE/2; 6.15 + return mfn_to_virt(xen_start_info->console_mfn) + PAGE_SIZE/2; 6.16 } 6.17 6.18
7.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h Tue Sep 20 14:18:01 2005 +0000 7.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h Tue Sep 20 14:18:23 2005 +0000 7.3 @@ -261,7 +261,6 @@ extern int sysctl_legacy_va_layout; 7.4 7.5 /* VIRT <-> MACHINE conversion */ 7.6 #define virt_to_machine(v) (phys_to_machine(__pa(v))) 7.7 -#define machine_to_virt(m) (__va(machine_to_phys(m))) 7.8 #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) 7.9 #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) 7.10
8.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h Tue Sep 20 14:18:01 2005 +0000 8.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h Tue Sep 20 14:18:23 2005 +0000 8.3 @@ -239,7 +239,6 @@ extern __inline__ int get_order(unsigned 8.4 8.5 /* VIRT <-> MACHINE conversion */ 8.6 #define virt_to_machine(v) (phys_to_machine(__pa(v))) 8.7 -#define machine_to_virt(m) (__va(machine_to_phys(m))) 8.8 #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) 8.9 #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) 8.10
10.1 --- a/xen/arch/x86/vmx.c Tue Sep 20 14:18:01 2005 +0000 10.2 +++ b/xen/arch/x86/vmx.c Tue Sep 20 14:18:23 2005 +0000 10.3 @@ -1100,6 +1100,11 @@ static int vmx_set_cr0(unsigned long val 10.4 d->arch.arch_vmx.cpu_cr3, mfn); 10.5 } 10.6 10.7 + if(!((value & X86_CR0_PE) && (value & X86_CR0_PG)) && paging_enabled) 10.8 + if(d->arch.arch_vmx.cpu_cr3) 10.9 + put_page(pfn_to_page(get_mfn_from_pfn( 10.10 + d->arch.arch_vmx.cpu_cr3 >> PAGE_SHIFT))); 10.11 + 10.12 /* 10.13 * VMX does not implement real-mode virtualization. We emulate 10.14 * real-mode by performing a world switch to VMXAssist whenever