aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormafetter@fleming.research <mafetter@fleming.research>2005-06-13 11:22:00 +0000
committermafetter@fleming.research <mafetter@fleming.research>2005-06-13 11:22:00 +0000
commit056548d9bc5e3e6318c53e9569cd67b9fc254616 (patch)
tree57646c3db71356d65ca60c5db2bfb1fbe7db3e7e
parentb8eed10db81736f509bb2317ddab23e5b634df2f (diff)
parent75fa2c58b25695e9e5bd64547b92bcd355a77665 (diff)
downloadxen-056548d9bc5e3e6318c53e9569cd67b9fc254616.tar.gz
xen-056548d9bc5e3e6318c53e9569cd67b9fc254616.tar.bz2
xen-056548d9bc5e3e6318c53e9569cd67b9fc254616.zip
bitkeeper revision 1.1713.1.1 (42ad6c58vwWhK1Og54nBpformSdpBg)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk into fleming.research:/scratch/fleming/mafetter/xen-unstable.bk
-rw-r--r--xen/arch/x86/mm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 7fd5b8c579..9b3d631bc0 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1246,7 +1246,7 @@ void free_page_type(struct pfn_info *page, unsigned int type)
{
gpfn = __mfn_to_gpfn(owner, page_to_pfn(page));
ASSERT(VALID_M2P(gpfn));
- remove_shadow(owner, gpfn, type);
+ remove_shadow(owner, gpfn, type & PGT_type_mask);
}
}