--- old-xen-unstable/xen/arch/x86/mm.c	2005-05-11 17:42:05.000000000 +0000
+++ new-xen-unstable/xen/arch/x86/mm.c	2005-05-12 11:05:15.000000000 +0000
@@ -209,9 +209,7 @@
         if ( e820.map[i].type == E820_RAM )
             continue;
         pfn = e820.map[i].addr >> PAGE_SHIFT;
-        nr_pfns = (e820.map[i].size +
-                   (e820.map[i].addr & ~PAGE_MASK) +
-                   ~PAGE_MASK) >> PAGE_SHIFT;
+        nr_pfns = (e820.map[i].size + ~PAGE_MASK) >> PAGE_SHIFT;
         for ( j = 0; j < nr_pfns; j++ )
         {
             if ( !pfn_valid(pfn+j) )