xen: event channel arrays are xen_ulong_t and not unsigned long

[cascardo/linux.git] / include / xen / interface / xen.h

diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 886a5d8..53ec416 100644 (file)
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -285,7 +285,7 @@ DEFINE_GUEST_HANDLE_STRUCT(multicall_entry);
  * Event channel endpoints per domain:
  *  1024 if a long is 32 bits; 4096 if a long is 64 bits.
  */
-#define NR_EVENT_CHANNELS (sizeof(unsigned long) * sizeof(unsigned long) * 64)
+#define NR_EVENT_CHANNELS (sizeof(xen_ulong_t) * sizeof(xen_ulong_t) * 64)
 
 struct vcpu_time_info {
        /*
@@ -341,7 +341,7 @@ struct vcpu_info {
         */
        uint8_t evtchn_upcall_pending;
        uint8_t evtchn_upcall_mask;
-       unsigned long evtchn_pending_sel;
+       xen_ulong_t evtchn_pending_sel;
        struct arch_vcpu_info arch;
        struct pvclock_vcpu_time_info time;
 }; /* 64 bytes (x86) */
@@ -384,8 +384,8 @@ struct shared_info {
         * per-vcpu selector word to be set. Each bit in the selector covers a
         * 'C long' in the PENDING bitfield array.
         */
-       unsigned long evtchn_pending[sizeof(unsigned long) * 8];
-       unsigned long evtchn_mask[sizeof(unsigned long) * 8];
+       xen_ulong_t evtchn_pending[sizeof(xen_ulong_t) * 8];
+       xen_ulong_t evtchn_mask[sizeof(xen_ulong_t) * 8];
 
        /*
         * Wallclock time: updated only by control software. Guests should base