---

yaml --- r: 61975 b: refs/heads/master c: 5f7426c h: refs/heads/master i: 61973: cf6df25 61971: b621220 61967: 1dd89eb v: v3
git-mirror · Jul 20, 2007 · 2f40a5f · 2f40a5f
1 parent df19457
commit 2f40a5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a26302164e0d26df94810ffa2eabcad0fc55c95
+refs/heads/master: 5f7426c0e16dba118aa1b18f3c97c3d7adfb7540
diff --git a/trunk/arch/sparc64/kernel/irq.c b/trunk/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) {