Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask
PATCH 1/1 Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask
# HG changeset patch
# User Patrick Colp <[email protected]>
# Date 1242295647 -3600
# Node ID c5098f5c5caf4174bd2e46d49d7b65109203f7c5
# Parent 2522cc95efd2f3fadf7342d18fe86e8f37f89c2a
Fix get_page_from_l1e and cleanup_page_cacheattr to use PGC_cacheattr_mask.
Signed-off-by Patrick Colp <[email protected]>
xen/arch/x86/mm.c +4 -3
@@ -766,7 +766,7 @@ goto could_not_pin;if (pte_flags_to_cacheattr (l1f) != - ((page->count_info >> PGC_cacheattr_base) &7 ) ) + ((page->count_info & PGC_cacheattr_mask) >> PGC_cacheattr_base) ) {unsigned long x, nx, y = page->count_info;unsigned long cacheattr =pte_flags_to_cacheattr (l1f);
@@ -782,7 +782,7 @@return 0 ; } -while ( ((y >> PGC_cacheattr_base) &7 ) != cacheattr ) +while ( ((y & PGC_cacheattr_mask) >> PGC_cacheattr_base) != cacheattr ) { x = y; nx = (x & ~PGC_cacheattr_mask) | (cacheattr << PGC_cacheattr_base);
@@ -2389,7 +2389,8 @@void cleanup_page_cacheattr (struct page_info *page) { -uint32_t cacheattr = (page->count_info >> PGC_cacheattr_base) &7 ; +uint32_t cacheattr = + (page->count_info & PGC_cacheattr_mask) >> PGC_cacheattr_base;if (likely (cacheattr ==0 ) )return ;