diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-19 08:16:51 +0200 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-20 06:28:43 +0200 |
commit | 5f7426c0e16dba118aa1b18f3c97c3d7adfb7540 (patch) | |
tree | 3ccab7349691b3268a3f4593ac84d826560bcba6 /arch/sparc64 | |
parent | [SPARC64]: Tweak kernel log messages in power_probe(). (diff) | |
download | linux-5f7426c0e16dba118aa1b18f3c97c3d7adfb7540.tar.xz linux-5f7426c0e16dba118aa1b18f3c97c3d7adfb7540.zip |
[SPARC64]: Tweak assertions in sun4v_build_virq().
They are too strict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 8cb3358674f5..c72795666a62 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c @@ -701,10 +701,10 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino) { unsigned long sysino, hv_err; - BUG_ON(devhandle & ~IMAP_IGN); - BUG_ON(devino & ~IMAP_INO); + BUG_ON(devhandle & devino); sysino = devhandle | devino; + BUG_ON(sysino & ~(IMAP_IGN | IMAP_INO)); hv_err = sun4v_vintr_set_cookie(devhandle, devino, sysino); if (hv_err) { |