From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 17:49:39 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8C115E4F; Mon, 6 May 2013 17:49:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 65C1C641; Mon, 6 May 2013 17:49:39 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7ED53B911; Mon, 6 May 2013 13:49:38 -0400 (EDT) From: John Baldwin To: Dimitry Andric Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern Date: Mon, 6 May 2013 09:59:52 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> In-Reply-To: <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201305060959.52379.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 06 May 2013 13:49:38 -0400 (EDT) Cc: mdf@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-8@freebsd.org, svn-src-stable@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 17:49:39 -0000 On Saturday, May 04, 2013 3:06:12 pm Dimitry Andric wrote: > On May 4, 2013, at 20:51, mdf@FreeBSD.org wrote: > > On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming wrote: > > Author: mdf > > Date: Sat May 4 18:49:04 2013 > > New Revision: 250249 > > URL: http://svnweb.freebsd.org/changeset/base/250249 > ...lots of changed properties... > > stable/8/sys/xen/ (props changed) > > > > This seems like an excessive amount of mergeinfo properties. Is stable/8 just borked that way (compared to 9) or did my svn client mess up somehow (which wouldn't make much sense since it worked for stable/9 okay)? > > > > I'm using svn 1.6.13 on this laptop. > > It will probably help if you upgrade to svn 1.7, which has marginally better merge logic. For some reason, 1.6 tends to add lots of property changes to each subdirectory, when merging. This was mostly fixed in 1.7. Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges now add a lot more mergeinfo. 1.6 should really be avoided at this point for merges if at all possible. -- John Baldwin From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 18:27:27 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E4948DF; Mon, 6 May 2013 18:27:27 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-qe0-f48.google.com (mail-qe0-f48.google.com [209.85.128.48]) by mx1.freebsd.org (Postfix) with ESMTP id 5106A95C; Mon, 6 May 2013 18:27:27 +0000 (UTC) Received: by mail-qe0-f48.google.com with SMTP id 9so2200375qea.21 for ; Mon, 06 May 2013 11:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=rE0TVLmZ3MFClp9mUMK2Ng6gP7ETFDFXOFteSQG396k=; b=AkXqNsR+q40H3CUF5uYTBz6BuxhwHEDjFsnOqnDN5japwC7ZU/JMc09ESQbfvOe1C7 ErbfOShKVhuzNTULGP0y9DvSLYxqyO+ptEzQ0YI7l2qIz+8N9rfPAX0l9f4NL9Q4dEhV CY6kw1TLB5OZ71RUs39wT8pX2bSAjKbc98g13Cy+itlg8fikg36CtwXG4AoH9S4d7VFq Okezcj8VCN1oRgAxRhQuOjtPId12aZT9FVsUejF+VzvVviThbMRKFDLxoJwx9rh8o/G/ zCl6nS+Y1uo/w8W7h3pweknfbzKYROuj9BFIn2Wrhs/Xrtezyi+w/eMRs9HYrx46qfQZ 6QKA== MIME-Version: 1.0 X-Received: by 10.49.104.7 with SMTP id ga7mr7430339qeb.27.1367864841445; Mon, 06 May 2013 11:27:21 -0700 (PDT) Sender: mdf356@gmail.com Received: by 10.229.127.152 with HTTP; Mon, 6 May 2013 11:27:21 -0700 (PDT) In-Reply-To: <201305060959.52379.jhb@freebsd.org> References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> Date: Mon, 6 May 2013 11:27:21 -0700 X-Google-Sender-Auth: mbR_C0OWhTWX59STl697Zu9G1w8 Message-ID: Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern From: mdf@FreeBSD.org To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Dimitry Andric , svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 18:27:28 -0000 On Mon, May 6, 2013 at 6:59 AM, John Baldwin wrote: > On Saturday, May 04, 2013 3:06:12 pm Dimitry Andric wrote: > > On May 4, 2013, at 20:51, mdf@FreeBSD.org wrote: > > > On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming > wrote: > > > Author: mdf > > > Date: Sat May 4 18:49:04 2013 > > > New Revision: 250249 > > > URL: http://svnweb.freebsd.org/changeset/base/250249 > > ...lots of changed properties... > > > stable/8/sys/xen/ (props changed) > > > > > > This seems like an excessive amount of mergeinfo properties. Is > stable/8 > just borked that way (compared to 9) or did my svn client mess up somehow > (which wouldn't make much sense since it worked for stable/9 okay)? > > > > > > I'm using svn 1.6.13 on this laptop. > > > > It will probably help if you upgrade to svn 1.7, which has marginally > better > merge logic. For some reason, 1.6 tends to add lots of property changes to > each subdirectory, when merging. This was mostly fixed in 1.7. > > Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges now > add > a lot more mergeinfo. 1.6 should really be avoided at this point for > merges > if at all possible. > Should I back this out, then, and re-do? And why did this happen on stable/8, but not stable/9 for the same MFC? Thanks, matthew From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 19:02:20 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 97DF3667; Mon, 6 May 2013 19:02:20 +0000 (UTC) (envelope-from dim@freebsd.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) by mx1.freebsd.org (Postfix) with ESMTP id 5B4DFB7E; Mon, 6 May 2013 19:02:20 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::cd6b:c604:1989:9c5c] (unknown [IPv6:2001:7b8:3a7:0:cd6b:c604:1989:9c5c]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 512DE5C5B; Mon, 6 May 2013 21:02:12 +0200 (CEST) Content-Type: text/plain; charset=iso-8859-1 Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\)) Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern From: Dimitry Andric In-Reply-To: Date: Mon, 6 May 2013 21:02:08 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> To: mdf@FreeBSD.org X-Mailer: Apple Mail (2.1503) Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-8@freebsd.org, John Baldwin X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 19:02:20 -0000 On May 6, 2013, at 20:27, mdf@FreeBSD.org wrote: > On Mon, May 6, 2013 at 6:59 AM, John Baldwin wrote: ... > Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges = now add > a lot more mergeinfo. 1.6 should really be avoided at this point for = merges > if at all possible. >=20 > Should I back this out, then, and re-do? And why did this happen on = stable/8, but not stable/9 for the same MFC? No, the spurious mergeinfo is not harmful, just a bit ugly. It should = be removed manually, by an svn expert (with a tiny bit of OCD... ;-). I think the stable/8 tree just contains more of this spurious merge = info, simply because a lot of that tree was created when svn 1.6 was the = current version. From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 19:59:15 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 24FE2DB0; Mon, 6 May 2013 19:59:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 17A52FD5; Mon, 6 May 2013 19:59:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46JxEPk041113; Mon, 6 May 2013 19:59:14 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46JxEUA041105; Mon, 6 May 2013 19:59:14 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201305061959.r46JxEUA041105@svn.freebsd.org> From: Dimitry Andric Date: Mon, 6 May 2013 19:59:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250306 - in stable/8/sys: net sys X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 19:59:15 -0000 Author: dim Date: Mon May 6 19:59:13 2013 New Revision: 250306 URL: http://svnweb.freebsd.org/changeset/base/250306 Log: MFC r215137: Revert r103230, which depended on ld preserving the __start_xxx and __stop_xxx symbols for custom sections, even when these were not referenced (at link time). This behaviour was changed again in binutils commit 0b8ed435c3fe8bd09a08c23920e65bfb03251221. This time, put the __GLOBL macro definition in cdefs.h, so it can be reused in a few other places where it will be needed. Reviewed by: kib MFC r215138: Use the same treatment as in linker_set.h for the __start and __stop symbols of the set_vnet and set_pcpu sections, so those symbols will always be emitted in kernel modules, if they use vnet.h or pcpu.h. Also, for pcpu.h, make the __(start|stop)_set_pcpu declarations, and associated macros invisible to userland, to prevent it picking up these symbols. Reviewed by: kib Modified: stable/8/sys/net/vnet.h stable/8/sys/sys/cdefs.h stable/8/sys/sys/linker_set.h stable/8/sys/sys/pcpu.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/net/ (props changed) stable/8/sys/sys/ (props changed) Modified: stable/8/sys/net/vnet.h ============================================================================== --- stable/8/sys/net/vnet.h Mon May 6 19:50:22 2013 (r250305) +++ stable/8/sys/net/vnet.h Mon May 6 19:59:13 2013 (r250306) @@ -95,7 +95,9 @@ struct vnet { * Location of the kernel's 'set_vnet' linker set. */ extern uintptr_t *__start_set_vnet; +__GLOBL(__start_set_vnet); extern uintptr_t *__stop_set_vnet; +__GLOBL(__stop_set_vnet); #define VNET_START (uintptr_t)&__start_set_vnet #define VNET_STOP (uintptr_t)&__stop_set_vnet Modified: stable/8/sys/sys/cdefs.h ============================================================================== --- stable/8/sys/sys/cdefs.h Mon May 6 19:50:22 2013 (r250305) +++ stable/8/sys/sys/cdefs.h Mon May 6 19:59:13 2013 (r250306) @@ -396,6 +396,9 @@ #endif /* __STDC__ */ #endif /* __GNUC__ || __INTEL_COMPILER */ +#define __GLOBL1(sym) __asm__(".globl " #sym) +#define __GLOBL(sym) __GLOBL1(sym) + #if defined(__GNUC__) || defined(__INTEL_COMPILER) #define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"") #else Modified: stable/8/sys/sys/linker_set.h ============================================================================== --- stable/8/sys/sys/linker_set.h Mon May 6 19:50:22 2013 (r250305) +++ stable/8/sys/sys/linker_set.h Mon May 6 19:59:13 2013 (r250306) @@ -45,6 +45,8 @@ */ #ifdef __GNUCLIKE___SECTION #define __MAKE_SET(set, sym) \ + __GLOBL(__CONCAT(__start_set_,set)); \ + __GLOBL(__CONCAT(__stop_set_,set)); \ static void const * const __set_##set##_sym_##sym \ __section("set_" #set) __used = &sym #else /* !__GNUCLIKE___SECTION */ Modified: stable/8/sys/sys/pcpu.h ============================================================================== --- stable/8/sys/sys/pcpu.h Mon May 6 19:50:22 2013 (r250305) +++ stable/8/sys/sys/pcpu.h Mon May 6 19:59:13 2013 (r250306) @@ -42,11 +42,15 @@ #include #include +#ifdef _KERNEL + /* * Define a set for pcpu data. */ extern uintptr_t *__start_set_pcpu; +__GLOBL(__start_set_pcpu); extern uintptr_t *__stop_set_pcpu; +__GLOBL(__stop_set_pcpu); /* * Array of dynamic pcpu base offsets. Indexed by id. @@ -127,6 +131,8 @@ extern uintptr_t dpcpu_off[]; } \ } while(0) +#endif /* _KERNEL */ + /* * XXXUPS remove as soon as we have per cpu variable * linker sets and can define rm_queue in _rm_lock.h From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 20:10:45 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 65246803; Mon, 6 May 2013 20:10:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) by mx1.freebsd.org (Postfix) with ESMTP id 2B7E6FD; Mon, 6 May 2013 20:10:45 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::cd6b:c604:1989:9c5c] (unknown [IPv6:2001:7b8:3a7:0:cd6b:c604:1989:9c5c]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 213835C5B; Mon, 6 May 2013 22:10:42 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\)) Subject: Re: svn commit: r250306 - in stable/8/sys: net sys From: Dimitry Andric In-Reply-To: <201305061959.r46JxEUA041105@svn.freebsd.org> Date: Mon, 6 May 2013 22:10:37 +0200 Content-Transfer-Encoding: 7bit Message-Id: References: <201305061959.r46JxEUA041105@svn.freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-Mailer: Apple Mail (2.1503) X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 20:10:45 -0000 On May 6, 2013, at 21:59, Dimitry Andric wrote: > Author: dim > Date: Mon May 6 19:59:13 2013 > New Revision: 250306 > URL: http://svnweb.freebsd.org/changeset/base/250306 > > Log: > MFC r215137: > > Revert r103230, which depended on ld preserving the __start_xxx and > __stop_xxx symbols for custom sections, even when these were not > referenced (at link time). This behaviour was changed again in binutils > commit 0b8ed435c3fe8bd09a08c23920e65bfb03251221. > > This time, put the __GLOBL macro definition in cdefs.h, so it can be > reused in a few other places where it will be needed. > > Reviewed by: kib > > MFC r215138: > > Use the same treatment as in linker_set.h for the __start and __stop > symbols of the set_vnet and set_pcpu sections, so those symbols will > always be emitted in kernel modules, if they use vnet.h or pcpu.h. > > Also, for pcpu.h, make the __(start|stop)_set_pcpu declarations, and > associated macros invisible to userland, to prevent it picking up these > symbols. > > Reviewed by: kib See the following discussion for the reason to merge these changes: http://docs.freebsd.org/cgi/mid.cgi?20130416121135.GA81519 From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 20:34:02 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D66A1287 for ; Mon, 6 May 2013 20:34:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x234.google.com (mail-pb0-x234.google.com [IPv6:2607:f8b0:400e:c01::234]) by mx1.freebsd.org (Postfix) with ESMTP id ACDBC273 for ; Mon, 6 May 2013 20:34:02 +0000 (UTC) Received: by mail-pb0-f52.google.com with SMTP id xa7so2178798pbc.11 for ; Mon, 06 May 2013 13:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=iDoYrkrwGk53PFUJutGCGbVigL/vYAvldj6P7b3it5Y=; b=b5/FyfiSG280yvj01cymv9uL7wk+elJSyIQxxG8HMTLVL2fLQkndn2QYMfMPLwCrLY L3jxxBXsnbmu7F9svkIqPxp9Eub4nenn1ZiW17/B7rI/c15SNogw0SIKHV6I0FNQUA54 /1kmsYhRPglxR/AArREQfwo8c5nTzQAmqspzI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=iDoYrkrwGk53PFUJutGCGbVigL/vYAvldj6P7b3it5Y=; b=D7hpRJAj0zFEOocgSVAS1QP4ilocdzz7zh0T3AXGmyEu2cLjA91z7IZohxfxxqpyVt cuHlif5jidPB6FmW6KEoCt1DF8KrWxglEs4byks0bQVsgtSbjXhl72/0PouX/S0dGTRB E99n2Kv9f+VoxwcDqvglwvTZo91/yDwYnsnOC7LrY+C/JTZ3j1Angjo8AN+DT7QAmXge 08R5ziD9iuMl7iT6vN1YucL8v1O3qCjZkoy7bZSmjtjkJR6H9QEvWZJnabwUIWBj7voi YoA8xtTwCf33OWmY3eDfs6/VvIVW1EAcghIC6P8OWW0dDDxR31EWVDS/ekJdxctESEfF VbtA== X-Received: by 10.68.255.130 with SMTP id aq2mr26841226pbd.164.1367872442314; Mon, 06 May 2013 13:34:02 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.66.159.97 with HTTP; Mon, 6 May 2013 13:33:31 -0700 (PDT) In-Reply-To: References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> From: Eitan Adler Date: Mon, 6 May 2013 16:33:31 -0400 X-Google-Sender-Auth: GNkMtM2eodX3ZSWjrL7UhseGOBc Message-ID: Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern To: Dimitry Andric Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQm+IblEMyC4Lkbm7Bctw8eGh6Xt/SPleJ11To5UKiEFuZ5C1ow8vBSp2d+2CyZKrozuMGjZ Cc: mdf@freebsd.org, "src-committers@freebsd.org" , John Baldwin , svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 20:34:02 -0000 On 6 May 2013 15:02, Dimitry Andric wrote: > On May 6, 2013, at 20:27, mdf@FreeBSD.org wrote: >> On Mon, May 6, 2013 at 6:59 AM, John Baldwin wrote: > ... >> Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges now add >> a lot more mergeinfo. 1.6 should really be avoided at this point for merges >> if at all possible. >> >> Should I back this out, then, and re-do? And why did this happen on stable/8, but not stable/9 for the same MFC? > > No, the spurious mergeinfo is not harmful, just a bit ugly. It should be removed manually, by an svn expert (with a tiny bit of OCD... ;-). > > I think the stable/8 tree just contains more of this spurious merge info, simply because a lot of that tree was created when svn 1.6 was the current version. It may be useful to block these commits using a pre-commit hook? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 21:13:23 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F21D8EE0; Mon, 6 May 2013 21:13:22 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CAB947AF; Mon, 6 May 2013 21:13:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46LDMTL068764; Mon, 6 May 2013 21:13:22 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46LDM7A068762; Mon, 6 May 2013 21:13:22 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305062113.r46LDM7A068762@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 6 May 2013 21:13:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250311 - stable/8/sys/compat/x86bios X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 21:13:23 -0000 Author: jkim Date: Mon May 6 21:13:22 2013 New Revision: 250311 URL: http://svnweb.freebsd.org/changeset/base/250311 Log: MFC: r210877 (partial) Decrease emulated stack size from 64K to 4K bytes. Modified: stable/8/sys/compat/x86bios/x86bios.c stable/8/sys/compat/x86bios/x86bios.h Modified: stable/8/sys/compat/x86bios/x86bios.c ============================================================================== --- stable/8/sys/compat/x86bios/x86bios.c Mon May 6 21:04:42 2013 (r250310) +++ stable/8/sys/compat/x86bios/x86bios.c Mon May 6 21:13:22 2013 (r250311) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #define X86BIOS_PAGE_SIZE 0x00001000 /* 4K */ #define X86BIOS_IVT_SIZE 0x00000500 /* 1K + 256 (BDA) */ -#define X86BIOS_SEG_SIZE 0x00010000 /* 64K */ #define X86BIOS_MEM_SIZE 0x00100000 /* 1M */ #define X86BIOS_IVT_BASE 0x00000000 @@ -63,11 +62,12 @@ __FBSDID("$FreeBSD$"); #define X86BIOS_ROM_BASE 0x000a0000 #define X86BIOS_ROM_SIZE (X86BIOS_MEM_SIZE - (uint32_t)x86bios_rom_phys) +#define X86BIOS_SEG_SIZE X86BIOS_PAGE_SIZE #define X86BIOS_PAGES (X86BIOS_MEM_SIZE / X86BIOS_PAGE_SIZE) -#define X86BIOS_R_DS _pad1 #define X86BIOS_R_SS _pad2 +#define X86BIOS_R_SP _pad3.I16_reg.x_reg static struct x86emu x86bios_emu; @@ -332,8 +332,8 @@ x86bios_init_regs(struct x86regs *regs) { bzero(regs, sizeof(*regs)); - regs->X86BIOS_R_DS = 0x40; - regs->X86BIOS_R_SS = x86bios_seg_phys >> 4; + regs->X86BIOS_R_SS = X86BIOS_PHYSTOSEG(x86bios_seg_phys); + regs->X86BIOS_R_SP = X86BIOS_PAGE_SIZE - 2; } void Modified: stable/8/sys/compat/x86bios/x86bios.h ============================================================================== --- stable/8/sys/compat/x86bios/x86bios.h Mon May 6 21:04:42 2013 (r250310) +++ stable/8/sys/compat/x86bios/x86bios.h Mon May 6 21:13:22 2013 (r250311) @@ -138,8 +138,8 @@ typedef struct x86regs x86regs_t; #define R_FS register_fs #define R_GS register_gs -#define X86BIOS_PHYSTOSEG(x) (((x) >> 4) & 0xffff) -#define X86BIOS_PHYSTOOFF(x) ((x) & 0x000f) +#define X86BIOS_PHYSTOSEG(x) (((x) >> 4) & 0xff00) +#define X86BIOS_PHYSTOOFF(x) ((x) & 0x0fff) __BEGIN_DECLS void *x86bios_alloc(uint32_t *offset, size_t size); From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 23:13:53 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8D186841; Mon, 6 May 2013 23:13:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) by mx1.freebsd.org (Postfix) with ESMTP id 61B47E86; Mon, 6 May 2013 23:13:53 +0000 (UTC) Received: from Julian-MBP3.local (50-196-156-133-static.hfc.comcastbusiness.net [50.196.156.133]) (authenticated bits=0) by vps1.elischer.org (8.14.5/8.14.5) with ESMTP id r46NDiOW048484 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Mon, 6 May 2013 16:13:46 -0700 (PDT) (envelope-from julian@freebsd.org) Message-ID: <51883923.8050505@freebsd.org> Date: Mon, 06 May 2013 16:13:39 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: Dimitry Andric Subject: Re: svn commit: r250306 - in stable/8/sys: net sys References: <201305061959.r46JxEUA041105@svn.freebsd.org> In-Reply-To: <201305061959.r46JxEUA041105@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 23:13:53 -0000 On 5/6/13 12:59 PM, Dimitry Andric wrote: > Author: dim > Date: Mon May 6 19:59:13 2013 > New Revision: 250306 > URL: http://svnweb.freebsd.org/changeset/base/250306 > > Log: > MFC r215137: > > Revert r103230, which depended on ld preserving the __start_xxx and > __stop_xxx symbols for custom sections, even when these were not > referenced (at link time). This behaviour was changed again in binutils > commit 0b8ed435c3fe8bd09a08c23920e65bfb03251221. > > This time, put the __GLOBL macro definition in cdefs.h, so it can be > reused in a few other places where it will be needed. > Is this stuff documented anywhere? From owner-svn-src-stable-8@FreeBSD.ORG Tue May 7 01:25:18 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 4DA2A191; Tue, 7 May 2013 01:25:18 +0000 (UTC) Date: Tue, 7 May 2013 01:25:18 +0000 From: Alexey Dokuchaev To: Dimitry Andric Subject: Re: svn commit: r250306 - in stable/8/sys: net sys Message-ID: <20130507012518.GA14600@FreeBSD.org> References: <201305061959.r46JxEUA041105@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 01:25:18 -0000 On Mon, May 06, 2013 at 10:10:37PM +0200, Dimitry Andric wrote: > On May 6, 2013, at 21:59, Dimitry Andric wrote: > > New Revision: 250306 > > URL: http://svnweb.freebsd.org/changeset/base/250306 > > > > Log: > > MFC r215137: > > [...] > > > > MFC r215138: > > [...] > > See the following discussion for the reason to merge these changes: > http://docs.freebsd.org/cgi/mid.cgi?20130416121135.GA81519 Thank you! ./danfe From owner-svn-src-stable-8@FreeBSD.ORG Tue May 7 09:48:42 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E1D33E88; Tue, 7 May 2013 09:48:42 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D42D4C3B; Tue, 7 May 2013 09:48:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r479mgMP035588; Tue, 7 May 2013 09:48:42 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r479mg8q035587; Tue, 7 May 2013 09:48:42 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201305070948.r479mg8q035587@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 7 May 2013 09:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250329 - stable/8/bin/dd X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 09:48:43 -0000 Author: kib Date: Tue May 7 09:48:42 2013 New Revision: 250329 URL: http://svnweb.freebsd.org/changeset/base/250329 Log: MFC r249811: Literally follow POSIX: If the bs= expr operand is specified and no conversions other than sync, noerror, or notrunc are requested, the data returned from each input block shall be written as a separate output block. PR: standards/177742 Modified: stable/8/bin/dd/dd.c Directory Properties: stable/8/bin/dd/ (props changed) Modified: stable/8/bin/dd/dd.c ============================================================================== --- stable/8/bin/dd/dd.c Tue May 7 09:47:12 2013 (r250328) +++ stable/8/bin/dd/dd.c Tue May 7 09:48:42 2013 (r250329) @@ -351,7 +351,7 @@ dd_in(void) * than noerror, notrunc or sync are specified, the block * is output without buffering as it is read. */ - if (ddflags & C_BS) { + if ((ddflags & ~(C_NOERROR | C_NOTRUNC | C_SYNC)) == C_BS) { out.dbcnt = in.dbcnt; dd_out(1); in.dbcnt = 0; From owner-svn-src-stable-8@FreeBSD.ORG Tue May 7 19:00:08 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1E284503; Tue, 7 May 2013 19:00:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by mx1.freebsd.org (Postfix) with ESMTP id 9E9DEBFA; Tue, 7 May 2013 19:00:07 +0000 (UTC) Received: from spaceball.andric.com (spaceball.andric.com [IPv6:2001:7b8:3a7:0:204:4bff:fe01:de8a]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 459655C44; Tue, 7 May 2013 21:00:06 +0200 (CEST) Message-ID: <51894F2D.7030708@FreeBSD.org> Date: Tue, 07 May 2013 20:59:57 +0200 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:21.0) Gecko/20100101 Thunderbird/21.0 MIME-Version: 1.0 To: Julian Elischer Subject: Re: svn commit: r250306 - in stable/8/sys: net sys References: <201305061959.r46JxEUA041105@svn.freebsd.org> <51883923.8050505@freebsd.org> In-Reply-To: <51883923.8050505@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 19:00:08 -0000 On 2013-05-07 01:13, Julian Elischer wrote: > On 5/6/13 12:59 PM, Dimitry Andric wrote: >> Author: dim >> Date: Mon May 6 19:59:13 2013 >> New Revision: 250306 >> URL: http://svnweb.freebsd.org/changeset/base/250306 >> >> Log: >> MFC r215137: >> >> Revert r103230, which depended on ld preserving the __start_xxx and >> __stop_xxx symbols for custom sections, even when these were not >> referenced (at link time). This behaviour was changed again in binutils >> commit 0b8ed435c3fe8bd09a08c23920e65bfb03251221. >> >> This time, put the __GLOBL macro definition in cdefs.h, so it can be >> reused in a few other places where it will be needed. > > Is this stuff documented anywhere? If you mean the specifics of , I don't think so. The documentation for the things that use it, are mostly in SYSINIT(9), DECLARE_MODULE(9) and module(9). In any case, the idea is that you tell the compiler and linker to add a few custom sections to the output, which contain metadata, for example to initialize a kernel module. Take the section headers of mpt.ko, for instance: Section Headers: [Nr] Name Type Addr Off Size ES Flg Lk Inf Al [ 0] NULL 00000000 000000 000000 00 0 0 0 [ 1] .hash HASH 000000b4 0000b4 00038c 04 A 2 0 4 [ 2] .dynsym DYNSYM 00000440 000440 000800 10 A 3 1 4 [ 3] .dynstr STRTAB 00000c40 000c40 000792 00 A 0 0 1 [ 4] .rel.dyn REL 000013d4 0013d4 004b80 08 A 2 0 4 [ 5] .text PROGBITS 00005f60 005f60 01258a 00 AX 0 0 16 [ 6] .rodata PROGBITS 000184f0 0184f0 00561d 00 A 0 0 16 [ 7] set_modmetadata_set PROGBITS 0001db10 01db10 000054 00 A 0 0 4 [ 8] set_sysinit_set PROGBITS 0001db64 01db64 000020 00 A 0 0 4 [ 9] set_sysuninit_set PROGBITS 0001db84 01db84 000004 00 A 0 0 4 [10] .dynamic DYNAMIC 0001e000 01e000 000078 08 WA 3 0 4 [11] .got.plt PROGBITS 0001e078 01e078 00000c 04 WA 0 0 4 [12] .data PROGBITS 0001e084 01e084 000478 00 WA 0 0 4 [13] .bss NOBITS 0001e4fc 01e4fc 000310 00 WA 0 0 4 [14] .comment PROGBITS 00000000 01e4fc 0001b3 01 MS 0 0 1 [15] .SUNW_ctf PROGBITS 00000000 01e6b0 0065f7 00 0 0 4 [16] .gnu_debuglink PROGBITS 00000000 024ca7 000014 00 0 0 1 [17] .shstrtab STRTAB 00000000 024cbb 0000bd 00 0 0 1 [18] .symtab SYMTAB 00000000 025098 0018d0 10 19 270 4 [19] .strtab STRTAB 00000000 026968 001e9f 00 0 0 1 Key to Flags: W (write), A (alloc), X (execute), M (merge), S (strings) I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown) O (extra OS processing required) o (OS specific), p (processor specific) The 'set_*' sections are added by the linker_set macros, and are marked as used, so the compiler will not optimize them away. However, in some versions of binutils, the linker still optimizes them away, so we have to resort to inserting assembler directives to force it to keep them. This is what r103230 and r215137 were about. -Dimitry From owner-svn-src-stable-8@FreeBSD.ORG Tue May 7 20:12:45 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C08A6D2; Tue, 7 May 2013 20:12:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 9352AF7B; Tue, 7 May 2013 20:12:45 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 0AC31B94A; Tue, 7 May 2013 16:12:45 -0400 (EDT) From: John Baldwin To: Dimitry Andric Subject: Re: svn commit: r250306 - in stable/8/sys: net sys Date: Tue, 7 May 2013 16:12:34 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201305061959.r46JxEUA041105@svn.freebsd.org> <51883923.8050505@freebsd.org> <51894F2D.7030708@FreeBSD.org> In-Reply-To: <51894F2D.7030708@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201305071612.34947.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 07 May 2013 16:12:45 -0400 (EDT) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Julian Elischer , svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 20:12:45 -0000 On Tuesday, May 07, 2013 2:59:57 pm Dimitry Andric wrote: > On 2013-05-07 01:13, Julian Elischer wrote: > > On 5/6/13 12:59 PM, Dimitry Andric wrote: > >> Author: dim > >> Date: Mon May 6 19:59:13 2013 > >> New Revision: 250306 > >> URL: http://svnweb.freebsd.org/changeset/base/250306 > >> > >> Log: > >> MFC r215137: > >> > >> Revert r103230, which depended on ld preserving the __start_xxx and > >> __stop_xxx symbols for custom sections, even when these were not > >> referenced (at link time). This behaviour was changed again in binutils > >> commit 0b8ed435c3fe8bd09a08c23920e65bfb03251221. > >> > >> This time, put the __GLOBL macro definition in cdefs.h, so it can be > >> reused in a few other places where it will be needed. > > > > Is this stuff documented anywhere? > > If you mean the specifics of , I don't think so. The > documentation for the things that use it, are mostly in SYSINIT(9), > DECLARE_MODULE(9) and module(9). > > In any case, the idea is that you tell the compiler and linker to add a > few custom sections to the output, which contain metadata, for example > to initialize a kernel module. > > Take the section headers of mpt.ko, for instance: > > Section Headers: > [Nr] Name Type Addr Off Size ES Flg Lk Inf Al > [ 0] NULL 00000000 000000 000000 00 0 0 0 > [ 1] .hash HASH 000000b4 0000b4 00038c 04 A 2 0 4 > [ 2] .dynsym DYNSYM 00000440 000440 000800 10 A 3 1 4 > [ 3] .dynstr STRTAB 00000c40 000c40 000792 00 A 0 0 1 > [ 4] .rel.dyn REL 000013d4 0013d4 004b80 08 A 2 0 4 > [ 5] .text PROGBITS 00005f60 005f60 01258a 00 AX 0 0 16 > [ 6] .rodata PROGBITS 000184f0 0184f0 00561d 00 A 0 0 16 > [ 7] set_modmetadata_set PROGBITS 0001db10 01db10 000054 00 A 0 0 4 > [ 8] set_sysinit_set PROGBITS 0001db64 01db64 000020 00 A 0 0 4 > [ 9] set_sysuninit_set PROGBITS 0001db84 01db84 000004 00 A 0 0 4 > [10] .dynamic DYNAMIC 0001e000 01e000 000078 08 WA 3 0 4 > [11] .got.plt PROGBITS 0001e078 01e078 00000c 04 WA 0 0 4 > [12] .data PROGBITS 0001e084 01e084 000478 00 WA 0 0 4 > [13] .bss NOBITS 0001e4fc 01e4fc 000310 00 WA 0 0 4 > [14] .comment PROGBITS 00000000 01e4fc 0001b3 01 MS 0 0 1 > [15] .SUNW_ctf PROGBITS 00000000 01e6b0 0065f7 00 0 0 4 > [16] .gnu_debuglink PROGBITS 00000000 024ca7 000014 00 0 0 1 > [17] .shstrtab STRTAB 00000000 024cbb 0000bd 00 0 0 1 > [18] .symtab SYMTAB 00000000 025098 0018d0 10 19 270 4 > [19] .strtab STRTAB 00000000 026968 001e9f 00 0 0 1 > Key to Flags: > W (write), A (alloc), X (execute), M (merge), S (strings) > I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown) > O (extra OS processing required) o (OS specific), p (processor specific) > > The 'set_*' sections are added by the linker_set macros, and are marked > as used, so the compiler will not optimize them away. > > However, in some versions of binutils, the linker still optimizes them > away, so we have to resort to inserting assembler directives to force it > to keep them. This is what r103230 and r215137 were about. You can use linker sets in userland as well. I used them in mfiutil and mptutil to build nested command tables. I've also used linker sets to build lists of unit tests in kernel modules. -- John Baldwin From owner-svn-src-stable-8@FreeBSD.ORG Wed May 8 15:48:37 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3A4814F3; Wed, 8 May 2013 15:48:37 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2C47E9DE; Wed, 8 May 2013 15:48:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r48FmbGX070574; Wed, 8 May 2013 15:48:37 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48FmbPm070573; Wed, 8 May 2013 15:48:37 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201305081548.r48FmbPm070573@svn.freebsd.org> From: Sean Bruno Date: Wed, 8 May 2013 15:48:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250368 - stable/8/sys/dev/ciss X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2013 15:48:37 -0000 Author: sbruno Date: Wed May 8 15:48:36 2013 New Revision: 250368 URL: http://svnweb.freebsd.org/changeset/base/250368 Log: MFC r249815 Return a lun count of 1 and a lun id of 0 when CAM attempts a REPORT_LUNS command on a disk device. This quieseces some noise on the console that recently appeared. Modified: stable/8/sys/dev/ciss/ciss.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/ciss/ (props changed) Modified: stable/8/sys/dev/ciss/ciss.c ============================================================================== --- stable/8/sys/dev/ciss/ciss.c Wed May 8 15:47:51 2013 (r250367) +++ stable/8/sys/dev/ciss/ciss.c Wed May 8 15:48:36 2013 (r250368) @@ -3207,6 +3207,19 @@ ciss_cam_emulate(struct ciss_softc *sc, } } + /* + * A CISS target can only ever have one lun per target. REPORT_LUNS requires + * at least one LUN field to be pre created for us, so snag it and fill in + * the least significant byte indicating 1 LUN here. Emulate the command + * return to shut up warning on console of a CDB error. swb + */ + if (opcode == REPORT_LUNS && csio->dxfer_len > 0) { + csio->data_ptr[3] = 8; + csio->ccb_h.status |= CAM_REQ_CMP; + xpt_done((union ccb *)csio); + return(1); + } + return(0); } From owner-svn-src-stable-8@FreeBSD.ORG Fri May 10 20:56:07 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9FDB964F; Fri, 10 May 2013 20:56:07 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 81F73850; Fri, 10 May 2013 20:56:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4AKu7x3047001; Fri, 10 May 2013 20:56:07 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4AKu7h7047000; Fri, 10 May 2013 20:56:07 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201305102056.r4AKu7h7047000@svn.freebsd.org> From: Mark Johnston Date: Fri, 10 May 2013 20:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r250479 - stable/8/usr.sbin/newsyslog X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 20:56:07 -0000 Author: markj Date: Fri May 10 20:56:07 2013 New Revision: 250479 URL: http://svnweb.freebsd.org/changeset/base/250479 Log: MFC r248776: Fix interval-based rotations when the -t flag is used. In this case, find the most-recently archived logfile and use its mtime to determine whether or not to rotate, as in the non-timestamped case. Previously we would just try to use the mtime of .0, which always results in a rotation since it generally doesn't exist in the -t case. Approved by: emaste Modified: stable/8/usr.sbin/newsyslog/newsyslog.c Directory Properties: stable/8/usr.sbin/newsyslog/ (props changed) Modified: stable/8/usr.sbin/newsyslog/newsyslog.c ============================================================================== --- stable/8/usr.sbin/newsyslog/newsyslog.c Fri May 10 20:55:39 2013 (r250478) +++ stable/8/usr.sbin/newsyslog/newsyslog.c Fri May 10 20:56:07 2013 (r250479) @@ -274,7 +274,7 @@ static void parse_args(int argc, char ** static int parse_doption(const char *doption); static void usage(void); static int log_trim(const char *logname, const struct conf_entry *log_ent); -static int age_old_log(char *file); +static int age_old_log(const char *file); static void savelog(char *from, char *to); static void createdir(const struct conf_entry *ent, char *dirpart); static void createlog(const struct conf_entry *ent); @@ -1442,6 +1442,66 @@ oldlog_entry_compare(const void *a, cons } /* + * Check whether the file corresponding to dp is an archive of the logfile + * logfname, based on the timefnamefmt format string. Return true and fill out + * tm if this is the case; otherwise return false. + */ +static int +validate_old_timelog(const struct dirent *dp, const char *logfname, struct tm *tm) +{ + size_t logfname_len; + char *s; + int c; + + logfname_len = strlen(logfname); + + if (dp->d_type != DT_REG) + return (0); + /* Ignore everything but files with our logfile prefix. */ + if (strncmp(dp->d_name, logfname, logfname_len) != 0) + return (0); + /* Ignore the actual non-rotated logfile. */ + if (dp->d_namlen == logfname_len) + return (0); + + /* + * Make sure we created have found a logfile, so the + * postfix is valid, IE format is: '.