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

Commit 1cbac972 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: uv io-apic - use BUILD_BUG_ON instead of BUG_ON 



The expression is known to be true/false at compilation
time so we're allowed to use build-time instead of
run-time check. Also align 'entry' items assignment.

[ Impact: shrink kernel a bit, cleanup ]

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20090502093956.GB4791@lenovo>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6f0aced6

arch/x86/kernel/apic/io_apic.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -3749,6 +3749,8 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, 
	unsigned long flags;

	unsigned long flags;

	int err;

	int err;





	BUILD_BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long));



	cfg = irq_cfg(irq);

	cfg = irq_cfg(irq);





	err = assign_irq_vector(irq, cfg, eligible_cpu);

	err = assign_irq_vector(irq, cfg, eligible_cpu);
@@ -3762,8 +3764,6 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, 




	mmr_value = 0;

	mmr_value = 0;

	entry = (struct uv_IO_APIC_route_entry *)&mmr_value;

	entry = (struct uv_IO_APIC_route_entry *)&mmr_value;

	BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long));



	entry->vector		= cfg->vector;

	entry->vector		= cfg->vector;

	entry->delivery_mode	= apic->irq_delivery_mode;

	entry->delivery_mode	= apic->irq_delivery_mode;

	entry->dest_mode	= apic->irq_dest_mode;

	entry->dest_mode	= apic->irq_dest_mode;
@@ -3788,10 +3788,10 @@ void arch_disable_uv_irq(int mmr_blade, unsigned long mmr_offset) 
	struct uv_IO_APIC_route_entry *entry;

	struct uv_IO_APIC_route_entry *entry;

	int mmr_pnode;

	int mmr_pnode;





	BUILD_BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long));



	mmr_value = 0;

	mmr_value = 0;

	entry = (struct uv_IO_APIC_route_entry *)&mmr_value;

	entry = (struct uv_IO_APIC_route_entry *)&mmr_value;

	BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long));



	entry->mask = 1;

	entry->mask = 1;





	mmr_pnode = uv_blade_to_pnode(mmr_blade);

	mmr_pnode = uv_blade_to_pnode(mmr_blade);