diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-02-27 13:14:54 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-03-12 15:46:50 +0000 |
| commit | fde3412217a1e84e2601e591ca92e82a208d9688 (patch) | |
| tree | 89c931bfd9d64739f14b8d4bbc9f8fdd05d8fb08 /xen/include | |
| parent | 49cc1f0431b7ff62780fc84975302eb444edbe05 (diff) | |
| download | xen-fde3412217a1e84e2601e591ca92e82a208d9688.tar.gz xen-fde3412217a1e84e2601e591ca92e82a208d9688.tar.bz2 xen-fde3412217a1e84e2601e591ca92e82a208d9688.zip | |
xen: correct BITS_PER_EVTCHN_WORD on arm
This is always 64-bit on ARM, not BITS_PER_LONG
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include')
| -rw-r--r-- | xen/include/asm-arm/config.h | 3 | ||||
| -rw-r--r-- | xen/include/asm-x86/config.h | 2 | ||||
| -rw-r--r-- | xen/include/xen/sched.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 3910dd27f3..8be85634ed 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -22,6 +22,9 @@ #define BYTES_PER_LONG (1 << LONG_BYTEORDER) #define BITS_PER_LONG (BYTES_PER_LONG << 3) +/* xen_ulong_t is always 64 bits */ +#define BITS_PER_XEN_ULONG 64 + #define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_PAGING_LEVELS 3 diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 0a5f031303..cf93bd5d68 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -14,6 +14,8 @@ #define BITS_PER_LONG (BYTES_PER_LONG << 3) #define BITS_PER_BYTE 8 +#define BITS_PER_XEN_ULONG BITS_PER_LONG + #define CONFIG_X86 1 #define CONFIG_X86_HT 1 #define CONFIG_PAGING_ASSISTANCE 1 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 569e76eac9..cabaf27753 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -46,9 +46,9 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_info_compat_t); extern struct domain *dom0; #ifndef CONFIG_COMPAT -#define BITS_PER_EVTCHN_WORD(d) BITS_PER_LONG +#define BITS_PER_EVTCHN_WORD(d) BITS_PER_XEN_ULONG #else -#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_LONG) +#define BITS_PER_EVTCHN_WORD(d) (has_32bit_shinfo(d) ? 32 : BITS_PER_XEN_ULONG) #endif #define MAX_EVTCHNS(d) (BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d)) #define EVTCHNS_PER_BUCKET 128 |