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

Commit 82b481e8 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

irq_remap: Fix UP build failure 



Fix the below UP build failure with CONFIG_IRQ_REMAP enabled.

 drivers/iommu/intel_irq_remapping.c:955:19: error: ‘struct irq_data’ has no member named ‘affinity’

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Cc: joro@8bytes.org
Cc: iommu@lists.linux-foundation.org
Cc: Joerg Roedel <joerg.roedel@amd.com>
Link: http://lkml.kernel.org/r/1336460934-23592-2-git-send-email-suresh.b.siddha@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 399988ee

drivers/iommu/intel_irq_remapping.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -902,6 +902,7 @@ static int intel_setup_ioapic_entry(int irq, 
	return 0;

	return 0;

}

}





#ifdef CONFIG_SMP

/*

/*

 * Migrate the IO-APIC irq in the presence of intr-remapping.

 * Migrate the IO-APIC irq in the presence of intr-remapping.

 *

 *
@@ -955,6 +956,7 @@ intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask, 
	cpumask_copy(data->affinity, mask);

	cpumask_copy(data->affinity, mask);

	return 0;

	return 0;

}

}

#endif





static void intel_compose_msi_msg(struct pci_dev *pdev,

static void intel_compose_msi_msg(struct pci_dev *pdev,

				  unsigned int irq, unsigned int dest,

				  unsigned int irq, unsigned int dest,
@@ -1056,7 +1058,9 @@ struct irq_remap_ops intel_irq_remap_ops = { 
	.reenable		= reenable_irq_remapping,

	.reenable		= reenable_irq_remapping,

	.enable_faulting	= enable_drhd_fault_handling,

	.enable_faulting	= enable_drhd_fault_handling,

	.setup_ioapic_entry	= intel_setup_ioapic_entry,

	.setup_ioapic_entry	= intel_setup_ioapic_entry,

#ifdef CONFIG_SMP

	.set_affinity		= intel_ioapic_set_affinity,

	.set_affinity		= intel_ioapic_set_affinity,

#endif

	.free_irq		= free_irte,

	.free_irq		= free_irte,

	.compose_msi_msg	= intel_compose_msi_msg,

	.compose_msi_msg	= intel_compose_msi_msg,

	.msi_alloc_irq		= intel_msi_alloc_irq,

	.msi_alloc_irq		= intel_msi_alloc_irq,

drivers/iommu/irq_remapping.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ int setup_ioapic_remapped_entry(int irq, 
					     vector, attr);

					     vector, attr);

}

}





#ifdef CONFIG_SMP

int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask,

int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask,

			      bool force)

			      bool force)

{

{
@@ -119,6 +120,7 @@ int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask, 




	return remap_ops->set_affinity(data, mask, force);

	return remap_ops->set_affinity(data, mask, force);

}

}

#endif





void free_remapped_irq(int irq)

void free_remapped_irq(int irq)

{

{

drivers/iommu/irq_remapping.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -59,9 +59,11 @@ struct irq_remap_ops { 
				  unsigned int, int,

				  unsigned int, int,

				  struct io_apic_irq_attr *);

				  struct io_apic_irq_attr *);





#ifdef CONFIG_SMP

	/* Set the CPU affinity of a remapped interrupt */

	/* Set the CPU affinity of a remapped interrupt */

	int (*set_affinity)(struct irq_data *data, const struct cpumask *mask,

	int (*set_affinity)(struct irq_data *data, const struct cpumask *mask,

			    bool force);

			    bool force);

#endif





	/* Free an IRQ */

	/* Free an IRQ */

	int (*free_irq)(int);

	int (*free_irq)(int);