diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-04-28 21:43:58 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-04-28 21:43:58 +0000 |
| commit | 121068390b8b1f4e72740cbcd9c02e3508c64d1a (patch) | |
| tree | 624d95786a61550e6342e4dc93ee1e163ef7e716 | |
| parent | 28421419fdc3982c41a569595f2b475f9b584db4 (diff) | |
| download | xen-121068390b8b1f4e72740cbcd9c02e3508c64d1a.tar.gz xen-121068390b8b1f4e72740cbcd9c02e3508c64d1a.tar.bz2 xen-121068390b8b1f4e72740cbcd9c02e3508c64d1a.zip | |
bitkeeper revision 1.1159.258.109 (4271591efy8CDaEUexiC4RrOlWxDNg)
Backport of bugfix to ensure that p2m entries are invalidated
before returning memory back to Xen allocation pool.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c index 022831606a..6c223c79e1 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c @@ -378,7 +378,8 @@ unsigned long allocate_empty_lowmem_region(unsigned long pages) pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE))); pfn_array[i] = pte->pte_low >> PAGE_SHIFT; queue_l1_entry_update(pte, 0); - phys_to_machine_mapping[__pa(vstart)>>PAGE_SHIFT] = INVALID_P2M_ENTRY; + phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = + INVALID_P2M_ENTRY; } /* Flush updates through and flush the TLB. */ |