From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 13:03:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C6EB19F; Sun, 30 Nov 2014 13:03:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49018105; Sun, 30 Nov 2014 13:03:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUD3mqV060623; Sun, 30 Nov 2014 13:03:48 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUD3kd8060612; Sun, 30 Nov 2014 13:03:46 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411301303.sAUD3kd8060612@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Nov 2014 13:03:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275327 - in projects/sendfile: etc/rc.d sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 13:03:48 -0000 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 */