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

Commit 9f0a5ba5 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] irq: Remove set_native_irq_info 



This patch replaces all instances of "set_native_irq_info(irq, mask)"
with "irq_desc[irq].affinity = mask".  The latter form is clearer
uses fewer abstractions, and makes access to this field uniform
accross different architectures.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc5d56f9

arch/i386/kernel/io_apic.c

+5 −5
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) 
			break;

		entry = irq_2_pin + entry->next;

	}

	set_native_irq_info(irq, cpumask);

	irq_desc[irq].affinity = cpumask;

	spin_unlock_irqrestore(&ioapic_lock, flags);

}
@@ -1354,7 +1354,7 @@ static void __init setup_IO_APIC_irqs(void) 
		}

		spin_lock_irqsave(&ioapic_lock, flags);

		__ioapic_write_entry(apic, pin, entry);

		set_native_irq_info(irq, TARGET_CPUS);

		irq_desc[irq].affinity = TARGET_CPUS;

		spin_unlock_irqrestore(&ioapic_lock, flags);

	}

	}
@@ -2585,7 +2585,7 @@ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask) 
	msg.address_lo |= MSI_ADDR_DEST_ID(dest);



	write_msi_msg(irq, &msg);

	set_native_irq_info(irq, mask);

	irq_desc[irq].affinity = mask;

}

#endif /* CONFIG_SMP */
@@ -2669,7 +2669,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) 
	dest = cpu_mask_to_apicid(mask);



	target_ht_irq(irq, dest);

	set_native_irq_info(irq, mask);

	irq_desc[irq].affinity = mask;

}

#endif
@@ -2875,7 +2875,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a 


	spin_lock_irqsave(&ioapic_lock, flags);

	__ioapic_write_entry(ioapic, pin, entry);

	set_native_irq_info(irq, TARGET_CPUS);

	irq_desc[irq].affinity = TARGET_CPUS;

	spin_unlock_irqrestore(&ioapic_lock, flags);



	return 0;

arch/ia64/kernel/msi_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) 
	msg.address_lo = addr;



	write_msi_msg(irq, &msg);

	set_native_irq_info(irq, cpu_mask);

	irq_desc[irq].affinity = cpu_mask;

}

#endif /* CONFIG_SMP */

arch/ia64/sn/kernel/msi_sn.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static void sn_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) 
	msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);



	write_msi_msg(irq, &msg);

	set_native_irq_info(irq, cpu_mask);

	irq_desc[irq].affinity = cpu_mask;

}

#endif /* CONFIG_SMP */

arch/x86_64/kernel/io_apic.c

+5 −5
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) 


	spin_lock_irqsave(&ioapic_lock, flags);

	__target_IO_APIC_irq(irq, dest, vector);

	set_native_irq_info(irq, mask);

	irq_desc[irq].affinity = mask;

	spin_unlock_irqrestore(&ioapic_lock, flags);

}

#endif
@@ -857,7 +857,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq) 
	ioapic_write_entry(apic, pin, entry);



	spin_lock_irqsave(&ioapic_lock, flags);

	set_native_irq_info(irq, TARGET_CPUS);

	irq_desc[irq].affinity = TARGET_CPUS;

	spin_unlock_irqrestore(&ioapic_lock, flags);



}
@@ -1930,7 +1930,7 @@ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask) 
	msg.address_lo |= MSI_ADDR_DEST_ID(dest);



	write_msi_msg(irq, &msg);

	set_native_irq_info(irq, mask);

	irq_desc[irq].affinity = mask;

}

#endif /* CONFIG_SMP */
@@ -2018,7 +2018,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) 
	dest = cpu_mask_to_apicid(tmp);



	target_ht_irq(irq, dest, vector);

	set_native_irq_info(irq, mask);

	irq_desc[irq].affinity = mask;

}

#endif
@@ -2143,7 +2143,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p 
	ioapic_write_entry(ioapic, pin, entry);



	spin_lock_irqsave(&ioapic_lock, flags);

	set_native_irq_info(irq, TARGET_CPUS);

	irq_desc[irq].affinity = TARGET_CPUS;

	spin_unlock_irqrestore(&ioapic_lock, flags);



	return 0;

include/linux/irq.h

+0 −11
Original line number Diff line number Diff line
@@ -199,17 +199,6 @@ extern int setup_irq(unsigned int irq, struct irqaction *new); 
# define handle_dynamic_tick(a)		do { } while (0)

#endif



#ifdef CONFIG_SMP

static inline void set_native_irq_info(int irq, cpumask_t mask)

{

	irq_desc[irq].affinity = mask;

}

#else

static inline void set_native_irq_info(int irq, cpumask_t mask)

{

}

#endif



#ifdef CONFIG_SMP



#if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)