aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-08-21 10:52:01 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-08-21 10:52:01 +0100
commitb9c620d078f2cc0503c59aafb0e42865aee977ff (patch)
treeab4b2f511ea038c6c326749e54505493fd2b77bc
parenta0685dba649a9eb4eaa525f3a39db912bb4df8bf (diff)
downloadxen-3.3.0-branched.tar.gz
xen-3.3.0-branched.tar.bz2
xen-3.3.0-branched.zip
x86: fix l1_disallow_mask() for HVM guests with pass-thru devices.3.3.0-branched
Signed-off-by: Naoki Nishiguchi <nisiguti@jp.fujitsu.com>
-rw-r--r--xen/arch/x86/mm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index c6855d76d6..150d987514 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -163,7 +163,8 @@ unsigned long total_pages;
#define l1_disallow_mask(d) \
((d != dom_io) && \
(rangeset_is_empty((d)->iomem_caps) && \
- rangeset_is_empty((d)->arch.ioport_caps)) ? \
+ rangeset_is_empty((d)->arch.ioport_caps) && \
+ !has_arch_pdevs(d)) ? \
L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
#ifdef CONFIG_COMPAT