summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-24 14:04:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-24 14:04:30 -0400
commitfe2dd212828d5c8ebe2f650f5089c705afc78ce5 (patch)
tree0ee831e367b6a0b9bc944cafb688c687909c48e4 /arch/x86
parentcad9d20784e9b31f0fa8eb82b4ae5dad633b560d (diff)
parent55467dea2967259f21f4f854fc99d39cc5fea60e (diff)
downloadop-kernel-dev-fe2dd212828d5c8ebe2f650f5089c705afc78ce5.zip
op-kernel-dev-fe2dd212828d5c8ebe2f650f5089c705afc78ce5.tar.gz
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 'arch/x86')
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 8ffb089..b86ebb1 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -118,7 +118,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu);
DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);
/* Linux <-> Xen vCPU id mapping */
-DEFINE_PER_CPU(int, xen_vcpu_id) = -1;
+DEFINE_PER_CPU(uint32_t, xen_vcpu_id);
EXPORT_PER_CPU_SYMBOL(xen_vcpu_id);
enum xen_domain_type xen_domain_type = XEN_NATIVE;
OpenPOWER on IntegriCloud