xen: event channel arrays are xen_ulong_t and not unsigned long

On ARM we want these to be the same size on 32- and 64-bit.

This is an ABI change on ARM. X86 does not change.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Keir (Xen.org) <keir@xen.org>
Cc: Tim Deegan <tim@xen.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: xen-devel@lists.xen.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 886a5d80a18f..53ec4167bd0b 100644
--- 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