PERFORCE change 82304 for review
Scott Long
scottl at FreeBSD.org
Sat Aug 20 03:55:25 GMT 2005
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.
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_eisa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_isa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.reg#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.seq#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.reg#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.seq#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_crom.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.h#2 integrate
Differences ...
==== //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,
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_eisa.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_isa.c#2 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahc_pci.c#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7770.c#1 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $
*/
#ifdef __linux__
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.reg#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.seq#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_inline.h#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#1 $
+ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#35 $
*/
#include <sys/cdefs.h>
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#5 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#5 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.reg#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.seq#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_inline.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#1 $
+ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#20 $
*/
#include <sys/cdefs.h>
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#5 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_pci.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/Makefile#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#2 $
+ * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
* $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.20 2005/01/06 01:42:34 imp Exp $
*/
==== //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.h#3 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_crom.c#4 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.c#2 (text+ko) ====
==== //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.h#2 (text+ko) ====
More information about the p4-projects
mailing list