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

Commit 3655b22d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.10-rc3-tag' of... 

Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull Xen fixes from Konrad Rzeszutek Wilk:
 - Use proper error paths
 - Clean up APIC IPI usage (incorrect arguments)
 - Delay XenBus frontend resume is backend (xenstored) is not running
 - Fix build error with various combinations of CONFIG_

* tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xenbus_client.c: correct exit path for xenbus_map_ring_valloc_hvm
  xen-pciback: more uses of cached MSI-X capability offset
  xen: Clean up apic ipi interface
  xenbus: save xenstore local status for later use
  xenbus: delay xenbus frontend resume if xenstored is not running
  xmem/tmem: fix 'undefined variable' build error.
parents 5489e948 8d0b8801

arch/x86/xen/smp.c

+4 −6
Original line number Diff line number Diff line
@@ -576,24 +576,22 @@ void xen_send_IPI_mask_allbutself(const struct cpumask *mask, 
{

	unsigned cpu;

	unsigned int this_cpu = smp_processor_id();

	int xen_vector = xen_map_vector(vector);



	if (!(num_online_cpus() > 1))

	if (!(num_online_cpus() > 1) || (xen_vector < 0))

		return;



	for_each_cpu_and(cpu, mask, cpu_online_mask) {

		if (this_cpu == cpu)

			continue;



		xen_smp_send_call_function_single_ipi(cpu);

		xen_send_IPI_one(cpu, xen_vector);

	}

}



void xen_send_IPI_allbutself(int vector)

{

	int xen_vector = xen_map_vector(vector);



	if (xen_vector >= 0)

		xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector);

	xen_send_IPI_mask_allbutself(cpu_online_mask, vector);

}



static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)

arch/x86/xen/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ extern void xen_send_IPI_mask(const struct cpumask *mask, 
extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask,

				int vector);

extern void xen_send_IPI_allbutself(int vector);

extern void physflat_send_IPI_allbutself(int vector);

extern void xen_send_IPI_all(int vector);

extern void xen_send_IPI_self(int vector);

drivers/xen/tmem.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ module_param(selfballooning, bool, S_IRUGO); 
#ifdef CONFIG_FRONTSWAP

static bool frontswap __read_mostly = true;

module_param(frontswap, bool, S_IRUGO);

#else /* CONFIG_FRONTSWAP */

#define frontswap (0)

#endif /* CONFIG_FRONTSWAP */



#ifdef CONFIG_XEN_SELFBALLOONING

drivers/xen/xen-pciback/pci_stub.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void pcistub_device_release(struct kref *kref) 
	else

		pci_restore_state(dev);



	if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) {

	if (dev->msix_cap) {

		struct physdev_pci_device ppdev = {

			.seg = pci_domain_nr(dev->bus),

			.bus = dev->bus->number,
@@ -371,7 +371,7 @@ static int pcistub_init_device(struct pci_dev *dev) 
	if (err)

		goto config_release;



	if (pci_find_capability(dev, PCI_CAP_ID_MSIX)) {

	if (dev->msix_cap) {

		struct physdev_pci_device ppdev = {

			.seg = pci_domain_nr(dev->bus),

			.bus = dev->bus->number,

drivers/xen/xenbus/xenbus_client.c

+3 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, 


	err = xenbus_map_ring(dev, gnt_ref, &node->handle, addr);

	if (err)

		goto out_err;

		goto out_err_free_ballooned_pages;



	spin_lock(&xenbus_valloc_lock);

	list_add(&node->next, &xenbus_valloc_pages);
@@ -543,8 +543,9 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, 
	*vaddr = addr;

	return 0;



 out_err:

 out_err_free_ballooned_pages:

	free_xenballooned_pages(1, &node->page);

 out_err:

	kfree(node);

	return err;

}