[SPARC64]: Tweak assertions in sun4v_build_virq().
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 19 Jul 2007 06:16:51 +0000 (23:16 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 20 Jul 2007 04:28:43 +0000 (21:28 -0700)
They are too strict.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/irq.c

index 8cb3358674f5257fcaff2ee83448592b1732e3dd..c72795666a624e393248d899bbeb8c70c3ff9e66 100644 (file)
@@ -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) {