PERFORCE change 101626 for review
Warner Losh
imp at FreeBSD.org
Fri Jul 14 23:25:40 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101626
Change 101626 by imp at imp_harmony on 2006/07/14 23:25:06
IFC @101625
Affected files ...
.. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#7 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_st.c#10 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#19 integrate
.. //depot/projects/arm/src/sys/arm/at91/files.at91#10 integrate
.. //depot/projects/arm/src/sys/conf/files#37 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iic.c#4 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iic.h#3 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#5 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iicbus.h#4 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iicbus_if.m#3 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#3 integrate
.. //depot/projects/arm/src/sys/dev/iicbus/iiconf.h#3 integrate
.. //depot/projects/arm/src/sys/dev/spibus/spi.h#2 integrate
.. //depot/projects/arm/src/sys/dev/spibus/spibus.c#4 integrate
.. //depot/projects/arm/src/sys/dev/spibus/spibus_if.m#3 integrate
.. //depot/projects/arm/src/sys/dev/spibus/spibusvar.h#2 integrate
.. //depot/projects/arm/src/sys/kern/link_elf.c#5 integrate
Differences ...
==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.1 2006/03/24 07:42:33 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.2 2006/07/14 22:30:44 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/at91/at91_st.c#10 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.3 2006/05/13 23:41:15 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.4 2006/07/14 22:31:12 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#19 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.2 2006/04/06 04:31:19 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/at91/files.at91#10 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/arm/at91/files.at91,v 1.5 2006/06/23 23:07:11 cognet Exp $
+# $FreeBSD: src/sys/arm/at91/files.at91,v 1.6 2006/07/14 22:41:54 imp Exp $
arm/arm/cpufunc_asm_arm9.S standard
arm/arm/irq_dispatch.S standard
arm/at91/at91.c standard
==== //depot/projects/arm/src/sys/conf/files#37 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1128 2006/07/06 23:37:39 rwatson Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1129 2006/07/14 22:50:46 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/arm/src/sys/dev/iicbus/iic.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.34 2006/04/04 23:29:17 imp Exp $
+ * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.35 2006/07/14 23:15:06 imp Exp $
*
*/
#include <sys/param.h>
==== //depot/projects/arm/src/sys/dev/iicbus/iic.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.3 1999/08/28 00:44:16 peter Exp $
+ * $FreeBSD: src/sys/dev/iicbus/iic.h,v 1.4 2006/07/14 23:15:06 imp Exp $
*
*/
#ifndef __IIC_H
==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.21 2006/04/17 22:33:42 jmg Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.22 2006/07/14 23:15:06 imp Exp $");
/*
* Autoconfiguration and support routines for the Philips serial I2C bus
==== //depot/projects/arm/src/sys/dev/iicbus/iicbus.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/iicbus/iicbus.h,v 1.5 2005/08/10 07:10:01 obrien Exp $
+ * $FreeBSD: src/sys/dev/iicbus/iicbus.h,v 1.6 2006/07/14 23:15:06 imp Exp $
*
*/
#ifndef __IICBUS_H
==== //depot/projects/arm/src/sys/dev/iicbus/iicbus_if.m#3 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.6 2005/01/06 01:42:47 imp Exp $
+# $FreeBSD: src/sys/dev/iicbus/iicbus_if.m,v 1.7 2006/07/14 23:15:06 imp Exp $
#
#include <sys/bus.h>
==== //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.14 2003/08/24 17:49:13 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.15 2006/07/14 23:15:06 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/dev/iicbus/iiconf.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.8 2003/06/19 02:50:08 jmg Exp $
+ * $FreeBSD: src/sys/dev/iicbus/iiconf.h,v 1.9 2006/07/14 23:15:06 imp Exp $
*/
#ifndef __IICONF_H
#define __IICONF_H
==== //depot/projects/arm/src/sys/dev/spibus/spi.h#2 (text+ko) ====
==== //depot/projects/arm/src/sys/dev/spibus/spibus.c#4 (text+ko) ====
==== //depot/projects/arm/src/sys/dev/spibus/spibus_if.m#3 (text+ko) ====
==== //depot/projects/arm/src/sys/dev/spibus/spibusvar.h#2 (text+ko) ====
==== //depot/projects/arm/src/sys/kern/link_elf.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.89 2006/06/21 20:42:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.90 2006/07/14 22:39:18 jkim Exp $");
#include "opt_gdb.h"
#include "opt_mac.h"
@@ -307,7 +307,7 @@
(void)link_elf_link_common_finish(linker_kernel_file);
}
-SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_SECOND, link_elf_init, 0);
+SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_THIRD, link_elf_init, 0);
static int
link_elf_preload_parse_symbols(elf_file_t ef)
More information about the p4-projects
mailing list