patch r187693 breaks HAL on amd64-current

[Stephane E. Potvin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ralph Zitz wrote:
> I'm not a HAL expert, but it seems that the patch makes HAL create a
> zombie process when watching /dev/cd0. Reversing the patch makes HAL
> work again.
> 
> Link to patch message:
> http://lists.freebsd.org/pipermail/svn-src-all/2009-January/004073.html
> 
Hi Ralph

Try the following patch, it should fix your problem with hal.

Regards

Steph
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmGB9YACgkQmdOXtTCX/nt8tACgj5IzDaHDEsKIJbZPefOwzkiW
Ne4AoMV4GzfMLeVeBAWIRbmG08R7Lpj3
=K7Cu
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: kern/sys_generic.c
===================================================================
--- kern/sys_generic.c	(revision 187983)
+++ kern/sys_generic.c	(working copy)
@@ -903,7 +903,7 @@
  * bit position in the fd_mask array.
  */
 static __inline int
-selflags(fd_mask **ibits, int idx, int bit)
+selflags(fd_mask **ibits, int idx, fd_mask bit)
 {
 	int flags;
 	int msk;
@@ -912,7 +912,7 @@
 	for (msk = 0; msk < 3; msk++) {
 		if (ibits[msk] == NULL)
 			continue;
-		if ((ibits[msk][idx] & (fd_mask)bit) == 0)
+		if ((ibits[msk][idx] & bit) == 0)
 			continue;
 		flags |= select_flags[msk];
 	}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: lp64_select_fix.diff.sig
Type: application/octet-stream
Size: 72 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20090201/569c95d8/lp64_select_fix.diff.obj