From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 19 Jul 2007 06:16:51 +0000 (-0700)
Subject: [SPARC64]: Tweak assertions in sun4v_build_virq().
X-Git-Tag: firefly_0821_release~27426^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f7426c0e16dba118aa1b18f3c97c3d7adfb7540;p=firefly-linux-kernel-4.4.55.git

[SPARC64]: Tweak assertions in sun4v_build_virq().

They are too strict.

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

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) {