drivers/xen: use nr_irqs (5a15d7e8) · Commits · e / devices / samsung / android_kernel_samsung_exynos7420

drivers/xen/events.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,7 @@ static void init_evtchn_cpu_bindings(void)
	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	int i;		int i;
	/* By default all event channels notify CPU#0. */		/* By default all event channels notify CPU#0. */
	for (i = 0; i < NR_IRQS; i++)		for (i = 0; i < nr_irqs; i++)
	irq_desc[i].affinity = cpumask_of_cpu(0);		irq_desc[i].affinity = cpumask_of_cpu(0);
	#endif		#endif

	@@ -229,12 +229,12 @@ static int find_unbound_irq(void)
	int irq;		int irq;

	/* Only allocate from dynirq range */		/* Only allocate from dynirq range */
	for (irq = 0; irq < NR_IRQS; irq++)		for (irq = 0; irq < nr_irqs; irq++)
	if (irq_bindcount[irq] == 0)		if (irq_bindcount[irq] == 0)
	break;		break;

	if (irq == NR_IRQS)		if (irq == nr_irqs)
	panic("No available IRQ to bind to: increase NR_IRQS!\n");		panic("No available IRQ to bind to: increase nr_irqs!\n");

	return irq;		return irq;
	}		}
	@@ -790,7 +790,7 @@ void xen_irq_resume(void)
	mask_evtchn(evtchn);		mask_evtchn(evtchn);

	/* No IRQ <-> event-channel mappings. */		/* No IRQ <-> event-channel mappings. */
	for (irq = 0; irq < NR_IRQS; irq++)		for (irq = 0; irq < nr_irqs; irq++)
	irq_info[irq].evtchn = 0; /* zap event-channel binding */		irq_info[irq].evtchn = 0; /* zap event-channel binding */

	for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)		for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++)
	@@ -822,7 +822,7 @@ void __init xen_init_IRQ(void)
	mask_evtchn(i);		mask_evtchn(i);

	/* Dynamic IRQ space is currently unbound. Zero the refcnts. */		/* Dynamic IRQ space is currently unbound. Zero the refcnts. */
	for (i = 0; i < NR_IRQS; i++)		for (i = 0; i < nr_irqs; i++)
	irq_bindcount[i] = 0;		irq_bindcount[i] = 0;

	irq_ctx_init(smp_processor_id());		irq_ctx_init(smp_processor_id());