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

Commit fcf1ae2f authored by Feng Wu's avatar Feng Wu Committed by Thomas Gleixner
Browse files

genirq: Make irq_set_vcpu_affinity available for CONFIG_SMP=n 



irq_set_vcpu_affinity() is needed when CONFIG_SMP=n, so move the
definition out of "#ifdef CONFIG_SMP"

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarFeng Wu <feng.wu@intel.com>
Cc: jiang.liu@linux.intel.com
Cc: pbonzini@redhat.com
Link: http://lkml.kernel.org/r/1443860438-144926-1-git-send-email-feng.wu@intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e509bd7d

kernel/irq/manage.c

+31 −31
Original line number Diff line number Diff line
@@ -258,37 +258,6 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) 
}

EXPORT_SYMBOL_GPL(irq_set_affinity_hint);



/**

 *	irq_set_vcpu_affinity - Set vcpu affinity for the interrupt

 *	@irq: interrupt number to set affinity

 *	@vcpu_info: vCPU specific data

 *

 *	This function uses the vCPU specific data to set the vCPU

 *	affinity for an irq. The vCPU specific data is passed from

 *	outside, such as KVM. One example code path is as below:

 *	KVM -> IOMMU -> irq_set_vcpu_affinity().

 */

int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)

{

	unsigned long flags;

	struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);

	struct irq_data *data;

	struct irq_chip *chip;

	int ret = -ENOSYS;



	if (!desc)

		return -EINVAL;



	data = irq_desc_get_irq_data(desc);

	chip = irq_data_get_irq_chip(data);

	if (chip && chip->irq_set_vcpu_affinity)

		ret = chip->irq_set_vcpu_affinity(data, vcpu_info);

	irq_put_desc_unlock(desc, flags);



	return ret;

}

EXPORT_SYMBOL_GPL(irq_set_vcpu_affinity);



static void irq_affinity_notify(struct work_struct *work)

{

	struct irq_affinity_notify *notify =
@@ -424,6 +393,37 @@ setup_affinity(struct irq_desc *desc, struct cpumask *mask) 
}

#endif



/**

 *	irq_set_vcpu_affinity - Set vcpu affinity for the interrupt

 *	@irq: interrupt number to set affinity

 *	@vcpu_info: vCPU specific data

 *

 *	This function uses the vCPU specific data to set the vCPU

 *	affinity for an irq. The vCPU specific data is passed from

 *	outside, such as KVM. One example code path is as below:

 *	KVM -> IOMMU -> irq_set_vcpu_affinity().

 */

int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)

{

	unsigned long flags;

	struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);

	struct irq_data *data;

	struct irq_chip *chip;

	int ret = -ENOSYS;



	if (!desc)

		return -EINVAL;



	data = irq_desc_get_irq_data(desc);

	chip = irq_data_get_irq_chip(data);

	if (chip && chip->irq_set_vcpu_affinity)

		ret = chip->irq_set_vcpu_affinity(data, vcpu_info);

	irq_put_desc_unlock(desc, flags);



	return ret;

}

EXPORT_SYMBOL_GPL(irq_set_vcpu_affinity);



void __disable_irq(struct irq_desc *desc)

{

	if (!desc->depth++)