svn commit: r275327 - in projects/sendfile: etc/rc.d sys/arm/arm
Gleb Smirnoff
glebius at FreeBSD.org
Sun Nov 30 13:03:48 UTC 2014
Author: glebius
Date: Sun Nov 30 13:03:46 2014
New Revision: 275327
URL: https://svnweb.freebsd.org/changeset/base/275327
Log:
Merge head up to r275326.
Modified:
projects/sendfile/etc/rc.d/ipmon
projects/sendfile/etc/rc.d/pflog
projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S
projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S
projects/sendfile/sys/arm/arm/fusu.S
projects/sendfile/sys/arm/arm/support.S
Directory Properties:
projects/sendfile/ (props changed)
projects/sendfile/etc/ (props changed)
projects/sendfile/sys/ (props changed)
Modified: projects/sendfile/etc/rc.d/ipmon
==============================================================================
--- projects/sendfile/etc/rc.d/ipmon Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/etc/rc.d/ipmon Sun Nov 30 13:03:46 2014 (r275327)
@@ -4,7 +4,7 @@
#
# PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl ipfilter
# BEFORE: SERVERS
# KEYWORD: nojail
Modified: projects/sendfile/etc/rc.d/pflog
==============================================================================
--- projects/sendfile/etc/rc.d/pflog Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/etc/rc.d/pflog Sun Nov 30 13:03:46 2014 (r275327)
@@ -4,7 +4,7 @@
#
# PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif FILESYSTEMS
+# REQUIRE: FILESYSTEMS netif
# KEYWORD: nojail
. /etc/rc.subr
Modified: projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S
==============================================================================
--- projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 13:03:46 2014 (r275327)
@@ -194,7 +194,6 @@ ENTRY(armv5_idcache_wbinv_range)
END(armv5_idcache_wbinv_range)
ENTRY_NP(armv5_idcache_wbinv_all)
-armv5_idcache_wbinv_all:
.Larmv5_idcache_wbinv_all:
/*
* We assume that the code here can never be out of sync with the
Modified: projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S
==============================================================================
--- projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 13:03:46 2014 (r275327)
@@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$");
ENTRY_NP(xscalec3_cache_syncI)
-xscalec3_cache_purgeID:
EENTRY_NP(xscalec3_cache_purgeID)
mcr p15, 0, r0, c7, c5, 0 /* flush I cache (D cleaned below) */
EENTRY_NP(xscalec3_cache_cleanID)
Modified: projects/sendfile/sys/arm/arm/fusu.S
==============================================================================
--- projects/sendfile/sys/arm/arm/fusu.S Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/sys/arm/arm/fusu.S Sun Nov 30 13:03:46 2014 (r275327)
@@ -129,7 +129,7 @@ EENTRY_NP(fuword32)
str r1, [r2, #PCB_ONFAULT]
mov r0, r3
RET
-END(fuword32)
+EEND(fuword32)
END(fuword)
/*
@@ -295,7 +295,7 @@ EENTRY_NP(suword32)
mov r0, #0x00000000
str r0, [r2, #PCB_ONFAULT]
RET
-END(suword32)
+EEND(suword32)
END(suword)
/*
Modified: projects/sendfile/sys/arm/arm/support.S
==============================================================================
--- projects/sendfile/sys/arm/arm/support.S Sun Nov 30 12:52:33 2014 (r275326)
+++ projects/sendfile/sys/arm/arm/support.S Sun Nov 30 13:03:46 2014 (r275327)
@@ -130,7 +130,7 @@ ENTRY(bzero)
.Lnormal0:
mov r3, #0x00
b do_memset
-EEND(bzero)
+END(bzero)
/* LINTSTUB: Func: void *memset(void *, int, size_t) */
ENTRY(memset)
and r3, r1, #0xff /* We deal with bytes */
More information about the svn-src-projects
mailing list