diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-05 12:09:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-05 12:09:59 +0200 |
commit | 2cc538412a1ca103923ec400a339a5b3833e0280 (patch) | |
tree | c141b83e1da736c3d069ed491816d0096e1b532a /arch/x86/xen/enlighten.c | |
parent | 36e674a05164cdbb9d4a5b1b0b279fabae6c13bd (diff) | |
parent | 58763148758057ffc447bf990321d3ea86d199a0 (diff) | |
download | linux-2cc538412a1ca103923ec400a339a5b3833e0280.tar.bz2 |
Merge branch 'perf/urgent' into perf/core, to pick up fixed and resolve conflicts
Conflicts:
kernel/events/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 8ffb089b19a5..b86ebb1a9a7f 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; |