commit 5f7426c0e16dba118aa1b18f3c97c3d7adfb7540
author David S. Miller <davem@sunset.davemloft.net> Wed Jul 18 23:16:51 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Thu Jul 19 21:28:43 2007 -0700
tree 3ccab7349691b3268a3f4593ac84d826560bcba6
parent 2a26302164e0d26df94810ffa2eabcad0fc55c95

[SPARC64]: Tweak assertions in sun4v_build_virq().

They are too strict.

Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc64/kernel/irq.c

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 8cb3358..c727956 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -701,10 +701,10 @@
 {
 	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) {