diff -rN -pu old-xen-build2/tools/libxc/xc_linux_build.c new-xen-build2/tools/libxc/xc_linux_build.c
--- old-xen-build2/tools/libxc/xc_linux_build.c	2005-10-04 19:08:38.000000000 +0000
+++ new-xen-build2/tools/libxc/xc_linux_build.c	2005-10-11 22:24:34.000000000 +0000
@@ -500,11 +500,11 @@ static int setup_guest(int xc_handle,
            _p(dsi.v_start), _p(v_end));
     printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
 
-    if ( (v_end - dsi.v_start) > (nr_pages * PAGE_SIZE) )
+    if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages )
     {
         printf("Initial guest OS requires too much space\n"
                "(%luMB is greater than %luMB limit)\n",
-               (v_end-dsi.v_start)>>20, (nr_pages<<PAGE_SHIFT)>>20);
+               (v_end-dsi.v_start)>>20, nr_pages>>(20-PAGE_SHIFT));
         goto error_out;
     }