diff options
| author | Linus Torvalds <[email protected]> | 2016-08-24 14:04:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-08-24 14:04:30 -0400 |
| commit | fe2dd212828d5c8ebe2f650f5089c705afc78ce5 (patch) | |
| tree | 0ee831e367b6a0b9bc944cafb688c687909c48e4 /include | |
| parent | cad9d20784e9b31f0fa8eb82b4ae5dad633b560d (diff) | |
| parent | 55467dea2967259f21f4f854fc99d39cc5fea60e (diff) | |
Merge tag 'for-linus-4.8b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen regression fix from David Vrabel:
"Fix a regression in the xenbus device preventing userspace tools from
working"
* tag 'for-linus-4.8b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: change the type of xen_vcpu_id to uint32_t
xenbus: don't look up transaction IDs for ordinary writes
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/xen-ops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 9a37c541822f..b5486e648607 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -9,8 +9,8 @@ DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); -DECLARE_PER_CPU(int, xen_vcpu_id); -static inline int xen_vcpu_nr(int cpu) +DECLARE_PER_CPU(uint32_t, xen_vcpu_id); +static inline uint32_t xen_vcpu_nr(int cpu) { return per_cpu(xen_vcpu_id, cpu); } |