From owner-p4-projects@FreeBSD.ORG  Sat Apr  1 21:03:36 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 635BE16A423; Sat,  1 Apr 2006 21:03:36 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3EB7816A428
	for <perforce@freebsd.org>; Sat,  1 Apr 2006 21:03:36 +0000 (UTC)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F349E43D45
	for <perforce@freebsd.org>; Sat,  1 Apr 2006 21:03:35 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k31L3ZU3063003
	for <perforce@freebsd.org>; Sat, 1 Apr 2006 21:03:35 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k31L3ZDQ063000
	for perforce@freebsd.org; Sat, 1 Apr 2006 21:03:35 GMT
	(envelope-from alc@freebsd.org)
Date: Sat, 1 Apr 2006 21:03:35 GMT
Message-Id: <200604012103.k31L3ZDQ063000@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94421 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Apr 2006 21:03:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=94421

Change 94421 by alc@alc_home on 2006/04/01 21:03:17

	IFC the correction to mpt

Affected files ...

.. //depot/projects/superpages/src/sys/dev/mpt/mpt.c#4 integrate

Differences ...

==== //depot/projects/superpages/src/sys/dev/mpt/mpt.c#4 (text+ko) ====

@@ -92,7 +92,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.24 2006/04/01 07:12:18 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.25 2006/04/01 19:49:55 mjacob Exp $");
 
 #include <dev/mpt/mpt.h>
 #include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
@@ -1398,11 +1398,11 @@
 	    (hdr->Function != MPI_FUNCTION_IOC_FACTS)){
 #if __FreeBSD_version >= 500000
 		mpt_prt(mpt, "reply length does not match message length: "
-			"got %x; expected %x for function %x\n",
+			"got %x; expected %zx for function %x\n",
 			hdr->MsgLength << 2, reply_len << 1, hdr->Function);
 #else
 		mpt_prt(mpt, "reply length does not match message length: "
-			"got %x; expected %zx for function %x\n",
+			"got %x; expected %x for function %x\n",
 			hdr->MsgLength << 2, reply_len << 1, hdr->Function);
 #endif
 	}