ia64/xen-unstable

changeset 18355:1e99ba540356 3.3.0-branched

x86: fix l1_disallow_mask() for HVM guests with pass-thru devices.
Signed-off-by: Naoki Nishiguchi <nisiguti@jp.fujitsu.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Aug 21 10:52:01 2008 +0100 (2008-08-21)
parents 1ea9dd2c7331
children ab1eec9ba5cb
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Thu Aug 21 09:51:46 2008 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Thu Aug 21 10:52:01 2008 +0100
     1.3 @@ -163,7 +163,8 @@ unsigned long total_pages;
     1.4  #define l1_disallow_mask(d)                                     \
     1.5      ((d != dom_io) &&                                           \
     1.6       (rangeset_is_empty((d)->iomem_caps) &&                     \
     1.7 -      rangeset_is_empty((d)->arch.ioport_caps)) ?               \
     1.8 +      rangeset_is_empty((d)->arch.ioport_caps) &&               \
     1.9 +      !has_arch_pdevs(d)) ?                                     \
    1.10       L1_DISALLOW_MASK : (L1_DISALLOW_MASK & ~PAGE_CACHE_ATTRS))
    1.11  
    1.12  #ifdef CONFIG_COMPAT