Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe2dd212 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cad9d207 55467dea

arch/arm/xen/enlighten.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); 
static struct vcpu_info __percpu *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);



/* These are unused until we support booting "pre-ballooned" */

arch/x86/xen/enlighten.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/xen/xenbus/xenbus_dev_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int xenbus_write_transaction(unsigned msg_type, 
			rc = -ENOMEM;

			goto out;

		}

	} else {

	} else if (msg_type == XS_TRANSACTION_END) {

		list_for_each_entry(trans, &u->transactions, list)

			if (trans->handle.id == u->u.msg.tx_id)

				break;

include/xen/xen-ops.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

}