File 19169-remove-declare-bitmap.patch of Package xen

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1233836213 0
# Node ID 7eb8b094a207267a40a7cf34754b10f12d54e6af
# Parent  1dfcb2444c6e0c0ff0e2809f4ac4ee4adda72fa6
Remove uses of DECLARE_BITMAP in the public HVM save format headers
and replace them with open-coded equivalents.  DECLARE_BITMAP is
not exported to user-space consumers of the Xen headers.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>

Index: xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
===================================================================
--- xen-3.3.1-testing.orig/xen/include/public/arch-x86/hvm/save.h
+++ xen-3.3.1-testing/xen/include/public/arch-x86/hvm/save.h
@@ -287,7 +287,7 @@ struct hvm_hw_pci_irqs {
      * Indexed by: device*4 + INTx#.
      */
     union {
-        DECLARE_BITMAP(i, 32*4);
+        unsigned long i[16 / sizeof (unsigned long)]; /* DECLARE_BITMAP(i, 32*4); */
         uint64_t pad[2];
     };
 };
@@ -300,7 +300,7 @@ struct hvm_hw_isa_irqs {
      * Indexed by ISA IRQ (assumes no ISA-device IRQ sharing).
      */
     union {
-        DECLARE_BITMAP(i, 16);
+        unsigned long i[1];  /* DECLARE_BITMAP(i, 16); */
         uint64_t pad[1];
     };
 };