From owner-p4-projects@FreeBSD.ORG  Thu Jul 27 16:15:29 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 82B7216A4E7; Thu, 27 Jul 2006 16:15:29 +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 59D4E16A4E5
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 16:15:29 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BA1D243D5A
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 16:15:28 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RGFSO8090147
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 16:15:28 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RGFScw090144
	for perforce@freebsd.org; Thu, 27 Jul 2006 16:15:28 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 27 Jul 2006 16:15:28 GMT
Message-Id: <200607271615.k6RGFScw090144@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102569 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: Thu, 27 Jul 2006 16:15:29 -0000

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

Change 102569 by piso@piso_newluxor on 2006/07/27 16:15:05

	IFC

Affected files ...

.. //depot/projects/soc2005/libalias/sys/arm/include/db_machdep.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#2 integrate

Differences ...

==== //depot/projects/soc2005/libalias/sys/arm/include/db_machdep.h#2 (text+ko) ====

@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04
- * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.5 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/db_machdep.h,v 1.6 2006/07/27 11:41:37 cognet Exp $
  */
 
 #ifndef	_MACHINE_DB_MACHDEP_H_
@@ -89,4 +89,7 @@
 
 u_int branch_taken (u_int insn, u_int pc);
 
+#ifdef __ARMEB__
+#define BYTE_MSF	(1)
+#endif
 #endif /* !_MACHINE_DB_MACHDEP_H_ */

==== //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.26 2006/06/05 21:38:54 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli.c,v 1.27 2006/07/27 11:52:12 yar Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1030,4 +1030,4 @@
 }
 
 DECLARE_GEOM_CLASS(g_eli_class, g_eli);
-MODULE_DEPEND(geom_eli, crypto, 1, 1, 1);
+MODULE_DEPEND(g_eli, crypto, 1, 1, 1);