From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 02:02:52 2015 Return-Path: Delivered-To: svn-src-head@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 DF0E1804; Sun, 1 Feb 2015 02:02:51 +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 BFCD18B0; Sun, 1 Feb 2015 02:02:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1122pXX044016; Sun, 1 Feb 2015 02:02:51 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1122pwk044009; Sun, 1 Feb 2015 02:02:51 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201502010202.t1122pwk044009@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sun, 1 Feb 2015 02:02:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278020 - head/sys/boot/powerpc/kboot X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 02:02:52 -0000 Author: nwhitehorn Date: Sun Feb 1 02:02:50 2015 New Revision: 278020 URL: https://svnweb.freebsd.org/changeset/base/278020 Log: Allow this to work with disks greater than 4 GB and with names not beginning with "s". Modified: head/sys/boot/powerpc/kboot/host_syscall.S head/sys/boot/powerpc/kboot/host_syscall.h head/sys/boot/powerpc/kboot/hostdisk.c Modified: head/sys/boot/powerpc/kboot/host_syscall.S ============================================================================== --- head/sys/boot/powerpc/kboot/host_syscall.S Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/host_syscall.S Sun Feb 1 02:02:50 2015 (r278020) @@ -1,3 +1,8 @@ +/* + * + * $FreeBSD$ + */ + #include ENTRY(host_read) @@ -16,7 +21,10 @@ ENTRY(host_write) blr ENTRY(host_seek) - li %r0, 19 # SYS_lseek + mr %r4,%r5 + mr %r5,%r6 + mr %r6,%r7 + li %r0, 140 # SYS_llseek sc blr Modified: head/sys/boot/powerpc/kboot/host_syscall.h ============================================================================== --- head/sys/boot/powerpc/kboot/host_syscall.h Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/host_syscall.h Sun Feb 1 02:02:50 2015 (r278020) @@ -32,7 +32,7 @@ ssize_t host_read(int fd, void *buf, size_t nbyte); ssize_t host_write(int fd, const void *buf, size_t nbyte); -ssize_t host_seek(int fd, int offset, int whence); +ssize_t host_seek(int fd, int64_t offset, int whence); int host_open(char *path, int flags, int mode); int host_close(int fd); void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, int); Modified: head/sys/boot/powerpc/kboot/hostdisk.c ============================================================================== --- head/sys/boot/powerpc/kboot/hostdisk.c Sun Feb 1 01:53:59 2015 (r278019) +++ head/sys/boot/powerpc/kboot/hostdisk.c Sun Feb 1 02:02:50 2015 (r278020) @@ -40,7 +40,7 @@ static int hostdisk_ioctl(struct open_fi static void hostdisk_print(int verbose); struct devsw hostdisk = { - "s", + "/dev", DEVT_DISK, hostdisk_init, hostdisk_strategy, @@ -67,8 +67,10 @@ hostdisk_strategy(void *devdata, int fla pos = dblk * 512; - if (host_seek(desc->d_unit, pos, 0) < 0) + if (host_seek(desc->d_unit, pos, 0) < 0) { + printf("Seek error\n"); return (EIO); + } n = host_read(desc->d_unit, buf, size); if (n < 0) @@ -82,22 +84,19 @@ static int hostdisk_open(struct open_file *f, ...) { struct devdesc *desc; - char *path; va_list vl; va_start(vl, f); desc = va_arg(vl, struct devdesc *); va_end(vl); - path = malloc(strlen((char *)(desc->d_opendata)) + 6); - strcpy(path, "/dev/"); - strcat(path, (char *)(desc->d_opendata)); + desc->d_unit = host_open(desc->d_opendata, O_RDONLY, 0); - desc->d_unit = host_open(path, O_RDONLY, 0); - free(path); - - if (desc->d_unit <= 0) + if (desc->d_unit <= 0) { + printf("hostdisk_open: couldn't open %s: %d\n", + desc->d_opendata, desc->d_unit); return (ENOENT); + } return (0); } From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 05:00:39 2015 Return-Path: Delivered-To: svn-src-head@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 D3C913D4; Sun, 1 Feb 2015 05:00:38 +0000 (UTC) Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au [211.29.132.249]) by mx1.freebsd.org (Postfix) with ESMTP id 2F9CF9AA; Sun, 1 Feb 2015 05:00:37 +0000 (UTC) Received: from c122-106-147-133.carlnfd1.nsw.optusnet.com.au (c122-106-147-133.carlnfd1.nsw.optusnet.com.au [122.106.147.133]) by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id 5791E1045F7B; Sun, 1 Feb 2015 16:00:35 +1100 (AEDT) Date: Sun, 1 Feb 2015 16:00:34 +1100 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Dimitry Andric Subject: Re: svn commit: r278004 - head/sys/dev/drm2/radeon In-Reply-To: <201501312218.t0VMIr7m035695@svn.freebsd.org> Message-ID: <20150201153237.Q867@besplex.bde.org> References: <201501312218.t0VMIr7m035695@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=Za4kaKlA c=1 sm=1 tr=0 a=7NqvjVvQucbO2RlWB8PEog==:117 a=PO7r1zJSAAAA:8 a=kj9zAlcOel0A:10 a=JzwRw_2MAAAA:8 a=pCuNxOU4Z9ZC8-tW4SQA:9 a=CjuIK1q_8ugA:10 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 05:00:39 -0000 On Sat, 31 Jan 2015, Dimitry Andric wrote: > Log: > Constify a number of accesses in drm2's radeon drivers to avoid > -Wcast-qual warnings. No functional change. This is much better than using __DECONST(), but still has bogus casts. > > Modified: head/sys/dev/drm2/radeon/ni.c > ============================================================================== > --- head/sys/dev/drm2/radeon/ni.c Sat Jan 31 22:07:38 2015 (r278003) > +++ head/sys/dev/drm2/radeon/ni.c Sat Jan 31 22:18:52 2015 (r278004) > @@ -182,7 +182,7 @@ int ni_mc_load_microcode(struct radeon_d > { > const __be32 *fw_data; > u32 mem_type, running, blackout = 0; > - u32 *io_mc_regs; > + const u32 *io_mc_regs; > int i, ucode_size, regs_size; > > if (!rdev->mc_fw) Part of the correct change. > @@ -190,23 +190,23 @@ int ni_mc_load_microcode(struct radeon_d > > switch (rdev->family) { > case CHIP_BARTS: > - io_mc_regs = (u32 *)&barts_io_mc_regs; Old bogus cast. The array has const elements, but the pointer was not even to non-const elements (it was to an array type). A case was used to break the warning about at least the non-const part of this. But -Wcast-qual restored the warning. > + io_mc_regs = (const u32 *)&barts_io_mc_regs; New bogus cast. Now that the pointer type actually matches the data element type, no cast is needed. However &barts_io_mc_regs isn't actually a pointer to a data element. It is a pointer to the array, which has a different type. The array type might actually be important here, since the array is multi-dimensional and only a pointer to an array could keep track of (most of) the dimensions. However the code want a pointer to an element, since it wants to treat the array as variable-size although its data is fixed-size, and C's array indexing is no good except for fixed dimentsions. > ucode_size = BTC_MC_UCODE_SIZE; > regs_size = BTC_IO_MC_REGS_SIZE; It keeps track of one of the dimensions here. The other one is presumably fixed at 2. I forget whether it is the first or last dimension that is not needed for array indexing. > break; So the bogus cast was also explicitly converting from an array type to its element type. That conversion is normally done implicitly by assignment because the types are compatible enough for this not to break type safety. However, perhaps it is not actually safe for multi-dimensional arrays or arrays with const elements. Really strict type warnings would warn about implicitly and and explicitly converting pointers to arrays. Anyway, it is clearer to point to the first element: io_mc_regs = &barts_io_mc_regs[0][0]; > case CHIP_TURKS: > - io_mc_regs = (u32 *)&turks_io_mc_regs; > + io_mc_regs = (const u32 *)&turks_io_mc_regs; > ucode_size = BTC_MC_UCODE_SIZE; > regs_size = BTC_IO_MC_REGS_SIZE; > break; Similarly for the other bogus casts. Bruce From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 09:50:35 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D905845E; Sun, 1 Feb 2015 09:50:34 +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 C40DCE76; Sun, 1 Feb 2015 09:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t119oYGA060084; Sun, 1 Feb 2015 09:50:34 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t119oY6X060080; Sun, 1 Feb 2015 09:50:34 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201502010950.t119oY6X060080@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 1 Feb 2015 09:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278023 - head/contrib/gcc/config/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 09:50:35 -0000 Author: andrew Date: Sun Feb 1 09:50:33 2015 New Revision: 278023 URL: https://svnweb.freebsd.org/changeset/base/278023 Log: FreeBSD expects _Unwind_GetGR, _Unwind_SetGR, and _Unwind_SetIP to be symbols and not macros. Make this so. This fixes a few ports that try to link against these functions but fail as they previously didn't exist. Modified: head/contrib/gcc/config/arm/unwind-arm.c head/contrib/gcc/config/arm/unwind-arm.h Modified: head/contrib/gcc/config/arm/unwind-arm.c ============================================================================== --- head/contrib/gcc/config/arm/unwind-arm.c Sun Feb 1 06:45:31 2015 (r278022) +++ head/contrib/gcc/config/arm/unwind-arm.c Sun Feb 1 09:50:33 2015 (r278023) @@ -25,6 +25,7 @@ along with this program; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#define __ARM_STATIC_INLINE #include "unwind.h" /* We add a prototype for abort here to avoid creating a dependency on @@ -1089,4 +1090,11 @@ _Unwind_GetIPInfo (struct _Unwind_Contex *ip_before_insn = 0; return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; } + +void +_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val) +{ + _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)); +} + #endif Modified: head/contrib/gcc/config/arm/unwind-arm.h ============================================================================== --- head/contrib/gcc/config/arm/unwind-arm.h Sun Feb 1 06:45:31 2015 (r278022) +++ head/contrib/gcc/config/arm/unwind-arm.h Sun Feb 1 09:50:33 2015 (r278023) @@ -34,6 +34,10 @@ #define __ARM_EABI_UNWINDER__ 1 +#ifndef __ARM_STATIC_INLINE +#define __ARM_STATIC_INLINE static inline +#endif + #ifdef __cplusplus extern "C" { #endif @@ -245,7 +249,7 @@ extern "C" { return tmp; } - static inline _Unwind_Word + __ARM_STATIC_INLINE _Unwind_Word _Unwind_GetGR (_Unwind_Context *context, int regno) { _uw val; @@ -253,6 +257,12 @@ extern "C" { return val; } + __ARM_STATIC_INLINE void + _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) + { + _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); + } + #ifndef __FreeBSD__ /* Return the address of the instruction, not the actual IP value. */ #define _Unwind_GetIP(context) \ @@ -260,21 +270,16 @@ extern "C" { #define _Unwind_GetIPInfo(context, ip_before_insn) \ (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) -#else - _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); - _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); -#endif - - static inline void - _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val) - { - _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val); - } /* The dwarf unwinder doesn't understand arm/thumb state. We assume the landing pad uses the same instruction set as the call site. */ #define _Unwind_SetIP(context, val) \ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)) +#else + _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); + _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); + void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr); +#endif #ifdef __cplusplus } /* extern "C" */ From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 15:28:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0061A1C5; Sun, 1 Feb 2015 15:28:22 +0000 (UTC) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB223BE; Sun, 1 Feb 2015 15:28:22 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::2844:fbf7:162f:3ca] (unknown [IPv6:2001:7b8:3a7:0:2844:fbf7:162f:3ca]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 9669A5C2E; Sun, 1 Feb 2015 16:28:17 +0100 (CET) Subject: Re: svn commit: r278004 - head/sys/dev/drm2/radeon Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 (755500a+) From: Dimitry Andric In-Reply-To: <20150201153237.Q867@besplex.bde.org> Date: Sun, 1 Feb 2015 16:28:16 +0100 Message-Id: References: <201501312218.t0VMIr7m035695@svn.freebsd.org> <20150201153237.Q867@besplex.bde.org> To: Bruce Evans X-Mailer: Apple Mail (2.2070.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 15:28:23 -0000 --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 01 Feb 2015, at 06:00, Bruce Evans wrote: > > On Sat, 31 Jan 2015, Dimitry Andric wrote: > >> Log: >> Constify a number of accesses in drm2's radeon drivers to avoid >> -Wcast-qual warnings. No functional change. > > This is much better than using __DECONST(), but still has bogus casts. ... > > Anyway, it is clearer to point to the > first element: > > io_mc_regs = &barts_io_mc_regs[0][0]; Thanks, I've put that up for review, here: https://reviews.freebsd.org/D1748 -Dimitry --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.26 iEYEARECAAYFAlTORhMACgkQsF6jCi4glqM3NwCeLTSFKvX2gnHwWJ3vZM5vpAYy NDYAn1eNWGEI6GipkgV4KkGhF1vSkqXE =lkrW -----END PGP SIGNATURE----- --Apple-Mail=_55BEC5ED-C86D-4836-9F47-35B16CC5E65F-- From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 17:19:58 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB6AF348; Sun, 1 Feb 2015 17:19:58 +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 C7F18C6C; Sun, 1 Feb 2015 17:19:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11HJwSu091385; Sun, 1 Feb 2015 17:19:58 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11HJwtc091383; Sun, 1 Feb 2015 17:19:58 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502011719.t11HJwtc091383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 1 Feb 2015 17:19:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278031 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 17:19:59 -0000 Author: ian Date: Sun Feb 1 17:19:57 2015 New Revision: 278031 URL: https://svnweb.freebsd.org/changeset/base/278031 Log: Remove a stale comment. The logic that deleted the map before other resources was removed long ago, but the comment stuck somehow. Modified: head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/arm/arm/busdma_machdep-v6.c ============================================================================== --- head/sys/arm/arm/busdma_machdep-v6.c Sun Feb 1 14:45:41 2015 (r278030) +++ head/sys/arm/arm/busdma_machdep-v6.c Sun Feb 1 17:19:57 2015 (r278031) @@ -858,8 +858,6 @@ bus_dmamem_free(bus_dma_tag_t dmat, void else ba = standard_allocator; - /* Be careful not to access map from here on. */ - bufzone = busdma_bufalloc_findzone(ba, dmat->maxsize); if (bufzone != NULL && dmat->alignment <= bufzone->size && From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 18:21:17 2015 Return-Path: Delivered-To: svn-src-head@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 61971D30; Sun, 1 Feb 2015 18:21:17 +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 4D5E825C; Sun, 1 Feb 2015 18:21:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11ILHI4023284; Sun, 1 Feb 2015 18:21:17 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11ILHCo023283; Sun, 1 Feb 2015 18:21:17 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502011821.t11ILHCo023283@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 1 Feb 2015 18:21:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278032 - head/sys/boot/fdt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 18:21:17 -0000 Author: ian Date: Sun Feb 1 18:21:16 2015 New Revision: 278032 URL: https://svnweb.freebsd.org/changeset/base/278032 Log: Do not skip setting the memory 'reg' property if the fdt data already contains one. Published dts source often includes a minimal default memory definition and expects it to be overridden by the bootloader after determining the actual physical memory in the system. Modified: head/sys/boot/fdt/fdt_loader_cmd.c Modified: head/sys/boot/fdt/fdt_loader_cmd.c ============================================================================== --- head/sys/boot/fdt/fdt_loader_cmd.c Sun Feb 1 17:19:57 2015 (r278031) +++ head/sys/boot/fdt/fdt_loader_cmd.c Sun Feb 1 18:21:16 2015 (r278032) @@ -566,17 +566,6 @@ fdt_fixup_memory(struct fdt_mem_region * return; } - if ((reg = (uint32_t *)fdt_getprop(fdtp, memory, "reg", - &len)) != NULL) { - - if (fdt_reg_valid(reg, len, addr_cells, size_cells) == 0) - /* - * Do not apply fixup if existing 'reg' property - * seems to be valid. - */ - return; - } - len = (addr_cells + size_cells) * realmrno * sizeof(uint32_t); sb = buf = (uint8_t *)malloc(len); if (!buf) From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 19:56:21 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1189FE3D; Sun, 1 Feb 2015 19:56:21 +0000 (UTC) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB50AC52; Sun, 1 Feb 2015 19:56:20 +0000 (UTC) Received: by mail-pa0-f54.google.com with SMTP id eu11so73502019pac.13; Sun, 01 Feb 2015 11:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=YvwL6LiIkbOSJvPhWrfOOUX0BimMkM23P4i7NxGn3N0=; b=0Vt0Bw+ZEJu2anWpzyTLe7OHbOPcmwV2QEFo2siBgwHnZmkcEjStPM6w8gC/7cSPFD 0a8aJyF8jM+ly5E5KqDhnzugzyYGEVMibi6yOawDdb7+YORS+nd14uoi7wsCw4pQm68q Wda77fiLNCQ72EOpDbchiFi5bBWrSxB/JwjhHTrWEtbag4o0m964q/dcfgr4dtaJvj+V hP1SlJvNsIFK20QOhgOVEk5xXB7ipC/xEosxhv7gA7FWxNhNUpbVpn/hgEgwdaLUOb7v Mrt3mHHTPbN8NnFwkURe1l853K3bSHhghEIZecDyYA182FbEhDiWPouLFQQynxz+9nXT DKoQ== X-Received: by 10.70.88.231 with SMTP id bj7mr24033013pdb.168.1422820579849; Sun, 01 Feb 2015 11:56:19 -0800 (PST) Received: from localhost (c-76-21-76-83.hsd1.ca.comcast.net. [76.21.76.83]) by mx.google.com with ESMTPSA id xw1sm16891257pac.47.2015.02.01.11.56.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 11:56:19 -0800 (PST) Sender: Gleb Kurtsou Date: Sun, 1 Feb 2015 11:57:29 -0800 From: Gleb Kurtsou To: Ivan Klymenko Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms Message-ID: <20150201195729.GA1990@reks> Mail-Followup-To: Ivan Klymenko , "Max N. Boyarov" , Konstantin Belousov , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150122121551.77a7a9fb@nonamehost.local> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Konstantin Belousov , "Max N. Boyarov" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 19:56:21 -0000 On (22/01/2015 12:15), Ivan Klymenko wrote: > В Thu, 22 Jan 2015 11:18:37 +0300 > "Max N. Boyarov" пишет: > > > On Wed, Jan 21, 2015 at 7:10 PM, Konstantin Belousov > > wrote: > > > Author: kib > > > Date: Wed Jan 21 16:10:37 2015 > > > New Revision: 277487 > > > URL: https://svnweb.freebsd.org/changeset/base/277487 > > > > > > Log: > > > An update for the i915 GPU driver, which brings the code up to > > > Linux commit 4d93914ae3db4a897ead4b. Some related drm > > > infrastructure changes are imported as needed. > > > > > > Biggest update is the rewrite of the i915 gem io to more closely > > > follow Linux model, althought the mechanism used by FreeBSD port > > > is different. > > > > > > Sponsored by: The FreeBSD Foundation > > > MFC after: 2 month > > > > Hi, after this commit i have many error messages like: > > > > error: [drm:pid1121:gen6_sanitize_pm] *ERROR* Power management > > discrepancy: GEN6_RP_INTERRUPT_LIMITS expected 18070000, was 18000000 I'm seeing the same errors. I've also noticed that my laptop started to overheat (up to 96 C). It was mostly idle, cpu usage at few percent, freq lowered by powerd, nothing cpu intensive running, web browser, terminals, etc. My initial suspect was recent TSC changes regarding C2/C3 sleep states. But reverting this commit seems to get situation back to normal. Did anybody else experience similar issues? From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 20:00:09 2015 Return-Path: Delivered-To: svn-src-head@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 B97F293; Sun, 1 Feb 2015 20:00:09 +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 A580AC95; Sun, 1 Feb 2015 20:00:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11K092i069533; Sun, 1 Feb 2015 20:00:09 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11K09AD069530; Sun, 1 Feb 2015 20:00:09 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201502012000.t11K09AD069530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Sun, 1 Feb 2015 20:00:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278034 - head/sys/dev/ahci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:00:09 -0000 Author: smh Date: Sun Feb 1 20:00:08 2015 New Revision: 278034 URL: https://svnweb.freebsd.org/changeset/base/278034 Log: Add a quirk to limit AHCI MSI vectors to one In 10.1-RELEASE the default number of MSI vectors used was changed from one to as many vectors as the HW supports. This change resulted in an ahci timeouts regression when running on AMD SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using this new quirk. MFC after: 2 weeks Sponsored by: Multiplay Modified: head/sys/dev/ahci/ahci.h head/sys/dev/ahci/ahci_pci.c Modified: head/sys/dev/ahci/ahci.h ============================================================================== --- head/sys/dev/ahci/ahci.h Sun Feb 1 19:07:42 2015 (r278033) +++ head/sys/dev/ahci/ahci.h Sun Feb 1 20:00:08 2015 (r278034) @@ -556,26 +556,27 @@ enum ahci_err_type { bus_write_multi_stream_4((res), (offset), (addr), (count)) -#define AHCI_Q_NOFORCE 1 -#define AHCI_Q_NOPMP 2 -#define AHCI_Q_NONCQ 4 -#define AHCI_Q_1CH 8 -#define AHCI_Q_2CH 0x10 -#define AHCI_Q_4CH 0x20 -#define AHCI_Q_EDGEIS 0x40 -#define AHCI_Q_SATA2 0x80 -#define AHCI_Q_NOBSYRES 0x100 -#define AHCI_Q_NOAA 0x200 -#define AHCI_Q_NOCOUNT 0x400 -#define AHCI_Q_ALTSIG 0x800 -#define AHCI_Q_NOMSI 0x1000 -#define AHCI_Q_ATI_PMP_BUG 0x2000 -#define AHCI_Q_MAXIO_64K 0x4000 -#define AHCI_Q_SATA1_UNIT0 0x8000 /* need better method for this */ -#define AHCI_Q_ABAR0 0x10000 +#define AHCI_Q_NOFORCE 0x00000001 +#define AHCI_Q_NOPMP 0x00000002 +#define AHCI_Q_NONCQ 0x00000004 +#define AHCI_Q_1CH 0x00000008 +#define AHCI_Q_2CH 0x00000010 +#define AHCI_Q_4CH 0x00000020 +#define AHCI_Q_EDGEIS 0x00000040 +#define AHCI_Q_SATA2 0x00000080 +#define AHCI_Q_NOBSYRES 0x00000100 +#define AHCI_Q_NOAA 0x00000200 +#define AHCI_Q_NOCOUNT 0x00000400 +#define AHCI_Q_ALTSIG 0x00000800 +#define AHCI_Q_NOMSI 0x00001000 +#define AHCI_Q_ATI_PMP_BUG 0x00002000 +#define AHCI_Q_MAXIO_64K 0x00004000 +#define AHCI_Q_SATA1_UNIT0 0x00008000 /* need better method for this */ +#define AHCI_Q_ABAR0 0x00010000 +#define AHCI_Q_1MSI 0x00020000 #define AHCI_Q_BIT_STRING \ - "\020" \ + "\021" \ "\001NOFORCE" \ "\002NOPMP" \ "\003NONCQ" \ @@ -592,7 +593,8 @@ enum ahci_err_type { "\016ATI_PMP_BUG" \ "\017MAXIO_64K" \ "\020SATA1_UNIT0" \ - "\021ABAR0" + "\021ABAR0" \ + "\0221MSI" int ahci_attach(device_t dev); int ahci_detach(device_t dev); Modified: head/sys/dev/ahci/ahci_pci.c ============================================================================== --- head/sys/dev/ahci/ahci_pci.c Sun Feb 1 19:07:42 2015 (r278033) +++ head/sys/dev/ahci/ahci_pci.c Sun Feb 1 20:00:08 2015 (r278034) @@ -55,12 +55,17 @@ static const struct { int quirks; } ahci_ids[] = { {0x43801002, 0x00, "AMD SB600", - AHCI_Q_NOMSI | AHCI_Q_ATI_PMP_BUG | AHCI_Q_MAXIO_64K}, - {0x43901002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43911002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43921002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43931002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, - {0x43941002, 0x00, "AMD SB7x0/SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, + AHCI_Q_NOMSI | AHCI_Q_ATI_PMP_BUG | AHCI_Q_MAXIO_64K}, + {0x43901002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43911002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43921002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43931002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, + {0x43941002, 0x00, "AMD SB7x0/SB8x0/SB9x0", + AHCI_Q_ATI_PMP_BUG | AHCI_Q_1MSI}, /* Not sure SB8x0/SB9x0 needs this quirk. Be conservative though */ {0x43951002, 0x00, "AMD SB8x0/SB9x0", AHCI_Q_ATI_PMP_BUG}, {0x78001022, 0x00, "AMD Hudson-2", 0}, @@ -137,7 +142,7 @@ static const struct { {0x1f378086, 0x00, "Intel Avoton (RAID)", 0}, {0x1f3e8086, 0x00, "Intel Avoton (RAID)", 0}, {0x1f3f8086, 0x00, "Intel Avoton (RAID)", 0}, - {0x23a38086, 0x00, "Intel Coleto Creek", 0}, + {0x23a38086, 0x00, "Intel Coleto Creek", 0}, {0x28238086, 0x00, "Intel Wellsburg (RAID)", 0}, {0x28278086, 0x00, "Intel Wellsburg (RAID)", 0}, {0x8c028086, 0x00, "Intel Lynx Point", 0}, @@ -410,10 +415,13 @@ ahci_pci_attach(device_t dev) /* Setup interrupts. */ /* Setup MSI register parameters */ - ctlr->msi = 2; /* Process hints. */ if (ctlr->quirks & AHCI_Q_NOMSI) ctlr->msi = 0; + else if (ctlr->quirks & AHCI_Q_1MSI) + ctlr->msi = 1; + else + ctlr->msi = 2; resource_int_value(device_get_name(dev), device_get_unit(dev), "msi", &ctlr->msi); ctlr->numirqs = 1; From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 20:31:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3334EDBB; Sun, 1 Feb 2015 20:31:37 +0000 (UTC) Received: from mail-wg0-x22a.google.com (mail-wg0-x22a.google.com [IPv6:2a00:1450:400c:c00::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B4933FCA; Sun, 1 Feb 2015 20:31:36 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id x13so35514921wgg.1; Sun, 01 Feb 2015 12:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=wqLfV78u8m31PRXvLTUedccm2WAmaXc0+kfjNOOBPg4=; b=lmOc6giW1SryagowNnMxBVV55hQ0UxpbVp/pa7JYvAgLs24Trua83pvbMGdPCCHOv2 U0CfAGksu4E8xN69sASyQU4dn5YCHOdvzcjaP+fU5JNSzeVQtblGSR8N1WnfOCjj4ajD aFRk6yB26gK4/wEbVEitWbPxVeN5zjrc2uvMMXN8mlZgF+J2L5K7nBywlXiI4tP4r4AW /8n9is0MrFNqS8NIHCF+ST+N+vSOI8FPCzcs1UejAI3qNC6ADpnoGytQ6sN17bbVUah5 UYjgD2QxvJXIdprnSpU0Mlm3BnrdHN1/w//gyMXFg9maXREjLUGrtLz7pKvipzrUKZ5Z nnhQ== X-Received: by 10.180.83.129 with SMTP id q1mr17188786wiy.8.1422822695122; Sun, 01 Feb 2015 12:31:35 -0800 (PST) Received: from brick.home (aeds165.neoplus.adsl.tpnet.pl. [79.186.96.165]) by mx.google.com with ESMTPSA id li7sm16703328wic.4.2015.02.01.12.31.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 12:31:34 -0800 (PST) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Date: Sun, 1 Feb 2015 21:31:32 +0100 From: Edward Tomasz =?utf-8?Q?Napiera=C5=82a?= To: Steven Hartland Subject: Re: svn commit: r278034 - head/sys/dev/ahci Message-ID: <20150201203132.GA30253@brick.home> Mail-Followup-To: Steven Hartland , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201502012000.t11K09AD069530@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201502012000.t11K09AD069530@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 20:31:37 -0000 On 0201T2000, Steven Hartland wrote: > Author: smh > Date: Sun Feb 1 20:00:08 2015 > New Revision: 278034 > URL: https://svnweb.freebsd.org/changeset/base/278034 > > Log: > Add a quirk to limit AHCI MSI vectors to one > > In 10.1-RELEASE the default number of MSI vectors used was changed from one > to as many vectors as the HW supports. > > This change resulted in an ahci timeouts regression when running on AMD > SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using > this new quirk. Could it fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195349? From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 21:27:16 2015 Return-Path: Delivered-To: svn-src-head@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 1E80285F; Sun, 1 Feb 2015 21:27:16 +0000 (UTC) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D2970807; Sun, 1 Feb 2015 21:27:15 +0000 (UTC) Received: by mail-ig0-f176.google.com with SMTP id hl2so14186965igb.3; Sun, 01 Feb 2015 13:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=XcKPFxCohcFuM8PwEeO9vXHDsFg87n0DuFdalFznT3k=; b=mizeroasBUTa97WVl8YrVROhmNcHSVeNNEssWbRNYBdQY4QNYh7WBQPTuW4s0Cq3Dh /K3jPrGDeTaygIpl/C1BAKXDTiVj7e8cCQk4jQCcl74VRA6COKofUgmTzaaEjoaNwjzm hOpdtXFypJXWQno29hvexoqS10rnRAGgS20SFk/Fv8aLDQHlEJ7MsOPjYsRfr1sVAtHF lCgMtwr1bzDzsSO/hZBmjkxR/8h2TUGmgk/vdsU/vbX+OtswnVDTC0gMVoy54W9ueZwh XMNJKujr35zfhDWBKViwZHmrN3kxJASr+IQiRHDpdaqh2AFEOpFMM1Lg+snzfUYnBOQC LNfQ== MIME-Version: 1.0 X-Received: by 10.50.107.7 with SMTP id gy7mr8378914igb.49.1422826035258; Sun, 01 Feb 2015 13:27:15 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 13:27:15 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 13:27:15 -0800 (PST) In-Reply-To: <20150201195729.GA1990@reks> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> Date: Sun, 1 Feb 2015 13:27:15 -0800 Message-ID: Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms From: Adrian Chadd To: svn-src-head@freebsd.org, Konstantin Belousov , svn-src-all@freebsd.org, src-committers@freebsd.org, Ivan Klymenko , "Max N. Boyarov" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 21:27:16 -0000 Try enabling rc6 sleep state in i915 and see what happens. I found that the package wasn't going to sleep without it. Bapt also found the same thing. I haven't chased up to see if enabling rc6 restored thing. Which hardware is this on? Adrian On Feb 1, 2015 11:56 AM, "Gleb Kurtsou" wrote: > On (22/01/2015 12:15), Ivan Klymenko wrote: > > =D0=92 Thu, 22 Jan 2015 11:18:37 +0300 > > "Max N. Boyarov" =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > > > > On Wed, Jan 21, 2015 at 7:10 PM, Konstantin Belousov > > > wrote: > > > > Author: kib > > > > Date: Wed Jan 21 16:10:37 2015 > > > > New Revision: 277487 > > > > URL: https://svnweb.freebsd.org/changeset/base/277487 > > > > > > > > Log: > > > > An update for the i915 GPU driver, which brings the code up to > > > > Linux commit 4d93914ae3db4a897ead4b. Some related drm > > > > infrastructure changes are imported as needed. > > > > > > > > Biggest update is the rewrite of the i915 gem io to more closely > > > > follow Linux model, althought the mechanism used by FreeBSD port > > > > is different. > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > MFC after: 2 month > > > > > > Hi, after this commit i have many error messages like: > > > > > > error: [drm:pid1121:gen6_sanitize_pm] *ERROR* Power management > > > discrepancy: GEN6_RP_INTERRUPT_LIMITS expected 18070000, was 18000000 > > I'm seeing the same errors. I've also noticed that my laptop started to > overheat (up to 96 C). It was mostly idle, cpu usage at few percent, > freq lowered by powerd, nothing cpu intensive running, web browser, > terminals, etc. > > My initial suspect was recent TSC changes regarding C2/C3 sleep states. > But reverting this commit seems to get situation back to normal. > Did anybody else experience similar issues? > > From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 21:50:32 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1449AFB8; Sun, 1 Feb 2015 21:50:32 +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 F33B59F3; Sun, 1 Feb 2015 21:50:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11LoVHC024601; Sun, 1 Feb 2015 21:50:31 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11LoSfT024581; Sun, 1 Feb 2015 21:50:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201502012150.t11LoSfT024581@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 1 Feb 2015 21:50:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278037 - in head: sys/cam/ctl usr.sbin/ctladm usr.sbin/ctld X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 21:50:32 -0000 Author: mav Date: Sun Feb 1 21:50:28 2015 New Revision: 278037 URL: https://svnweb.freebsd.org/changeset/base/278037 Log: CTL LUN mapping rewrite. Replace iSCSI-specific LUN mapping mechanism with new one, working for any ports. By default all ports are created without LUN mapping, exposing all CTL LUNs as before. But, if needed, LUN mapping can be manually set on per-port basis via ctladm. For its iSCSI ports ctld does it via ioctl(2). The next step will be to teach ctld to work with FibreChannel ports also. Respecting additional flexibility of the new mechanism, ctl.conf now allows alternative syntax for LUN definition. LUNs can now be defined in global context, and then referenced from targets by unique name, as needed. It allows same LUN to be exposed several times via multiple targets. While there, increase limit for LUNs per target in ctld from 256 to 1024. Some initiators do not support LUNs above 255, but that is not our problem. Discussed with: trasz MFC after: 2 weeks Relnotes: yes Sponsored by: iXsystems, Inc. Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_frontend.c head/sys/cam/ctl/ctl_frontend.h head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_frontend_iscsi.h head/sys/cam/ctl/ctl_ioctl.h head/sys/cam/ctl/ctl_private.h head/sys/cam/ctl/ctl_tpc_local.c head/usr.sbin/ctladm/ctladm.8 head/usr.sbin/ctladm/ctladm.c head/usr.sbin/ctld/ctl.conf.5 head/usr.sbin/ctld/ctld.c head/usr.sbin/ctld/ctld.h head/usr.sbin/ctld/kernel.c head/usr.sbin/ctld/parse.y Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl.c Sun Feb 1 21:50:28 2015 (r278037) @@ -398,12 +398,11 @@ static int ctl_ioctl_fill_ooa(struct ctl struct ctl_ooa_entry *kern_entries); static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); -static uint32_t ctl_map_lun(struct ctl_softc *softc, int port_num, uint32_t lun); -static uint32_t ctl_map_lun_back(struct ctl_softc *softc, int port_num, uint32_t lun); static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun, struct ctl_be_lun *be_lun, struct ctl_id target_id); static int ctl_free_lun(struct ctl_lun *lun); static void ctl_create_lun(struct ctl_be_lun *be_lun); +static struct ctl_port * ctl_io_port(struct ctl_io_hdr *io_hdr); /** static void ctl_failover_change_pages(struct ctl_softc *softc, struct ctl_scsiio *ctsio, int master); @@ -3411,6 +3410,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, struct ctl_lun_list *list; struct ctl_option *opt; int j; + uint32_t plun; list = (struct ctl_lun_list *)addr; @@ -3491,6 +3491,18 @@ ctl_ioctl(struct cdev *dev, u_long cmd, break; } + if (port->lun_map != NULL) { + sbuf_printf(sb, "\ton\n"); + for (j = 0; j < CTL_MAX_LUNS; j++) { + plun = ctl_lun_map_from_port(port, j); + if (plun >= CTL_MAX_LUNS) + continue; + sbuf_printf(sb, + "\t%u\n", + j, plun); + } + } + for (j = 0; j < CTL_MAX_INIT_PER_PORT; j++) { if (port->wwpn_iid[j].in_use == 0 || (port->wwpn_iid[j].wwpn == 0 && @@ -3538,6 +3550,38 @@ ctl_ioctl(struct cdev *dev, u_long cmd, sbuf_delete(sb); break; } + case CTL_LUN_MAP: { + struct ctl_lun_map *lm = (struct ctl_lun_map *)addr; + struct ctl_port *port; + + mtx_lock(&softc->ctl_lock); + if (lm->port >= CTL_MAX_PORTS || + (port = softc->ctl_ports[lm->port]) == NULL) { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + if (lm->plun < CTL_MAX_LUNS) { + if (lm->lun == UINT32_MAX) + retval = ctl_lun_map_unset(port, lm->plun); + else if (lm->lun < CTL_MAX_LUNS && + softc->ctl_luns[lm->lun] != NULL) + retval = ctl_lun_map_set(port, lm->plun, lm->lun); + else { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + } else if (lm->plun == UINT32_MAX) { + if (lm->lun == UINT32_MAX) + retval = ctl_lun_map_deinit(port); + else + retval = ctl_lun_map_init(port); + } else { + mtx_unlock(&softc->ctl_lock); + return (ENXIO); + } + mtx_unlock(&softc->ctl_lock); + break; + } default: { /* XXX KDM should we fix this? */ #if 0 @@ -3602,35 +3646,106 @@ ctl_port_idx(int port_num) return(port_num - CTL_MAX_PORTS); } -static uint32_t -ctl_map_lun(struct ctl_softc *softc, int port_num, uint32_t lun_id) +int +ctl_lun_map_init(struct ctl_port *port) +{ + uint32_t i; + + if (port->lun_map == NULL) + port->lun_map = malloc(sizeof(uint32_t) * CTL_MAX_LUNS, + M_CTL, M_NOWAIT); + if (port->lun_map == NULL) + return (ENOMEM); + for (i = 0; i < CTL_MAX_LUNS; i++) + port->lun_map[i] = UINT32_MAX; + return (0); +} + +int +ctl_lun_map_deinit(struct ctl_port *port) +{ + + if (port->lun_map == NULL) + return (0); + free(port->lun_map, M_CTL); + port->lun_map = NULL; + return (0); +} + +int +ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun) +{ + int status; + + if (port->lun_map == NULL) { + status = ctl_lun_map_init(port); + if (status != 0) + return (status); + } + port->lun_map[plun] = glun; + return (0); +} + +int +ctl_lun_map_unset(struct ctl_port *port, uint32_t plun) +{ + + if (port->lun_map == NULL) + return (0); + port->lun_map[plun] = UINT32_MAX; + return (0); +} + +int +ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun) +{ + int i; + + if (port->lun_map == NULL) + return (0); + for (i = 0; i < CTL_MAX_LUNS; i++) { + if (port->lun_map[i] == glun) + port->lun_map[i] = UINT32_MAX; + } + return (0); +} + +uint32_t +ctl_lun_map_from_port(struct ctl_port *port, uint32_t lun_id) { - struct ctl_port *port; - port = softc->ctl_ports[ctl_port_idx(port_num)]; if (port == NULL) return (UINT32_MAX); - if (port->lun_map == NULL) + if (port->lun_map == NULL || lun_id >= CTL_MAX_LUNS) return (lun_id); - return (port->lun_map(port->targ_lun_arg, lun_id)); + return (port->lun_map[lun_id]); } -static uint32_t -ctl_map_lun_back(struct ctl_softc *softc, int port_num, uint32_t lun_id) +uint32_t +ctl_lun_map_to_port(struct ctl_port *port, uint32_t lun_id) { - struct ctl_port *port; uint32_t i; - port = softc->ctl_ports[ctl_port_idx(port_num)]; + if (port == NULL) + return (UINT32_MAX); if (port->lun_map == NULL) return (lun_id); for (i = 0; i < CTL_MAX_LUNS; i++) { - if (port->lun_map(port->targ_lun_arg, i) == lun_id) + if (port->lun_map[i] == lun_id) return (i); } return (UINT32_MAX); } +static struct ctl_port * +ctl_io_port(struct ctl_io_hdr *io_hdr) +{ + int port_num; + + port_num = io_hdr->nexus.targ_port; + return (control_softc->ctl_ports[ctl_port_idx(port_num)]); +} + /* * Note: This only works for bitmask sizes that are at least 32 bits, and * that are a power of 2. @@ -4676,9 +4791,7 @@ static int ctl_free_lun(struct ctl_lun *lun) { struct ctl_softc *softc; -#if 0 struct ctl_port *port; -#endif struct ctl_lun *nlun; int i; @@ -4686,6 +4799,9 @@ ctl_free_lun(struct ctl_lun *lun) mtx_assert(&softc->ctl_lock, MA_OWNED); + STAILQ_FOREACH(port, &softc->port_list, links) + ctl_lun_map_unsetg(port, lun->lun); + STAILQ_REMOVE(&softc->lun_list, lun, ctl_lun, links); ctl_clear_mask(softc->ctl_lun_mask, lun->lun); @@ -7343,8 +7459,7 @@ ctl_report_tagret_port_groups(struct ctl STAILQ_FOREACH(port, &softc->port_list, links) { if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; - if (ctl_map_lun_back(softc, port->targ_port, lun->lun) >= - CTL_MAX_LUNS) + if (ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; num_target_ports++; } @@ -7417,8 +7532,7 @@ ctl_report_tagret_port_groups(struct ctl STAILQ_FOREACH(port, &softc->port_list, links) { if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; - if (ctl_map_lun_back(softc, port->targ_port, lun->lun) - >= CTL_MAX_LUNS) + if (ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS; scsi_ulto2b(p, tpg_desc->descriptors[pc]. @@ -9260,6 +9374,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio struct scsi_report_luns *cdb; struct scsi_report_luns_data *lun_data; struct ctl_lun *lun, *request_lun; + struct ctl_port *port; int num_luns, retval; uint32_t alloc_len, lun_datalen; int num_filled, well_known; @@ -9316,6 +9431,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio request_lun = (struct ctl_lun *) ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr; + port = ctl_io_port(&ctsio->io_hdr); lun_datalen = sizeof(*lun_data) + (num_luns * sizeof(struct scsi_report_luns_lundata)); @@ -9328,8 +9444,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio mtx_lock(&softc->ctl_lock); for (targ_lun_id = 0, num_filled = 0; targ_lun_id < CTL_MAX_LUNS && num_filled < num_luns; targ_lun_id++) { - lun_id = ctl_map_lun(softc, ctsio->io_hdr.nexus.targ_port, - targ_lun_id); + lun_id = ctl_lun_map_from_port(port, targ_lun_id); if (lun_id >= CTL_MAX_LUNS) continue; lun = softc->ctl_luns[lun_id]; @@ -10014,8 +10129,7 @@ ctl_inquiry_evpd_scsi_ports(struct ctl_s if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; if (lun != NULL && - ctl_map_lun_back(softc, port->targ_port, lun->lun) >= - CTL_MAX_LUNS) + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; num_target_ports++; if (port->init_devid) @@ -10068,8 +10182,7 @@ ctl_inquiry_evpd_scsi_ports(struct ctl_s if ((port->status & CTL_PORT_STATUS_ONLINE) == 0) continue; if (lun != NULL && - ctl_map_lun_back(softc, port->targ_port, lun->lun) - >= CTL_MAX_LUNS) + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) continue; p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS; scsi_ulto2b(p, pd->relative_port_id); @@ -13745,6 +13858,7 @@ int ctl_queue_sense(union ctl_io *io) { struct ctl_lun *lun; + struct ctl_port *port; struct ctl_softc *softc; uint32_t initidx, targ_lun; @@ -13765,8 +13879,8 @@ ctl_queue_sense(union ctl_io *io) * If we don't have a LUN for this, just toss the sense * information. */ - targ_lun = io->io_hdr.nexus.targ_lun; - targ_lun = ctl_map_lun(softc, io->io_hdr.nexus.targ_port, targ_lun); + port = ctl_io_port(&ctsio->io_hdr); + targ_lun = ctl_lun_map_from_port(port, io->io_hdr.nexus.targ_lun); if ((targ_lun < CTL_MAX_LUNS) && (softc->ctl_luns[targ_lun] != NULL)) lun = softc->ctl_luns[targ_lun]; @@ -13806,6 +13920,7 @@ bailout: int ctl_queue(union ctl_io *io) { + struct ctl_port *port; CTL_DEBUG_PRINT(("ctl_queue cdb[0]=%02X\n", io->scsiio.cdb[0])); @@ -13815,9 +13930,9 @@ ctl_queue(union ctl_io *io) #endif /* CTL_TIME_IO */ /* Map FE-specific LUN ID into global one. */ + port = ctl_io_port(&io->io_hdr); io->io_hdr.nexus.targ_mapped_lun = - ctl_map_lun(control_softc, io->io_hdr.nexus.targ_port, - io->io_hdr.nexus.targ_lun); + ctl_lun_map_from_port(port, io->io_hdr.nexus.targ_lun); switch (io->io_hdr.io_type) { case CTL_IO_SCSI: Modified: head/sys/cam/ctl/ctl_frontend.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend.c Sun Feb 1 21:50:28 2015 (r278037) @@ -234,6 +234,7 @@ ctl_port_deregister(struct ctl_port *por ctl_pool_free(pool); ctl_free_opts(&port->options); + ctl_lun_map_deinit(port); free(port->port_devid, M_CTL); port->port_devid = NULL; free(port->target_devid, M_CTL); Modified: head/sys/cam/ctl/ctl_frontend.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend.h Sun Feb 1 21:50:28 2015 (r278037) @@ -51,7 +51,6 @@ typedef void (*fe_shutdown_t)(void); typedef void (*port_func_t)(void *onoff_arg); typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb); typedef int (*lun_func_t)(void *arg, struct ctl_id targ_id, int lun_id); -typedef uint32_t (*lun_map_func_t)(void *arg, uint32_t lun_id); typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); @@ -226,7 +225,7 @@ struct ctl_port { void *onoff_arg; /* passed to CTL */ lun_func_t lun_enable; /* passed to CTL */ lun_func_t lun_disable; /* passed to CTL */ - lun_map_func_t lun_map; /* passed to CTL */ + uint32_t *lun_map; /* passed to CTL */ void *targ_lun_arg; /* passed to CTL */ void (*fe_datamove)(union ctl_io *io); /* passed to CTL */ void (*fe_done)(union ctl_io *io); /* passed to CTL */ Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Feb 1 21:50:28 2015 (r278037) @@ -151,7 +151,6 @@ static int cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id); -static uint32_t cfiscsi_lun_map(void *arg, uint32_t lun); static int cfiscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td); static void cfiscsi_datamove(union ctl_io *io); @@ -2031,7 +2030,6 @@ cfiscsi_ioctl_port_create(struct ctl_req port->onoff_arg = ct; port->lun_enable = cfiscsi_lun_enable; port->lun_disable = cfiscsi_lun_disable; - port->lun_map = cfiscsi_lun_map; port->targ_lun_arg = ct; port->fe_datamove = cfiscsi_datamove; port->fe_done = cfiscsi_done; @@ -2081,7 +2079,7 @@ cfiscsi_ioctl_port_create(struct ctl_req free(port->target_devid, M_CFISCSI); req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "ctl_frontend_register() failed with error %d", retval); + "ctl_port_register() failed with error %d", retval); return; } done: @@ -2259,7 +2257,6 @@ cfiscsi_target_find_or_create(struct cfi const char *alias) { struct cfiscsi_target *ct, *newct; - int i; if (name[0] == '\0' || strlen(name) >= CTL_ISCSI_NAME_LEN) return (NULL); @@ -2277,9 +2274,6 @@ cfiscsi_target_find_or_create(struct cfi return (ct); } - for (i = 0; i < CTL_MAX_LUNS; i++) - newct->ct_luns[i] = UINT32_MAX; - strlcpy(newct->ct_name, name, sizeof(newct->ct_name)); if (alias != NULL) strlcpy(newct->ct_alias, alias, sizeof(newct->ct_alias)); @@ -2294,108 +2288,17 @@ cfiscsi_target_find_or_create(struct cfi return (newct); } -/* - * Takes LUN from the target space and returns LUN from the CTL space. - */ -static uint32_t -cfiscsi_lun_map(void *arg, uint32_t lun) -{ - struct cfiscsi_target *ct = arg; - - if (lun >= CTL_MAX_LUNS) { - CFISCSI_DEBUG("requested lun number %d is higher " - "than maximum %d", lun, CTL_MAX_LUNS - 1); - return (UINT32_MAX); - } - return (ct->ct_luns[lun]); -} - -static int -cfiscsi_target_set_lun(struct cfiscsi_target *ct, - unsigned long lun_id, unsigned long ctl_lun_id) -{ - - if (lun_id >= CTL_MAX_LUNS) { - CFISCSI_WARN("requested lun number %ld is higher " - "than maximum %d", lun_id, CTL_MAX_LUNS - 1); - return (-1); - } - - if (ct->ct_luns[lun_id] < CTL_MAX_LUNS) { - /* - * CTL calls cfiscsi_lun_enable() twice for each LUN - once - * when the LUN is created, and a second time just before - * the port is brought online; don't emit warnings - * for that case. - */ - if (ct->ct_luns[lun_id] == ctl_lun_id) - return (0); - CFISCSI_WARN("lun %ld already allocated", lun_id); - return (-1); - } - -#if 0 - CFISCSI_DEBUG("adding mapping for lun %ld, target %s " - "to ctl lun %ld", lun_id, ct->ct_name, ctl_lun_id); -#endif - - ct->ct_luns[lun_id] = ctl_lun_id; - - return (0); -} - static int cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) { - struct cfiscsi_softc *softc; - struct cfiscsi_target *ct; - const char *target = NULL; - const char *lun = NULL; - unsigned long tmp; - - ct = (struct cfiscsi_target *)arg; - softc = ct->ct_softc; - - target = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options, - "cfiscsi_target"); - lun = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options, - "cfiscsi_lun"); - - if (target == NULL && lun == NULL) - return (0); - - if (target == NULL || lun == NULL) { - CFISCSI_WARN("lun added with cfiscsi_target, but without " - "cfiscsi_lun, or the other way around; ignoring"); - return (0); - } - - if (strcmp(target, ct->ct_name) != 0) - return (0); - tmp = strtoul(lun, NULL, 10); - cfiscsi_target_set_lun(ct, tmp, lun_id); return (0); } static int cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id) { - struct cfiscsi_softc *softc; - struct cfiscsi_target *ct; - int i; - - ct = (struct cfiscsi_target *)arg; - softc = ct->ct_softc; - mtx_lock(&softc->lock); - for (i = 0; i < CTL_MAX_LUNS; i++) { - if (ct->ct_luns[i] != lun_id) - continue; - ct->ct_luns[i] = UINT32_MAX; - break; - } - mtx_unlock(&softc->lock); return (0); } Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_frontend_iscsi.h Sun Feb 1 21:50:28 2015 (r278037) @@ -38,7 +38,6 @@ struct cfiscsi_target { TAILQ_ENTRY(cfiscsi_target) ct_next; - uint32_t ct_luns[CTL_MAX_LUNS]; struct cfiscsi_softc *ct_softc; volatile u_int ct_refcount; char ct_name[CTL_ISCSI_NAME_LEN]; Modified: head/sys/cam/ctl/ctl_ioctl.h ============================================================================== --- head/sys/cam/ctl/ctl_ioctl.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_ioctl.h Sun Feb 1 21:50:28 2015 (r278037) @@ -805,6 +805,12 @@ struct ctl_iscsi { /* passed to userland */ }; +struct ctl_lun_map { + uint32_t port; + uint32_t plun; + uint32_t lun; +}; + #define CTL_IO _IOWR(CTL_MINOR, 0x00, union ctl_io) #define CTL_ENABLE_PORT _IOW(CTL_MINOR, 0x04, struct ctl_port_entry) #define CTL_DISABLE_PORT _IOW(CTL_MINOR, 0x05, struct ctl_port_entry) @@ -832,6 +838,7 @@ struct ctl_iscsi { #define CTL_ISCSI _IOWR(CTL_MINOR, 0x25, struct ctl_iscsi) #define CTL_PORT_REQ _IOWR(CTL_MINOR, 0x26, struct ctl_req) #define CTL_PORT_LIST _IOWR(CTL_MINOR, 0x27, struct ctl_lun_list) +#define CTL_LUN_MAP _IOW(CTL_MINOR, 0x28, struct ctl_lun_map) #endif /* _CTL_IOCTL_H_ */ Modified: head/sys/cam/ctl/ctl_private.h ============================================================================== --- head/sys/cam/ctl/ctl_private.h Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_private.h Sun Feb 1 21:50:28 2015 (r278037) @@ -492,6 +492,13 @@ extern const struct ctl_cmd_entry ctl_cm uint32_t ctl_get_initindex(struct ctl_nexus *nexus); uint32_t ctl_get_resindex(struct ctl_nexus *nexus); uint32_t ctl_port_idx(int port_num); +int ctl_lun_map_init(struct ctl_port *port); +int ctl_lun_map_deinit(struct ctl_port *port); +int ctl_lun_map_set(struct ctl_port *port, uint32_t plun, uint32_t glun); +int ctl_lun_map_unset(struct ctl_port *port, uint32_t plun); +int ctl_lun_map_unsetg(struct ctl_port *port, uint32_t glun); +uint32_t ctl_lun_map_from_port(struct ctl_port *port, uint32_t plun); +uint32_t ctl_lun_map_to_port(struct ctl_port *port, uint32_t glun); int ctl_pool_create(struct ctl_softc *ctl_softc, const char *pool_name, uint32_t total_ctl_io, void **npool); void ctl_pool_free(struct ctl_io_pool *pool); Modified: head/sys/cam/ctl/ctl_tpc_local.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc_local.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/sys/cam/ctl/ctl_tpc_local.c Sun Feb 1 21:50:28 2015 (r278037) @@ -314,48 +314,30 @@ tpcl_resolve(struct ctl_softc *softc, in struct scsi_ec_cscd_id *cscdid; struct ctl_port *port; struct ctl_lun *lun; - uint64_t lunid = UINT64_MAX, l; - int i; + uint64_t lunid = UINT64_MAX; if (cscd->type_code != EC_CSCD_ID) return (lunid); cscdid = (struct scsi_ec_cscd_id *)cscd; mtx_lock(&softc->ctl_lock); - if (init_port >= 0) { + if (init_port >= 0) port = softc->ctl_ports[ctl_port_idx(init_port)]; - if (port == NULL || port->lun_map == NULL) - init_port = -1; - } - if (init_port < 0) { - STAILQ_FOREACH(lun, &softc->lun_list, links) { - if (lun->lun_devid == NULL) - continue; - if (scsi_devid_match(lun->lun_devid->data, - lun->lun_devid->len, &cscdid->codeset, - cscdid->length + 4) == 0) { - lunid = lun->lun; - if (ss && lun->be_lun) - *ss = lun->be_lun->blocksize; - break; - } - } - } else { - for (i = 0; i < CTL_MAX_LUNS; i++) { - l = port->lun_map(port->targ_lun_arg, i); - if (l >= CTL_MAX_LUNS) - continue; - lun = softc->ctl_luns[l]; - if (lun == NULL || lun->lun_devid == NULL) - continue; - if (scsi_devid_match(lun->lun_devid->data, - lun->lun_devid->len, &cscdid->codeset, - cscdid->length + 4) == 0) { - lunid = lun->lun; - if (ss && lun->be_lun) - *ss = lun->be_lun->blocksize; - break; - } + else + port = NULL; + STAILQ_FOREACH(lun, &softc->lun_list, links) { + if (port != NULL && + ctl_lun_map_to_port(port, lun->lun) >= CTL_MAX_LUNS) + continue; + if (lun->lun_devid == NULL) + continue; + if (scsi_devid_match(lun->lun_devid->data, + lun->lun_devid->len, &cscdid->codeset, + cscdid->length + 4) == 0) { + lunid = lun->lun; + if (ss && lun->be_lun) + *ss = lun->be_lun->blocksize; + break; } } mtx_unlock(&softc->ctl_lock); Modified: head/usr.sbin/ctladm/ctladm.8 ============================================================================== --- head/usr.sbin/ctladm/ctladm.8 Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctladm/ctladm.8 Sun Feb 1 21:50:28 2015 (r278037) @@ -34,7 +34,7 @@ .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" $FreeBSD$ .\" -.Dd December 17, 2014 +.Dd February 1, 2015 .Dt CTLADM 8 .Os .Sh NAME @@ -196,11 +196,17 @@ .Ic portlist .Op Fl f Ar frontend .Op Fl i +.Op Fl l .Op Fl p Ar targ_port .Op Fl q .Op Fl v .Op Fl x .Nm +.Ic lunmap +.Aq Fl p Ar targ_port +.Op Fl l Ar pLUN +.Op Fl L Ar cLUN +.Nm .Ic dumpooa .Nm .Ic dumpstructs @@ -782,7 +788,9 @@ List CTL frontend ports. .It Fl f Ar frontend Specify the frontend type. .It Fl i -Report target and connected initiators addresses +Report target and connected initiators addresses. +.It Fl l +Report LUN mapping. .It Fl p Ar targ_port Specify the frontend port number. .It Fl q @@ -792,6 +800,31 @@ Enable verbose output (report all port o .It Fl x Output the port list in XML format. .El +.It Ic lunmap +Change LUN mapping for specified port. +If both +.Ar pLUN +and +.Ar cLUN +are specified -- LUN will be mapped. +If +.Ar pLUN +is specified, but +.Ar cLUN +is not -- LUN will be unmapped. +If neither +.Ar pLUN +nor +.Ar cLUN +are specified -- LUN mapping will be disabled, exposing all CTL LUNs. +.Bl -tag -width 12n +.It Fl p Ar targ_port +Specify the frontend port number. +.It Fl l Ar pLUN +LUN number visible by specified port. +.It Fl L Ar cLUN +CTL LUN number. +.El .It Ic dumpooa Dump the OOA (Order Of Arrival) queue for each LUN registered with CTL. .It Ic dumpstructs Modified: head/usr.sbin/ctladm/ctladm.c ============================================================================== --- head/usr.sbin/ctladm/ctladm.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctladm/ctladm.c Sun Feb 1 21:50:28 2015 (r278037) @@ -121,7 +121,8 @@ typedef enum { CTLADM_CMD_MODIFY, CTLADM_CMD_ISLIST, CTLADM_CMD_ISLOGOUT, - CTLADM_CMD_ISTERMINATE + CTLADM_CMD_ISTERMINATE, + CTLADM_CMD_LUNMAP } ctladm_cmdfunction; typedef enum { @@ -188,10 +189,11 @@ static struct ctladm_opts option_table[] {"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ac:i:p:"}, {"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ac:i:p:"}, {"lunlist", CTLADM_CMD_LUNLIST, CTLADM_ARG_NONE, NULL}, + {"lunmap", CTLADM_CMD_LUNMAP, CTLADM_ARG_NONE, "p:l:L:"}, {"modesense", CTLADM_CMD_MODESENSE, CTLADM_ARG_NEED_TL, "P:S:dlm:c:"}, {"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:s:"}, {"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "lo:p:qt:w:W:x"}, - {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ip:qvx"}, + {"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:ilp:qvx"}, {"prin", CTLADM_CMD_PRES_IN, CTLADM_ARG_NEED_TL, "a:"}, {"prout", CTLADM_CMD_PRES_OUT, CTLADM_ARG_NEED_TL, "a:k:r:s:"}, {"read", CTLADM_CMD_READ, CTLADM_ARG_NEED_TL, rw_opts}, @@ -4106,8 +4108,9 @@ struct cctl_port { char *frontend_type; char *name; int pp, vp; - char *target, *port; + char *target, *port, *lun_map; STAILQ_HEAD(,cctl_lun_nv) init_list; + STAILQ_HEAD(,cctl_lun_nv) lun_list; STAILQ_HEAD(,cctl_lun_nv) attr_list; STAILQ_ENTRY(cctl_port) links; }; @@ -4161,6 +4164,7 @@ cctl_start_pelement(void *user_data, con portlist->cur_port = cur_port; STAILQ_INIT(&cur_port->init_list); + STAILQ_INIT(&cur_port->lun_list); STAILQ_INIT(&cur_port->attr_list); cur_port->port_id = portlist->cur_id; STAILQ_INSERT_TAIL(&portlist->port_list, cur_port, links); @@ -4220,6 +4224,9 @@ cctl_end_pelement(void *user_data, const } else if (strcmp(name, "port") == 0) { cur_port->port = str; str = NULL; + } else if (strcmp(name, "lun_map") == 0) { + cur_port->lun_map = str; + str = NULL; } else if (strcmp(name, "targ_port") == 0) { portlist->cur_port = NULL; } else if (strcmp(name, "ctlportlist") == 0) { @@ -4232,7 +4239,8 @@ cctl_end_pelement(void *user_data, const err(1, "%s: can't allocate %zd bytes for nv pair", __func__, sizeof(*nv)); - if (strcmp(name, "initiator") == 0) + if (strcmp(name, "initiator") == 0 || + strcmp(name, "lun") == 0) asprintf(&nv->name, "%ju", portlist->cur_id); else nv->name = strdup(name); @@ -4244,6 +4252,8 @@ cctl_end_pelement(void *user_data, const str = NULL; if (strcmp(name, "initiator") == 0) STAILQ_INSERT_TAIL(&cur_port->init_list, nv, links); + else if (strcmp(name, "lun") == 0) + STAILQ_INSERT_TAIL(&cur_port->lun_list, nv, links); else STAILQ_INSERT_TAIL(&cur_port->attr_list, nv, links); } @@ -4274,7 +4284,7 @@ cctl_portlist(int fd, int argc, char **a int retval, c; char *frontend = NULL; uint64_t portarg = UINT64_MAX; - int verbose = 0, init = 0, quiet = 0; + int verbose = 0, init = 0, lun = 0, quiet = 0; retval = 0; port_len = 4096; @@ -4290,6 +4300,9 @@ cctl_portlist(int fd, int argc, char **a case 'i': init++; break; + case 'l': + lun++; + break; case 'p': portarg = strtoll(optarg, NULL, 0); break; @@ -4381,6 +4394,17 @@ retry: } } + if (lun || verbose) { + if (port->lun_map) { + STAILQ_FOREACH(nv, &port->lun_list, links) + printf(" LUN %s: %s\n", + nv->name, nv->value); + if (STAILQ_EMPTY(&port->lun_list)) + printf(" No LUNs mapped\n"); + } else + printf(" All LUNs mapped\n"); + } + if (verbose) { STAILQ_FOREACH(nv, &port->attr_list, links) { printf(" %s=%s\n", nv->name, nv->value); @@ -4393,6 +4417,41 @@ bailout: return (retval); } +static int +cctl_lunmap(int fd, int argc, char **argv, char *combinedopt) +{ + struct ctl_lun_map lm; + int retval = 0, c; + + retval = 0; + lm.port = UINT32_MAX; + lm.plun = UINT32_MAX; + lm.lun = UINT32_MAX; + + while ((c = getopt(argc, argv, combinedopt)) != -1) { + switch (c) { + case 'p': + lm.port = strtoll(optarg, NULL, 0); + break; + case 'l': + lm.plun = strtoll(optarg, NULL, 0); + break; + case 'L': + lm.lun = strtoll(optarg, NULL, 0); + break; + default: + break; + } + } + + if (ioctl(fd, CTL_LUN_MAP, &lm) == -1) { + warn("%s: error issuing CTL_LUN_MAP ioctl", __func__); + retval = 1; + } + + return (retval); +} + void usage(int error) { @@ -4430,6 +4489,7 @@ usage(int error) " ctladm hardstop\n" " ctladm hardstart\n" " ctladm lunlist\n" +" ctladm lunmap -p targ_port [-l pLUN] [-L cLUN]\n" " ctladm bbrread [dev_id] <-l lba> <-d datalen>\n" " ctladm delay [dev_id] <-l datamove|done> [-T oneshot|cont]\n" " [-t secs]\n" @@ -4529,10 +4589,15 @@ usage(int error) "portlist options:\n" "-f fronetnd : specify frontend type\n" "-i : report target and initiators addresses\n" +"-l : report LUN mapping\n" "-p targ_port : specify target port number\n" "-q : omit header in list output\n" "-v : verbose output (report all port options)\n" "-x : output port list in XML format\n" +"lunmap options:\n" +"-p targ_port : specify target port number\n" +"-L pLUN : specify port-visible LUN\n" +"-L cLUN : specify CTL LUN\n" "bbrread options:\n" "-l lba : starting LBA\n" "-d datalen : length, in bytes, to read\n", @@ -4760,6 +4825,9 @@ main(int argc, char **argv) case CTLADM_CMD_PORTLIST: retval = cctl_portlist(fd, argc, argv, combinedopt); break; + case CTLADM_CMD_LUNMAP: + retval = cctl_lunmap(fd, argc, argv, combinedopt); + break; case CTLADM_CMD_READCAPACITY: retval = cctl_read_capacity(fd, target, lun, initid, retries, argc, argv, combinedopt); Modified: head/usr.sbin/ctld/ctl.conf.5 ============================================================================== --- head/usr.sbin/ctld/ctl.conf.5 Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctld/ctl.conf.5 Sun Feb 1 21:50:28 2015 (r278037) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 24, 2014 +.Dd February 1, 2015 .Dt CTL.CONF 5 .Os .Sh NAME @@ -60,9 +60,14 @@ file is: .Dl ... } +.No lun Ar name No { +.Dl path Ar path +} + .No target Ar name { .Dl auth-group Ar name .Dl portal-group Ar name +.Dl lun Ar number Ar name .Dl lun Ar number No { .Dl path Ar path .Dl } @@ -95,6 +100,10 @@ Create a configuration context, defining a new portal-group, which can then be assigned to any number of targets. +.It Ic lun Ar name +Create a +.Sy lun +configuration context, defining a LUN to be exported by some target(s). .It Ic target Ar name Create a .Sy target @@ -312,6 +321,10 @@ IPv4 or IPv6 address to redirect initiat When configured, all initiators attempting to connect to this target will get redirected using "Target moved temporarily" login response. Redirection happens after successful authentication. +.It Ic lun Ar number Ar name +Export previously defined +.Sy lun +by the parent target. .It Ic lun Ar number Create a .Sy lun @@ -387,21 +400,21 @@ target iqn.2012-06.com.example:target0 { } } +lun example_1 { + path /dev/zvol/tank/example_1 +} + target iqn.2012-06.com.example:target1 { chap chapuser chapsecret - lun 0 { - path /dev/zvol/tank/example_1 - } + lun 0 example_1 } target iqn.2012-06.com.example:target2 { auth-group ag0 portal-group pg0 - lun 0 { - path /dev/zvol/tank/example2_0 - } + lun 0 example_1 lun 1 { - path /dev/zvol/tank/example2_1 + path /dev/zvol/tank/example_2 option foo bar } } Modified: head/usr.sbin/ctld/ctld.c ============================================================================== --- head/usr.sbin/ctld/ctld.c Sun Feb 1 20:16:18 2015 (r278036) +++ head/usr.sbin/ctld/ctld.c Sun Feb 1 21:50:28 2015 (r278037) @@ -87,6 +87,7 @@ conf_new(void) conf = calloc(1, sizeof(*conf)); if (conf == NULL) log_err(1, "calloc"); + TAILQ_INIT(&conf->conf_luns); TAILQ_INIT(&conf->conf_targets); TAILQ_INIT(&conf->conf_auth_groups); TAILQ_INIT(&conf->conf_portal_groups); @@ -104,6 +105,7 @@ conf_new(void) void conf_delete(struct conf *conf) { + struct lun *lun, *ltmp; struct target *targ, *tmp; struct auth_group *ag, *cagtmp; struct portal_group *pg, *cpgtmp; @@ -111,6 +113,8 @@ conf_delete(struct conf *conf) assert(conf->conf_pidfh == NULL); + TAILQ_FOREACH_SAFE(lun, &conf->conf_luns, l_next, ltmp) + lun_delete(lun); TAILQ_FOREACH_SAFE(targ, &conf->conf_targets, t_next, tmp) target_delete(targ); TAILQ_FOREACH_SAFE(ag, &conf->conf_auth_groups, ag_next, cagtmp) @@ -1146,7 +1150,6 @@ target_new(struct conf *conf, const char for (i = 0; i < len; i++) targ->t_name[i] = tolower(targ->t_name[i]); - TAILQ_INIT(&targ->t_luns); targ->t_conf = conf; TAILQ_INSERT_TAIL(&conf->conf_targets, targ, t_next); @@ -1156,12 +1159,9 @@ target_new(struct conf *conf, const char void target_delete(struct target *targ) { - struct lun *lun, *tmp; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 22:50:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBE64A16; Sun, 1 Feb 2015 22:50:34 +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 B6AC6F2A; Sun, 1 Feb 2015 22:50:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11MoY7Z054982; Sun, 1 Feb 2015 22:50:34 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11MoYMh054980; Sun, 1 Feb 2015 22:50:34 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201502012250.t11MoYMh054980@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sun, 1 Feb 2015 22:50:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278038 - in head: contrib/netbsd-tests/lib/libc/gen lib/libc/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 22:50:34 -0000 Author: jilles Date: Sun Feb 1 22:50:33 2015 New Revision: 278038 URL: https://svnweb.freebsd.org/changeset/base/278038 Log: ttyname_r(): Return actual error, not always [ENOTTY]. Adjust the test that used to fail because of this bug. PR: 191936 MFC after: 1 week Modified: head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c head/lib/libc/gen/ttyname.c Modified: head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Sun Feb 1 21:50:28 2015 (r278037) +++ head/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Sun Feb 1 22:50:33 2015 (r278038) @@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc) ATF_REQUIRE(rv == ERANGE); } -#ifdef __FreeBSD__ - atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936"); -#endif rv = ttyname_r(-1, buf, ttymax); ATF_REQUIRE(rv == EBADF); Modified: head/lib/libc/gen/ttyname.c ============================================================================== --- head/lib/libc/gen/ttyname.c Sun Feb 1 21:50:28 2015 (r278037) +++ head/lib/libc/gen/ttyname.c Sun Feb 1 22:50:33 2015 (r278038) @@ -65,7 +65,7 @@ ttyname_r(int fd, char *buf, size_t len) /* Must be a terminal. */ if (!isatty(fd)) - return (ENOTTY); + return (errno); /* Must have enough room */ if (len <= sizeof(_PATH_DEV)) return (ERANGE); @@ -73,7 +73,7 @@ ttyname_r(int fd, char *buf, size_t len) strcpy(buf, _PATH_DEV); used = strlen(buf); if (fdevname_r(fd, buf + used, len - used) == NULL) - return (ENOTTY); + return (errno == EINVAL ? ERANGE : errno); return (0); } From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:02:43 2015 Return-Path: Delivered-To: svn-src-head@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 42606C4B; Sun, 1 Feb 2015 23:02:43 +0000 (UTC) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [IPv6:2a00:1450:400c:c05::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFAE3120; Sun, 1 Feb 2015 23:02:42 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id h11so13123295wiw.5; Sun, 01 Feb 2015 15:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Ka2kCyCrZTXVhbKMlUS8cehOUr7B2C+rrAVE71Alkpo=; b=QAYtaz7Neo/7V4hEQ7bOSL1cCCd7Sr9keqOfmOSpCyAqqC0hJwLhEZWovCCcpQDTgd GIuxPtzQKUwM+T+NldeRcgzhJ8meqOUpdeouKzz3mI2dsGz5Z/yIWGbt1+szNc3+shnr kIwI9DPR26Uoh1vrfzC1ICnX0Y/A3s/cVpF00gwxCWkm+/D5O1SX0v0yJET+jjCohFX6 YqZz5gQwPKAVX9FCYgFTK5j+cRDLXTGEaubTM4TE6us4wfr/L8yGiw3ZS4a09iZlCSbP 9JGA06/7kQbovqP+x8CXho7vMbS8Q2CADB67L3/od878wt9JbY3ZQTiydT0RqvG+bQeL RTdw== X-Received: by 10.194.120.40 with SMTP id kz8mr37130458wjb.21.1422831761225; Sun, 01 Feb 2015 15:02:41 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id hl1sm25166792wjc.18.2015.02.01.15.02.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 15:02:40 -0800 (PST) Sender: Baptiste Daroussin Date: Mon, 2 Feb 2015 00:02:38 +0100 From: Baptiste Daroussin To: Adrian Chadd Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms Message-ID: <20150201230238.GG11558@ivaldir.etoilebsd.net> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/i8j2F0k9BYX4qLc" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Ivan Klymenko , src-committers@freebsd.org, "Max N. Boyarov" , svn-src-all@freebsd.org, Konstantin Belousov , svn-src-head@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:02:43 -0000 --/i8j2F0k9BYX4qLc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 01, 2015 at 01:27:15PM -0800, Adrian Chadd wrote: > Try enabling rc6 sleep state in i915 and see what happens. >=20 > I found that the package wasn't going to sleep without it. >=20 > Bapt also found the same thing. I haven't chased up to see if enabling rc6 > restored thing. >=20 Yes this restored thing, the laptop is now usable again. Chatting about this is Lars (lme@) at FOSDEM he sees the same results. Bapt --/i8j2F0k9BYX4qLc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlTOsI4ACgkQ8kTtMUmk6Ez0mgCdEtnXXSQoG8+lBf13rZCoimvz vi4AoJ3YLn0Df/7KwedeVok5ZRIZRDdM =VlRA -----END PGP SIGNATURE----- --/i8j2F0k9BYX4qLc-- From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:08:20 2015 Return-Path: Delivered-To: svn-src-head@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 BB715D9A for ; Sun, 1 Feb 2015 23:08:20 +0000 (UTC) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51E171C2 for ; Sun, 1 Feb 2015 23:08:19 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id fb4so13163268wid.2 for ; Sun, 01 Feb 2015 15:08:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=/n77tIki6Edragq76cTT0MWcZ3HGt6rDYkG5p/pyv9s=; b=c5mrlQSp1GRQtXzpIcC+15e12+sq1QFqZjOXF9DL0/n5woc1vNJjWg1oyXb9V9tHhW Qsmqy4g9r27hJ5GewmOhm8dcAamQEQMo3anqlwMEo9V/XIrufDR//iN/AZFcm0u4w5wd Sx2AAOS94yMQdP45HnBhAGLAn4aUQDyJhsk3It97qVkGLNC9oYA/kbuzDLf58I8IEbDX dWptcAA2sgMVOd1v1aoX8wlq1T5pQFyBA7/lQr8PlnbwdqfcPcICkrRqTWMwZnN1/iwl RnFCAPRAtAOAxzeSrO1fQS27Qzks6c/q0zQNPLCGvhx3mF3y7MaTOV2LLFfTRJQJUlFf UJAw== X-Gm-Message-State: ALoCoQmS28OK6kqQ+ZXRHi3PnVdsBVc6QyaxxWRQuibKwdbfYEuAEDP8/GGatx/MsQq7jv5i1LRR X-Received: by 10.194.239.72 with SMTP id vq8mr27067461wjc.110.1422832092255; Sun, 01 Feb 2015 15:08:12 -0800 (PST) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id x6sm25183244wjf.24.2015.02.01.15.08.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 15:08:11 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <54CEB1DE.8070300@freebsd.org> Date: Sun, 01 Feb 2015 23:08:14 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r278034 - head/sys/dev/ahci References: <201502012000.t11K09AD069530@svn.freebsd.org> <20150201203132.GA30253@brick.home> In-Reply-To: <20150201203132.GA30253@brick.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:08:20 -0000 On 01/02/2015 20:31, Edward Tomasz Napierała wrote: > On 0201T2000, Steven Hartland wrote: >> Author: smh >> Date: Sun Feb 1 20:00:08 2015 >> New Revision: 278034 >> URL: https://svnweb.freebsd.org/changeset/base/278034 >> >> Log: >> Add a quirk to limit AHCI MSI vectors to one >> >> In 10.1-RELEASE the default number of MSI vectors used was changed from one >> to as many vectors as the HW supports. >> >> This change resulted in an ahci timeouts regression when running on AMD >> SB7x0/SB8x0/SB9x0 hardware, so its now limited to 1 MSI by default using >> this new quirk. > Could it fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195349? > Yes it could well fix that as the dmesg lists the effected hardware From owner-svn-src-head@FreeBSD.ORG Sun Feb 1 23:19:07 2015 Return-Path: Delivered-To: svn-src-head@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 8793AA4; Sun, 1 Feb 2015 23:19:07 +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 73E892EE; Sun, 1 Feb 2015 23:19:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11NJ7Dp066323; Sun, 1 Feb 2015 23:19:07 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11NJ7Vo066322; Sun, 1 Feb 2015 23:19:07 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502012319.t11NJ7Vo066322@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sun, 1 Feb 2015 23:19:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278039 - head/lib/libc/rpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2015 23:19:07 -0000 Author: pfg Date: Sun Feb 1 23:19:06 2015 New Revision: 278039 URL: https://svnweb.freebsd.org/changeset/base/278039 Log: Resource leak CID: 1016703 Reviewed by: alfred Modified: head/lib/libc/rpc/crypt_client.c Modified: head/lib/libc/rpc/crypt_client.c ============================================================================== --- head/lib/libc/rpc/crypt_client.c Sun Feb 1 22:50:33 2015 (r278038) +++ head/lib/libc/rpc/crypt_client.c Sun Feb 1 23:19:06 2015 (r278039) @@ -64,6 +64,7 @@ _des_crypt_call(buf, len, dparms) } if (nconf == NULL) { warnx("getnetconfig: %s", nc_sperror()); + endnetconfig(localhandle); return(DESERR_HWERROR); } clnt = clnt_tp_create(NULL, CRYPT_PROG, CRYPT_VERS, nconf); From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:17:37 2015 Return-Path: Delivered-To: svn-src-head@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 A16FC8BE; Mon, 2 Feb 2015 00:17:37 +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 8D21CA4B; Mon, 2 Feb 2015 00:17:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t120HbT5095089; Mon, 2 Feb 2015 00:17:37 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t120Hb2g095087; Mon, 2 Feb 2015 00:17:37 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201502020017.t120Hb2g095087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Mon, 2 Feb 2015 00:17:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:17:37 -0000 Author: smh Date: Mon Feb 2 00:17:36 2015 New Revision: 278040 URL: https://svnweb.freebsd.org/changeset/base/278040 Log: Prevent inlining txg_quiesce This allows dtrace to monitor the calls to txg_quiesce which can be really helpful. Also standardise __noinline order for arc_kmem_reap_now. Sponsored by: Multiplay Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Feb 2 00:17:36 2015 (r278040) @@ -2677,7 +2677,7 @@ extern kmem_cache_t *zio_buf_cache[]; extern kmem_cache_t *zio_data_buf_cache[]; extern kmem_cache_t *range_seg_cache; -static void __noinline +static __noinline void arc_kmem_reap_now(arc_reclaim_strategy_t strat) { size_t i; Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Sun Feb 1 23:19:06 2015 (r278039) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Mon Feb 2 00:17:36 2015 (r278040) @@ -353,7 +353,7 @@ txg_rele_to_sync(txg_handle_t *th) * On return, the transaction group has reached a stable state in which it can * then be passed off to the syncing context. */ -static void +static __noinline void txg_quiesce(dsl_pool_t *dp, uint64_t txg) { tx_state_t *tx = &dp->dp_tx; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:19:39 2015 Return-Path: Delivered-To: svn-src-head@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 E6767A7C; Mon, 2 Feb 2015 00:19:38 +0000 (UTC) Received: from mail-ie0-x22e.google.com (mail-ie0-x22e.google.com [IPv6:2607:f8b0:4001:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6C76A62; Mon, 2 Feb 2015 00:19:38 +0000 (UTC) Received: by mail-ie0-f174.google.com with SMTP id vy18so14334847iec.5; Sun, 01 Feb 2015 16:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=j2K/fst7K9vc8dD0olhx/GqVal3GdwWp6d9RJIKWOgM=; b=BNXoxQyvHqNWX0WQmAkY25Hxv9dZD007Rl068B4fx3aavltlsddghqS9MCwfcktx+Q 31jZyMo2/R84Lt9GnbuVyG1wf1j4OvA3ancv1nutdjLYigRKUeLCh7VjN63XstLmoOey B7hwXVRWrPMYhLDr8dwDhupiey6/lOCJxrlNI7vK3kWfzbz9W+KTFOz06b9nucH2Etj4 rjg1s9WmAqXJSSXUsjVNhT9U06pUfCytHoIMY+m33IDSYz5yuDh+XI5PA2KM1n+DlXIS pZH6MXogwfxZjH0PuWd2fXRLhnFHPlK0v8e4RQ++q6XUFZUxeWPJmEY6RWCYtAoVdUMP pILQ== MIME-Version: 1.0 X-Received: by 10.42.62.71 with SMTP id x7mr16104763ich.61.1422836378139; Sun, 01 Feb 2015 16:19:38 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 16:19:38 -0800 (PST) Received: by 10.36.17.7 with HTTP; Sun, 1 Feb 2015 16:19:38 -0800 (PST) In-Reply-To: <20150201230238.GG11558@ivaldir.etoilebsd.net> References: <201501211610.t0LGAcMg085437@svn.freebsd.org> <20150122121551.77a7a9fb@nonamehost.local> <20150201195729.GA1990@reks> <20150201230238.GG11558@ivaldir.etoilebsd.net> Date: Sun, 1 Feb 2015 16:19:38 -0800 Message-ID: Subject: Re: svn commit: r277487 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon modules/drm2/i915kms From: Adrian Chadd To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: Ivan Klymenko , src-committers@freebsd.org, "Max N. Boyarov" , svn-src-all@freebsd.org, Konstantin Belousov , svn-src-head@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:19:39 -0000 It sounds like the driver is doing something new unless you're in rc6. Maybe its not clocking the GPU core down? How can we check the state of the GPU bits? Adrian On Feb 1, 2015 3:02 PM, "Baptiste Daroussin" wrote: > On Sun, Feb 01, 2015 at 01:27:15PM -0800, Adrian Chadd wrote: > > Try enabling rc6 sleep state in i915 and see what happens. > > > > I found that the package wasn't going to sleep without it. > > > > Bapt also found the same thing. I haven't chased up to see if enabling > rc6 > > restored thing. > > > Yes this restored thing, the laptop is now usable again. > > Chatting about this is Lars (lme@) at FOSDEM he sees the same results. > > Bapt > From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:21:35 2015 Return-Path: Delivered-To: svn-src-head@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 CAD03C52; Mon, 2 Feb 2015 00:21:35 +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 B702DA8A; Mon, 2 Feb 2015 00:21:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t120LZ6k098118; Mon, 2 Feb 2015 00:21:35 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t120LZhX098117; Mon, 2 Feb 2015 00:21:35 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201502020021.t120LZhX098117@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 2 Feb 2015 00:21:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278041 - head/lib/libc/rpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:21:35 -0000 Author: pfg Date: Mon Feb 2 00:21:34 2015 New Revision: 278041 URL: https://svnweb.freebsd.org/changeset/base/278041 Log: rpc: Uninitialized pointer read Initialize *xprt to avoid exposing a random value in cleanup_svc_vc_create. CID: 1018723 Phabric: D1749 Reviewed by: alfred Modified: head/lib/libc/rpc/svc_vc.c Modified: head/lib/libc/rpc/svc_vc.c ============================================================================== --- head/lib/libc/rpc/svc_vc.c Mon Feb 2 00:17:36 2015 (r278040) +++ head/lib/libc/rpc/svc_vc.c Mon Feb 2 00:21:34 2015 (r278041) @@ -128,7 +128,7 @@ svc_vc_create(fd, sendsize, recvsize) u_int sendsize; u_int recvsize; { - SVCXPRT *xprt; + SVCXPRT *xprt = NULL; struct cf_rendezvous *r = NULL; struct __rpc_sockinfo si; struct sockaddr_storage sslocal; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:28:27 2015 Return-Path: Delivered-To: svn-src-head@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 84E22DFE; Mon, 2 Feb 2015 00:28:27 +0000 (UTC) Received: from mail-yk0-x234.google.com (mail-yk0-x234.google.com [IPv6:2607:f8b0:4002:c07::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40154B5B; Mon, 2 Feb 2015 00:28:27 +0000 (UTC) Received: by mail-yk0-f180.google.com with SMTP id 131so20723446ykp.11; Sun, 01 Feb 2015 16:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=1Z7FteLj26Ne5DLSAZXGzyTrPNP2W9qS1BRCdHkR1XY=; b=O2W2XKp6cuYkhf72z5vpHMUIZvREwbebRfeyVFMWVM7sp2n5LkT1uSp5RQ91pcccik 6CqYAkbAnT989548po2Orn98Prv/GDYLkgealz8jjJ2otG37YxH7+XRI0HKZT6LBqm4x +IA4iXkrSOhGLPeb2sW9ak7MH+LBeBlN7ye1lKz7hD3/Wuxourv4Vnlc41Vz/vE0ZT8Q 2n0sz57ctrCQYAbS2LkQBSN9ZF5O7aB/L7gz0CF0RfdfUBUJgb9BnwMK4bzMN1jK4FCq Hsy0lsKhi7XbNuM72i63i6RBpv7jdq32puUF+tNf0873K19Ur9jJ1KiiX5G0axEyGbcJ gvDQ== MIME-Version: 1.0 X-Received: by 10.170.56.5 with SMTP id 5mr8094939yky.103.1422836906290; Sun, 01 Feb 2015 16:28:26 -0800 (PST) Sender: davide.italiano@gmail.com Received: by 10.170.157.85 with HTTP; Sun, 1 Feb 2015 16:28:26 -0800 (PST) In-Reply-To: <201502020017.t120Hb2g095087@svn.freebsd.org> References: <201502020017.t120Hb2g095087@svn.freebsd.org> Date: Mon, 2 Feb 2015 01:28:26 +0100 X-Google-Sender-Auth: L4s-roTUaC0qxHe3iMBkd_4rWlY Message-ID: Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs From: Davide Italiano To: Steven Hartland Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:28:27 -0000 On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland wrote: > Author: smh > Date: Mon Feb 2 00:17:36 2015 > New Revision: 278040 > URL: https://svnweb.freebsd.org/changeset/base/278040 > > Log: > Prevent inlining txg_quiesce > > This allows dtrace to monitor the calls to txg_quiesce which can be really > helpful. > > Also standardise __noinline order for arc_kmem_reap_now. > > Sponsored by: Multiplay > > I found this while I was at iXsystems, trying to port Richard Elling's arc statistics utility to FreeBSD. I do not disagree with the change in theory, but I never committed this because I was worried of performance penalty. Last time I checked Solaris/Illumos actually do not inline this function without any particular directive (I guess this is mostly due to difference in toolchain, in particular in the compiler), so it shouldn't be a big deal, but if you have time, do you mind to check the penalty introduced, if any, is negligible? Thanks, -- Davide "There are no solved problems; there are only problems that are more or less solved" -- Henri Poincare From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:52:12 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58EC7293 for ; Mon, 2 Feb 2015 00:52:12 +0000 (UTC) Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com [209.85.216.176]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1445CD6E for ; Mon, 2 Feb 2015 00:52:11 +0000 (UTC) Received: by mail-qc0-f176.google.com with SMTP id c9so28164764qcz.7 for ; Sun, 01 Feb 2015 16:52:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=e8Wqg9T5Awgrg+K+jUW7+9nLUpKndxVis+H/+Zx4zG4=; b=S12XaRDU1I8zVhsFZaHp7npsMpgeaXQuGT4HManlXx2Qs5GP+2LXx5chFoSQFEYCJh pWQts6v1mv8sIE4/vlfpxoxvNHpsulMqf0cmw+apbv9EHjqjgwMzkH/ufePii8sxfU// BS/QBrxhIve8JTV7ieJQxtP+ldIZNu0evifK7DqehDiztz+yFdjR1GC6tsZOlwkzOfeP j8grPbJ6z39MFvptdWjg7Sc6rmtTYk/6QmMqju9ioyCSG4BcVcYEdk97rbfCiBy/gQK5 gIDmX8NZ5XbRzcTWFCGWTLbSkBe+YYwUnOvZueG3jNFXteXbiont1Pk+WPpdILnjPfmX RfaQ== X-Gm-Message-State: ALoCoQkkdfiDhVpr0wjSU4CvOCjllkcqGHOGPdRuuGoEHy2TM1jJ20+/+JltIJHTr3FvC8K+gp6s MIME-Version: 1.0 X-Received: by 10.229.68.202 with SMTP id w10mr36682528qci.13.1422837923425; Sun, 01 Feb 2015 16:45:23 -0800 (PST) Received: by 10.140.88.103 with HTTP; Sun, 1 Feb 2015 16:45:23 -0800 (PST) In-Reply-To: References: <201502020017.t120Hb2g095087@svn.freebsd.org> Date: Sun, 1 Feb 2015 17:45:23 -0700 Message-ID: Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs From: Will Andrews To: Davide Italiano Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "svn-src-head@freebsd.org" , Steven Hartland , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:52:12 -0000 On Sunday, February 1, 2015, Davide Italiano wrote: > On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland > wrote: > > Author: smh > > Date: Mon Feb 2 00:17:36 2015 > > New Revision: 278040 > > URL: https://svnweb.freebsd.org/changeset/base/278040 > > > > Log: > > Prevent inlining txg_quiesce > > > > This allows dtrace to monitor the calls to txg_quiesce which can be > really > > helpful. > > > > Also standardise __noinline order for arc_kmem_reap_now. > > > > Sponsored by: Multiplay > > > > > > I found this while I was at iXsystems, trying to port Richard Elling's > arc statistics utility to FreeBSD. > I do not disagree with the change in theory, but I never committed > this because I was worried of performance penalty. > Last time I checked Solaris/Illumos actually do not inline this > function without any particular directive (I guess this is mostly due > to difference in toolchain, in particular in the compiler), so it > shouldn't be a big deal, but if you have time, do you mind to check > the penalty introduced, if any, is negligible? > It should be negligible. The function is only called once per txg, which generally is only supposed to happen about 1-0.2Hz. --Will. From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 00:54:04 2015 Return-Path: Delivered-To: svn-src-head@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 1D20D2C1 for ; Mon, 2 Feb 2015 00:54:04 +0000 (UTC) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4E00D79 for ; Mon, 2 Feb 2015 00:54:03 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id q59so36263606wes.10 for ; Sun, 01 Feb 2015 16:53:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=gDff3yowCPqdd5FzpNQ0C8o+Fr0u8lzeG/I8Sh3WHow=; b=C4WWjYjWFCd7ZYtO1h6BiGklkoBmK//LhvhnSrVKN79gvsygtidDFfGR5r76BueSCd E3o2tBLz77H8JrwbFOWqSxcK+DdwwrVi6FeMKGCqZh4hZorrH1HggRndbHOH9SuISKpm uH6bXLybTYrJs8RuSdG7Qm3292lfhwN79VD6zvMvm/wG4J3TI4WZ/CoLNMEtJNbtc+Io AD1GEtCSfTp5fjO1mxCdqb2WF+GZd7g6hsdVUxOFZp8gnpNR/JQf4L2/y4dPEHEMZUzg tarSwlFSdJvYLBUM0//6N3SU0jOSagt8KYhf1JXD3ARH3Nr84wGapDuWqZ4ADpopa7IL JOsQ== X-Gm-Message-State: ALoCoQkFMZ7MkyPJGG2YfNgGSm9QtQMpUlh+zE0iZFnFzFHf2rrvCckzjx8mF49c95UB0M8nfrUq X-Received: by 10.194.170.161 with SMTP id an1mr36500237wjc.126.1422838435803; Sun, 01 Feb 2015 16:53:55 -0800 (PST) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id u9sm25443419wjy.37.2015.02.01.16.53.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 16:53:55 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <54CECAA5.9090406@freebsd.org> Date: Mon, 02 Feb 2015 00:53:57 +0000 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Davide Italiano Subject: Re: svn commit: r278040 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201502020017.t120Hb2g095087@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 00:54:04 -0000 On 02/02/2015 00:28, Davide Italiano wrote: > On Mon, Feb 2, 2015 at 1:17 AM, Steven Hartland wrote: >> Author: smh >> Date: Mon Feb 2 00:17:36 2015 >> New Revision: 278040 >> URL: https://svnweb.freebsd.org/changeset/base/278040 >> >> Log: >> Prevent inlining txg_quiesce >> >> This allows dtrace to monitor the calls to txg_quiesce which can be really >> helpful. >> >> Also standardise __noinline order for arc_kmem_reap_now. >> >> Sponsored by: Multiplay >> >> > I found this while I was at iXsystems, trying to port Richard Elling's > arc statistics utility to FreeBSD. > I do not disagree with the change in theory, but I never committed > this because I was worried of performance penalty. > Last time I checked Solaris/Illumos actually do not inline this > function without any particular directive (I guess this is mostly due > to difference in toolchain, in particular in the compiler), so it > shouldn't be a big deal, but if you have time, do you mind to check > the penalty introduced, if any, is negligible? Performance difference should be negligible if not unmeasurable, but I'll run some tests to check call frequency to be sure. From what I can tell its inlined because there is only a single caller (txg_quiesce_thread). Regards Steve From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:44:28 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20B41123; Mon, 2 Feb 2015 02:44:28 +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 E6B879A4; Mon, 2 Feb 2015 02:44:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122iRUQ065198; Mon, 2 Feb 2015 02:44:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122iRIK065197; Mon, 2 Feb 2015 02:44:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020244.t122iRIK065197@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:44:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278043 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:44:28 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:44:27 2015 New Revision: 278043 URL: https://svnweb.freebsd.org/changeset/base/278043 Log: - Remove more files when MK_BINUTILS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 01:02:49 2015 (r278042) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:44:27 2015 (r278043) @@ -181,6 +181,34 @@ OLD_FILES+=usr/share/man/man8/bhyveload. OLD_DIRS+=usr/share/examples/bhyve .endif +.if ${MK_BINUTILS} == no +OLD_FILES+=usr/bin/as +OLD_FILES+=usr/bin/ld +OLD_FILES+=usr/bin/objcopy +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/bin/readelf +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu +OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw +OLD_FILES+=usr/share/doc/binutils/as.txt +OLD_FILES+=usr/share/doc/binutils/ld.txt +OLD_FILES+=usr/share/man/man1/as.1.gz +OLD_FILES+=usr/share/man/man1/ld.1.gz +OLD_FILES+=usr/share/man/man1/objcopy.1.gz +OLD_FILES+=usr/share/man/man1/objdump.1.gz +OLD_FILES+=usr/share/man/man1/readelf.1.gz +.endif + .if ${MK_BLUETOOTH} == no OLD_FILES+=etc/bluetooth/hcsecd.conf OLD_FILES+=etc/bluetooth/hosts From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:47:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C578313; Mon, 2 Feb 2015 02:47:38 +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 0EB8B9CD; Mon, 2 Feb 2015 02:47:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122lblS065590; Mon, 2 Feb 2015 02:47:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122lbAn065589; Mon, 2 Feb 2015 02:47:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020247.t122lbAn065589@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:47:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278044 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:47:38 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:47:37 2015 New Revision: 278044 URL: https://svnweb.freebsd.org/changeset/base/278044 Log: - Remove more files when MK_BLUETOOTH == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:44:27 2015 (r278043) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:47:37 2015 (r278044) @@ -215,6 +215,10 @@ OLD_FILES+=etc/bluetooth/hosts OLD_FILES+=etc/bluetooth/protocols OLD_FILES+=etc/defaults/bluetooth.device.conf OLD_DIRS+=etc/bluetooth +OLD_FILES+=etc/rc.d/bluetooth +OLD_FILES+=etc/rc.d/bthidd +OLD_FILES+=etc/rc.d/hcsecd +OLD_FILES+=etc/rc.d/ubthidhci OLD_FILES+=usr/bin/bthost OLD_FILES+=usr/bin/btsockstat OLD_FILES+=usr/bin/rfcomm_sppd @@ -251,6 +255,7 @@ OLD_FILES+=usr/lib32/libsdp.so OLD_LIBS+=usr/lib32/libsdp.so.4 OLD_FILES+=usr/lib32/libsdp_p.a .endif +OLD_FILES+=usr/sbin/ath3kfw OLD_FILES+=usr/sbin/bcmfw OLD_FILES+=usr/sbin/bt3cfw OLD_FILES+=usr/sbin/bthidcontrol @@ -264,6 +269,7 @@ OLD_FILES+=usr/sbin/l2ping OLD_FILES+=usr/sbin/rfcomm_pppd OLD_FILES+=usr/sbin/sdpcontrol OLD_FILES+=usr/sbin/sdpd +OLD_FILES+=usr/share/examples/etc/defaults/bluetooth.device.conf OLD_FILES+=usr/share/man/man1/bthost.1.gz OLD_FILES+=usr/share/man/man1/btsockstat.1.gz OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz @@ -321,6 +327,7 @@ OLD_FILES+=usr/share/man/man3/sdp_search OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz +OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz OLD_FILES+=usr/share/man/man8/bcmfw.8.gz OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:49:02 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 465C5460; Mon, 2 Feb 2015 02:49:02 +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 181D09DD; Mon, 2 Feb 2015 02:49:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122n1Di065788; Mon, 2 Feb 2015 02:49:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122n1jc065787; Mon, 2 Feb 2015 02:49:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020249.t122n1jc065787@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:49:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278045 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:49:02 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:49:01 2015 New Revision: 278045 URL: https://svnweb.freebsd.org/changeset/base/278045 Log: - Remove more files when MK_BOOT == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:47:37 2015 (r278044) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:01 2015 (r278045) @@ -343,9 +343,63 @@ OLD_FILES+=usr/share/man/man8/sdpcontrol OLD_FILES+=usr/share/man/man8/sdpd.8.gz .endif -#.if ${MK_BOOT} == no -# to be filled in -#.endif +.if ${MK_BOOT} == no +OLD_FILES+=boot/beastie.4th +OLD_FILES+=boot/boot +OLD_FILES+=boot/boot0 +OLD_FILES+=boot/boot0sio +OLD_FILES+=boot/boot1 +OLD_FILES+=boot/boot1.efi +OLD_FILES+=boot/boot1.efifat +OLD_FILES+=boot/boot2 +OLD_FILES+=boot/brand.4th +OLD_FILES+=boot/cdboot +OLD_FILES+=boot/check-password.4th +OLD_FILES+=boot/color.4th +OLD_FILES+=boot/defaults/loader.conf +OLD_FILES+=boot/delay.4th +OLD_FILES+=boot/device.hints +OLD_FILES+=boot/frames.4th +OLD_FILES+=boot/gptboot +OLD_FILES+=boot/gptzfsboot +OLD_FILES+=boot/loader +OLD_FILES+=boot/loader.4th +OLD_FILES+=boot/loader.efi +OLD_FILES+=boot/loader.help +OLD_FILES+=boot/loader.rc +OLD_FILES+=boot/mbr +OLD_FILES+=boot/menu-commands.4th +OLD_FILES+=boot/menu.4th +OLD_FILES+=boot/menu.rc +OLD_FILES+=boot/menusets.4th +OLD_FILES+=boot/pcibios.4th +OLD_FILES+=boot/pmbr +OLD_FILES+=boot/pxeboot +OLD_FILES+=boot/screen.4th +OLD_FILES+=boot/shortcuts.4th +OLD_FILES+=boot/support.4th +OLD_FILES+=boot/userboot.so +OLD_FILES+=boot/version.4th +OLD_FILES+=boot/zfsboot +OLD_FILES+=boot/zfsloader +OLD_FILES+=usr/lib/kgzldr.o +OLD_FILES+=usr/share/man/man5/loader.conf.5.gz +OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz +OLD_FILES+=usr/share/man/man8/brand.4th.8.gz +OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz +OLD_FILES+=usr/share/man/man8/color.4th.8.gz +OLD_FILES+=usr/share/man/man8/delay.4th.8.gz +OLD_FILES+=usr/share/man/man8/gptboot.8.gz +OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz +OLD_FILES+=usr/share/man/man8/loader.4th.8.gz +OLD_FILES+=usr/share/man/man8/loader.8.gz +OLD_FILES+=usr/share/man/man8/menu.4th.8.gz +OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz +OLD_FILES+=usr/share/man/man8/pxeboot.8.gz +OLD_FILES+=usr/share/man/man8/version.4th.8.gz +OLD_FILES+=usr/share/man/man8/zfsboot.8.gz +OLD_FILES+=usr/share/man/man8/zfsloader.8.gz +.endif .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:49:55 2015 Return-Path: Delivered-To: svn-src-head@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 47CAF5A2; Mon, 2 Feb 2015 02:49:55 +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 33E549E6; Mon, 2 Feb 2015 02:49:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122ntSO065906; Mon, 2 Feb 2015 02:49:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122nthl065905; Mon, 2 Feb 2015 02:49:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020249.t122nthl065905@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:49:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278046 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:49:55 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:49:54 2015 New Revision: 278046 URL: https://svnweb.freebsd.org/changeset/base/278046 Log: - Remove more files when MK_BSD_CPIO == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:01 2015 (r278045) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:54 2015 (r278046) @@ -401,6 +401,13 @@ OLD_FILES+=usr/share/man/man8/zfsboot.8. OLD_FILES+=usr/share/man/man8/zfsloader.8.gz .endif +.if ${MK_BSD_CPIO} == no +OLD_FILES+=usr/bin/bsdcpio +OLD_FILES+=usr/bin/cpio +OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz +OLD_FILES+=usr/share/man/man1/cpio.1.gz +.endif + .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:51:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A12E6EB; Mon, 2 Feb 2015 02:51:23 +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 2BF6BA85; Mon, 2 Feb 2015 02:51:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122pNGw069160; Mon, 2 Feb 2015 02:51:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122pNao069159; Mon, 2 Feb 2015 02:51:23 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020251.t122pNao069159@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278047 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:51:23 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:51:22 2015 New Revision: 278047 URL: https://svnweb.freebsd.org/changeset/base/278047 Log: - Remove more files when MK_BSNMP == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:49:54 2015 (r278046) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:51:22 2015 (r278047) @@ -457,25 +457,44 @@ OLD_FILES+=usr/include/bsnmp/snmpagent.h OLD_FILES+=usr/include/bsnmp/snmpclient.h OLD_FILES+=usr/include/bsnmp/snmpmod.h OLD_FILES+=usr/lib/libbsnmp.a +OLD_FILES+=usr/lib/libbsnmp.so OLD_LIBS+=usr/lib/libbsnmp.so.6 OLD_FILES+=usr/lib/libbsnmp_p.a OLD_FILES+=usr/lib/libbsnmptools.a +OLD_FILES+=usr/lib/libbsnmptools.so OLD_LIBS+=usr/lib/libbsnmptools.so.0 OLD_FILES+=usr/lib/libbsnmptools_p.a +OLD_FILES+=usr/lib/snmp_atm.so OLD_LIBS+=usr/lib/snmp_atm.so.6 +OLD_FILES+=usr/lib/snmp_bridge.so OLD_LIBS+=usr/lib/snmp_bridge.so.6 +OLD_FILES+=usr/lib/snmp_hast.so OLD_LIBS+=usr/lib/snmp_hast.so.6 +OLD_FILES+=usr/lib/snmp_hostres.so OLD_LIBS+=usr/lib/snmp_hostres.so.6 +OLD_FILES+=usr/lib/snmp_lm75.so OLD_LIBS+=usr/lib/snmp_lm75.so.6 +OLD_FILES+=usr/lib/snmp_mibII.so OLD_LIBS+=usr/lib/snmp_mibII.so.6 +OLD_FILES+=usr/lib/snmp_netgraph.so OLD_LIBS+=usr/lib/snmp_netgraph.so.6 +OLD_FILES+=usr/lib/snmp_pf.so OLD_LIBS+=usr/lib/snmp_pf.so.6 +OLD_FILES+=usr/lib/snmp_target.so OLD_LIBS+=usr/lib/snmp_target.so.6 +OLD_FILES+=usr/lib/snmp_usm.so OLD_LIBS+=usr/lib/snmp_usm.so.6 +OLD_FILES+=usr/lib/snmp_vacm.so OLD_LIBS+=usr/lib/snmp_vacm.so.6 +OLD_FILES+=usr/lib/snmp_wlan.so OLD_LIBS+=usr/lib/snmp_wlan.so.6 +OLD_FILES+=usr/lib32/libbsnmp.a +OLD_FILES+=usr/lib32/libbsnmp.so +OLD_LIBS+=usr/lib32/libbsnmp.so.6 +OLD_FILES+=usr/lib32/libbsnmp_p.a OLD_FILES+=usr/sbin/bsnmpd OLD_FILES+=usr/sbin/gensnmptree +OLD_FILES+=usr/share/examples/etc/snmpd.config OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:53:53 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6EE3B9D7; Mon, 2 Feb 2015 02:53:53 +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 5B1EAAB1; Mon, 2 Feb 2015 02:53:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122rrfA070117; Mon, 2 Feb 2015 02:53:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122rr4a070116; Mon, 2 Feb 2015 02:53:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020253.t122rr4a070116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278048 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:53:53 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:53:52 2015 New Revision: 278048 URL: https://svnweb.freebsd.org/changeset/base/278048 Log: - Remove more files when MK_DMAGENT == no and move the chunk into its alphabetical place MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:51:22 2015 (r278047) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:53:52 2015 (r278048) @@ -1552,6 +1552,14 @@ OLD_FILES+=usr/share/dict/words OLD_DIRS+=usr/share/dict .endif +.if ${MK_DMAGENT} == no +OLD_FILES+=etc/dma/dma.conf +OLD_FILES+=usr/libexec/dma +OLD_FILES+=usr/libexec/dma-mbox-create +OLD_FILES+=usr/share/man/man8/dma.8.gz +OLD_FILES+=usr/share/examples/dma/mailer.conf +.endif + .if ${MK_EE} == no OLD_FILES+=usr/bin/edit OLD_FILES+=usr/bin/ee @@ -5157,13 +5165,6 @@ OLD_FILES+=usr/bin/svnsync OLD_FILES+=usr/bin/svnversion .endif -.if ${MK_DMAGENT} == no -OLD_FILES+=usr/libexec/dma -OLD_FILES+=usr/libexec/dma-mbox-create -OLD_FILES+=usr/share/man/man8/dma.8.gz -OLD_FILES+=usr/share/examples/dma/mailer.conf -.endif - .if ${MK_HYPERV} == no OLD_FILES+=etc/devd/hyperv.conf OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 02:56:30 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA9F9B30; Mon, 2 Feb 2015 02:56:30 +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 9764FAC8; Mon, 2 Feb 2015 02:56:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t122uUa5070531; Mon, 2 Feb 2015 02:56:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t122uUmK070530; Mon, 2 Feb 2015 02:56:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502020256.t122uUmK070530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 02:56:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278049 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 02:56:30 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 02:56:29 2015 New Revision: 278049 URL: https://svnweb.freebsd.org/changeset/base/278049 Log: - Remove more files when MK_GPIO == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:53:52 2015 (r278048) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 02:56:29 2015 (r278049) @@ -1713,8 +1713,13 @@ OLD_FILES+=usr/share/man/man1/kgdb.1.gz .if ${MK_GPIO} == no OLD_FILES+=usr/include/libgpio.h OLD_FILES+=usr/lib/libgpio.a +OLD_FILES+=usr/lib/libgpio.so OLD_LIBS+=usr/lib/libgpio.so.0 OLD_FILES+=usr/lib/libgpio_p.a +OLD_FILES+=usr/lib32/libgpio.a +OLD_FILES+=usr/lib32/libgpio.so +OLD_LIBS+=usr/lib32/libgpio.so.0 +OLD_FILES+=usr/lib32/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl OLD_FILES+=usr/share/man/man3/gpio.3.gz OLD_FILES+=usr/share/man/man3/gpio_close.3.gz From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 05:41:18 2015 Return-Path: Delivered-To: svn-src-head@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 A526AB1; Mon, 2 Feb 2015 05:41:18 +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 922BBDA9; Mon, 2 Feb 2015 05:41:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t125fIBY050071; Mon, 2 Feb 2015 05:41:18 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t125fIAS050070; Mon, 2 Feb 2015 05:41:18 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502020541.t125fIAS050070@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 05:41:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278053 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 05:41:18 -0000 Author: ngie Date: Mon Feb 2 05:41:17 2015 New Revision: 278053 URL: https://svnweb.freebsd.org/changeset/base/278053 Log: Remove hostapd and wpa_supplicant from FILES so they're installed conditionally if MK_WIRELESS != no MFC after: 3 days X-MFC with: r277740 Modified: head/etc/rc.d/Makefile Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Mon Feb 2 05:17:26 2015 (r278052) +++ head/etc/rc.d/Makefile Mon Feb 2 05:41:17 2015 (r278053) @@ -43,7 +43,6 @@ FILES= DAEMON \ growfs \ gssd \ ${_hcsecd} \ - hostapd \ hostid \ hostid_save \ hostname \ @@ -137,7 +136,6 @@ FILES= DAEMON \ var \ virecover \ watchdogd \ - wpa_supplicant \ ypbind \ yppasswdd \ ypserv \ From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 08:01:11 2015 Return-Path: Delivered-To: svn-src-head@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 8305CE58; Mon, 2 Feb 2015 08:01:11 +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 55346C89; Mon, 2 Feb 2015 08:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1281BZG015114; Mon, 2 Feb 2015 08:01:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1281BCL015113; Mon, 2 Feb 2015 08:01:11 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201502020801.t1281BCL015113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Mon, 2 Feb 2015 08:01:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278061 - head/sys/arm/ti/am335x X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 08:01:11 -0000 Author: rpaulo Date: Mon Feb 2 08:01:10 2015 New Revision: 278061 URL: https://svnweb.freebsd.org/changeset/base/278061 Log: am335x_clk_pruss_activate(): use the L3F clock. The DISP DPLL clock is slower and was making the PRU programs slower on FreeBSD than on Linux. Submitted by: Manuel Stuehn MFC after: 1 week Modified: head/sys/arm/ti/am335x/am335x_prcm.c Modified: head/sys/arm/ti/am335x/am335x_prcm.c ============================================================================== --- head/sys/arm/ti/am335x/am335x_prcm.c Mon Feb 2 07:42:03 2015 (r278060) +++ head/sys/arm/ti/am335x/am335x_prcm.c Mon Feb 2 08:01:10 2015 (r278061) @@ -502,7 +502,7 @@ am335x_clk_gpio_activate(struct ti_clock /* set *_CLKCTRL register MODULEMODE[1:0] to enable(2) */ /* set *_CLKCTRL register OPTFCLKEN_GPIO_1_G DBCLK[18] to FCLK_EN(1) */ prcm_write_4(clk_details->clkctrl_reg, 2 | (1 << 18)); - while ((prcm_read_4(clk_details->clkctrl_reg) & + while ((prcm_read_4(clk_details->clkctrl_reg) & (3 | (1 << 18) )) != (2 | (1 << 18))) DELAY(10); @@ -724,11 +724,11 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x4); /* Make sure it's in bypass mode */ - while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while (!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 8))) DELAY(10); - /* + /* * For now set frequency to 99*SYSFREQ/8 which is twice as * HDMI 1080p pixel clock (minimum LCDC freq divisor is 2) */ @@ -738,7 +738,7 @@ am335x_clk_lcdc_activate(struct ti_clock prcm_write_4(CM_WKUP_CM_CLKMODE_DPLL_DISP, 0x7); int timeout = 10000; - while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) + while ((!(prcm_read_4(CM_WKUP_CM_IDLEST_DPLL_DISP) & (1 << 0))) && timeout--) DELAY(10); @@ -786,9 +786,9 @@ am335x_clk_pruss_activate(struct ti_cloc while ((prcm_read_4(CM_PER_PRUSS_CLKSTCTRL) & (1<<6)) == 0) DELAY(10); - /* Select DISP DPLL as OCP clock */ - prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 1); - while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 1) + /* Select L3F as OCP clock */ + prcm_write_4(CLKSEL_PRUSS_OCP_CLK, 0); + while ((prcm_read_4(CLKSEL_PRUSS_OCP_CLK) & 0x3) != 0) DELAY(10); /* Clear the RESET bit */ From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 10:31:36 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AF42E88; Mon, 2 Feb 2015 10:31:36 +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 8582CE31; Mon, 2 Feb 2015 10:31:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12AVaps087337; Mon, 2 Feb 2015 10:31:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12AVaCk087336; Mon, 2 Feb 2015 10:31:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502021031.t12AVaCk087336@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 10:31:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278070 - head/sbin X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 10:31:36 -0000 Author: ngie Date: Mon Feb 2 10:31:35 2015 New Revision: 278070 URL: https://svnweb.freebsd.org/changeset/base/278070 Log: Remove duplicate MK_ISCSI block and sort the conditional blocks so this error won't crop up again in the future Reported by: gjb MFC after: 1 week Modified: head/sbin/Makefile Modified: head/sbin/Makefile ============================================================================== --- head/sbin/Makefile Mon Feb 2 10:00:45 2015 (r278069) +++ head/sbin/Makefile Mon Feb 2 10:31:35 2015 (r278070) @@ -91,6 +91,11 @@ SUBDIR+= hastctl SUBDIR+= hastd .endif +.if ${MK_INET6} != "no" +SUBDIR+= ping6 +SUBDIR+= rtsol +.endif + .if ${MK_IPFILTER} != "no" SUBDIR+= ipf .endif @@ -114,15 +119,6 @@ SUBDIR+= pfctl SUBDIR+= pflogd .endif -.if ${MK_INET6} != "no" -SUBDIR+= ping6 -SUBDIR+= rtsol -.endif - -.if ${MK_ISCSI} != "no" -SUBDIR+= iscontrol -.endif - .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck .endif From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 11:06:43 2015 Return-Path: Delivered-To: svn-src-head@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 EC235546; Mon, 2 Feb 2015 11:06:42 +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 D7AE11EB; Mon, 2 Feb 2015 11:06:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12B6g2w002811; Mon, 2 Feb 2015 11:06:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12B6gvc002807; Mon, 2 Feb 2015 11:06:42 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021106.t12B6gvc002807@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 11:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278071 - in head/sys/dev/usb: . controller X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 11:06:43 -0000 Author: hselasky Date: Mon Feb 2 11:06:41 2015 New Revision: 278071 URL: https://svnweb.freebsd.org/changeset/base/278071 Log: Section 3.2.9 in the XHCI specification about control transfers says that we should use a normal-TRB if there are more TRBs extending the data-stage TRB. Add a dedicated state bit to the internal USB transfer flags to handle this case. Reported by: Kohji Okuno MFC after: 1 week Modified: head/sys/dev/usb/controller/xhci.c head/sys/dev/usb/usb_core.h head/sys/dev/usb/usb_transfer.c Modified: head/sys/dev/usb/controller/xhci.c ============================================================================== --- head/sys/dev/usb/controller/xhci.c Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/controller/xhci.c Mon Feb 2 11:06:41 2015 (r278071) @@ -1866,6 +1866,15 @@ restart: XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_DATA_STAGE); if (temp->direction == UE_DIR_IN) dword |= XHCI_TRB_3_DIR_IN | XHCI_TRB_3_ISP_BIT; + /* + * Section 3.2.9 in the XHCI + * specification about control + * transfers says that we should use a + * normal-TRB if there are more TRBs + * extending the data-stage + * TRB. Update the "trb_type". + */ + temp->trb_type = XHCI_TRB_TYPE_NORMAL; break; case XHCI_TRB_TYPE_STATUS_STAGE: dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT | @@ -2106,7 +2115,8 @@ xhci_setup_generic_chain(struct usb_xfer mult = 1; temp.isoc_delta = 0; temp.isoc_frame = 0; - temp.trb_type = XHCI_TRB_TYPE_DATA_STAGE; + temp.trb_type = xfer->flags_int.control_did_data ? + XHCI_TRB_TYPE_NORMAL : XHCI_TRB_TYPE_DATA_STAGE; } else { x = 0; mult = 1; Modified: head/sys/dev/usb/usb_core.h ============================================================================== --- head/sys/dev/usb/usb_core.h Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/usb_core.h Mon Feb 2 11:06:41 2015 (r278071) @@ -101,6 +101,7 @@ struct usb_xfer_flags_int { * sent */ uint8_t control_act:1; /* set if control transfer is active */ uint8_t control_stall:1; /* set if control transfer should be stalled */ + uint8_t control_did_data:1; /* set if control DATA has been transferred */ uint8_t short_frames_ok:1; /* filtered version */ uint8_t short_xfer_ok:1; /* filtered version */ Modified: head/sys/dev/usb/usb_transfer.c ============================================================================== --- head/sys/dev/usb/usb_transfer.c Mon Feb 2 10:31:35 2015 (r278070) +++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:06:41 2015 (r278071) @@ -1409,6 +1409,29 @@ usbd_control_transfer_init(struct usb_xf } /*------------------------------------------------------------------------* + * usbd_control_transfer_did_data + * + * This function returns non-zero if a control endpoint has + * transferred the first DATA packet after the SETUP packet. + * Else it returns zero. + *------------------------------------------------------------------------*/ +static uint8_t +usbd_control_transfer_did_data(struct usb_xfer *xfer) +{ + struct usb_device_request req; + + /* SETUP packet is not yet sent */ + if (xfer->flags_int.control_hdr != 0) + return (0); + + /* copy out the USB request header */ + usbd_copy_out(xfer->frbuffers, 0, &req, sizeof(req)); + + /* compare remainder to the initial value */ + return (xfer->flags_int.control_rem != UGETW(req.wLength)); +} + +/*------------------------------------------------------------------------* * usbd_setup_ctrl_transfer * * This function handles initialisation of control transfers. Control @@ -1513,6 +1536,11 @@ usbd_setup_ctrl_transfer(struct usb_xfer len = (xfer->sumlen - sizeof(struct usb_device_request)); } + /* update did data flag */ + + xfer->flags_int.control_did_data = + usbd_control_transfer_did_data(xfer); + /* check if there is a length mismatch */ if (len > xfer->flags_int.control_rem) { From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 11:32:17 2015 Return-Path: Delivered-To: svn-src-head@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 132E3269; Mon, 2 Feb 2015 11:32:17 +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 E811D79C; Mon, 2 Feb 2015 11:32:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12BWGP1016755; Mon, 2 Feb 2015 11:32:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12BWGae016753; Mon, 2 Feb 2015 11:32:16 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502021132.t12BWGae016753@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 2 Feb 2015 11:32:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278074 - in head/sys: conf dev/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 11:32:17 -0000 Author: hselasky Date: Mon Feb 2 11:32:15 2015 New Revision: 278074 URL: https://svnweb.freebsd.org/changeset/base/278074 Log: Optimise allocation of USB DMA structures. By default don't double map allocations if only one element should be allocated per page cache. Make one allocation per element compile time configurable. Fix a comment while at it. Suggested by: ian @ MFC after: 1 week Modified: head/sys/conf/options head/sys/dev/usb/usb_transfer.c Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Mon Feb 2 11:26:52 2015 (r278073) +++ head/sys/conf/options Mon Feb 2 11:32:15 2015 (r278074) @@ -651,6 +651,7 @@ USB_HOST_ALIGN opt_usb.h USB_REQ_DEBUG opt_usb.h USB_TEMPLATE opt_usb.h USB_VERBOSE opt_usb.h +USB_DMA_SINGLE_ALLOC opt_usb.h USB_EHCI_BIG_ENDIAN_DESC opt_usb.h U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h Modified: head/sys/dev/usb/usb_transfer.c ============================================================================== --- head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:26:52 2015 (r278073) +++ head/sys/dev/usb/usb_transfer.c Mon Feb 2 11:32:15 2015 (r278074) @@ -237,7 +237,11 @@ usbd_transfer_setup_sub_malloc(struct us n_obj = 1; } else { /* compute number of objects per page */ +#ifdef USB_DMA_SINGLE_ALLOC + n_obj = 1; +#else n_obj = (USB_PAGE_SIZE / size); +#endif /* * Compute number of DMA chunks, rounded up * to nearest one: @@ -273,15 +277,33 @@ usbd_transfer_setup_sub_malloc(struct us &parm->curr_xfer->xroot->dma_parent_tag; } - if (ppc) { - *ppc = parm->xfer_page_cache_ptr; + if (ppc != NULL) { + if (n_obj != 1) + *ppc = parm->xfer_page_cache_ptr; + else + *ppc = parm->dma_page_cache_ptr; } r = count; /* set remainder count */ z = n_obj * size; /* set allocation size */ pc = parm->xfer_page_cache_ptr; pg = parm->dma_page_ptr; - for (x = 0; x != n_dma_pc; x++) { + if (n_obj == 1) { + /* + * Avoid mapping memory twice if only a single object + * should be allocated per page cache: + */ + for (x = 0; x != n_dma_pc; x++) { + if (usb_pc_alloc_mem(parm->dma_page_cache_ptr, + pg, z, align)) { + return (1); /* failure */ + } + /* Make room for one DMA page cache and "n_dma_pg" pages */ + parm->dma_page_cache_ptr++; + pg += n_dma_pg; + } + } else { + for (x = 0; x != n_dma_pc; x++) { if (r < n_obj) { /* compute last remainder */ @@ -294,7 +316,7 @@ usbd_transfer_setup_sub_malloc(struct us } /* Set beginning of current buffer */ buf = parm->dma_page_cache_ptr->buffer; - /* Make room for one DMA page cache and one page */ + /* Make room for one DMA page cache and "n_dma_pg" pages */ parm->dma_page_cache_ptr++; pg += n_dma_pg; @@ -314,6 +336,7 @@ usbd_transfer_setup_sub_malloc(struct us } mtx_unlock(pc->tag_parent->mtx); } + } } parm->xfer_page_cache_ptr = pc; From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 13:03:05 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CF7E9DA; Mon, 2 Feb 2015 13:03:05 +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 780C0BD; Mon, 2 Feb 2015 13:03:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12D355u059545; Mon, 2 Feb 2015 13:03:05 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12D35Nf059543; Mon, 2 Feb 2015 13:03:05 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201502021303.t12D35Nf059543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Mon, 2 Feb 2015 13:03:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278080 - head/sbin/ifconfig X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 13:03:05 -0000 Author: vsevolod (ports committer) Date: Mon Feb 2 13:03:04 2015 New Revision: 278080 URL: https://svnweb.freebsd.org/changeset/base/278080 Log: Reorganize the list of addresses associated with an interface and group them based on the address family. This should help to recognize interfaces with multiple AF (e.g. ipv4 and ipv6) with many aliases or additional addresses. The order of addresses inside a single group is strictly preserved. Improve the scope_id output for AF_INET6 families, as the current approach uses hexadecimal string that is basically the ID of an interface, whilst this information is already depicted by getnameinfo(3) call. Therefore, now ifconfig just prints the scope of address as it is defined in 2.4 of RFC 2373. PR: 197270 Approved by: bapt MFC after: 2 weeks Modified: head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/af_inet6.c ============================================================================== --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 12:48:13 2015 (r278079) +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015 (r278080) @@ -167,6 +167,33 @@ setip6eui64(const char *cmd, int dummy _ } static void +in6_print_scope(uint8_t *a) +{ + const char *sname = NULL; + uint16_t val; + + val = (a[0] << 4) + ((a[1] & 0xc0) >> 4); + + if ((val & 0xff0) == 0xff0) + sname = "Multicast"; + else { + switch(val) { + case 0xfe8: + sname = "Link"; + break; + case 0xfec: + sname = "Site"; + break; + default: + sname = "Global"; + break; + } + } + + printf("scope: %s ", sname); +} + +static void in6_status(int s __unused, const struct ifaddrs *ifa) { struct sockaddr_in6 *sin, null_sin; @@ -257,9 +284,7 @@ in6_status(int s __unused, const struct if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) printf("prefer_source "); - if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id) - printf("scopeid 0x%x ", - ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id); + in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_addr); if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { printf("pltime "); Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 12:48:13 2015 (r278079) +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015 (r278080) @@ -47,6 +47,7 @@ static const char rcsid[] = #include #include #include +#include #include #include @@ -110,6 +111,15 @@ static void af_other_status(int); static struct option *opts = NULL; +struct ifa_order_elt { + int if_order; + int af_orders[255]; + struct ifaddrs *ifa; + TAILQ_ENTRY(ifa_order_elt) link; +}; + +TAILQ_HEAD(ifa_queue, ifa_order_elt); + void opt_register(struct option *p) { @@ -141,16 +151,162 @@ usage(void) exit(1); } +static int +calcorders(struct ifaddrs *ifa, struct ifa_queue *q) +{ + unsigned int ord, af, ifa_ord; + struct ifaddrs *prev; + struct ifa_order_elt *cur; + + prev = NULL; + cur = NULL; + ord = 0; + ifa_ord = 0; + + while (ifa != NULL) { + if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0) { + cur = calloc(1, sizeof(*cur)); + + if (cur == NULL) + return (-1); + + TAILQ_INSERT_TAIL(q, cur, link); + cur->if_order = ifa_ord ++; + cur->ifa = ifa; + ord = 0; + } + + if (ifa->ifa_addr) { + af = ifa->ifa_addr->sa_family; + + if (af < sizeof(cur->af_orders) / sizeof(cur->af_orders[0]) && + cur->af_orders[af] == 0) + cur->af_orders[af] = ++ord; + } + prev = ifa; + ifa = ifa->ifa_next; + } + + return (0); +} + +static int +cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q) +{ + int ret; + unsigned int af1, af2; + struct ifa_order_elt *cur, *e1, *e2; + + e1 = e2 = NULL; + + ret = strcmp(a->ifa_name, b->ifa_name); + if (ret != 0) { + /* We need to find elements corresponding to these different names */ + TAILQ_FOREACH(cur, q, link) { + if (e1 && e2) + break; + + if (strcmp(cur->ifa->ifa_name, a->ifa_name) == 0) + e1 = cur; + else if (strcmp(cur->ifa->ifa_name, b->ifa_name) == 0) + e2 = cur; + } + + if (!e1 || !e2) + return (0); + else + return (e1->if_order - e2->if_order); + + } else if (a->ifa_addr != NULL && b->ifa_addr != NULL) { + TAILQ_FOREACH(cur, q, link) { + if (strcmp(cur->ifa->ifa_name, a->ifa_name) == 0) { + e1 = cur; + break; + } + } + + if (!e1) + return (0); + + af1 = a->ifa_addr->sa_family; + af2 = b->ifa_addr->sa_family; + + if (af1 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0]) && + af2 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0])) + return (e1->af_orders[af2] - e1->af_orders[af1]); + } + + return (0); +} + +static struct ifaddrs * +sortifaddrs(struct ifaddrs *list, + int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), + struct ifa_queue *q) +{ + + struct ifaddrs *right, *temp, *last, *result, *next, *tail; + + right = list; + temp = list; + last = list; + result = NULL; + next = NULL; + tail = NULL; + + if (!list || !list->ifa_next) + return (list); + + while (temp && temp->ifa_next) { + last = right; + right = right->ifa_next; + temp = temp->ifa_next->ifa_next; + } + + last->ifa_next = NULL; + + list = sortifaddrs(list, compare, q); + right = sortifaddrs(right, compare, q); + + while (list || right) { + + if (!right) { + next = list; + list = list->ifa_next; + } else if (!list) { + next = right; + right = right->ifa_next; + } else if (compare(list, right, q) <= 0) { + next = list; + list = list->ifa_next; + } else { + next = right; + right = right->ifa_next; + } + + if (!result) + result = next; + else + tail->ifa_next = next; + + tail = next; + } + + return (result); +} + int main(int argc, char *argv[]) { int c, all, namesonly, downonly, uponly; const struct afswtch *afp = NULL; int ifindex; - struct ifaddrs *ifap, *ifa; + struct ifaddrs *ifap, *sifap, *ifa; struct ifreq paifr; const struct sockaddr_dl *sdl; char options[1024], *cp, *namecp = NULL; + struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); + struct ifa_order_elt *cur, *tmp; const char *ifname; struct option *p; size_t iflen; @@ -285,9 +441,19 @@ main(int argc, char *argv[]) if (getifaddrs(&ifap) != 0) err(EXIT_FAILURE, "getifaddrs"); + cp = NULL; + + if (calcorders(ifap, &q) != 0) + err(EXIT_FAILURE, "calcorders"); + + sifap = sortifaddrs(ifap, cmpifaddrs, &q); + + TAILQ_FOREACH_SAFE(cur, &q, link, tmp) + free(cur); + ifindex = 0; - for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + for (ifa = sifap; ifa; ifa = ifa->ifa_next) { memset(&paifr, 0, sizeof(paifr)); strncpy(paifr.ifr_name, ifa->ifa_name, sizeof(paifr.ifr_name)); if (sizeof(paifr.ifr_addr) >= ifa->ifa_addr->sa_len) { From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:37:46 2015 Return-Path: Delivered-To: svn-src-head@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 8E8CDA93; Mon, 2 Feb 2015 14:37:46 +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 7A161C95; Mon, 2 Feb 2015 14:37:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EbkgA002350; Mon, 2 Feb 2015 14:37:46 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Ebk7M002347; Mon, 2 Feb 2015 14:37:46 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201502021437.t12Ebk7M002347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Mon, 2 Feb 2015 14:37:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278081 - head/sbin/ifconfig X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:37:46 -0000 Author: vsevolod (ports committer) Date: Mon Feb 2 14:37:45 2015 New Revision: 278081 URL: https://svnweb.freebsd.org/changeset/base/278081 Log: Style(9) fixes. Approved by: bapt, ae X-MFC-With: r278080 Modified: head/sbin/ifconfig/af_inet6.c head/sbin/ifconfig/ifconfig.c Modified: head/sbin/ifconfig/af_inet6.c ============================================================================== --- head/sbin/ifconfig/af_inet6.c Mon Feb 2 13:03:04 2015 (r278080) +++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 14:37:45 2015 (r278081) @@ -58,8 +58,8 @@ static const char rcsid[] = #include "ifconfig.h" static struct in6_ifreq in6_ridreq; -static struct in6_aliasreq in6_addreq = - { .ifra_flags = 0, +static struct in6_aliasreq in6_addreq = + { .ifra_flags = 0, .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; static int ip6lifetime; @@ -284,20 +284,23 @@ in6_status(int s __unused, const struct if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0) printf("prefer_source "); - in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_addr); + in6_print_scope((uint8_t *)&((struct sockaddr_in6 *) + (ifa->ifa_addr))->sin6_addr); if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) { printf("pltime "); if (lifetime.ia6t_preferred) { printf("%s ", lifetime.ia6t_preferred < now.tv_sec - ? "0" : sec2str(lifetime.ia6t_preferred - now.tv_sec)); + ? "0" : + sec2str(lifetime.ia6t_preferred - now.tv_sec)); } else printf("infty "); printf("vltime "); if (lifetime.ia6t_expire) { printf("%s ", lifetime.ia6t_expire < now.tv_sec - ? "0" : sec2str(lifetime.ia6t_expire - now.tv_sec)); + ? "0" : + sec2str(lifetime.ia6t_expire - now.tv_sec)); } else printf("infty "); } @@ -372,25 +375,25 @@ in6_getaddr(const char *s, int which) static int prefix(void *val, int size) { - u_char *name = (u_char *)val; - int byte, bit, plen = 0; + u_char *name = (u_char *)val; + int byte, bit, plen = 0; - for (byte = 0; byte < size; byte++, plen += 8) - if (name[byte] != 0xff) - break; + for (byte = 0; byte < size; byte++, plen += 8) + if (name[byte] != 0xff) + break; if (byte == size) return (plen); for (bit = 7; bit != 0; bit--, plen++) - if (!(name[byte] & (1 << bit))) - break; - for (; bit != 0; bit--) - if (name[byte] & (1 << bit)) - return(0); - byte++; - for (; byte < size; byte++) - if (name[byte]) - return(0); - return (plen); + if (!(name[byte] & (1 << bit))) + break; + for (; bit != 0; bit--) + if (name[byte] & (1 << bit)) + return(0); + byte++; + for (; byte < size; byte++) + if (name[byte]) + return(0); + return (plen); } static char * @@ -534,7 +537,11 @@ in6_Lopt_cb(const char *optarg __unused) { ip6lifetime++; /* print IPv6 address lifetime */ } -static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb }; +static struct option in6_Lopt = { + .opt = "L", + .opt_usage = "[-L]", + .cb = in6_Lopt_cb +}; static __constructor void inet6_ctor(void) Modified: head/sbin/ifconfig/ifconfig.c ============================================================================== --- head/sbin/ifconfig/ifconfig.c Mon Feb 2 13:03:04 2015 (r278080) +++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 14:37:45 2015 (r278081) @@ -151,12 +151,14 @@ usage(void) exit(1); } +#define ORDERS_SIZE(x) sizeof(x) / sizeof(x[0]) + static int calcorders(struct ifaddrs *ifa, struct ifa_queue *q) { - unsigned int ord, af, ifa_ord; struct ifaddrs *prev; struct ifa_order_elt *cur; + unsigned int ord, af, ifa_ord; prev = NULL; cur = NULL; @@ -164,7 +166,8 @@ calcorders(struct ifaddrs *ifa, struct i ifa_ord = 0; while (ifa != NULL) { - if (prev == NULL || strcmp(ifa->ifa_name, prev->ifa_name) != 0) { + if (prev == NULL || + strcmp(ifa->ifa_name, prev->ifa_name) != 0) { cur = calloc(1, sizeof(*cur)); if (cur == NULL) @@ -179,12 +182,12 @@ calcorders(struct ifaddrs *ifa, struct i if (ifa->ifa_addr) { af = ifa->ifa_addr->sa_family; - if (af < sizeof(cur->af_orders) / sizeof(cur->af_orders[0]) && - cur->af_orders[af] == 0) + if (af < ORDERS_SIZE(cur->af_orders) && + cur->af_orders[af] == 0) cur->af_orders[af] = ++ord; } prev = ifa; - ifa = ifa->ifa_next; + ifa = ifa->ifa_next; } return (0); @@ -193,15 +196,14 @@ calcorders(struct ifaddrs *ifa, struct i static int cmpifaddrs(struct ifaddrs *a, struct ifaddrs *b, struct ifa_queue *q) { - int ret; - unsigned int af1, af2; struct ifa_order_elt *cur, *e1, *e2; + unsigned int af1, af2; + int ret; e1 = e2 = NULL; ret = strcmp(a->ifa_name, b->ifa_name); if (ret != 0) { - /* We need to find elements corresponding to these different names */ TAILQ_FOREACH(cur, q, link) { if (e1 && e2) break; @@ -231,20 +233,21 @@ cmpifaddrs(struct ifaddrs *a, struct ifa af1 = a->ifa_addr->sa_family; af2 = b->ifa_addr->sa_family; - if (af1 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0]) && - af2 < sizeof(e1->af_orders) / sizeof(e1->af_orders[0])) + if (af1 < ORDERS_SIZE(e1->af_orders) && + af2 < ORDERS_SIZE(e1->af_orders)) return (e1->af_orders[af2] - e1->af_orders[af1]); } return (0); } +#undef ORDERS_SIZE + static struct ifaddrs * sortifaddrs(struct ifaddrs *list, - int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), - struct ifa_queue *q) + int (*compare)(struct ifaddrs *, struct ifaddrs *, struct ifa_queue *), + struct ifa_queue *q) { - struct ifaddrs *right, *temp, *last, *result, *next, *tail; right = list; @@ -499,7 +502,8 @@ main(int argc, char *argv[]) sdl->sdl_alen != ETHER_ADDR_LEN) continue; } else { - if (ifa->ifa_addr->sa_family != afp->af_af) + if (ifa->ifa_addr->sa_family + != afp->af_af) continue; } } @@ -835,7 +839,7 @@ settunnel(const char *src, const char *d errx(1, "error in parsing address string: %s", gai_strerror(ecode)); - if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) + if ((ecode = getaddrinfo(dst, NULL, NULL, &dstres)) != 0) errx(1, "error in parsing address string: %s", gai_strerror(ecode)); From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:38:48 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6EEBBDD; Mon, 2 Feb 2015 14:38: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 C2A1FCA2; Mon, 2 Feb 2015 14:38: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 t12EcmQY002520; Mon, 2 Feb 2015 14:38:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EcmPx002519; Mon, 2 Feb 2015 14:38:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021438.t12EcmPx002519@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:38:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278082 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:38:49 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:38:47 2015 New Revision: 278082 URL: https://svnweb.freebsd.org/changeset/base/278082 Log: - Remove more files when MK_GROFF == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:37:45 2015 (r278081) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47 2015 (r278082) @@ -1777,6 +1777,76 @@ OLD_FILES+=usr/bin/tfmtodit OLD_FILES+=usr/bin/troff OLD_FILES+=usr/bin/vgrind OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/dict/eign +OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz +OLD_FILES+=usr/share/doc/papers/bio.ascii.gz +OLD_FILES+=usr/share/doc/papers/contents.ascii.gz +OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz +OLD_FILES+=usr/share/doc/papers/jail.ascii.gz +OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz +OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz +OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz +OLD_FILES+=usr/share/doc/papers/releng.ascii.gz +OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz +OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz +OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz +OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz +OLD_FILES+=usr/share/doc/psd/Title.ascii.gz +OLD_FILES+=usr/share/doc/psd/contents.ascii.gz +OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz +OLD_FILES+=usr/share/doc/smm/Title.ascii.gz +OLD_FILES+=usr/share/doc/smm/contents.ascii.gz +OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/Title.ascii.gz +OLD_FILES+=usr/share/doc/usd/contents.ascii.gz OLD_FILES+=usr/share/groff_font/devX100-12/CB OLD_FILES+=usr/share/groff_font/devX100-12/CBI OLD_FILES+=usr/share/groff_font/devX100-12/CI From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:40:43 2015 Return-Path: Delivered-To: svn-src-head@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 3E7F9D48; Mon, 2 Feb 2015 14:40:43 +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 2A169CC0; Mon, 2 Feb 2015 14:40:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EehMT004708; Mon, 2 Feb 2015 14:40:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Eeh9P004707; Mon, 2 Feb 2015 14:40:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021440.t12Eeh9P004707@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:40:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278083 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:40:43 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:40:42 2015 New Revision: 278083 URL: https://svnweb.freebsd.org/changeset/base/278083 Log: - Remove more files when MK_HTML == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:38:47 2015 (r278082) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42 2015 (r278083) @@ -2402,9 +2402,76 @@ OLD_FILES+=usr/share/man/man3/hesiod.3.g OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz .endif -#.if ${MK_HTML} == no -# to be filled in -#.endif +.if ${MK_HTML} == no +OLD_FILES+=usr/share/doc/ncurses/hackguide.html +OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html +OLD_FILES+=usr/share/doc/ntp/accopt.html +OLD_FILES+=usr/share/doc/ntp/assoc.html +OLD_FILES+=usr/share/doc/ntp/audio.html +OLD_FILES+=usr/share/doc/ntp/authopt.html +OLD_FILES+=usr/share/doc/ntp/build.html +OLD_FILES+=usr/share/doc/ntp/clockopt.html +OLD_FILES+=usr/share/doc/ntp/config.html +OLD_FILES+=usr/share/doc/ntp/confopt.html +OLD_FILES+=usr/share/doc/ntp/copyright.html +OLD_FILES+=usr/share/doc/ntp/debug.html +OLD_FILES+=usr/share/doc/ntp/driver1.html +OLD_FILES+=usr/share/doc/ntp/driver10.html +OLD_FILES+=usr/share/doc/ntp/driver11.html +OLD_FILES+=usr/share/doc/ntp/driver12.html +OLD_FILES+=usr/share/doc/ntp/driver16.html +OLD_FILES+=usr/share/doc/ntp/driver18.html +OLD_FILES+=usr/share/doc/ntp/driver19.html +OLD_FILES+=usr/share/doc/ntp/driver2.html +OLD_FILES+=usr/share/doc/ntp/driver20.html +OLD_FILES+=usr/share/doc/ntp/driver22.html +OLD_FILES+=usr/share/doc/ntp/driver26.html +OLD_FILES+=usr/share/doc/ntp/driver27.html +OLD_FILES+=usr/share/doc/ntp/driver28.html +OLD_FILES+=usr/share/doc/ntp/driver29.html +OLD_FILES+=usr/share/doc/ntp/driver3.html +OLD_FILES+=usr/share/doc/ntp/driver30.html +OLD_FILES+=usr/share/doc/ntp/driver32.html +OLD_FILES+=usr/share/doc/ntp/driver33.html +OLD_FILES+=usr/share/doc/ntp/driver34.html +OLD_FILES+=usr/share/doc/ntp/driver35.html +OLD_FILES+=usr/share/doc/ntp/driver36.html +OLD_FILES+=usr/share/doc/ntp/driver37.html +OLD_FILES+=usr/share/doc/ntp/driver4.html +OLD_FILES+=usr/share/doc/ntp/driver5.html +OLD_FILES+=usr/share/doc/ntp/driver6.html +OLD_FILES+=usr/share/doc/ntp/driver7.html +OLD_FILES+=usr/share/doc/ntp/driver8.html +OLD_FILES+=usr/share/doc/ntp/driver9.html +OLD_FILES+=usr/share/doc/ntp/extern.html +OLD_FILES+=usr/share/doc/ntp/hints.html +OLD_FILES+=usr/share/doc/ntp/howto.html +OLD_FILES+=usr/share/doc/ntp/index.html +OLD_FILES+=usr/share/doc/ntp/kern.html +OLD_FILES+=usr/share/doc/ntp/ldisc.html +OLD_FILES+=usr/share/doc/ntp/measure.html +OLD_FILES+=usr/share/doc/ntp/miscopt.html +OLD_FILES+=usr/share/doc/ntp/monopt.html +OLD_FILES+=usr/share/doc/ntp/mx4200data.html +OLD_FILES+=usr/share/doc/ntp/notes.html +OLD_FILES+=usr/share/doc/ntp/ntpd.html +OLD_FILES+=usr/share/doc/ntp/ntpdate.html +OLD_FILES+=usr/share/doc/ntp/ntpdc.html +OLD_FILES+=usr/share/doc/ntp/ntpq.html +OLD_FILES+=usr/share/doc/ntp/ntptime.html +OLD_FILES+=usr/share/doc/ntp/ntptrace.html +OLD_FILES+=usr/share/doc/ntp/parsedata.html +OLD_FILES+=usr/share/doc/ntp/parsenew.html +OLD_FILES+=usr/share/doc/ntp/patches.html +OLD_FILES+=usr/share/doc/ntp/porting.html +OLD_FILES+=usr/share/doc/ntp/pps.html +OLD_FILES+=usr/share/doc/ntp/prefer.html +OLD_FILES+=usr/share/doc/ntp/quick.html +OLD_FILES+=usr/share/doc/ntp/rdebug.html +OLD_FILES+=usr/share/doc/ntp/refclock.html +OLD_FILES+=usr/share/doc/ntp/release.html +OLD_FILES+=usr/share/doc/ntp/tickadj.html +.endif .if ${MK_ICONV} == no OLD_FILES+=usr/bin/iconv From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:43:08 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B564EA7; Mon, 2 Feb 2015 14:43:08 +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 573CDD6D; Mon, 2 Feb 2015 14:43:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Eh8G6006581; Mon, 2 Feb 2015 14:43:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Eh8XO006580; Mon, 2 Feb 2015 14:43:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021443.t12Eh8XO006580@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278084 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:43:08 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:43:07 2015 New Revision: 278084 URL: https://svnweb.freebsd.org/changeset/base/278084 Log: - Remove more files when MK_LIBCPLUSPLUS == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:40:42 2015 (r278083) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07 2015 (r278084) @@ -3661,6 +3661,7 @@ OLD_FILES+=usr/include/c++/v1/__function OLD_FILES+=usr/include/c++/v1/__hash_table OLD_FILES+=usr/include/c++/v1/__locale OLD_FILES+=usr/include/c++/v1/__mutex_base +OLD_FILES+=usr/include/c++/v1/__refstring OLD_FILES+=usr/include/c++/v1/__split_buffer OLD_FILES+=usr/include/c++/v1/__sso_allocator OLD_FILES+=usr/include/c++/v1/__std_stream @@ -3704,8 +3705,12 @@ OLD_FILES+=usr/include/c++/v1/cwctype OLD_FILES+=usr/include/c++/v1/cxxabi.h OLD_FILES+=usr/include/c++/v1/deque OLD_FILES+=usr/include/c++/v1/exception +OLD_FILES+=usr/include/c++/v1/experimental/__config OLD_FILES+=usr/include/c++/v1/experimental/dynarray OLD_FILES+=usr/include/c++/v1/experimental/optional +OLD_FILES+=usr/include/c++/v1/experimental/string_view +OLD_FILES+=usr/include/c++/v1/experimental/type_traits +OLD_FILES+=usr/include/c++/v1/experimental/utility OLD_FILES+=usr/include/c++/v1/ext/__hash OLD_FILES+=usr/include/c++/v1/ext/hash_map OLD_FILES+=usr/include/c++/v1/ext/hash_set @@ -3735,6 +3740,7 @@ OLD_FILES+=usr/include/c++/v1/ratio OLD_FILES+=usr/include/c++/v1/regex OLD_FILES+=usr/include/c++/v1/scoped_allocator OLD_FILES+=usr/include/c++/v1/set +OLD_FILES+=usr/include/c++/v1/shared_mutex OLD_FILES+=usr/include/c++/v1/sstream OLD_FILES+=usr/include/c++/v1/stack OLD_FILES+=usr/include/c++/v1/stdexcept @@ -3744,6 +3750,103 @@ OLD_FILES+=usr/include/c++/v1/strstream OLD_FILES+=usr/include/c++/v1/system_error OLD_FILES+=usr/include/c++/v1/tgmath.h OLD_FILES+=usr/include/c++/v1/thread +OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference +OLD_FILES+=usr/include/c++/v1/tr1/__config +OLD_FILES+=usr/include/c++/v1/tr1/__debug +OLD_FILES+=usr/include/c++/v1/tr1/__functional_03 +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base +OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03 +OLD_FILES+=usr/include/c++/v1/tr1/__hash_table +OLD_FILES+=usr/include/c++/v1/tr1/__locale +OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base +OLD_FILES+=usr/include/c++/v1/tr1/__refstring +OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer +OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator +OLD_FILES+=usr/include/c++/v1/tr1/__std_stream +OLD_FILES+=usr/include/c++/v1/tr1/__tree +OLD_FILES+=usr/include/c++/v1/tr1/__tuple +OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03 +OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max +OLD_FILES+=usr/include/c++/v1/tr1/algorithm +OLD_FILES+=usr/include/c++/v1/tr1/array +OLD_FILES+=usr/include/c++/v1/tr1/atomic +OLD_FILES+=usr/include/c++/v1/tr1/bitset +OLD_FILES+=usr/include/c++/v1/tr1/cassert +OLD_FILES+=usr/include/c++/v1/tr1/ccomplex +OLD_FILES+=usr/include/c++/v1/tr1/cctype +OLD_FILES+=usr/include/c++/v1/tr1/cerrno +OLD_FILES+=usr/include/c++/v1/tr1/cfenv +OLD_FILES+=usr/include/c++/v1/tr1/cfloat +OLD_FILES+=usr/include/c++/v1/tr1/chrono +OLD_FILES+=usr/include/c++/v1/tr1/cinttypes +OLD_FILES+=usr/include/c++/v1/tr1/ciso646 +OLD_FILES+=usr/include/c++/v1/tr1/climits +OLD_FILES+=usr/include/c++/v1/tr1/clocale +OLD_FILES+=usr/include/c++/v1/tr1/cmath +OLD_FILES+=usr/include/c++/v1/tr1/codecvt +OLD_FILES+=usr/include/c++/v1/tr1/complex +OLD_FILES+=usr/include/c++/v1/tr1/complex.h +OLD_FILES+=usr/include/c++/v1/tr1/condition_variable +OLD_FILES+=usr/include/c++/v1/tr1/csetjmp +OLD_FILES+=usr/include/c++/v1/tr1/csignal +OLD_FILES+=usr/include/c++/v1/tr1/cstdarg +OLD_FILES+=usr/include/c++/v1/tr1/cstdbool +OLD_FILES+=usr/include/c++/v1/tr1/cstddef +OLD_FILES+=usr/include/c++/v1/tr1/cstdint +OLD_FILES+=usr/include/c++/v1/tr1/cstdio +OLD_FILES+=usr/include/c++/v1/tr1/cstdlib +OLD_FILES+=usr/include/c++/v1/tr1/cstring +OLD_FILES+=usr/include/c++/v1/tr1/ctgmath +OLD_FILES+=usr/include/c++/v1/tr1/ctime +OLD_FILES+=usr/include/c++/v1/tr1/cwchar +OLD_FILES+=usr/include/c++/v1/tr1/cwctype +OLD_FILES+=usr/include/c++/v1/tr1/deque +OLD_FILES+=usr/include/c++/v1/tr1/exception +OLD_FILES+=usr/include/c++/v1/tr1/forward_list +OLD_FILES+=usr/include/c++/v1/tr1/fstream +OLD_FILES+=usr/include/c++/v1/tr1/functional +OLD_FILES+=usr/include/c++/v1/tr1/future +OLD_FILES+=usr/include/c++/v1/tr1/initializer_list +OLD_FILES+=usr/include/c++/v1/tr1/iomanip +OLD_FILES+=usr/include/c++/v1/tr1/ios +OLD_FILES+=usr/include/c++/v1/tr1/iosfwd +OLD_FILES+=usr/include/c++/v1/tr1/iostream +OLD_FILES+=usr/include/c++/v1/tr1/istream +OLD_FILES+=usr/include/c++/v1/tr1/iterator +OLD_FILES+=usr/include/c++/v1/tr1/limits +OLD_FILES+=usr/include/c++/v1/tr1/list +OLD_FILES+=usr/include/c++/v1/tr1/locale +OLD_FILES+=usr/include/c++/v1/tr1/map +OLD_FILES+=usr/include/c++/v1/tr1/memory +OLD_FILES+=usr/include/c++/v1/tr1/mutex +OLD_FILES+=usr/include/c++/v1/tr1/new +OLD_FILES+=usr/include/c++/v1/tr1/numeric +OLD_FILES+=usr/include/c++/v1/tr1/ostream +OLD_FILES+=usr/include/c++/v1/tr1/queue +OLD_FILES+=usr/include/c++/v1/tr1/random +OLD_FILES+=usr/include/c++/v1/tr1/ratio +OLD_FILES+=usr/include/c++/v1/tr1/regex +OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator +OLD_FILES+=usr/include/c++/v1/tr1/set +OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex +OLD_FILES+=usr/include/c++/v1/tr1/sstream +OLD_FILES+=usr/include/c++/v1/tr1/stack +OLD_FILES+=usr/include/c++/v1/tr1/stdexcept +OLD_FILES+=usr/include/c++/v1/tr1/streambuf +OLD_FILES+=usr/include/c++/v1/tr1/string +OLD_FILES+=usr/include/c++/v1/tr1/strstream +OLD_FILES+=usr/include/c++/v1/tr1/system_error +OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h +OLD_FILES+=usr/include/c++/v1/tr1/thread +OLD_FILES+=usr/include/c++/v1/tr1/tuple +OLD_FILES+=usr/include/c++/v1/tr1/type_traits +OLD_FILES+=usr/include/c++/v1/tr1/typeindex +OLD_FILES+=usr/include/c++/v1/tr1/typeinfo +OLD_FILES+=usr/include/c++/v1/tr1/unordered_map +OLD_FILES+=usr/include/c++/v1/tr1/unordered_set +OLD_FILES+=usr/include/c++/v1/tr1/utility +OLD_FILES+=usr/include/c++/v1/tr1/valarray +OLD_FILES+=usr/include/c++/v1/tr1/vector OLD_FILES+=usr/include/c++/v1/tuple OLD_FILES+=usr/include/c++/v1/type_traits OLD_FILES+=usr/include/c++/v1/typeindex @@ -3756,6 +3859,14 @@ OLD_FILES+=usr/include/c++/v1/unwind.h OLD_FILES+=usr/include/c++/v1/utility OLD_FILES+=usr/include/c++/v1/valarray OLD_FILES+=usr/include/c++/v1/vector +OLD_FILES+=usr/lib32/libc++.a +OLD_FILES+=usr/lib32/libc++.so +OLD_LIBS+=usr/lib32/libc++.so.1 +OLD_FILES+=usr/lib32/libc++_p.a +OLD_FILES+=usr/lib32/libcxxrt.a +OLD_FILES+=usr/lib32/libcxxrt.so +OLD_LIBS+=usr/lib32/libcxxrt.so.1 +OLD_FILES+=usr/lib32/libcxxrt_p.a OLD_DIRS+=usr/include/c++/v1/experimental OLD_DIRS+=usr/include/c++/v1/ext OLD_DIRS+=usr/include/c++/v1 From owner-svn-src-head@FreeBSD.ORG Mon Feb 2 14:45:18 2015 Return-Path: Delivered-To: svn-src-head@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 CBB1CC2; Mon, 2 Feb 2015 14:45:18 +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 B51AFD83; Mon, 2 Feb 2015 14:45:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12EjIle006957; Mon, 2 Feb 2015 14:45:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12EjIex006956; Mon, 2 Feb 2015 14:45:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502021445.t12EjIex006956@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 2 Feb 2015 14:45:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278085 - head/tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 14:45:18 -0000 Author: amdmi3 (ports committer) Date: Mon Feb 2 14:45:17 2015 New Revision: 278085 URL: https://svnweb.freebsd.org/changeset/base/278085 Log: - Remove more files when MK_LOCALES == no MFC after: 1 week Reviewed by: ngie Approved by: ngie Differential Revision: D1600 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:43:07 2015 (r278084) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 14:45:17 2015 (r278085) @@ -3876,9 +3876,1039 @@ OLD_DIRS+=usr/include/c++/v1 # to be filled in #.endif -#.if ${MK_LOCALES} == no -# to be filled in -#.endif +.if ${MK_LOCALES} == no +OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MONETARY +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC +OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_TIME +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MONETARY +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_NUMERIC +OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_TIME +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_TIME +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC +OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC +OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC +OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE +OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MONETARY +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_NUMERIC +OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_TIME +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_TIME +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC +OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_TIME +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC +OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_TIME +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/l