x86: uv io-apic - use BUILD_BUG_ON instead of BUG_ON
PATCH 1/1 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.
Signed-off-by Cyrill Gorcunov <[email protected]>
CC Jack Steiner <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/io_apic.c +11 -11
@@ -3752,6 +3752,8 @@ int arch_enable_uv_irq(char *irq_name, uunsigned long flags;int err; +BUILD_BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); + cfg =irq_cfg (irq); err =assign_irq_vector (irq, cfg, eligible_cpu);
@@ -3765,15 +3767,13 @@ int arch_enable_uv_irq(char *irq_name, u mmr_value =0 ; 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->delivery_mode = apic->irq_delivery_mode; - entry->dest_mode = apic->irq_dest_mode; - entry->polarity =0 ; - entry->trigger =0 ; - entry->mask =0 ; - entry->dest = apic->cpu_mask_to_apicid (eligible_cpu); + entry->vector = cfg->vector; + entry->delivery_mode = apic->irq_delivery_mode; + entry->dest_mode = apic->irq_dest_mode; + entry->polarity =0 ; + entry->trigger =0 ; + entry->mask =0 ; + entry->dest = apic->cpu_mask_to_apicid (eligible_cpu); mmr_pnode =uv_blade_to_pnode (mmr_blade);uv_write_global_mmr64 (mmr_pnode, mmr_offset, mmr_value);
@@ -3791,10 +3791,10 @@ void arch_disable_uv_irq(int mmr_blade,struct uv_IO_APIC_route_entry *entry;int mmr_pnode; +BUILD_BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); + mmr_value =0 ; entry = (struct uv_IO_APIC_route_entry *)&mmr_value; -BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); - entry->mask =1 ; mmr_pnode =uv_blade_to_pnode (mmr_blade);
Commit-ID: 1cbac972ba28e706fa9ce4d4c81830040bc811ee Gitweb: http://git.kernel.org/tip/1cbac972ba28e706fa9ce4d4c81830040bc811ee Author: Cyrill Gorcunov <[email protected]> AuthorDate: Sat, 2 May 2009 13:39:56 +0400 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 3 May 2009 10:38:21 +0200
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 Cyrill Gorcunov <[email protected]>
Cc Jack Steiner <[email protected]>
LKML-Reference: <20090502093956.GB4791@lenovo>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/apic/io_apic.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/io_apic.c +11 -11
@@ -3749,6 +3749,8 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,unsigned long flags;int err; +BUILD_BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); + cfg =irq_cfg (irq); err =assign_irq_vector (irq, cfg, eligible_cpu);
@@ -3762,15 +3764,13 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, mmr_value =0 ; 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->delivery_mode = apic->irq_delivery_mode; - entry->dest_mode = apic->irq_dest_mode; - entry->polarity =0 ; - entry->trigger =0 ; - entry->mask =0 ; - entry->dest = apic->cpu_mask_to_apicid (eligible_cpu); + entry->vector = cfg->vector; + entry->delivery_mode = apic->irq_delivery_mode; + entry->dest_mode = apic->irq_dest_mode; + entry->polarity =0 ; + entry->trigger =0 ; + entry->mask =0 ; + entry->dest = apic->cpu_mask_to_apicid (eligible_cpu); mmr_pnode =uv_blade_to_pnode (mmr_blade);uv_write_global_mmr64 (mmr_pnode, mmr_offset, mmr_value);
@@ -3788,10 +3788,10 @@ void arch_disable_uv_irq(int mmr_blade, unsigned long mmr_offset)struct uv_IO_APIC_route_entry *entry;int mmr_pnode; +BUILD_BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); + mmr_value =0 ; entry = (struct uv_IO_APIC_route_entry *)&mmr_value; -BUG_ON (sizeof (struct uv_IO_APIC_route_entry ) !=sizeof (unsigned long )); - entry->mask =1 ; mmr_pnode =uv_blade_to_pnode (mmr_blade);