---
 tools/xenpaging/xenpaging.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
===================================================================
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c
@@ -721,6 +721,13 @@ static void resume_pages(xenpaging_t *pa
 
     for ( i = 0; i < paging->max_pages && num < num_pages; i++ )
     {
+        /* Skip empty longs */
+        if ( (i & (BITS_PER_LONG - 1)) == 0 && paging->bitmap[i >> ORDER_LONG] == 0 )
+        {
+            i += BITS_PER_LONG;
+            continue;
+        }
+
         if ( test_bit(i, paging->bitmap) )
         {
             paging->pagein_queue[num] = i;