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

Commit 865d8722 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull two xen bugfixes from David Vrabel:

 - fix ARM build regression.

 - fix VIRQ_CONSOLE related oops.

* tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/events: don't bind non-percpu VIRQs with percpu chip
  xen/arm: Define xen_arch_suspend()
parents f0d8690a 77bb3dfd

arch/arm/xen/enlighten.c

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ void xen_arch_pre_suspend(void) { } 
void xen_arch_post_suspend(int suspend_cancelled) { }

void xen_timer_resume(void) { }

void xen_arch_resume(void) { }

void xen_arch_suspend(void) { }





/* In the hypervisor.S file. */

drivers/tty/hvc/hvc_xen.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int xen_initial_domain_console_init(void) 
			return -ENOMEM;

	}



	info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);

	info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0, false);

	info->vtermno = HVC_COOKIE;



	spin_lock(&xencons_lock);

drivers/xen/events/events_base.c

+8 −4
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ unsigned xen_evtchn_nr_channels(void) 
}

EXPORT_SYMBOL_GPL(xen_evtchn_nr_channels);



int bind_virq_to_irq(unsigned int virq, unsigned int cpu)

int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu)

{

	struct evtchn_bind_virq bind_virq;

	int evtchn, irq, ret;
@@ -971,8 +971,12 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu) 
		if (irq < 0)

			goto out;



		if (percpu)

			irq_set_chip_and_handler_name(irq, &xen_percpu_chip,

						      handle_percpu_irq, "virq");

		else

			irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,

						      handle_edge_irq, "virq");



		bind_virq.virq = virq;

		bind_virq.vcpu = cpu;
@@ -1062,7 +1066,7 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, 
{

	int irq, retval;



	irq = bind_virq_to_irq(virq, cpu);

	irq = bind_virq_to_irq(virq, cpu, irqflags & IRQF_PERCPU);

	if (irq < 0)

		return irq;

	retval = request_irq(irq, handler, irqflags, devname, dev_id);

include/xen/events.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn, 
			      irq_handler_t handler,

			      unsigned long irqflags, const char *devname,

			      void *dev_id);

int bind_virq_to_irq(unsigned int virq, unsigned int cpu);

int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu);

int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,

			    irq_handler_t handler,

			    unsigned long irqflags, const char *devname,