PERFORCE change 82304 for review

[Nate Lawson]

Scott Long wrote:
> http://perforce.freebsd.org/chv.cgi?CH=82304
> 
> Change 82304 by scottl at scottl-junior on 2005/08/20 03:54:47
> 
> 	Fix unintentional diffs, most relating to $Id$ expansion.
> 
> ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#5 (text+ko) ====
> 
> @@ -38,7 +38,7 @@
>  /* Functions accessed by the peripheral drivers */
>  #ifdef _KERNEL
>  void		xpt_polled_action(union ccb *ccb);
> -union ccb	*xpt_alloc_ccb(int wait);
> +union ccb	*xpt_alloc_ccb(void);
>  union ccb	*xpt_alloc_ccb_nowait(void);
>  void		xpt_free_ccb(union ccb *free_ccb);
>  void		xpt_release_ccb(union ccb *released_ccb);
> 
> ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#5 (text+ko) ====
> 
> @@ -495,7 +495,7 @@
>  						inccb->ccb_h.pinfo.priority);
>  			ccb_malloced = 0;
>  		} else {
> -			ccb = xpt_alloc_ccb(M_WAITOK);
> +			ccb = xpt_alloc_ccb();
>  
>  			if (ccb != NULL)
>  				xpt_setup_ccb(&ccb->ccb_h, periph->path,

Are you sure you wanted to revert this?

-- 
Nate