Re: svn commit: r284863 - head/sys/net/altq
On Fri, Jun 26, 2015 at 1:16 AM, Bjoern A. Zeeb wrote:
> Author: bz
> Date: Thu Jun 25 23:16:01 2015
> New Revision: 284863
> URL: https://svnweb.freebsd.org/changeset/base/284863
>
> Log:
> Another attempt to make this compile on more architectures after r284777.
>
> Modified:
> head/sys/net/altq/altq_fairq.c
>
> Modified: head/sys/net/altq/altq_fairq.c
>
> ==
> --- head/sys/net/altq/altq_fairq.c Thu Jun 25 20:46:11 2015
> (r284862)
> +++ head/sys/net/altq/altq_fairq.c Thu Jun 25 23:16:01 2015
> (r284863)
> @@ -742,8 +742,8 @@ fairq_pollq(struct fairq_class *cl, uint
> if (bw > cl->cl_bandwidth)
> *hit_limit = 1;
> #ifdef ALTQ_DEBUG
> - printf("BW %6lld relative to %6u %d queue %p\n",
> - bw, cl->cl_bandwidth, *hit_limit, b);
> + printf("BW %6ju relative to %6u %d queue %p\n",
> + (uintmax_t)bw, cl->cl_bandwidth, *hit_limit, b);
> #endif
> }
> return(m);
>
>
Thank you.
--
Ermal
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284865 - head/sys/dev/sound/midi
On Thu, Jun 25, 2015 at 9:12 PM, Adrian Chadd wrote: > Author: adrian > Date: Fri Jun 26 04:12:06 2015 > New Revision: 284865 > URL: https://svnweb.freebsd.org/changeset/base/284865 > > Log: > Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.) Should this be MFCed? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284868 - stable/10/sys/fs/tmpfs
Author: kib Date: Fri Jun 26 06:25:14 2015 New Revision: 284868 URL: https://svnweb.freebsd.org/changeset/base/284868 Log: MFC r284594: Restore the td_cookie value upon detach. Modified: stable/10/sys/fs/tmpfs/tmpfs_subr.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/tmpfs/tmpfs_subr.c == --- stable/10/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 26 06:08:52 2015 (r284867) +++ stable/10/sys/fs/tmpfs/tmpfs_subr.c Fri Jun 26 06:25:14 2015 (r284868) @@ -1031,6 +1031,7 @@ tmpfs_dir_detach(struct vnode *vp, struc tmpfs_free_dirent(tmp, xde); } } + de->td_cookie = de->td_hash; } else RB_REMOVE(tmpfs_dir, head, de); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284867 - stable/10/sys/dev/sfxge
Author: arybchik
Date: Fri Jun 26 06:08:52 2015
New Revision: 284867
URL: https://svnweb.freebsd.org/changeset/base/284867
Log:
MFC: r284747
sfxge: skip VPD info population if access is denied
The patch allows to run on unprivileged PF (PFIOV) passed to
a virtual machine.
Reviewed by:gnn
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/sfxge.c
==
--- stable/10/sys/dev/sfxge/sfxge.c Fri Jun 26 04:14:05 2015
(r284866)
+++ stable/10/sys/dev/sfxge/sfxge.c Fri Jun 26 06:08:52 2015
(r284867)
@@ -902,8 +902,15 @@ sfxge_vpd_init(struct sfxge_softc *sc)
efx_vpd_value_t value;
int rc;
- if ((rc = efx_vpd_size(sc->enp, &sc->vpd_size)) != 0)
+ if ((rc = efx_vpd_size(sc->enp, &sc->vpd_size)) != 0) {
+ /*
+* Unpriviledged functions deny VPD access.
+* Simply skip VPD in this case.
+*/
+ if (rc == EACCES)
+ goto done;
goto fail;
+ }
sc->vpd_data = malloc(sc->vpd_size, M_SFXGE, M_WAITOK);
if ((rc = efx_vpd_read(sc->enp, sc->vpd_data, sc->vpd_size)) != 0)
goto fail2;
@@ -932,6 +939,7 @@ sfxge_vpd_init(struct sfxge_softc *sc)
for (keyword[1] = 'A'; keyword[1] <= 'Z'; keyword[1]++)
sfxge_vpd_try_add(sc, vpd_list, EFX_VPD_RO, keyword);
+done:
return (0);
fail2:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284866 - in head/sys: kern sys
Author: adrian
Date: Fri Jun 26 04:14:05 2015
New Revision: 284866
URL: https://svnweb.freebsd.org/changeset/base/284866
Log:
Un-static cpuset_which() - it's useful in other contexts, such as some
CPU set operations in my upcoming NUMA work.
Tested/compiled:
* i386 (run)
* amd64 (run)
* mips (run)
* mips64 (run)
* armv6 (built)
Sponsored by: Norse Corp, Inc.
Modified:
head/sys/kern/kern_cpuset.c
head/sys/sys/cpuset.h
Modified: head/sys/kern/kern_cpuset.c
==
--- head/sys/kern/kern_cpuset.c Fri Jun 26 04:12:06 2015(r284865)
+++ head/sys/kern/kern_cpuset.c Fri Jun 26 04:14:05 2015(r284866)
@@ -400,7 +400,7 @@ out:
* -1 may be supplied for any argument to mean the current proc/thread or
* the base set of the current thread. May fail with ESRCH/EPERM.
*/
-static int
+int
cpuset_which(cpuwhich_t which, id_t id, struct proc **pp, struct thread **tdp,
struct cpuset **setp)
{
Modified: head/sys/sys/cpuset.h
==
--- head/sys/sys/cpuset.h Fri Jun 26 04:12:06 2015(r284865)
+++ head/sys/sys/cpuset.h Fri Jun 26 04:14:05 2015(r284866)
@@ -124,6 +124,9 @@ int cpuset_setthread(lwpid_t id, cpuset_
intcpuset_setithread(lwpid_t id, int cpu);
intcpuset_create_root(struct prison *, struct cpuset **);
intcpuset_setproc_update_set(struct proc *, struct cpuset *);
+intcpuset_which(cpuwhich_t, id_t, struct proc **,
+ struct thread **, struct cpuset **);
+
char *cpusetobj_strprint(char *, const cpuset_t *);
intcpusetobj_strscan(cpuset_t *, const char *);
#ifdef DDB
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284865 - head/sys/dev/sound/midi
Author: adrian
Date: Fri Jun 26 04:12:06 2015
New Revision: 284865
URL: https://svnweb.freebsd.org/changeset/base/284865
Log:
Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.)
Modified:
head/sys/dev/sound/midi/sequencer.c
Modified: head/sys/dev/sound/midi/sequencer.c
==
--- head/sys/dev/sound/midi/sequencer.c Fri Jun 26 03:29:23 2015
(r284864)
+++ head/sys/dev/sound/midi/sequencer.c Fri Jun 26 04:12:06 2015
(r284865)
@@ -98,21 +98,21 @@ __FBSDID("$FreeBSD$");
#define MIDIDEV(y) (dev2unit(y) & 0x0f)
/* These are the entries to the sequencer driver. */
-static d_open_t seq_open;
-static d_close_t seq_close;
-static d_ioctl_t seq_ioctl;
-static d_read_t seq_read;
-static d_write_t seq_write;
-static d_poll_t seq_poll;
+static d_open_t mseq_open;
+static d_close_t mseq_close;
+static d_ioctl_t mseq_ioctl;
+static d_read_t mseq_read;
+static d_write_t mseq_write;
+static d_poll_t mseq_poll;
static struct cdevsw seq_cdevsw = {
.d_version = D_VERSION,
- .d_open = seq_open,
- .d_close = seq_close,
- .d_read = seq_read,
- .d_write = seq_write,
- .d_ioctl = seq_ioctl,
- .d_poll = seq_poll,
+ .d_open = mseq_open,
+ .d_close = mseq_close,
+ .d_read = mseq_read,
+ .d_write = mseq_write,
+ .d_ioctl = mseq_ioctl,
+ .d_poll = mseq_poll,
.d_name = "sequencer",
};
@@ -737,7 +737,7 @@ seq_fetch_mid(struct seq_softc *scp, int
}
int
-seq_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
+mseq_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
{
struct seq_softc *scp = i_dev->si_drv1;
int i;
@@ -817,10 +817,10 @@ seq_open(struct cdev *i_dev, int flags,
}
/*
- * seq_close
+ * mseq_close
*/
int
-seq_close(struct cdev *i_dev, int flags, int mode, struct thread *td)
+mseq_close(struct cdev *i_dev, int flags, int mode, struct thread *td)
{
int i;
struct seq_softc *scp = i_dev->si_drv1;
@@ -858,7 +858,7 @@ err:
}
int
-seq_read(struct cdev *i_dev, struct uio *uio, int ioflag)
+mseq_read(struct cdev *i_dev, struct uio *uio, int ioflag)
{
int retval, used;
struct seq_softc *scp = i_dev->si_drv1;
@@ -869,12 +869,12 @@ seq_read(struct cdev *i_dev, struct uio
if (scp == NULL)
return ENXIO;
- SEQ_DEBUG(7, printf("seq_read: unit %d, resid %zd.\n",
+ SEQ_DEBUG(7, printf("mseq_read: unit %d, resid %zd.\n",
scp->unit, uio->uio_resid));
mtx_lock(&scp->seq_lock);
if ((scp->fflags & FREAD) == 0) {
- SEQ_DEBUG(2, printf("seq_read: unit %d is not for reading.\n",
+ SEQ_DEBUG(2, printf("mseq_read: unit %d is not for reading.\n",
scp->unit));
retval = EIO;
goto err1;
@@ -927,14 +927,14 @@ seq_read(struct cdev *i_dev, struct uio
retval = 0;
err1:
mtx_unlock(&scp->seq_lock);
- SEQ_DEBUG(6, printf("seq_read: ret %d, resid %zd.\n",
+ SEQ_DEBUG(6, printf("mseq_read: ret %d, resid %zd.\n",
retval, uio->uio_resid));
return retval;
}
int
-seq_write(struct cdev *i_dev, struct uio *uio, int ioflag)
+mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag)
{
u_char event[EV_SZ], newevent[EV_SZ], ev_code;
struct seq_softc *scp = i_dev->si_drv1;
@@ -1113,7 +1113,7 @@ err0:
}
int
-seq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
+mseq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
struct thread *td)
{
int midiunit, ret, tmp;
@@ -1417,7 +1417,7 @@ timerevent:
}
int
-seq_poll(struct cdev *i_dev, int events, struct thread *td)
+mseq_poll(struct cdev *i_dev, int events, struct thread *td)
{
int ret, lim;
struct seq_softc *scp = i_dev->si_drv1;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284864 - head/usr.sbin/ntp
In message <201506260329.t5q3tndv022...@svn.freebsd.org>, Cy Schubert writes: > Author: cy > Date: Fri Jun 26 03:29:23 2015 > New Revision: 284864 > URL: https://svnweb.freebsd.org/changeset/base/284864 > > Log: > Add support for additional architectures in ntp. > > Differential Revision: D2720 > Reviewed by:jmg, reoberto, andrew, ian, imp roberto > > Modified: > head/usr.sbin/ntp/config.h I didn't want to write this in the commit log as it is more appropriate as a comment about the commit. This commit is a temporary measure until a per architecture set of config.h files is committed. This was a suggestion by kib, which after a bit of reflection, I had to agree with. -- Cheers, Cy Schubert or FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284864 - head/usr.sbin/ntp
Author: cy Date: Fri Jun 26 03:29:23 2015 New Revision: 284864 URL: https://svnweb.freebsd.org/changeset/base/284864 Log: Add support for additional architectures in ntp. Differential Revision:D2720 Reviewed by: jmg, reoberto, andrew, ian, imp Modified: head/usr.sbin/ntp/config.h Modified: head/usr.sbin/ntp/config.h == --- head/usr.sbin/ntp/config.h Thu Jun 25 23:16:01 2015(r284863) +++ head/usr.sbin/ntp/config.h Fri Jun 26 03:29:23 2015(r284864) @@ -1379,7 +1379,7 @@ /* #undef NO_THREADS */ /* Default location of crypto key info */ -#define NTP_KEYSDIR "/usr/local/etc" +#define NTP_KEYSDIR "/etc/ntp" /* Path to sign daemon rendezvous socket */ #define NTP_SIGND_PATH "/var/run/ntp_signd" @@ -1469,7 +1469,7 @@ /* #undef SCO5_CLOCK */ /* The size of `char*', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_CHARP 8 #else #define SIZEOF_CHARP 4 @@ -1479,7 +1479,7 @@ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#ifdef __LP64__ #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 @@ -1498,10 +1498,10 @@ #define SIZEOF_SIGNED_CHAR 1 /* The size of `time_t', as computed by sizeof. */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -#define SIZEOF_TIME_T 8 -#else +#if defined(__i386__) || defined(__powerpc__) #define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 #endif /* Does SIOCGIFCONF return size in the buffer? */ @@ -1534,6 +1534,24 @@ #define STR_SYSTEM "sparc64-undermydesk-freebsd" #elif defined(__amd64__) #define STR_SYSTEM "amd64-undermydesk-freebsd" +#elif defined(__powerpc64__) +#define STR_SYSTEM "powerpc64-undermydesk-freebsd" +#elif defined(__powerpc__) +#define STR_SYSTEM "powerpc-undermydesk-freebsd" +#elif defined(__mips64) +#define STR_SYSTEM "mips64-undermydesk-freebsd" +#elif defined(__mips__) +#define STR_SYSTEM "mips-undermydesk-freebsd" +#elif defined(__aarch64__) +#define STR_SYSTEM "arm64-undermydesk-freebsd" +#elif defined(__arm__) +#define STR_SYSTEM "arm-undermydesk-freebsd" +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__sparc__) +#define STR_SYSTEM "sparc-undermydesk-freebsd" +#elif defined(__ia64__) +#define STR_SYSTEM "ia64-undermydesk-freebsd" #else #define STR_SYSTEM "i386-undermydesk-freebsd" #endif @@ -1600,14 +1618,9 @@ typedef unsigned int uintptr_t; /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif +#if defined(__ARMEB__) || defined(__MIPSEB__) || defined(__powerpc__) || \ +defined(__powerpc64__) || defined(__sparc64__) +#define WORDS_BIGENDIAN 1 #endif /* routine worker child proc uses to exit. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284863 - head/sys/net/altq
Author: bz
Date: Thu Jun 25 23:16:01 2015
New Revision: 284863
URL: https://svnweb.freebsd.org/changeset/base/284863
Log:
Another attempt to make this compile on more architectures after r284777.
Modified:
head/sys/net/altq/altq_fairq.c
Modified: head/sys/net/altq/altq_fairq.c
==
--- head/sys/net/altq/altq_fairq.c Thu Jun 25 20:46:11 2015
(r284862)
+++ head/sys/net/altq/altq_fairq.c Thu Jun 25 23:16:01 2015
(r284863)
@@ -742,8 +742,8 @@ fairq_pollq(struct fairq_class *cl, uint
if (bw > cl->cl_bandwidth)
*hit_limit = 1;
#ifdef ALTQ_DEBUG
- printf("BW %6lld relative to %6u %d queue %p\n",
- bw, cl->cl_bandwidth, *hit_limit, b);
+ printf("BW %6ju relative to %6u %d queue %p\n",
+ (uintmax_t)bw, cl->cl_bandwidth, *hit_limit, b);
#endif
}
return(m);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284862 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 20:46:11 2015 New Revision: 284862 URL: https://svnweb.freebsd.org/changeset/base/284862 Log: Revert r284860. I was looking at the wrong files. Sigh. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:44:46 2015(r284861) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:46:11 2015(r284862) @@ -1086,7 +1086,7 @@ Support for the hardware power button on the BeagleBone Black system has been added. - Initial ACPI support has been added for &os;/&arch.arm64;. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284861 - head/sys/vm
Author: jmg
Date: Thu Jun 25 20:44:46 2015
New Revision: 284861
URL: https://svnweb.freebsd.org/changeset/base/284861
Log:
If INVARIANTS is specified, add ctor/dtor to junk memory if they are
unspecified...
Submitted by: Suresh Gumpula at Netapp
Differential Revision:https://reviews.freebsd.org/D2725
Modified:
head/sys/vm/uma_core.c
head/sys/vm/uma_dbg.c
Modified: head/sys/vm/uma_core.c
==
--- head/sys/vm/uma_core.c Thu Jun 25 20:40:51 2015(r284860)
+++ head/sys/vm/uma_core.c Thu Jun 25 20:44:46 2015(r284861)
@@ -1940,6 +1940,20 @@ uma_zcreate(const char *name, size_t siz
args.dtor = dtor;
args.uminit = uminit;
args.fini = fini;
+#ifdef INVARIANTS
+ /*
+* If a zone is being created with an empty constructor and
+* destructor, pass UMA constructor/destructor which checks for
+* memory use after free.
+*/
+ if ((!(flags & UMA_ZONE_ZINIT)) && ctor == NULL && dtor == NULL &&
+ uminit == NULL && fini == NULL) {
+ args.ctor = trash_ctor;
+ args.dtor = trash_dtor;
+ args.uminit = trash_init;
+ args.fini = trash_fini;
+ }
+#endif
args.align = align;
args.flags = flags;
args.keg = NULL;
Modified: head/sys/vm/uma_dbg.c
==
--- head/sys/vm/uma_dbg.c Thu Jun 25 20:40:51 2015(r284860)
+++ head/sys/vm/uma_dbg.c Thu Jun 25 20:44:46 2015(r284861)
@@ -69,8 +69,13 @@ trash_ctor(void *mem, int size, void *ar
for (p = mem; cnt > 0; cnt--, p++)
if (*p != uma_junk) {
+#ifdef INVARIANTS
+ panic("Memory modified after free %p(%d) val=%x @ %p\n",
+ mem, size, *p, p);
+#else
printf("Memory modified after free %p(%d) val=%x @
%p\n",
mem, size, *p, p);
+#endif
return (0);
}
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284860 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 20:40:51 2015 New Revision: 284860 URL: https://svnweb.freebsd.org/changeset/base/284860 Log: Fix an incorrect revision number. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:01:27 2015(r284859) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 20:40:51 2015(r284860) @@ -1086,7 +1086,7 @@ Support for the hardware power button on the BeagleBone Black system has been added. - Initial ACPI support has been added for &os;/&arch.arm64;. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284859 - in stable: 10/release/doc/share/xml 8/release/doc/share/xml 9/release/doc/share/xml
Author: gjb Date: Thu Jun 25 20:01:27 2015 New Revision: 284859 URL: https://svnweb.freebsd.org/changeset/base/284859 Log: Document FreeBSD-EN-15:06.file, FreeBSD-EN-15:07.zfs, FreeBSD-EN-15:08.sendmail, FreeBSD-SA-15:10.openssl. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/doc/share/xml/errata.xml stable/9/release/doc/share/xml/security.xml Changes in other areas also in this revision: Modified: stable/10/release/doc/share/xml/errata.xml stable/10/release/doc/share/xml/security.xml stable/8/release/doc/share/xml/errata.xml stable/8/release/doc/share/xml/security.xml Modified: stable/9/release/doc/share/xml/errata.xml == --- stable/9/release/doc/share/xml/errata.xml Thu Jun 25 19:39:07 2015 (r284858) +++ stable/9/release/doc/share/xml/errata.xml Thu Jun 25 20:01:27 2015 (r284859) @@ -79,6 +79,20 @@ &man.freebsd-update.8; does not ensure the previous upgrade has completed + + + FreeBSD-EN-15:06.file + 9 June 2015 + Multiple denial of service issues + + + + FreeBSD-EN-15:08.sendmail + 18 June 2015 + Sendmail TLS/DH interoperability improvement + Modified: stable/9/release/doc/share/xml/security.xml == --- stable/9/release/doc/share/xml/security.xml Thu Jun 25 19:39:07 2015 (r284858) +++ stable/9/release/doc/share/xml/security.xml Thu Jun 25 20:01:27 2015 (r284859) @@ -148,6 +148,13 @@ Router advertisement Denial of Service + + + FreeBSD-SA-15:10.openssl + 16 June 2015 + Multiple vulnerabilities + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284859 - in stable: 10/release/doc/share/xml 8/release/doc/share/xml 9/release/doc/share/xml
Author: gjb Date: Thu Jun 25 20:01:27 2015 New Revision: 284859 URL: https://svnweb.freebsd.org/changeset/base/284859 Log: Document FreeBSD-EN-15:06.file, FreeBSD-EN-15:07.zfs, FreeBSD-EN-15:08.sendmail, FreeBSD-SA-15:10.openssl. Sponsored by: The FreeBSD Foundation Modified: stable/8/release/doc/share/xml/errata.xml stable/8/release/doc/share/xml/security.xml Changes in other areas also in this revision: Modified: stable/10/release/doc/share/xml/errata.xml stable/10/release/doc/share/xml/security.xml stable/9/release/doc/share/xml/errata.xml stable/9/release/doc/share/xml/security.xml Modified: stable/8/release/doc/share/xml/errata.xml == --- stable/8/release/doc/share/xml/errata.xml Thu Jun 25 19:39:07 2015 (r284858) +++ stable/8/release/doc/share/xml/errata.xml Thu Jun 25 20:01:27 2015 (r284859) @@ -134,6 +134,20 @@ &man.freebsd-update.8; does not ensure the previous upgrade has completed + + + FreeBSD-EN-15:06.file + 9 June 2015 + Multiple denial of service issues + + + + FreeBSD-EN-15:08.sendmail + 18 June 2015 + Sendmail TLS/DH interoperability improvement + Modified: stable/8/release/doc/share/xml/security.xml == --- stable/8/release/doc/share/xml/security.xml Thu Jun 25 19:39:07 2015 (r284858) +++ stable/8/release/doc/share/xml/security.xml Thu Jun 25 20:01:27 2015 (r284859) @@ -253,6 +253,13 @@ Router advertisement Denial of Service + + + FreeBSD-SA-15:10.openssl + 16 June 2015 + Multiple vulnerabilities + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284859 - in stable: 10/release/doc/share/xml 8/release/doc/share/xml 9/release/doc/share/xml
Author: gjb Date: Thu Jun 25 20:01:27 2015 New Revision: 284859 URL: https://svnweb.freebsd.org/changeset/base/284859 Log: Document FreeBSD-EN-15:06.file, FreeBSD-EN-15:07.zfs, FreeBSD-EN-15:08.sendmail, FreeBSD-SA-15:10.openssl. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/share/xml/errata.xml stable/10/release/doc/share/xml/security.xml Changes in other areas also in this revision: Modified: stable/8/release/doc/share/xml/errata.xml stable/8/release/doc/share/xml/security.xml stable/9/release/doc/share/xml/errata.xml stable/9/release/doc/share/xml/security.xml Modified: stable/10/release/doc/share/xml/errata.xml == --- stable/10/release/doc/share/xml/errata.xml Thu Jun 25 19:39:07 2015 (r284858) +++ stable/10/release/doc/share/xml/errata.xml Thu Jun 25 20:01:27 2015 (r284859) @@ -64,6 +64,27 @@ Deadlock on reboot with UFS tuned with SU+J + + + FreeBSD-EN-15:06.file + 9 June 2015 + Multiple denial of service issues + + + + FreeBSD-EN-15:07.zfs + 9 June 2015 + ZFS reliability improvements + + + + FreeBSD-EN-15:08.sendmail + 18 June 2015 + Sendmail TLS/DH interoperability improvement + Modified: stable/10/release/doc/share/xml/security.xml == --- stable/10/release/doc/share/xml/security.xmlThu Jun 25 19:39:07 2015(r284858) +++ stable/10/release/doc/share/xml/security.xmlThu Jun 25 20:01:27 2015(r284859) @@ -109,6 +109,13 @@ Router advertisement Denial of Service + + + FreeBSD-SA-15:10.openssl + 16 June 2015 + Multiple vulnerabilities + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284858 - head/sys/sys
Author: tijl Date: Thu Jun 25 19:39:07 2015 New Revision: 284858 URL: https://svnweb.freebsd.org/changeset/base/284858 Log: Enable the use of __builtin_va_* for ICC. PR: 198822 Submitted by: Sergey Melnikov MFC after:5 days Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h == --- head/sys/sys/cdefs.hThu Jun 25 18:45:37 2015(r284857) +++ head/sys/sys/cdefs.hThu Jun 25 19:39:07 2015(r284858) @@ -92,7 +92,7 @@ #undef __GNUCLIKE_BUILTIN_CONSTANT_P #endif -#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) && !defined(__INTEL_COMPILER) +#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define__GNUCLIKE_BUILTIN_VARARGS 1 #define__GNUCLIKE_BUILTIN_STDARG 1 #define__GNUCLIKE_BUILTIN_VAALIST 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284850 - in stable/10/release/doc: en_US.ISO8859-1/relnotes share/xml
Author: gjb Date: Thu Jun 25 18:45:22 2015 New Revision: 284850 URL: https://svnweb.freebsd.org/changeset/base/284850 Log: Document r283280, several improvements/updates to the HyperV drivers. Add Microsoft Open Source Technology Center to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/10/release/doc/share/xml/sponsor.ent Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:20 2015(r284849) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:22 2015(r284850) @@ -361,6 +361,27 @@ The &man.bhyve.8; hypervisor has been updated to support DSM TRIM commands for virtual AHCI disks. + + The + Hyper-V™ drivers have been updated with several + enhancements: + + + + The &man.hv.vmbus.4; driver now has multi-channel + support. + + + + The &man.hv.storvsc.4; driver now has scatter/gather + support, in addition to performance improvements. + + + + The &man.hv.kvp.4; driver has received several bug + fixes. + + Modified: stable/10/release/doc/share/xml/sponsor.ent == --- stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:20 2015 (r284849) +++ stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:22 2015 (r284850) @@ -26,6 +26,8 @@ + + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284826 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:25 2015 New Revision: 284826 URL: https://svnweb.freebsd.org/changeset/base/284826 Log: Document r283959, EM_MULTIQUEUE kernel configuration option. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:22 2015(r284825) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:25 2015(r284826) @@ -687,6 +687,16 @@ arch="powerpc">The &man.pmap.9; implementation for 64-bit &powerpc; processors has been overhaulded to improve concurrency. + + A new kernel configuration option, + EM_MULTIQUEUE, has been added which enables + multi-queue support in the &man.em.4; driver. + + + Multi-queue support in the &man.em.4; driver is not + officially supported by &intel;. + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284821 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:14 2015 New Revision: 284821 URL: https://svnweb.freebsd.org/changeset/base/284821 Log: Document r282973, libgomp no longer built by default, unless building the base system GCC. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:12 2015(r284820) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:14 2015(r284821) @@ -569,6 +569,13 @@ Support for file verification in MAC has been added. + + The + libgomp library is now only built when + building GCC from the base system. An + up-to-date version is available in the Ports Collection as + devel/libiomp5-devel. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284822 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:16 2015 New Revision: 284822 URL: https://svnweb.freebsd.org/changeset/base/284822 Log: Document r282988, alloc_align() added to malloc.h and stdlib.h. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:14 2015(r284821) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:16 2015(r284822) @@ -576,6 +576,11 @@ up-to-date version is available in the Ports Collection as devel/libiomp5-devel. + + The stdlib.h and + malloc.h headers have been updated to + make use of the gcc + alloc_align() attribute. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284856 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:35 2015 New Revision: 284856 URL: https://svnweb.freebsd.org/changeset/base/284856 Log: Document r284778, file(1) updated to 5.23. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:33 2015(r284855) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:35 2015(r284856) @@ -235,6 +235,9 @@ The &man.acpi.4; subsystem has been updated to version 20150515. + + The &man.file.1; utility has been + updated to version 5.23. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284845 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:11 2015 New Revision: 284845 URL: https://svnweb.freebsd.org/changeset/base/284845 Log: Document r282974, uefisign(8) added. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:09 2015(r284844) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:11 2015(r284845) @@ -209,6 +209,9 @@ sponsor="&scaleengine;">The &man.freebsd-update.8; utility has been updated to prevent fetching updated binary patches when a previous upgrade has not been thoroughly completed. + + The + &man.uefisign.8; utility has been added. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284842 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:59 2015 New Revision: 284842 URL: https://svnweb.freebsd.org/changeset/base/284842 Log: Document r284237, file(1) updated to 5.23. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:57 2015(r284841) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:59 2015(r284842) @@ -473,6 +473,9 @@ The &man.acpi.4; subsystem has been updated to version 20150515. + + The &man.file.1; utility has been + updated to version 5.23. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284853 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:29 2015 New Revision: 284853 URL: https://svnweb.freebsd.org/changeset/base/284853 Log: Document r284460, ACPICA updated to 20150515. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:27 2015(r284852) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:29 2015(r284853) @@ -226,15 +226,15 @@ file has been updated to version 5.22. - The &man.acpi.4; subsystem has been - updated to version 20150410. - The &man.resolvconf.8; utility has been updated to version 3.7.0. OpenSSL has been updated to version 1.0.1o. + + The &man.acpi.4; subsystem has been + updated to version 20150515. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284847 - stable/10/release/doc/share/xml
Author: gjb Date: Thu Jun 25 18:45:15 2015 New Revision: 284847 URL: https://svnweb.freebsd.org/changeset/base/284847 Log: Add ScaleEngine, Inc. to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/share/xml/sponsor.ent Modified: stable/10/release/doc/share/xml/sponsor.ent == --- stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:13 2015 (r284846) +++ stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:15 2015 (r284847) @@ -29,4 +29,5 @@ + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284851 - in stable/10/release/doc: en_US.ISO8859-1/relnotes share/xml
Author: gjb Date: Thu Jun 25 18:45:24 2015 New Revision: 284851 URL: https://svnweb.freebsd.org/changeset/base/284851 Log: Document r283875, chmod, chflags, chown and chgrp recursive symlink processing. Add Multiplay to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml stable/10/release/doc/share/xml/sponsor.ent Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:22 2015(r284850) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:24 2015(r284851) @@ -212,6 +212,12 @@ The &man.uefisign.8; utility has been added. + + The &man.chflags.1;, &man.chgrp.1;, + &man.chmod.1;, and &man.chown.8; utilities now affect symbolic + links when the -R flag is specified, as + documented in &man.symlink.7;. Modified: stable/10/release/doc/share/xml/sponsor.ent == --- stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:22 2015 (r284850) +++ stable/10/release/doc/share/xml/sponsor.ent Thu Jun 25 18:45:24 2015 (r284851) @@ -27,6 +27,7 @@ + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284857 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:37 2015 New Revision: 284857 URL: https://svnweb.freebsd.org/changeset/base/284857 Log: Update the svn revision marker. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:35 2015(r284856) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:37 2015(r284857) @@ -22,7 +22,7 @@ $FreeBSD$ - + 2015 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284855 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:33 2015 New Revision: 284855 URL: https://svnweb.freebsd.org/changeset/base/284855 Log: Document r284665: - kern.racct.enable tunable and RACCT_DISABLED kernel configuration option. - RACCT/RCTL in GENERIC by default. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:31 2015(r284854) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:33 2015(r284855) @@ -325,6 +325,26 @@ The kern.osrelease and kern.osreldate are now configurable &man.jail.8; parameters. + + A new + &man.sysctl.8;, kern.racct.enable, has been + added, which when set to a non-zero value allows using + &man.rctl.8; with the GENERIC kernel. + A new kernel configuration option, + RACCT_DISABLED has also been added. + + The + GENERIC kernel configuration now includes + RACCT and RCTL by + default. + + + To enable RACCT and + RCTL on a system using the + GENERIC kernel configuration, add + kern.racct.enable=1 to + &man.loader.conf.5;, and reboot the system. + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284854 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:31 2015 New Revision: 284854 URL: https://svnweb.freebsd.org/changeset/base/284854 Log: Document rr284522, EM_MULTIQUEUE kernel configuration option. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:29 2015(r284853) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:31 2015(r284854) @@ -291,7 +291,15 @@ Kernel Configuration - + A new kernel configuration option, + EM_MULTIQUEUE, has been added which enables + multi-queue support in the &man.em.4; driver. + + + Multi-queue support in the &man.em.4; driver is not + officially supported by &intel;. + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284852 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:27 2015 New Revision: 284852 URL: https://svnweb.freebsd.org/changeset/base/284852 Log: Document r284330, OpenSSL updated to 1.0.1o. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:24 2015(r284851) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:27 2015(r284852) @@ -226,15 +226,15 @@ file has been updated to version 5.22. - OpenSSL has - been updated to version 1.0.1m. - The &man.acpi.4; subsystem has been updated to version 20150410. The &man.resolvconf.8; utility has been updated to version 3.7.0. + + OpenSSL has + been updated to version 1.0.1o. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284837 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:48 2015 New Revision: 284837 URL: https://svnweb.freebsd.org/changeset/base/284837 Log: Document r275681, autofs(5) '-media' map addition. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:46 2015(r284836) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:48 2015(r284837) @@ -1107,6 +1107,13 @@ The &man.ctld.8; utility has been updated to allow controlling non-iSCSI &man.ctl.4; ports. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -media, which + allows automatically mounting removable media, such as + CD drives or USB flash + drives. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284844 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:09 2015 New Revision: 284844 URL: https://svnweb.freebsd.org/changeset/base/284844 Log: Document r282870, freebsd-update(8) prevents upgrading a system with pending (incomplete) updates. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:07 2015(r284843) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:09 2015(r284844) @@ -204,6 +204,11 @@ would cause final results to be sent to &man.stderr.4; when receiving the SIGINFO signal has been fixed. + + The &man.freebsd-update.8; utility has + been updated to prevent fetching updated binary patches when + a previous upgrade has not been thoroughly completed. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284838 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:50 2015 New Revision: 284838 URL: https://svnweb.freebsd.org/changeset/base/284838 Log: Document r279955, autofs(5) '-noauto' map addition. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:48 2015(r284837) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:50 2015(r284838) @@ -1114,6 +1114,12 @@ allows automatically mounting removable media, such as CD drives or USB flash drives. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -noauto, which + handles &man.fstab.5; entries set to + noauto. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284848 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:17 2015 New Revision: 284848 URL: https://svnweb.freebsd.org/changeset/base/284848 Log: Document r283242, autofs(5) '-noauto' map addition. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:15 2015(r284847) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:17 2015(r284848) @@ -397,6 +397,12 @@ allows automatically mounting removable media, such as CD drives or USB flash drives. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -noauto, which + handles &man.fstab.5; entries set to + noauto. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284846 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:13 2015 New Revision: 284846 URL: https://svnweb.freebsd.org/changeset/base/284846 Log: Document r283223, autofs(5) '-media' map. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:11 2015(r284845) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:13 2015(r284846) @@ -390,6 +390,13 @@ The &man.ctld.8; utility has been updated to allow controlling non-iSCSI &man.ctl.4; ports. + + The + &man.autofs.5; subsystem has been updated to include a new + &man.auto.master.5; map, -media, which + allows automatically mounting removable media, such as + CD drives or USB flash + drives. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284843 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:07 2015 New Revision: 284843 URL: https://svnweb.freebsd.org/changeset/base/284843 Log: Document r282746, openresolv updated to 3.7.0. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:59 2015(r284842) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:07 2015(r284843) @@ -217,6 +217,10 @@ The &man.acpi.4; subsystem has been updated to version 20150410. + + The + &man.resolvconf.8; utility has been updated to version + 3.7.0. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284841 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:57 2015 New Revision: 284841 URL: https://svnweb.freebsd.org/changeset/base/284841 Log: Document r283092, ACPICA updated to 20150515. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:55 2015(r284840) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:57 2015(r284841) @@ -454,9 +454,6 @@ The &man.nvi.1; utility has been updated to version 2.1.3. - The &man.acpi.4; subsystem has been - updated to version 20150410. - The &man.wpa.supplicant.8; and &man.hostapd.8; utilities have been updated to version 2.4. @@ -473,6 +470,9 @@ OpenSSL has been updated to version 1.0.1o. + + The &man.acpi.4; subsystem has been + updated to version 20150515. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284832 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:38 2015 New Revision: 284832 URL: https://svnweb.freebsd.org/changeset/base/284832 Log: Document r284589, fstyp(8) now recognizes ZFS and GELI filesystems. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:36 2015(r284831) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:38 2015(r284832) @@ -367,6 +367,11 @@ acquisition are now reported. + + The &man.fstyp.8; utility has been + updated to be able to detect &man.zfs.8; and &man.geli.8; + filesystems. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284835 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:44 2015 New Revision: 284835 URL: https://svnweb.freebsd.org/changeset/base/284835 Log: Document r284746, TSO and checksum offloading support in hv_netvsc(4). Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:42 2015(r284834) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:44 2015(r284835) @@ -1052,6 +1052,10 @@ Support for &man.xen.4; para-virtualized domU kernels has been removed. + + The + &man.hv.netvsc.4; driver has been updated to support checksum + offloading and TSO. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284849 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:45:20 2015 New Revision: 284849 URL: https://svnweb.freebsd.org/changeset/base/284849 Log: Document r283262, boot-time memory test on amd64 platforms is now disabled by default. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:17 2015(r284848) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:45:20 2015(r284849) @@ -458,6 +458,10 @@ loading the kernel. To enable this behavior, add geom_eli_passphrase_prompt="YES" to &man.loader.conf.5;. + + The + memory test run at boot time on &os;/&arch.amd64; platforms + has been disabled by default. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284834 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:42 2015 New Revision: 284834 URL: https://svnweb.freebsd.org/changeset/base/284834 Log: Add missing '-' in Hyper-V. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:40 2015(r284833) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:42 2015(r284834) @@ -1030,7 +1030,7 @@ has been added. The - HyperV™ drivers have been updated with several + Hyper-V™ drivers have been updated with several enhancements: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284840 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:55 2015 New Revision: 284840 URL: https://svnweb.freebsd.org/changeset/base/284840 Log: Document r284329, OpenSSL update to 1.0.1o. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:53 2015(r284839) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:55 2015(r284840) @@ -444,9 +444,6 @@ The &man.xz.1; utility has been updated to support multi-threaded compression. - OpenSSL has - been updated to version 1.0.1m. - The elftoolchain utilities have been updated to version 3179. @@ -473,6 +470,9 @@ bmake has been updated to version 20150606. + + OpenSSL has + been updated to version 1.0.1o. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284829 - in head/release/doc: en_US.ISO8859-1/relnotes share/xml
Author: gjb Date: Thu Jun 25 18:44:31 2015 New Revision: 284829 URL: https://svnweb.freebsd.org/changeset/base/284829 Log: Document r284297, lockstat(1) improvements. Add ClusterHQ to sponsors.ent. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml head/release/doc/share/xml/sponsor.ent Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:29 2015(r284828) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:31 2015(r284829) @@ -345,6 +345,32 @@ would cause final results to be sent to &man.stderr.4; when receiving the SIGINFO signal has been fixed. + + The &man.lockstat.1; utility has been + updated with several improvements: + + + + Spin locks are now reported as the amount of time + spinning, instead of loop iterations. + + + + Reader locks are now recognized as adaptive and can + spin on &os;. + + + + Lock aquisition events for successful reader try-lock + events are now reported. + + + + Spin-and-block events that occur before lock + acquisition are now reported. + + Modified: head/release/doc/share/xml/sponsor.ent == --- head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:29 2015 (r284828) +++ head/release/doc/share/xml/sponsor.ent Thu Jun 25 18:44:31 2015 (r284829) @@ -15,6 +15,8 @@ + + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284831 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:36 2015 New Revision: 284831 URL: https://svnweb.freebsd.org/changeset/base/284831 Log: Move the crypt(3) entries from userland-programs to userland-libraries. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:34 2015(r284830) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:36 2015(r284831) @@ -220,10 +220,6 @@ to filter by &man.jail.8; ID or name, in followup to the &man.ps.1; change in r265229. - The Blowfish &man.crypt.3; default - format has been changed to - $2b$. - The &man.pmcstat.8; utility has been updated to include a new flag, -l, which ends event collection after the specified number of @@ -371,10 +367,6 @@ acquisition are now reported. - - The Blowfish &man.crypt.3; library - has been updated to support $2y$ hashes. @@ -542,6 +534,10 @@ Runtime Libraries and API + The Blowfish &man.crypt.3; default + format has been changed to + $2b$. + The &man.readline.3; library is now statically linked in software within the base system, and the shared library is no longer installed, allowing the Ports @@ -611,6 +607,10 @@ malloc.h headers have been updated to make use of the gcc alloc_align() attribute. + + The Blowfish &man.crypt.3; library + has been updated to support $2y$ hashes. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284839 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:53 2015 New Revision: 284839 URL: https://svnweb.freebsd.org/changeset/base/284839 Log: Document r258431, boot-time memory test on amd64 platforms is now disabled by default. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:50 2015(r284838) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:53 2015(r284839) @@ -1179,6 +1179,10 @@ loading the kernel. To enable this behavior, add geom_eli_passphrase_prompt="YES" to &man.loader.conf.5;. + + The + memory test run at boot time on &os;/&arch.amd64; platforms + has been disabled by default. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284836 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:46 2015 New Revision: 284836 URL: https://svnweb.freebsd.org/changeset/base/284836 Log: Update the svn revision marker. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:44 2015(r284835) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:46 2015(r284836) @@ -22,7 +22,7 @@ $FreeBSD$ - + 2015 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284827 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:27 2015 New Revision: 284827 URL: https://svnweb.freebsd.org/changeset/base/284827 Log: Document r284254, bmake updated to 20150606. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:25 2015(r284826) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:27 2015(r284827) @@ -437,15 +437,15 @@ &man.hostapd.8; utilities have been updated to version 2.4. - bmake has - been updated to version 20150418. - The &man.unbound.8; utility has been updated to version 1.5.3. The &man.resolvconf.8; utility has been updated to version 3.7.0. + + bmake has + been updated to version 20150606. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284833 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:40 2015 New Revision: 284833 URL: https://svnweb.freebsd.org/changeset/base/284833 Log: Document r284702, uart(4) update to support AMT on newer systems. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:38 2015(r284832) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:40 2015(r284833) @@ -972,6 +972,9 @@ The &man.ig4.4; driver has been added, providing support for the fourth generation &intel; I2C SMBus. + + The &man.uart.4; driver has been updated to support + AMT devices on newer systems. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284820 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:12 2015 New Revision: 284820 URL: https://svnweb.freebsd.org/changeset/base/284820 Log: Document r282901, RACCT/RCTL in GENERIC by default. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:10 2015(r284819) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:12 2015(r284820) @@ -703,6 +703,19 @@ &man.rctl.8; with the GENERIC kernel. A new kernel configuration option, RACCT_DISABLED has also been added. + + The + GENERIC kernel configuration now includes + RACCT and RCTL by + default. + + + To enable RACCT and + RCTL on a system using the + GENERIC kernel configuration, add + kern.racct.enable=1 to + &man.loader.conf.5;, and reboot the system. + ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284823 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:18 2015 New Revision: 284823 URL: https://svnweb.freebsd.org/changeset/base/284823 Log: Document r283136, net.inet.tcp.hostcache.purgenow addition. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:16 2015(r284822) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:18 2015(r284823) @@ -728,6 +728,13 @@ kern.racct.enable=1 to &man.loader.conf.5;, and reboot the system. + + A new &man.sysctl.8;, + net.inet.tcp.hostcache.purgenow, has + been added, which when set to 1 during + runtime will flush all + net.inet.tcp.hostcache entries. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284824 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:20 2015 New Revision: 284824 URL: https://svnweb.freebsd.org/changeset/base/284824 Log: Document r283766, ig4(4) addition. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:18 2015(r284823) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:20 2015(r284824) @@ -919,6 +919,10 @@ updated to include AES-ICM and AES-GCM modes, both of which have also been added to the &man.aesni.4; driver. + + The &man.ig4.4; driver has been added, + providing support for the fourth generation &intel; + I2C SMBus. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284830 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:34 2015 New Revision: 284830 URL: https://svnweb.freebsd.org/changeset/base/284830 Log: Document r284483, Blowfish crypt(3) now supports $2y$ format. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:31 2015(r284829) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:34 2015(r284830) @@ -371,6 +371,10 @@ acquisition are now reported. + + The Blowfish &man.crypt.3; library + has been updated to support $2y$ hashes. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284828 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:29 2015 New Revision: 284828 URL: https://svnweb.freebsd.org/changeset/base/284828 Log: Document r284273, initial ACPI support for aarch64. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:27 2015(r284827) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:29 2015(r284828) @@ -1040,6 +1040,11 @@ Support for the hardware power button on the BeagleBone Black system has been added. + + Initial + ACPI support has been added for + &os;/&arch.arm64;. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284825 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:22 2015 New Revision: 284825 URL: https://svnweb.freebsd.org/changeset/base/284825 Log: Document r283766, improved hang detection in em(4). Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:20 2015(r284824) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:22 2015(r284825) @@ -874,6 +874,10 @@ &man.gre.4; driver has been significantly overhauled, and has been split into two separate modules, &man.gre.4; and &man.me.4;. + + The &man.em.4; driver has been updated + with improved transmission queue hang detection. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284819 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:10 2015 New Revision: 284819 URL: https://svnweb.freebsd.org/changeset/base/284819 Log: Document r282827, BeagleBone Black power button support added. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:08 2015(r284818) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:10 2015(r284819) @@ -987,6 +987,9 @@ Kernel support for Thumb-2 has been added. + + Support for the hardware power button + on the BeagleBone Black system has been added. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284817 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:06 2015 New Revision: 284817 URL: https://svnweb.freebsd.org/changeset/base/284817 Log: Document r282779, Thumb-2 support for ARMv7 added. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:38:58 2015(r284816) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:06 2015(r284817) @@ -980,6 +980,9 @@ Initial support for the ARM AArch64 architecture has been added. + + Kernel support for Thumb-2 + has been added. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284818 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Thu Jun 25 18:44:08 2015 New Revision: 284818 URL: https://svnweb.freebsd.org/changeset/base/284818 Log: Document r282783, freescale PCI Root Complex support added. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:06 2015(r284817) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 25 18:44:08 2015(r284818) @@ -744,6 +744,10 @@ The drm code has been updated to match &linux; version 3.8.13. + + Support for the Freescale + PCI Root Complex device has been + added. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf
> On 25 Jun 2015, at 15:07 , Ermal Luçi wrote: > > Fixed. I have a feeling it’s not; amd64.LINT: /scratch/tmp/bz/head.svn/sys/net/altq/altq_fairq.c:746:4: error: format specifies type 'long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] bw, cl->cl_bandwidth, *hit_limit, b); ^~ 1 error generated. --- altq_fairq.o --- *** [altq_fairq.o] Error code 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284816 - head/sbin/setkey
Author: gnn
Date: Thu Jun 25 18:38:58 2015
New Revision: 284816
URL: https://svnweb.freebsd.org/changeset/base/284816
Log:
Fix support for the null encryption algorithm which now requires
a key.
Sponsored by: Rubicon Communications (Netgate)
Modified:
head/sbin/setkey/token.l
Modified: head/sbin/setkey/token.l
==
--- head/sbin/setkey/token.lThu Jun 25 16:47:11 2015(r284815)
+++ head/sbin/setkey/token.lThu Jun 25 18:38:58 2015(r284816)
@@ -159,7 +159,7 @@ tcp { yylval.num = 0; return(PR_TCP); }
{hyphen}E { BEGIN S_ENCALG; return(F_ENC); }
des-cbc { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL;
return(ALG_ENC); }
3des-cbc { yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL;
return(ALG_ENC); }
-null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL;
return(ALG_ENC_NOKEY); }
+null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL;
return(ALG_ENC); }
simple { yylval.num = SADB_EALG_NULL; BEGIN INITIAL;
return(ALG_ENC_OLD); }
blowfish-cbc { yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL;
return(ALG_ENC); }
cast128-cbc { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL;
return(ALG_ENC); }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284815 - head/share/mk
Author: andrew
Date: Thu Jun 25 16:47:11 2015
New Revision: 284815
URL: https://svnweb.freebsd.org/changeset/base/284815
Log:
Sort the cpu architectures by name rather than a combination of
alphabetical order and appending new architectures to the end of the list.
Obtained from:ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/share/mk/bsd.cpu.mk
Modified: head/share/mk/bsd.cpu.mk
==
--- head/share/mk/bsd.cpu.mkThu Jun 25 15:05:58 2015(r284814)
+++ head/share/mk/bsd.cpu.mkThu Jun 25 16:47:11 2015(r284815)
@@ -6,18 +6,18 @@
.if !defined(CPUTYPE) || empty(CPUTYPE)
_CPUCFLAGS =
-. if ${MACHINE_CPUARCH} == "i386"
-MACHINE_CPU = i486
-. elif ${MACHINE_CPUARCH} == "amd64"
+. if ${MACHINE_CPUARCH} == "amd64"
MACHINE_CPU = amd64 sse2 sse mmx
-. elif ${MACHINE_CPUARCH} == "powerpc"
-MACHINE_CPU = aim
-. elif ${MACHINE_CPUARCH} == "sparc64"
-MACHINE_CPU = ultrasparc
. elif ${MACHINE_CPUARCH} == "arm"
MACHINE_CPU = arm
+. elif ${MACHINE_CPUARCH} == "i386"
+MACHINE_CPU = i486
. elif ${MACHINE_CPUARCH} == "mips"
MACHINE_CPU = mips
+. elif ${MACHINE_CPUARCH} == "powerpc"
+MACHINE_CPU = aim
+. elif ${MACHINE_CPUARCH} == "sparc64"
+MACHINE_CPU = ultrasparc
. endif
.else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284813 - in stable/10/release: . tools
Author: gjb
Date: Thu Jun 25 14:58:50 2015
New Revision: 284813
URL: https://svnweb.freebsd.org/changeset/base/284813
Log:
MFC r284780, r284811, r284812:
r284780:
Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
DESTDIR, otherwise it can get stuck in ttyin.
r284811:
Consider PRERELEASE builds snapshots, in addition to CURRENT
and STABLE.
r284812:
Change the hour:minute delimiter from ':' to '-', since
the former is an invalid character in EC2 images.
Approved by: re (glebius, insta-MFC)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile.azure
stable/10/release/Makefile.ec2
stable/10/release/Makefile.mirrors
stable/10/release/tools/ec2.conf
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile.azure
==
--- stable/10/release/Makefile.azureThu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.azureThu Jun 25 14:58:50 2015
(r284813)
@@ -16,8 +16,8 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU
. endfor
.endif
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
-SNAPSHOT_DATE!=date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
+SNAPSHOT_DATE!=date +-%Y-%m-%d-%H-%M
.endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
Modified: stable/10/release/Makefile.ec2
==
--- stable/10/release/Makefile.ec2 Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.ec2 Thu Jun 25 14:58:50 2015
(r284813)
@@ -5,8 +5,8 @@
# Makefile for creating an EC2 AMI from a disk image.
#
-.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
-AMINAMESUFFIX!=date +-%Y-%m-%d-%H:%M
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
+AMINAMESUFFIX!=date +-%Y-%m-%d-%H-%M
.endif
.if defined(EC2PUBLIC)
PUBLISH= --public
Modified: stable/10/release/Makefile.mirrors
==
--- stable/10/release/Makefile.mirrors Thu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/Makefile.mirrors Thu Jun 25 14:58:50 2015
(r284813)
@@ -27,7 +27,7 @@ EMBEDDED= 1
.endif
# snapshot
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
TLD?= ${FTPDIR}/snapshots
. if !defined(SVNREVISION) || empty(SVNREVISION)
@@ -63,7 +63,7 @@ BOARDNAME:= ${KERNCONF}
. else
OLDNAME:= ${KERNCONF}
. endif
-. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
. endif
IMAGES:= img
Modified: stable/10/release/tools/ec2.conf
==
--- stable/10/release/tools/ec2.confThu Jun 25 14:24:06 2015
(r284812)
+++ stable/10/release/tools/ec2.confThu Jun 25 14:58:50 2015
(r284813)
@@ -32,7 +32,7 @@ vm_extra_pre_umount() {
# catalogue and install or update pkg when the instance first
# launches, so these files would just be replaced anyway; removing
# them from the image allows it to boot faster.
- pkg -c ${DESTDIR} delete -f -y pkg
+ env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
# The size of the EC2 root disk can be configured at instance launch
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284811 - head/release
Author: gjb
Date: Thu Jun 25 13:40:00 2015
New Revision: 284811
URL: https://svnweb.freebsd.org/changeset/base/284811
Log:
Consider PRERELEASE builds snapshots, in addition to CURRENT and
STABLE.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.azure
head/release/Makefile.ec2
head/release/Makefile.mirrors
Modified: head/release/Makefile.azure
==
--- head/release/Makefile.azure Thu Jun 25 13:01:10 2015(r284810)
+++ head/release/Makefile.azure Thu Jun 25 13:40:00 2015(r284811)
@@ -16,7 +16,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU
. endfor
.endif
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT_DATE!=date +-%Y-%m-%d-%H:%M
.endif
Modified: head/release/Makefile.ec2
==
--- head/release/Makefile.ec2 Thu Jun 25 13:01:10 2015(r284810)
+++ head/release/Makefile.ec2 Thu Jun 25 13:40:00 2015(r284811)
@@ -5,7 +5,7 @@
# Makefile for creating an EC2 AMI from a disk image.
#
-.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE"
+.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
AMINAMESUFFIX!=date +-%Y-%m-%d-%H:%M
.endif
.if defined(EC2PUBLIC)
Modified: head/release/Makefile.mirrors
==
--- head/release/Makefile.mirrors Thu Jun 25 13:01:10 2015
(r284810)
+++ head/release/Makefile.mirrors Thu Jun 25 13:40:00 2015
(r284811)
@@ -27,7 +27,7 @@ EMBEDDED= 1
.endif
# snapshot
-.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
TLD?= ${FTPDIR}/snapshots
. if !defined(SVNREVISION) || empty(SVNREVISION)
@@ -63,7 +63,7 @@ BOARDNAME:= ${KERNCONF}
. else
OLDNAME:= ${KERNCONF}
. endif
-. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT"
+. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
SNAPSHOT= 1
. endif
IMAGES:= img
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284814 - head/sys/net/altq
Author: eri
Date: Thu Jun 25 15:05:58 2015
New Revision: 284814
URL: https://svnweb.freebsd.org/changeset/base/284814
Log:
Correct r284777 to use proper includes and remove dead code to unbreak kernel
builds.
Differential Revision:https://reviews.freebsd.org/D2847
Modified:
head/sys/net/altq/altq_fairq.c
Modified: head/sys/net/altq/altq_fairq.c
==
--- head/sys/net/altq/altq_fairq.c Thu Jun 25 14:58:50 2015
(r284813)
+++ head/sys/net/altq/altq_fairq.c Thu Jun 25 15:05:58 2015
(r284814)
@@ -103,9 +103,12 @@
#include
#include
+#include
#include
-#include
+#include
+#include
+#include
#include
#include
@@ -406,24 +409,6 @@ fairq_class_create(struct fairq_if *pif,
#endif /* ALTQ_RED */
return (cl);
-
-err_buckets:
- if (cl->cl_buckets != NULL)
- free(cl->cl_buckets, M_DEVBUF);
-err_ret:
-if (cl->cl_red != NULL) {
-#ifdef ALTQ_RIO
-if (cl->cl_qtype == Q_RIO)
-rio_destroy((rio_t *)cl->cl_red);
-#endif
-#ifdef ALTQ_RED
- if (cl->cl_qtype == Q_RED)
- red_destroy(cl->cl_red);
-#endif
-}
-if (cl != NULL)
-free(cl, M_DEVBUF);
-return (NULL);
}
static int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284812 - head/release
Author: gjb
Date: Thu Jun 25 14:24:06 2015
New Revision: 284812
URL: https://svnweb.freebsd.org/changeset/base/284812
Log:
Change the hour:minute delimiter from ':' to '-', since
the former is an invalid character in EC2 images.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/Makefile.azure
head/release/Makefile.ec2
Modified: head/release/Makefile.azure
==
--- head/release/Makefile.azure Thu Jun 25 13:40:00 2015(r284811)
+++ head/release/Makefile.azure Thu Jun 25 14:24:06 2015(r284812)
@@ -17,7 +17,7 @@ AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZU
.endif
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} ==
"PRERELEASE"
-SNAPSHOT_DATE!=date +-%Y-%m-%d-%H:%M
+SNAPSHOT_DATE!=date +-%Y-%m-%d-%H-%M
.endif
AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
Modified: head/release/Makefile.ec2
==
--- head/release/Makefile.ec2 Thu Jun 25 13:40:00 2015(r284811)
+++ head/release/Makefile.ec2 Thu Jun 25 14:24:06 2015(r284812)
@@ -6,7 +6,7 @@
#
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} ==
"PRERELEASE"
-AMINAMESUFFIX!=date +-%Y-%m-%d-%H:%M
+AMINAMESUFFIX!=date +-%Y-%m-%d-%H-%M
.endif
.if defined(EC2PUBLIC)
PUBLISH= --public
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284810 - in stable/10/lib/msun: . ld128 ld80 man src
Author: tijl
Date: Thu Jun 25 13:01:10 2015
New Revision: 284810
URL: https://svnweb.freebsd.org/changeset/base/284810
Log:
MFC r271651, r271719, r272138, r272457, r272845, r275476, r275518, r275614,
r275819, r276176, r278154, r278160, r278339, r279127, r279240, r279491,
r279493, r279856, r283032, r284423, r284426, r284427, r284428
Merge changes to libm from the past 9 months. This includes improvements
to the Bessel functions and adds the C99 function lgammal.
Added:
stable/10/lib/msun/ld128/e_lgammal_r.c
- copied, changed from r271651, head/lib/msun/ld128/e_lgammal_r.c
stable/10/lib/msun/ld80/e_lgammal_r.c
- copied, changed from r271651, head/lib/msun/ld80/e_lgammal_r.c
stable/10/lib/msun/src/e_lgammal.c
- copied unchanged from r271651, head/lib/msun/src/e_lgammal.c
Modified:
stable/10/lib/msun/Makefile
stable/10/lib/msun/Symbol.map
stable/10/lib/msun/ld128/k_expl.h
stable/10/lib/msun/ld80/k_expl.h
stable/10/lib/msun/man/j0.3
stable/10/lib/msun/man/lgamma.3
stable/10/lib/msun/src/catrig.c
stable/10/lib/msun/src/catrigf.c
stable/10/lib/msun/src/e_j0.c
stable/10/lib/msun/src/e_j0f.c
stable/10/lib/msun/src/e_j1.c
stable/10/lib/msun/src/e_j1f.c
stable/10/lib/msun/src/e_jn.c
stable/10/lib/msun/src/e_jnf.c
stable/10/lib/msun/src/e_lgamma.c
stable/10/lib/msun/src/e_lgamma_r.c
stable/10/lib/msun/src/e_lgammaf_r.c
stable/10/lib/msun/src/imprecise.c
stable/10/lib/msun/src/k_exp.c
stable/10/lib/msun/src/k_expf.c
stable/10/lib/msun/src/math.h
stable/10/lib/msun/src/math_private.h
stable/10/lib/msun/src/s_ccosh.c
stable/10/lib/msun/src/s_ccoshf.c
stable/10/lib/msun/src/s_cexp.c
stable/10/lib/msun/src/s_cexpf.c
stable/10/lib/msun/src/s_conj.c
stable/10/lib/msun/src/s_conjf.c
stable/10/lib/msun/src/s_conjl.c
stable/10/lib/msun/src/s_cproj.c
stable/10/lib/msun/src/s_cprojf.c
stable/10/lib/msun/src/s_cprojl.c
stable/10/lib/msun/src/s_csinh.c
stable/10/lib/msun/src/s_csinhf.c
stable/10/lib/msun/src/s_csqrt.c
stable/10/lib/msun/src/s_csqrtf.c
stable/10/lib/msun/src/s_csqrtl.c
stable/10/lib/msun/src/s_ctanh.c
stable/10/lib/msun/src/s_ctanhf.c
stable/10/lib/msun/src/s_scalbln.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/msun/Makefile
==
--- stable/10/lib/msun/Makefile Thu Jun 25 11:32:41 2015(r284809)
+++ stable/10/lib/msun/Makefile Thu Jun 25 13:01:10 2015(r284810)
@@ -98,6 +98,7 @@ COMMON_SRCS+= s_copysignl.c s_fabsl.c s_
# If long double != double use these; otherwise, we alias the double versions.
COMMON_SRCS+= e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \
e_coshl.c e_fmodl.c e_hypotl.c \
+ e_lgammal.c e_lgammal_r.c \
e_remainderl.c e_sinhl.c e_sqrtl.c \
invtrig.c k_cosl.c k_sinl.c k_tanl.c \
s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \
@@ -188,7 +189,8 @@ MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.
ilogb.3 logb.3 ilogb.3 logbf.3 ilogb.3 logbl.3
MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3
MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3
-MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 lgammaf.3 \
+MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 \
+ lgamma.3 lgammaf.3 lgamma.3 lgammal.3 \
lgamma.3 tgamma.3 lgamma.3 tgammaf.3
MLINKS+=log.3 log10.3 log.3 log10f.3 log.3 log10l.3 \
log.3 log1p.3 log.3 log1pf.3 log.3 log1pl.3 \
Modified: stable/10/lib/msun/Symbol.map
==
--- stable/10/lib/msun/Symbol.map Thu Jun 25 11:32:41 2015
(r284809)
+++ stable/10/lib/msun/Symbol.map Thu Jun 25 13:01:10 2015
(r284810)
@@ -269,6 +269,7 @@ FBSD_1.3 {
erfl;
expl;
expm1l;
+ lgammal;
log10l;
log1pl;
log2l;
@@ -276,7 +277,11 @@ FBSD_1.3 {
sinhl;
tanhl;
/* Implemented as weak aliases for imprecise versions */
- lgammal;
powl;
tgammal;
};
+
+/* First added in 11.0-CURRENT */
+FBSD_1.4 {
+ lgammal_r;
+};
Copied and modified: stable/10/lib/msun/ld128/e_lgammal_r.c (from r271651,
head/lib/msun/ld128/e_lgammal_r.c)
==
--- head/lib/msun/ld128/e_lgammal_r.c Mon Sep 15 23:21:57 2014
(r271651, copy source)
+++ stable/10/lib/msun/ld128/e_lgammal_r.c Thu Jun 25 13:01:10 2015
(r284810)
@@ -206,13 +206,13 @@ sin_pil(long double x)
n--;
}
n &= 7;
- y = y - z + n * 0.25L;
+ y = y - z + n * 0.25;
switch (n) {
case 0: y = __kernel_sinl(pi*y,zero,0); break;
case 1:
case 2: y = __kernel_cosl(pi*(0.5-y),zero); break;
- case 3:
+ case 3:
case 4: y = __ke
Re: svn commit: r284163 - head/bin/cp
On Wed, 24 Jun 2015, Bryan Drewery wrote:
On 6/9/2015 1:28 AM, Bruce Evans wrote:
On Mon, 8 Jun 2015, Bryan Drewery wrote:
Log:
Cleanup some style(9) issues.
- Whitespace.
- Comments.
- Wrap long lines.
cp's style had a remarlable amount of bitrot.
This change unimproves it in some places.
I have been traveling and packing. I'm replying now but won't have time
to address the issues until next week. I was trying to avoid doing any
of this but touched code which was horrendously misstyled and chained
into reindenting the whole file and doing it wrong :). At this point I
don't want to tweak this much more.
Thanks for replying.
@@ -245,10 +245,10 @@ main(int argc, char *argv[])
type = FILE_TO_FILE;
if (have_trailing_slash && type == FILE_TO_FILE) {
-if (r == -1)
+if (r == -1) {
This adds excessive braces.
errx(1, "directory %s does not exist",
- to.p_path);
-else
+to.p_path);
+} else
It is a multi-line statement due to the hard 80-width wrap. I feel it is
fine in this case.
OK. The mail mangled all the tabs so this is hard to see now.
@@ -379,7 +379,8 @@ copy(char *argv[], enum op type, int fts
mode = curr->fts_statp->st_mode;
if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) ||
((mode | S_IRWXU) & mask) != (mode & mask))
-if (chmod(to.p_path, mode & mask) != 0){
+if (chmod(to.p_path, mode & mask) !=
+0) {
warn("chmod: %s", to.p_path);
rval = 1;
}
This changes from a minor misformatting to avoid a long line to even uglier
formatting with a split line.
I agree 100%. I did it because of our hard 80-width cut-off. What would
the proper style be? My inclination would be to wrap at the first comma
but then it is even more odd. I find our 80-width cut-off to be strange
when editors/tmux/window manager/etc can resize and wrap long lines already.
I don't mind the hack of omitting the space before the final parentheses.
This gives a line length of exactly 80, which is a little too long. The
main problem with this is that automatic formatting programs will want to
"fix" it.
I like to wrap at the last possible comma, except for printf()s I usually
wrap after the format string. Here the last comma is also the first comma.
It is a little too early.
Editors/tmux/window manager/etc cannot wrap long lines already. Even
indent(1) is clueless about wrapping long lines. It mostly doesn't
do it. Otherwise it would want to change more than it does, and make
more messes by getting the wrapping slightly wronger than the original.
How could a mere editor/window manager know:
- C syntax, so as to pick wrapping points like commas
- the project and programmer's preference for wrapping early or late
in a context-dependent way
- special cases like the above?
Formatting away from the project or current source style to the programmer's
preferred style is relatively easy, but is very difficult to format back
to the original style so as to not change everything for a 1-line real
change.
Actually I don't see a width restriction in style(9) at all but surely
we have this rule documented somewhere. My guess is that it is inherited
by KNF.
cp.c (like most utilities in bin) used to be in KNF. I think CSRG release
engineers (mainly Bostic?) enforced them a common style (perhaps the
single release engineer's style and not quite KNF). From the above hack
alone in cp.c, we can infer that the line length limit is 80. The
default line length limit in indent(1) is 79, but indent(1) doesn't
actually understand line lengths. Fuller references for the line length
limit are:
expand 4.4BD-Lite2/usr/src/admin/style/style | grep ... (79+ dots)
This finds 1 line of length 80, and that line is broken (it has garbage
trailing tabs), and a couple of lines of length 79, and none longer.
This files gives KNF rules by example. Whitespace in it was broken by
converting it to a man page.
similar greps in kern and pure BSD utilities
It is necessary to make such changes if you
use indent(1) to generate and check the changes -- otherwise, indent keeps
Do you have an indent configuration I can use?
I use this .indent.pro.
%%%
-TFILE
-Tfd_mask
-Tfd_set
-Tu_char
-Tu_int
-Tu_long
-Tu_short
-ta
-bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj
-ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -nv
%%%
The T directives in this are very incomplete. The -ta directive is
supposed to handle all typedefs that spelled with a _t suffix. It
replaces a much longer but even more incomplete list of T directives,
and mostly works (it obviously makes messes if you have some non-typedefs
spelled with a _t suffix).
Modified: head/bin/cp/utils.c
===
Re: svn commit: r284807 - in head/lib/libc/aarch64: . gen
[ +das@ ] 2015-06-25 18:03 GMT+02:00 Ed Schouten : > Considering that this interface is essentially deprecated (they were > replaced by C99 ), would it make sense to figure out what > actually uses this? If it's just Python and a small number of other > ports, maybe it would be worth porting these over? Even more interesting, if I look at the Python code (Modules/python.c, in main()): /* 754 requires that FP exceptions run in "no stop" mode by default, * and until C vendors implement C99's ways to control FP exceptions, * Python requires non-stop mode. Alas, some platforms enable FP * exceptions by default. Here we disable them. */ This contradicts with what fenv(3) says: "Non-stop mode is the default, but it may be altered by feenableexcept() and fedisableexcept()." This line has already been in there since its first version (2004). My suspicion is that the code that Python has, is only there to deal with older versions of FreeBSD from 2004 that may have been non-conforming. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK/VAT number: 62051717 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284809 - stable/9/sys/conf
Author: avg
Date: Thu Jun 25 11:32:41 2015
New Revision: 284809
URL: https://svnweb.freebsd.org/changeset/base/284809
Log:
revert local hack that sneaked into r284804
Pointy hat to:avg
Modified:
stable/9/sys/conf/kern.mk
Modified: stable/9/sys/conf/kern.mk
==
--- stable/9/sys/conf/kern.mk Thu Jun 25 10:03:38 2015(r284808)
+++ stable/9/sys/conf/kern.mk Thu Jun 25 11:32:41 2015(r284809)
@@ -5,7 +5,7 @@
#
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
- -Wundef -Wno-pointer-sign \
+ -Wundef -Wno-pointer-sign -fformat-extensions \
-Wmissing-include-dirs -fdiagnostics-show-option \
${CWARNEXTRA}
MK_CLANG_IS_CC ?= no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284807 - in head/lib/libc/aarch64: . gen
Hi Andrew, 2015-06-25 10:22 GMT+02:00 Andrew Turner : > Log: > Implement fpgetmask, it's needed by Python. Interesting. Never heard of these functions before. Considering that this interface is essentially deprecated (they were replaced by C99 ), would it make sense to figure out what actually uses this? If it's just Python and a small number of other ports, maybe it would be worth porting these over? -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK/VAT number: 62051717 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284808 - head/sys/dev/isp
Author: mav
Date: Thu Jun 25 10:03:38 2015
New Revision: 284808
URL: https://svnweb.freebsd.org/changeset/base/284808
Log:
Remove limitations on setting WWNNs starting from 2.
It is odd that driver first tries to generate synthetic WWNN based on
WWPN starting from 2, but then refuses to use it. If we don't trust
generated WWNN, we should probably not generate it. Same time this
limitation prevents potentially valid WWNN setting by user.
Modified:
head/sys/dev/isp/isp.c
Modified: head/sys/dev/isp/isp.c
==
--- head/sys/dev/isp/isp.c Thu Jun 25 08:22:25 2015(r284807)
+++ head/sys/dev/isp/isp.c Thu Jun 25 10:03:38 2015(r284808)
@@ -1848,7 +1848,7 @@ isp_fibre_init(ispsoftc_t *isp)
icbp->icb_lunetimeout = ICB_LUN_ENABLE_TOV;
}
#endif
- if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) {
+ if (fcp->isp_wwnn && fcp->isp_wwpn) {
icbp->icb_fwoptions |= ICBOPT_BOTH_WWNS;
MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn);
MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn);
@@ -2075,7 +2075,7 @@ isp_fibre_init_2400(ispsoftc_t *isp)
}
icbp->icb_logintime = ICB_LOGIN_TOV;
- if (fcp->isp_wwnn && fcp->isp_wwpn && (fcp->isp_wwnn >> 60) != 2) {
+ if (fcp->isp_wwnn && fcp->isp_wwpn) {
icbp->icb_fwoptions1 |= ICB2400_OPT1_BOTH_WWNS;
MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, fcp->isp_wwpn);
MAKE_NODE_NAME_FROM_WWN(icbp->icb_nodename, fcp->isp_wwnn);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf
Fixed. On Thu, Jun 25, 2015 at 11:00 AM, Ermal Luçi wrote: > > On Thu, Jun 25, 2015 at 10:42 AM, Bjoern A. Zeeb wrote: > >> >> > On 24 Jun 2015, at 19:16 , Ermal Luçi wrote: >> > >> > Author: eri >> > Date: Wed Jun 24 19:16:41 2015 >> > New Revision: 284777 >> > URL: https://svnweb.freebsd.org/changeset/base/284777 >> > >> > Log: >> > ALTQ FAIRQ discipline import from DragonFLY >> > >> > Differential Revision: https://reviews.freebsd.org/D2847 >> > Reviewed by:glebius, wblock(manpage) >> > Approved by:gnn(mentor) >> > Obtained from: pfSense >> > Sponsored by: Netgate >> >> I see a lot of kernel configurations failing to build dring a universe; >> here’s some errors: >> >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected >> declaration specifiers or '...' before 'pf_keyhash' >> cc1: warnings being treated as errors >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected >> declaration specifiers or '...' before 'pf_idhash' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected >> declaration specifiers or '...' before 'pf_srchash' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected >> declaration specifiers or '...' before 'pf_swi_cookie' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected >> declaration specifiers or '...' before 'pf_stateid' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected >> declaration specifiers or '...' before 'pf_altqs' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected >> declaration specifiers or '...' before 'pf_pabuf' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected >> declaration specifiers or '...' before 'ticket_altqs_active' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected >> declaration specifiers or '...' before 'ticket_altqs_inactive' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected >> declaration specifiers or '...' before 'altqs_inactive_open' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected >> declaration specifiers or '...' before 'ticket_pabuf' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected >> declaration specifiers or '...' before 'pf_altqs_active' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected >> declaration specifiers or '...' before 'pf_altqs_inactive' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types >> for 'VNET_DECLARE' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous >> declaration of 'VNET_DECLARE' was here >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected >> declaration specifiers or '...' before 'pf_unlinked_rules' >> /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error
svn commit: r284796 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:09:39 2015
New Revision: 284796
URL: https://svnweb.freebsd.org/changeset/base/284796
Log:
MFC r284639: Introduce separate lock for tokens to reduce ctl_lock scope.
Modified:
stable/10/sys/cam/ctl/ctl_private.h
stable/10/sys/cam/ctl/ctl_tpc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl_private.h
==
--- stable/10/sys/cam/ctl/ctl_private.h Thu Jun 25 07:08:46 2015
(r284795)
+++ stable/10/sys/cam/ctl/ctl_private.h Thu Jun 25 07:09:39 2015
(r284796)
@@ -494,6 +494,7 @@ struct ctl_softc {
struct ctl_thread threads[CTL_MAX_THREADS];
TAILQ_HEAD(tpc_tokens, tpc_token) tpc_tokens;
struct callout tpc_timeout;
+ struct mtx tpc_lock;
};
#ifdef _KERNEL
Modified: stable/10/sys/cam/ctl/ctl_tpc.c
==
--- stable/10/sys/cam/ctl/ctl_tpc.c Thu Jun 25 07:08:46 2015
(r284795)
+++ stable/10/sys/cam/ctl/ctl_tpc.c Thu Jun 25 07:09:39 2015
(r284796)
@@ -167,6 +167,7 @@ tpc_timeout(void *arg)
}
/* Free inactive ROD tokens with expired timeout. */
+ mtx_lock(&softc->tpc_lock);
TAILQ_FOREACH_SAFE(token, &softc->tpc_tokens, links, ttoken) {
if (token->active ||
time_uptime < token->last_active + token->timeout + 1)
@@ -175,6 +176,7 @@ tpc_timeout(void *arg)
free(token->params, M_CTL);
free(token, M_CTL);
}
+ mtx_unlock(&softc->tpc_lock);
callout_schedule(&softc->tpc_timeout, hz);
}
@@ -182,6 +184,7 @@ void
ctl_tpc_init(struct ctl_softc *softc)
{
+ mtx_init(&softc->tpc_lock, "CTL TPC mutex", NULL, MTX_DEF);
TAILQ_INIT(&softc->tpc_tokens);
callout_init_mtx(&softc->tpc_timeout, &softc->ctl_lock, 0);
callout_reset(&softc->tpc_timeout, hz, tpc_timeout, softc);
@@ -195,13 +198,14 @@ ctl_tpc_shutdown(struct ctl_softc *softc
callout_drain(&softc->tpc_timeout);
/* Free ROD tokens. */
- mtx_lock(&softc->ctl_lock);
+ mtx_lock(&softc->tpc_lock);
while ((token = TAILQ_FIRST(&softc->tpc_tokens)) != NULL) {
TAILQ_REMOVE(&softc->tpc_tokens, token, links);
free(token->params, M_CTL);
free(token, M_CTL);
}
- mtx_unlock(&softc->ctl_lock);
+ mtx_unlock(&softc->tpc_lock);
+ mtx_destroy(&softc->tpc_lock);
}
void
@@ -227,7 +231,7 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun
}
/* Free ROD tokens for this LUN. */
- mtx_assert(&softc->ctl_lock, MA_OWNED);
+ mtx_lock(&softc->tpc_lock);
TAILQ_FOREACH_SAFE(token, &softc->tpc_tokens, links, ttoken) {
if (token->lun != lun->lun || token->active)
continue;
@@ -235,6 +239,7 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun
free(token->params, M_CTL);
free(token, M_CTL);
}
+ mtx_unlock(&softc->tpc_lock);
}
int
@@ -1394,10 +1399,10 @@ done:
free(list->params, M_CTL);
list->params = NULL;
if (list->token) {
- mtx_lock(&softc->ctl_lock);
+ mtx_lock(&softc->tpc_lock);
if (--list->token->active == 0)
list->token->last_active = time_uptime;
- mtx_unlock(&softc->ctl_lock);
+ mtx_unlock(&softc->tpc_lock);
list->token = NULL;
}
mtx_lock(&lun->lun_lock);
@@ -1991,9 +1996,9 @@ ctl_populate_token(struct ctl_scsiio *ct
list->curseg = 0;
list->completed = 1;
list->last_active = time_uptime;
- mtx_lock(&softc->ctl_lock);
+ mtx_lock(&softc->tpc_lock);
TAILQ_INSERT_TAIL(&softc->tpc_tokens, token, links);
- mtx_unlock(&softc->ctl_lock);
+ mtx_unlock(&softc->tpc_lock);
ctl_set_success(ctsio);
ctl_done((union ctl_io *)ctsio);
return (CTL_RETVAL_COMPLETE);
@@ -2100,7 +2105,7 @@ ctl_write_using_token(struct ctl_scsiio
return (CTL_RETVAL_COMPLETE);
}
- mtx_lock(&softc->ctl_lock);
+ mtx_lock(&softc->tpc_lock);
TAILQ_FOREACH(token, &softc->tpc_tokens, links) {
if (memcmp(token->token, data->rod_token,
sizeof(data->rod_token)) == 0)
@@ -2112,7 +2117,7 @@ ctl_write_using_token(struct ctl_scsiio
if (data->flags & EC_WUT_DEL_TKN)
token->timeout = 0;
}
- mtx_unlock(&softc->ctl_lock);
+ mtx_unlock(&softc->tpc_lock);
if (token == NULL) {
mtx_lock(&lun->lun_lock);
TAILQ_REMOVE(&lun->tpc_lists, list, links);
@@ -2254,10 +2259,10 @@ ctl_report_all_rod_tokens(struct ctl_scs
retval = CTL_RETVAL_COMPLETE;
tokens = 0;
- mtx_lock(&s
svn commit: r284806 - head/lib/libc/aarch64
Author: andrew
Date: Thu Jun 25 08:15:47 2015
New Revision: 284806
URL: https://svnweb.freebsd.org/changeset/base/284806
Log:
Export __flt_rounds from the arm64 libc.so
Modified:
head/lib/libc/aarch64/Symbol.map
Modified: head/lib/libc/aarch64/Symbol.map
==
--- head/lib/libc/aarch64/Symbol.mapThu Jun 25 08:11:39 2015
(r284805)
+++ head/lib/libc/aarch64/Symbol.mapThu Jun 25 08:15:47 2015
(r284806)
@@ -14,6 +14,7 @@ FBSD_1.0 {
_setjmp;
_longjmp;
fabs;
+ __flt_rounds;
fpsetmask;
setjmp;
longjmp;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284792 - head/sys/dev/hptnr
Author: delphij Date: Thu Jun 25 06:15:08 2015 New Revision: 284792 URL: https://svnweb.freebsd.org/changeset/base/284792 Log: Merge changes from vendor driver 1.1.4: v1.1.4 2015-06-09 * Fix a bug that FailLED was not initialized properly. v1.1.3 2015-05-19 * Support Report Luns command. v1.1.2 2015-05-05 * Fix a bug that report wrong physical sector size for 512e HDD. Many thanks to HighPoint for continued support of FreeBSD! This driver update is intended for 10.2-RELEASE. Submitted by: Steve Chang MFC after:3 days Modified: head/sys/dev/hptnr/README head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu head/sys/dev/hptnr/him.h head/sys/dev/hptnr/hptnr_config.c head/sys/dev/hptnr/hptnr_osm_bsd.c head/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu head/sys/dev/hptnr/ldm.h head/sys/dev/hptnr/osm.h Modified: head/sys/dev/hptnr/README == --- head/sys/dev/hptnr/README Thu Jun 25 01:57:47 2015(r284791) +++ head/sys/dev/hptnr/README Thu Jun 25 06:15:08 2015(r284792) @@ -3,6 +3,16 @@ Copyright (C) 2015 HighPoint Technologie # Revision History: + + v1.1.4 2015-06-09 + * Fix a bug that FailLED was not initialized properly. + + v1.1.3 2015-05-19 + * Support Report Luns command. + + v1.1.2 2015-05-05 + * Fix a bug that report wrong physical sector size for 512e HDD. + v1.1.1 2015-03-26 * Support 4Kn drive. * Change the SCSI target ID of the disk to be the index of physical connetion to the HBA. @@ -57,7 +67,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-130701.tgz + # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz 3) Update the kernel configuration file to include the HighPoint source. Assume the configure file is GENERIC, and new kernel configure file is @@ -79,8 +89,8 @@ Revision History: compile-with"uudecode < $S/dev/hptnr/i386-elf.hptnr_lib.o.uu" \ no-implicit-rule - dev/hptnr/os_bsd.c optionalhptnr - dev/hptnr/osm_bsd.c optionalhptnr + dev/hptnr/hptnr_os_bsd.c optionalhptnr + dev/hptnr/hptnr_osm_bsd.c optionalhptnr dev/hptnr/hptnr_config.c optionalhptnr For amd64 system, edit /usr/src/sys/conf/files.amd64 and append the lines @@ -91,13 +101,13 @@ Revision History: compile-with"uudecode < $S/dev/hptnr/amd64-elf.hptnr_lib.o.uu" \ no-implicit-rule - dev/hptnr/os_bsd.c optionalhptnr - dev/hptnr/osm_bsd.c optionalhptnr + dev/hptnr/hptnr_os_bsd.c optionalhptnr + dev/hptnr/hptnr_osm_bsd.c optionalhptnr dev/hptnr/hptnr_config.c optionalhptnr 6) Rebuild and install the kernel: - a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386: + a) for FreeBSD 5.x-i386/6.x-i386/7.x-i386/8.x-i386/9.x-i386/10.x-i386: # cd /usr/src/sys/i386/conf/ # /usr/sbin/config MYKERNEL @@ -106,7 +116,7 @@ Revision History: # make # make install - b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64: + b) for FreeBSD 5.x-amd64/6.x-amd64/7.x-amd64/8.x-amd64/9.x-amd64/10.x-amd64: # cd /usr/src/sys/amd64/conf/ # /usr/sbin/config MYKERNEL @@ -139,7 +149,7 @@ Revision History: 2) Extract the driver files under the kernel source tree: # cd /usr/src/sys/ - # tar xvzf /your/path/to/hptnr-freebsd-src-v1.0-111213.tgz + # tar xvzf /your/path/to/HPTNR_FreeBSD_Src_1.x.x_xx_xx_xx.tgz 4) Build the driver module: @@ -153,7 +163,7 @@ Revision History: # cp hptnr.ko /modules/ - For FreeBSD 5.x/6.x/7.x/8.x/9.x: + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x: # cp hptnr.ko /boot/kernel/ @@ -179,7 +189,7 @@ Revision History: /modules/hptnr.ko text=0xf571 data=0x2c8+0x254 ok boot - For FreeBSD 5.x/6.x/7.x/8.x/9.x, you can select 6 on the boot menu to get a loader + For FreeBSD 5.x/6.x/7.x/8.x/9.x/10.x, you can select 6 on the boot menu to get a loader prompt. 7) You can add a below line into /boot/defaults/loader.conf to load the Modified: head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu == --- head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Thu Jun 25 01:57:47 2015 (r284791) +++ head/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu Thu Jun 25 06:15:08 2015 (r284792) @@ -1,5 +1,5 @@ begin 644 hptnr_lib.o -M?T5,1@(!`0D```$`/@`!`$#S!``` +M?T5,1@(!`0D`
svn commit: r284794 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:07:32 2015
New Revision: 284794
URL: https://svnweb.freebsd.org/changeset/base/284794
Log:
MFC r284622: Remove device queue freeze handling and replace it with dummy.
At this point CTL has no known use case for device queue freezes.
Same time existing (considered to be broken) code was found to cause
modify-after-free issues.
Modified:
stable/10/sys/cam/ctl/scsi_ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/scsi_ctl.c
==
--- stable/10/sys/cam/ctl/scsi_ctl.cThu Jun 25 07:06:24 2015
(r284793)
+++ stable/10/sys/cam/ctl/scsi_ctl.cThu Jun 25 07:07:32 2015
(r284794)
@@ -848,15 +848,6 @@ ctlfestart(struct cam_periph *periph, un
atio->ccb_h.target_lun = CAM_LUN_WILDCARD;
}
- if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) {
- cam_release_devq(periph->path,
-/*relsim_flags*/0,
-/*reduction*/0,
-/*timeout*/0,
-/*getcount_only*/0);
- atio->ccb_h.status &= ~CAM_DEV_QFRZN;
- }
-
if (atio->ccb_h.func_code != XPT_ACCEPT_TARGET_IO) {
xpt_print(periph->path, "%s: func_code "
"is %#x\n", __func__,
@@ -966,15 +957,6 @@ ctlfestart(struct cam_periph *periph, un
xpt_action(start_ccb);
cam_periph_lock(periph);
- if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) {
- cam_release_devq(periph->path,
-/*relsim_flags*/0,
-/*reduction*/0,
-/*timeout*/0,
-/*getcount_only*/0);
- atio->ccb_h.status &= ~CAM_DEV_QFRZN;
- }
-
/*
* If we still have work to do, ask for another CCB.
*/
@@ -1107,6 +1089,19 @@ ctlfedone(struct cam_periph *periph, uni
done_ccb->ccb_h.func_code);
#endif
+ /*
+* At this point CTL has no known use case for device queue freezes.
+* In case some SIM think different -- drop its freeze right here.
+*/
+ if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
+ cam_release_devq(periph->path,
+/*relsim_flags*/0,
+/*reduction*/0,
+/*timeout*/0,
+/*getcount_only*/0);
+ done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
+ }
+
softc = (struct ctlfe_lun_softc *)periph->softc;
bus_softc = softc->parent_softc;
mtx = cam_periph_mtx(periph);
@@ -1417,12 +1412,9 @@ ctlfedone(struct cam_periph *periph, uni
union ctl_io *io;
struct ccb_immediate_notify *inot;
cam_status status;
- int frozen, send_ctl_io;
+ int send_ctl_io;
inot = &done_ccb->cin1;
-
- frozen = (done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0;
-
printf("%s: got XPT_IMMEDIATE_NOTIFY status %#x tag %#x "
"seq %#x\n", __func__, inot->ccb_h.status,
inot->tag_id, inot->seq_id);
@@ -1524,14 +1516,6 @@ ctlfedone(struct cam_periph *periph, uni
done_ccb->ccb_h.func_code = XPT_NOTIFY_ACKNOWLEDGE;
xpt_action(done_ccb);
}
-
- if (frozen != 0) {
- cam_release_devq(periph->path,
-/*relsim_flags*/ 0,
-/*opening reduction*/ 0,
-/*timeout*/ 0,
-/*getcount_only*/ 0);
- }
break;
}
case XPT_NOTIFY_ACKNOWLEDGE:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284804 - in stable/9: cddl/contrib/opensolaris/lib/libzfs/common sys/conf
Author: avg
Date: Thu Jun 25 08:10:23 2015
New Revision: 284804
URL: https://svnweb.freebsd.org/changeset/base/284804
Log:
MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE
Modified:
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
stable/9/sys/conf/kern.mk
Directory Properties:
stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==
--- stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun
25 07:52:51 2015(r284803)
+++ stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun
25 08:10:23 2015(r284804)
@@ -23,6 +23,7 @@
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2015 RackTop Systems.
*/
/*
@@ -1090,11 +1091,7 @@ zpool_open_func(void *arg)
}
(void) close(fd);
-
rn->rn_config = config;
- if (config != NULL) {
- assert(rn->rn_nozpool == B_FALSE);
- }
}
/*
Modified: stable/9/sys/conf/kern.mk
==
--- stable/9/sys/conf/kern.mk Thu Jun 25 07:52:51 2015(r284803)
+++ stable/9/sys/conf/kern.mk Thu Jun 25 08:10:23 2015(r284804)
@@ -5,7 +5,7 @@
#
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
- -Wundef -Wno-pointer-sign -fformat-extensions \
+ -Wundef -Wno-pointer-sign \
-Wmissing-include-dirs -fdiagnostics-show-option \
${CWARNEXTRA}
MK_CLANG_IS_CC ?= no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284807 - in head/lib/libc/aarch64: . gen
Author: andrew
Date: Thu Jun 25 08:22:25 2015
New Revision: 284807
URL: https://svnweb.freebsd.org/changeset/base/284807
Log:
Implement fpgetmask, it's needed by Python.
Approved by: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Added:
head/lib/libc/aarch64/gen/fpgetmask.c (contents, props changed)
Modified:
head/lib/libc/aarch64/Symbol.map
head/lib/libc/aarch64/gen/Makefile.inc
Modified: head/lib/libc/aarch64/Symbol.map
==
--- head/lib/libc/aarch64/Symbol.mapThu Jun 25 08:15:47 2015
(r284806)
+++ head/lib/libc/aarch64/Symbol.mapThu Jun 25 08:22:25 2015
(r284807)
@@ -15,6 +15,7 @@ FBSD_1.0 {
_longjmp;
fabs;
__flt_rounds;
+ fpgetmask;
fpsetmask;
setjmp;
longjmp;
Modified: head/lib/libc/aarch64/gen/Makefile.inc
==
--- head/lib/libc/aarch64/gen/Makefile.inc Thu Jun 25 08:15:47 2015
(r284806)
+++ head/lib/libc/aarch64/gen/Makefile.inc Thu Jun 25 08:22:25 2015
(r284807)
@@ -2,6 +2,7 @@
SRCS+= fabs.S \
flt_rounds.c \
+ fpgetmask.c \
fpsetmask.c \
ldexp.c \
_setjmp.S \
Added: head/lib/libc/aarch64/gen/fpgetmask.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/aarch64/gen/fpgetmask.c Thu Jun 25 08:22:25 2015
(r284807)
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2015 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Andrew Turner under
+ * sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+
+#define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP)
+
+fp_except_t
+fpgetmask(void)
+{
+ uint64_t mask;
+
+ /* Read the current mask */
+ __asm __volatile("mrs %0, fpcr" : "=&r"(mask));
+
+ return (mask & FP_X_MASK);
+}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf
> On 24 Jun 2015, at 19:16 , Ermal Luçi wrote: > > Author: eri > Date: Wed Jun 24 19:16:41 2015 > New Revision: 284777 > URL: https://svnweb.freebsd.org/changeset/base/284777 > > Log: > ALTQ FAIRQ discipline import from DragonFLY > > Differential Revision: https://reviews.freebsd.org/D2847 > Reviewed by:glebius, wblock(manpage) > Approved by:gnn(mentor) > Obtained from: pfSense > Sponsored by: Netgate I see a lot of kernel configurations failing to build dring a universe; here’s some errors: /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected declaration specifiers or '...' before 'pf_keyhash' cc1: warnings being treated as errors /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected declaration specifiers or '...' before 'pf_idhash' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected declaration specifiers or '...' before 'pf_srchash' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected declaration specifiers or '...' before 'pf_swi_cookie' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected declaration specifiers or '...' before 'pf_stateid' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected declaration specifiers or '...' before 'pf_altqs' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected declaration specifiers or '...' before 'pf_pabuf' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected declaration specifiers or '...' before 'ticket_altqs_active' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected declaration specifiers or '...' before 'ticket_altqs_inactive' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected declaration specifiers or '...' before 'altqs_inactive_open' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected declaration specifiers or '...' before 'ticket_pabuf' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected declaration specifiers or '...' before 'pf_altqs_active' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected declaration specifiers or '...' before 'pf_altqs_inactive' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected declaration specifiers or '...' before 'pf_unlinked_rules' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration of 'VNET_DECLARE' was here /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: expected declaration specifiers or '...' before 'pf_state_z' /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1508: error: conflicting types for 'VNET_DECLARE' /scratch/tmp/bz/head.s
Re: svn commit: r284777 - in head: sbin/pfctl share/man/man4 sys/conf sys/net/altq sys/netpfil/pf
On Thu, Jun 25, 2015 at 10:42 AM, Bjoern A. Zeeb wrote: > > > On 24 Jun 2015, at 19:16 , Ermal Luçi wrote: > > > > Author: eri > > Date: Wed Jun 24 19:16:41 2015 > > New Revision: 284777 > > URL: https://svnweb.freebsd.org/changeset/base/284777 > > > > Log: > > ALTQ FAIRQ discipline import from DragonFLY > > > > Differential Revision: https://reviews.freebsd.org/D2847 > > Reviewed by:glebius, wblock(manpage) > > Approved by:gnn(mentor) > > Obtained from: pfSense > > Sponsored by: Netgate > > I see a lot of kernel configurations failing to build dring a universe; > here’s some errors: > > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: expected declaration > specifiers or '...' before 'pf_keyhash' > cc1: warnings being treated as errors > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: expected declaration > specifiers or '...' before 'pf_idhash' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1461: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: expected declaration > specifiers or '...' before 'pf_srchash' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1464: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: expected declaration > specifiers or '...' before 'pf_swi_cookie' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1469: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: expected declaration > specifiers or '...' before 'pf_stateid' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1472: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: expected declaration > specifiers or '...' before 'pf_altqs' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1476: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: expected declaration > specifiers or '...' before 'pf_pabuf' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1478: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: expected declaration > specifiers or '...' before 'ticket_altqs_active' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1481: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: expected declaration > specifiers or '...' before 'ticket_altqs_inactive' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1483: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: expected declaration > specifiers or '...' before 'altqs_inactive_open' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1485: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: expected declaration > specifiers or '...' before 'ticket_pabuf' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1487: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: expected declaration > specifiers or '...' before 'pf_altqs_active' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1489: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: expected declaration > specifiers or '...' before 'pf_altqs_inactive' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1491: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: expected declaration > specifiers or '...' before 'pf_unlinked_rules' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1494: error: conflicting types > for 'VNET_DECLARE' > /scratch/tmp/bz/head.svn/sys/net/pfvar.h:1460: error: previous declaration > of 'VNET_DECLARE' was here > /scratch/tmp/bz/
svn commit: r284803 - head/sys/dev/ichiic
Author: grembo (ports committer)
Date: Thu Jun 25 07:52:51 2015
New Revision: 284803
URL: https://svnweb.freebsd.org/changeset/base/284803
Log:
Protect smbus ioctls in ig4 driver using a shared lock.
Document locking semantics.
Differential Revision:https://reviews.freebsd.org/D2744
Reviewed by: jah, kib
Approved by: kib
Modified:
head/sys/dev/ichiic/ig4_iic.c
head/sys/dev/ichiic/ig4_pci.c
head/sys/dev/ichiic/ig4_var.h
Modified: head/sys/dev/ichiic/ig4_iic.c
==
--- head/sys/dev/ichiic/ig4_iic.c Thu Jun 25 07:25:40 2015
(r284802)
+++ head/sys/dev/ichiic/ig4_iic.c Thu Jun 25 07:52:51 2015
(r284803)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
* Intel fourth generation mobile cpus integrated I2C device, smbus driver.
*
* See ig4_reg.h for datasheet reference and notes.
+ * See ig4_var.h for locking semantics.
*/
#include
@@ -49,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -115,7 +117,7 @@ set_controller(ig4iic_softc_t *sc, uint3
error = 0;
break;
}
- mtx_sleep(sc, &sc->mutex, 0, "i2cslv", 1);
+ mtx_sleep(sc, &sc->io_lock, 0, "i2cslv", 1);
}
return (error);
}
@@ -179,7 +181,7 @@ wait_status(ig4iic_softc_t *sc, uint32_t
* work, otherwise poll with the lock held.
*/
if (status & IG4_STATUS_RX_NOTEMPTY) {
- mtx_sleep(sc, &sc->mutex, PZERO, "i2cwait",
+ mtx_sleep(sc, &sc->io_lock, 0, "i2cwait",
(hz + 99) / 100); /* sleep up to 10ms */
count_us += 1;
} else {
@@ -522,6 +524,8 @@ ig4iic_attach(ig4iic_softc_t *sc)
* Use a threshold of 1 so we get interrupted on each character,
* allowing us to use mtx_sleep() in our poll code. Not perfect
* but this is better than using DELAY() for receiving data.
+*
+* See ig4_var.h for details on interrupt handler synchronization.
*/
reg_write(sc, IG4_REG_RX_TL, 1);
@@ -551,12 +555,12 @@ ig4iic_attach(ig4iic_softc_t *sc)
*/
reg_write(sc, IG4_REG_INTR_MASK, IG4_INTR_STOP_DET |
IG4_INTR_RX_FULL);
- mtx_lock(&sc->mutex);
+ mtx_lock(&sc->io_lock);
if (set_controller(sc, 0))
device_printf(sc->dev, "controller error during attach-1\n");
if (set_controller(sc, IG4_I2C_ENABLE))
device_printf(sc->dev, "controller error during attach-2\n");
- mtx_unlock(&sc->mutex);
+ mtx_unlock(&sc->io_lock);
error = bus_setup_intr(sc->dev, sc->intr_res, INTR_TYPE_MISC |
INTR_MPSAFE,
NULL, ig4iic_intr, sc, &sc->intr_handle);
if (error) {
@@ -615,7 +619,8 @@ ig4iic_detach(ig4iic_softc_t *sc)
if (sc->intr_handle)
bus_teardown_intr(sc->dev, sc->intr_res, sc->intr_handle);
- mtx_lock(&sc->mutex);
+ sx_xlock(&sc->call_lock);
+ mtx_lock(&sc->io_lock);
sc->smb = NULL;
sc->intr_handle = NULL;
@@ -623,18 +628,16 @@ ig4iic_detach(ig4iic_softc_t *sc)
reg_read(sc, IG4_REG_CLR_INTR);
set_controller(sc, 0);
- mtx_unlock(&sc->mutex);
+ mtx_unlock(&sc->io_lock);
+ sx_xunlock(&sc->call_lock);
return (0);
}
int
ig4iic_smb_callback(device_t dev, int index, void *data)
{
- ig4iic_softc_t *sc = device_get_softc(dev);
int error;
- mtx_lock(&sc->mutex);
-
switch (index) {
case SMB_REQUEST_BUS:
error = 0;
@@ -647,8 +650,6 @@ ig4iic_smb_callback(device_t dev, int in
break;
}
- mtx_unlock(&sc->mutex);
-
return (error);
}
@@ -660,25 +661,8 @@ ig4iic_smb_callback(device_t dev, int in
int
ig4iic_smb_quick(device_t dev, u_char slave, int how)
{
- ig4iic_softc_t *sc = device_get_softc(dev);
- int error;
-
- mtx_lock(&sc->mutex);
- switch (how) {
- case SMB_QREAD:
- error = SMB_ENOTSUPP;
- break;
- case SMB_QWRITE:
- error = SMB_ENOTSUPP;
- break;
- default:
- error = SMB_ENOTSUPP;
- break;
- }
- mtx_unlock(&sc->mutex);
-
- return (error);
+ return (SMB_ENOTSUPP);
}
/*
@@ -695,7 +679,8 @@ ig4iic_smb_sendb(device_t dev, u_char sl
uint32_t cmd;
int error;
- mtx_lock(&sc->mutex);
+ sx_xlock(&sc->call_lock);
+ mtx_lock(&sc->io_lock);
set_slave_addr(sc, slave, 0);
cmd = byte;
@@ -706,7 +691,8 @@ ig4iic_smb_sendb(device_t dev, u_char sl
error = SMB_ETIMEOUT;
}
- mtx_unlock(&sc->
svn commit: r284802 - stable/10/sys/dev/isp
Author: mav
Date: Thu Jun 25 07:25:40 2015
New Revision: 284802
URL: https://svnweb.freebsd.org/changeset/base/284802
Log:
MFC r284698: Dump additional config bytes for INIT_FIRMWARE_MULTI_ID.
Modified:
stable/10/sys/dev/isp/isp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp.c
==
--- stable/10/sys/dev/isp/isp.c Thu Jun 25 07:24:47 2015(r284801)
+++ stable/10/sys/dev/isp/isp.c Thu Jun 25 07:25:40 2015(r284802)
@@ -2182,6 +2182,11 @@ isp_fibre_init_2400(ispsoftc_t *isp)
isp_put_vp_port_info(isp, &pi, pdst);
amt += ICB2400_VPOPT_WRITE_SIZE;
}
+ if (isp->isp_dblev & ISP_LOGDEBUG1) {
+ isp_print_bytes(isp, "isp_fibre_init_2400",
+ amt - ICB2400_VPINFO_OFF,
+ (char *)fcp->isp_scratch + ICB2400_VPINFO_OFF);
+ }
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284799 - stable/10/sys/dev/isp
Author: mav
Date: Thu Jun 25 07:22:37 2015
New Revision: 284799
URL: https://svnweb.freebsd.org/changeset/base/284799
Log:
MFC r274675 (by jhb), r274708:
Convert the refire_notify_ack timer from timeout(9) to callout(9).
Modified:
stable/10/sys/dev/isp/isp_freebsd.c
stable/10/sys/dev/isp/isp_freebsd.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp_freebsd.c
==
--- stable/10/sys/dev/isp/isp_freebsd.c Thu Jun 25 07:11:48 2015
(r284798)
+++ stable/10/sys/dev/isp/isp_freebsd.c Thu Jun 25 07:22:37 2015
(r284799)
@@ -2118,10 +2118,9 @@ static void
isp_refire_putback_atio(void *arg)
{
union ccb *ccb = arg;
- ispsoftc_t *isp = XS_ISP(ccb);
- ISP_LOCK(isp);
+
+ ISP_ASSERT_LOCKED((ispsoftc_t *)XS_ISP(ccb));
isp_target_putback_atio(ccb);
- ISP_UNLOCK(isp);
}
static void
@@ -2129,13 +2128,13 @@ isp_refire_notify_ack(void *arg)
{
isp_tna_t *tp = arg;
ispsoftc_t *isp = tp->isp;
- ISP_LOCK(isp);
+
+ ISP_ASSERT_LOCKED(isp);
if (isp_notify_ack(isp, tp->not)) {
- (void) timeout(isp_refire_notify_ack, tp, 5);
+ callout_schedule(&tp->timer, 5);
} else {
free(tp, M_DEVBUF);
}
- ISP_UNLOCK(isp);
}
@@ -2152,7 +2151,8 @@ isp_target_putback_atio(union ccb *ccb)
if (qe == NULL) {
xpt_print(ccb->ccb_h.path,
"%s: Request Queue Overflow\n", __func__);
- (void) timeout(isp_refire_putback_atio, ccb, 10);
+ callout_reset(&PISP_PCMD(ccb)->wdog, 10,
+ isp_refire_putback_atio, ccb);
return;
}
memset(qe, 0, QENTRY_LEN);
@@ -5991,7 +5991,9 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
} else {
tp->not = NULL;
}
- (void) timeout(isp_refire_notify_ack, tp, 5);
+ callout_init_mtx(&tp->timer, &isp->isp_lock, 0);
+ callout_reset(&tp->timer, 5,
+ isp_refire_notify_ack, tp);
} else {
isp_prt(isp, ISP_LOGERR, "you lose- cannot
allocate a notify refire");
}
Modified: stable/10/sys/dev/isp/isp_freebsd.h
==
--- stable/10/sys/dev/isp/isp_freebsd.h Thu Jun 25 07:11:48 2015
(r284798)
+++ stable/10/sys/dev/isp/isp_freebsd.h Thu Jun 25 07:22:37 2015
(r284799)
@@ -158,6 +158,7 @@ typedef struct isp_timed_notify_ack {
void *isp;
void *not;
uint8_t data[64];/* sb QENTRY_LEN, but order of definitions is
wrong */
+ struct callout timer;
} isp_tna_t;
TAILQ_HEAD(isp_ccbq, ccb_hdr);
@@ -396,8 +397,9 @@ struct isposinfo {
/*
* Locking macros...
*/
-#defineISP_LOCK(isp) mtx_lock(&isp->isp_osinfo.lock)
-#defineISP_UNLOCK(isp) mtx_unlock(&isp->isp_osinfo.lock)
+#defineISP_LOCK(isp) mtx_lock(&(isp)->isp_osinfo.lock)
+#defineISP_UNLOCK(isp) mtx_unlock(&(isp)->isp_osinfo.lock)
+#defineISP_ASSERT_LOCKED(isp) mtx_assert(&(isp)->isp_osinfo.lock,
MA_OWNED)
/*
* Required Macros/Defines
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284805 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common
Author: avg
Date: Thu Jun 25 08:11:39 2015
New Revision: 284805
URL: https://svnweb.freebsd.org/changeset/base/284805
Log:
MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE
Modified:
stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Thu Jun 25 08:10:23 2015(r284804)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Thu Jun 25 08:11:39 2015(r284805)
@@ -23,6 +23,7 @@
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright 2015 RackTop Systems.
*/
/*
@@ -1094,11 +1095,7 @@ zpool_open_func(void *arg)
}
(void) close(fd);
-
rn->rn_config = config;
- if (config != NULL) {
- assert(rn->rn_nozpool == B_FALSE);
- }
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284801 - stable/10/sys/dev/isp
Author: mav
Date: Thu Jun 25 07:24:47 2015
New Revision: 284801
URL: https://svnweb.freebsd.org/changeset/base/284801
Log:
MFC r284697: Add logging of executed mailbox command names.
Previously those commands were logged only as part of register dump,
that is not very readable.
Modified:
stable/10/sys/dev/isp/isp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp.c
==
--- stable/10/sys/dev/isp/isp.c Thu Jun 25 07:23:35 2015(r284800)
+++ stable/10/sys/dev/isp/isp.c Thu Jun 25 07:24:47 2015(r284801)
@@ -7344,6 +7344,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb
isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x",
opcode);
return;
}
+ cname = fc_mbcmd_names[opcode];
ibits = ISP_FC_IBITS(opcode);
obits = ISP_FC_OBITS(opcode);
} else {
@@ -7352,9 +7353,15 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb
isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x",
opcode);
return;
}
+ cname = scsi_mbcmd_names[opcode];
ibits = ISP_SCSI_IBITS(opcode);
obits = ISP_SCSI_OBITS(opcode);
}
+ if (cname == NULL) {
+ cname = tname;
+ ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode);
+ }
+ isp_prt(isp, ISP_LOGDEBUG3, "Mailbox Command '%s'", cname);
/*
* Pick up any additional bits that the caller might have set.
@@ -7440,11 +7447,6 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mb
if (mbp->logval == 0 || opcode == MBOX_EXEC_FIRMWARE) {
return;
}
- cname = (IS_FC(isp))? fc_mbcmd_names[opcode] : scsi_mbcmd_names[opcode];
- if (cname == NULL) {
- cname = tname;
- ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode);
- }
/*
* Just to be chatty here...
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284798 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:11:48 2015
New Revision: 284798
URL: https://svnweb.freebsd.org/changeset/base/284798
Log:
MFC r284640: Bring per-port LUN enable/disable code up to date:
- remove last remnants of never implemented multiple targets support;
- implement missing support for LUN mapping in this area.
Due to existing locking constraints LUN mapping code is practically
unlocked at this point. Hopefully it is not racy enough to live until
somebody get idea how to call sleeping fronend methods under lock also
taken by the same frontend in non-sleepable context. :(
Modified:
stable/10/sys/cam/ctl/ctl.c
stable/10/sys/cam/ctl/ctl_frontend.c
stable/10/sys/cam/ctl/ctl_frontend.h
stable/10/sys/cam/ctl/ctl_frontend_cam_sim.c
stable/10/sys/cam/ctl/ctl_frontend_internal.c
stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
stable/10/sys/cam/ctl/ctl_private.h
stable/10/sys/cam/ctl/ctl_tpc_local.c
stable/10/sys/cam/ctl/scsi_ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==
--- stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:10:51 2015(r284797)
+++ stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:11:48 2015(r284798)
@@ -385,8 +385,8 @@ static int ctl_open(struct cdev *dev, in
static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td);
static void ctl_ioctl_online(void *arg);
static void ctl_ioctl_offline(void *arg);
-static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id);
-static int ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id);
+static int ctl_ioctl_lun_enable(void *arg, int lun_id);
+static int ctl_ioctl_lun_disable(void *arg, int lun_id);
static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio);
static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio);
static int ctl_ioctl_submit_wait(union ctl_io *io);
@@ -401,7 +401,7 @@ static int ctl_ioctl_fill_ooa(struct ctl
static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
struct thread *td);
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);
+struct ctl_be_lun *be_lun);
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);
@@ -1130,13 +1130,6 @@ ctl_init(void)
softc->port_offset = (softc->ha_id - 1) * CTL_MAX_PORTS;
softc->persis_offset = softc->port_offset * CTL_MAX_INIT_PER_PORT;
- /*
-* XXX KDM need to figure out where we want to get our target ID
-* and WWID. Is it different on each port?
-*/
- softc->target.id = 0;
- softc->target.wwid[0] = 0x12345678;
- softc->target.wwid[1] = 0x87654321;
STAILQ_INIT(&softc->lun_list);
STAILQ_INIT(&softc->pending_lun_queue);
STAILQ_INIT(&softc->fe_list);
@@ -1649,13 +1642,13 @@ ctl_create_iid(struct ctl_port *port, in
}
static int
-ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
+ctl_ioctl_lun_enable(void *arg, int lun_id)
{
return (0);
}
static int
-ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id)
+ctl_ioctl_lun_disable(void *arg, int lun_id)
{
return (0);
}
@@ -2480,28 +2473,9 @@ ctl_ioctl(struct cdev *dev, u_long cmd,
mtx_unlock(&softc->ctl_lock);
if (cmd == CTL_ENABLE_PORT) {
- struct ctl_lun *lun;
-
- STAILQ_FOREACH(lun, &softc->lun_list,
- links) {
-
port->lun_enable(port->targ_lun_arg,
- lun->target,
- lun->lun);
- }
-
ctl_port_online(port);
} else if (cmd == CTL_DISABLE_PORT) {
- struct ctl_lun *lun;
-
ctl_port_offline(port);
-
- STAILQ_FOREACH(lun, &softc->lun_list,
- links) {
- port->lun_disable(
- port->targ_lun_arg,
- lun->target,
- lun->lun);
- }
}
mtx_lock(&softc->ctl_lock);
@@ -3562,26 +3536,22 @@ ctl_ioctl(struct cdev *dev, u_
svn commit: r284797 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:10:51 2015
New Revision: 284797
URL: https://svnweb.freebsd.org/changeset/base/284797
Log:
MFC r284627: Remove some dead and duplicate LUN enabling code.
Modified:
stable/10/sys/cam/ctl/ctl.c
stable/10/sys/cam/ctl/ctl_frontend.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==
--- stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:09:39 2015(r284796)
+++ stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:10:51 2015(r284797)
@@ -4537,7 +4537,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft
struct ctl_be_lun *const be_lun, struct ctl_id target_id)
{
struct ctl_lun *nlun, *lun;
- struct ctl_port *port;
struct scsi_vpd_id_descriptor *desc;
struct scsi_vpd_id_t10 *t10id;
const char *eui, *naa, *scsiname, *vendor, *value;
@@ -4767,24 +4766,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft
mtx_unlock(&ctl_softc->ctl_lock);
lun->be_lun->lun_config_status(lun->be_lun->be_lun, CTL_LUN_CONFIG_OK);
-
- /*
-* Run through each registered FETD and bring it online if it isn't
-* already. Enable the target ID if it hasn't been enabled, and
-* enable this particular LUN.
-*/
- STAILQ_FOREACH(port, &ctl_softc->port_list, links) {
- int retval;
-
- retval = port->lun_enable(port->targ_lun_arg,
target_id,lun_number);
- if (retval != 0) {
- printf("ctl_alloc_lun: FETD %s port %d returned error "
- "%d for lun_enable on target %ju lun %d\n",
- port->port_name, port->targ_port, retval,
- (uintmax_t)target_id.id, lun_number);
- } else
- port->status |= CTL_PORT_STATUS_LUN_ONLINE;
- }
return (0);
}
@@ -4821,58 +4802,6 @@ ctl_free_lun(struct ctl_lun *lun)
softc->num_luns--;
/*
-* XXX KDM this scheme only works for a single target/multiple LUN
-* setup. It needs to be revamped for a multiple target scheme.
-*
-* XXX KDM this results in port->lun_disable() getting called twice,
-* once when ctl_disable_lun() is called, and a second time here.
-* We really need to re-think the LUN disable semantics. There
-* should probably be several steps/levels to LUN removal:
-* - disable
-* - invalidate
-* - free
-*
-* Right now we only have a disable method when communicating to
-* the front end ports, at least for individual LUNs.
-*/
-#if 0
- STAILQ_FOREACH(port, &softc->port_list, links) {
- int retval;
-
- retval = port->lun_disable(port->targ_lun_arg, lun->target,
-lun->lun);
- if (retval != 0) {
- printf("ctl_free_lun: FETD %s port %d returned error "
- "%d for lun_disable on target %ju lun %jd\n",
- port->port_name, port->targ_port, retval,
- (uintmax_t)lun->target.id, (intmax_t)lun->lun);
- }
-
- if (STAILQ_FIRST(&softc->lun_list) == NULL) {
- port->status &= ~CTL_PORT_STATUS_LUN_ONLINE;
-
- retval =
port->targ_disable(port->targ_lun_arg,lun->target);
- if (retval != 0) {
- printf("ctl_free_lun: FETD %s port %d "
- "returned error %d for targ_disable on "
- "target %ju\n", port->port_name,
- port->targ_port, retval,
- (uintmax_t)lun->target.id);
- } else
- port->status &= ~CTL_PORT_STATUS_TARG_ONLINE;
-
- if ((port->status & CTL_PORT_STATUS_TARG_ONLINE) != 0)
- continue;
-
-#if 0
- port->port_offline(port->onoff_arg);
- port->status &= ~CTL_PORT_STATUS_ONLINE;
-#endif
- }
- }
-#endif
-
- /*
* Tell the backend to free resources, if this LUN has a backend.
*/
atomic_subtract_int(&lun->be_lun->be->num_luns, 1);
@@ -4966,12 +4895,6 @@ ctl_enable_lun(struct ctl_be_lun *be_lun
__func__, port->port_name, port->targ_port,
retval,
(uintmax_t)lun->target.id, (intmax_t)lun->lun);
}
-#if 0
-else {
-/* NOTE: TODO: why does lun enable affect port status? */
- port->status |= CTL_PORT_STATUS_LUN_ONLINE;
- }
-#endif
}
mtx_unlock(&softc->ctl
svn commit: r284800 - stable/10/sys/dev/isp
Author: mav
Date: Thu Jun 25 07:23:35 2015
New Revision: 284800
URL: https://svnweb.freebsd.org/changeset/base/284800
Log:
MFC r284540:
In case of target mode disable at least ISP2532 return invalid zero
ct_rxid value on CTIO completion. Try to workaround that using tag_id
from the CCB, pointed by still valid ct_syshandle.
I don't know whether this is valid fix or dirty hack, but considering that
alternative is indefinitely stuck command -- it worth trying.
Modified:
stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp_freebsd.c
==
--- stable/10/sys/dev/isp/isp_freebsd.c Thu Jun 25 07:22:37 2015
(r284799)
+++ stable/10/sys/dev/isp/isp_freebsd.c Thu Jun 25 07:23:35 2015
(r284800)
@@ -2914,6 +2914,14 @@ isp_handle_platform_ctio(ispsoftc_t *isp
atp = isp_find_atpd(isp, tptr, ((ct_entry_t
*)arg)->ct_fwhandle);
}
if (atp == NULL) {
+ /*
+* In case of target mode disable at least ISP2532 return
+* invalid zero ct_rxid value. Try to workaround that using
+* tag_id from the CCB, pointed by valid ct_syshandle.
+*/
+ atp = isp_find_atpd(isp, tptr, ccb->csio.tag_id);
+ }
+ if (atp == NULL) {
rls_lun_statep(isp, tptr);
isp_prt(isp, ISP_LOGERR, "%s: cannot find adjunct for %x after
I/O", __func__, ccb->csio.tag_id);
return;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r284793 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:06:24 2015
New Revision: 284793
URL: https://svnweb.freebsd.org/changeset/base/284793
Log:
MFC r284541:
Change ATIO/INOT counting to prevent periph destruction while requests
are still running inside CTL.
Modified:
stable/10/sys/cam/ctl/scsi_ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/scsi_ctl.c
==
--- stable/10/sys/cam/ctl/scsi_ctl.cThu Jun 25 06:15:08 2015
(r284792)
+++ stable/10/sys/cam/ctl/scsi_ctl.cThu Jun 25 07:06:24 2015
(r284793)
@@ -104,10 +104,10 @@ struct ctlfe_lun_softc {
uint64_t ccbs_freed;
uint64_t ctios_sent;
uint64_t ctios_returned;
- uint64_t atios_sent;
- uint64_t atios_returned;
- uint64_t inots_sent;
- uint64_t inots_returned;
+ uint64_t atios_alloced;
+ uint64_t atios_freed;
+ uint64_t inots_alloced;
+ uint64_t inots_freed;
/* bus_dma_tag_t dma_tag; */
TAILQ_HEAD(, ccb_hdr) work_queue;
STAILQ_ENTRY(ctlfe_lun_softc) links;
@@ -546,6 +546,7 @@ ctlferegister(struct cam_periph *periph,
status = CAM_RESRC_UNAVAIL;
break;
}
+ softc->atios_alloced++;
new_ccb->ccb_h.io_ptr = new_io;
xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
@@ -553,7 +554,6 @@ ctlferegister(struct cam_periph *periph,
new_ccb->ccb_h.cbfcnp = ctlfedone;
new_ccb->ccb_h.flags |= CAM_UNLOCKED;
xpt_action(new_ccb);
- softc->atios_sent++;
status = new_ccb->ccb_h.status;
if ((status & CAM_STATUS_MASK) != CAM_REQ_INPROG) {
ctl_free_io(new_io);
@@ -591,6 +591,7 @@ ctlferegister(struct cam_periph *periph,
status = CAM_RESRC_UNAVAIL;
break;
}
+ softc->inots_alloced++;
new_ccb->ccb_h.io_ptr = new_io;
xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
@@ -598,7 +599,6 @@ ctlferegister(struct cam_periph *periph,
new_ccb->ccb_h.cbfcnp = ctlfedone;
new_ccb->ccb_h.flags |= CAM_UNLOCKED;
xpt_action(new_ccb);
- softc->inots_sent++;
status = new_ccb->ccb_h.status;
if ((status & CAM_STATUS_MASK) != CAM_REQ_INPROG) {
/*
@@ -650,10 +650,6 @@ ctlfeoninvalidate(struct cam_periph *per
* XXX KDM what do we do now?
*/
}
- xpt_print(periph->path, "LUN removed, %ju ATIOs outstanding, %ju "
- "INOTs outstanding, %d refs\n", softc->atios_sent -
- softc->atios_returned, softc->inots_sent -
- softc->inots_returned, periph->refcount);
bus_softc = softc->parent_softc;
mtx_lock(&bus_softc->lun_softc_mtx);
@@ -666,13 +662,20 @@ ctlfecleanup(struct cam_periph *periph)
{
struct ctlfe_lun_softc *softc;
- xpt_print(periph->path, "%s: Called\n", __func__);
-
softc = (struct ctlfe_lun_softc *)periph->softc;
- /*
-* XXX KDM is there anything else that needs to be done here?
-*/
+ KASSERT(softc->ccbs_freed == softc->ccbs_alloced, ("%s: "
+ "ccbs_freed %ju != ccbs_alloced %ju", __func__,
+ softc->ccbs_freed, softc->ccbs_alloced));
+ KASSERT(softc->ctios_returned == softc->ctios_sent, ("%s: "
+ "ctios_returned %ju != ctios_sent %ju", __func__,
+ softc->ctios_returned, softc->ctios_sent));
+ KASSERT(softc->atios_freed == softc->atios_alloced, ("%s: "
+ "atios_freed %ju != atios_alloced %ju", __func__,
+ softc->atios_freed, softc->atios_alloced));
+ KASSERT(softc->inots_freed == softc->inots_alloced, ("%s: "
+ "inots_freed %ju != inots_alloced %ju", __func__,
+ softc->inots_freed, softc->inots_alloced));
free(softc, M_CTLFE);
}
@@ -871,7 +874,6 @@ ctlfestart(struct cam_periph *periph, un
* Send the ATIO back down to the SIM.
*/
xpt_action((union ccb *)atio);
- softc->atios_sent++;
/*
* If we still have work to do, ask for
@@ -989,11 +991,11 @@ ctlfe_free_ccb(struct cam_periph *periph
switch (ccb->ccb_h.func_code) {
case XPT_ACCEPT_TARGET_IO:
- softc->atios_returned++;
+ softc->atios_freed++;
break;
case XPT_IMMEDIATE_NOTIFY:
case XPT_NOTIFY_ACKNOWLEDGE:
- softc->inots_returned++;
+ softc->inots_freed++;
break;
default:
bre
svn commit: r284795 - stable/10/sys/cam/ctl
Author: mav
Date: Thu Jun 25 07:08:46 2015
New Revision: 284795
URL: https://svnweb.freebsd.org/changeset/base/284795
Log:
MFC r284641:
Fix REPORT LUNS command output for the case when same LUN mapped to same
port several times. While it is unusual configuration, it is not illegal.
Modified:
stable/10/sys/cam/ctl/ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==
--- stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:07:32 2015(r284794)
+++ stable/10/sys/cam/ctl/ctl.c Thu Jun 25 07:08:46 2015(r284795)
@@ -9452,11 +9452,16 @@ ctl_report_luns(struct ctl_scsiio *ctsio
well_known = 0;
cdb = (struct scsi_report_luns *)ctsio->cdb;
+ port = ctl_io_port(&ctsio->io_hdr);
CTL_DEBUG_PRINT(("ctl_report_luns\n"));
mtx_lock(&softc->ctl_lock);
- num_luns = softc->num_luns;
+ num_luns = 0;
+ for (targ_lun_id = 0; targ_lun_id < CTL_MAX_LUNS; targ_lun_id++) {
+ if (ctl_lun_map_from_port(port, targ_lun_id) < CTL_MAX_LUNS)
+ num_luns++;
+ }
mtx_unlock(&softc->ctl_lock);
switch (cdb->select_report) {
@@ -9499,7 +9504,6 @@ 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));
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r284163 - head/bin/cp
On 6/9/2015 1:28 AM, Bruce Evans wrote:
> On Mon, 8 Jun 2015, Bryan Drewery wrote:
>
>> Log:
>> Cleanup some style(9) issues.
>>
>> - Whitespace.
>> - Comments.
>> - Wrap long lines.
>
> cp's style had a remarlable amount of bitrot.
>
> This change unimproves it in some places.
I have been traveling and packing. I'm replying now but won't have time
to address the issues until next week. I was trying to avoid doing any
of this but touched code which was horrendously misstyled and chained
into reindenting the whole file and doing it wrong :). At this point I
don't want to tweak this much more.
>> --- head/bin/cp/cp.cMon Jun 8 19:13:04 2015(r284162)
>> +++ head/bin/cp/cp.cMon Jun 8 19:24:18 2015(r284163)
>> @@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$");
>> #include "extern.h"
>>
>> #defineSTRIP_TRAILING_SLASH(p) {\
>> -while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')\
>> -*--(p).p_end = 0;\
>> +while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')\
>> +*--(p).p_end = 0;\
>
Woops.
>
>> @@ -245,10 +245,10 @@ main(int argc, char *argv[])
>> type = FILE_TO_FILE;
>>
>> if (have_trailing_slash && type == FILE_TO_FILE) {
>> -if (r == -1)
>> +if (r == -1) {
>
> This adds excessive braces.
>
>> errx(1, "directory %s does not exist",
>> - to.p_path);
>> -else
>> +to.p_path);
>> +} else
It is a multi-line statement due to the hard 80-width wrap. I feel it is
fine in this case.
>> errx(1, "%s is not a directory", to.p_path);
>> }
>> } else
>> ...
>> @@ -379,7 +379,8 @@ copy(char *argv[], enum op type, int fts
>> mode = curr->fts_statp->st_mode;
>> if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) ||
>> ((mode | S_IRWXU) & mask) != (mode & mask))
>> -if (chmod(to.p_path, mode & mask) != 0){
>> +if (chmod(to.p_path, mode & mask) !=
>> +0) {
>> warn("chmod: %s", to.p_path);
>> rval = 1;
>> }
>
> This changes from a minor misformatting to avoid a long line to even uglier
> formatting with a split line.
I agree 100%. I did it because of our hard 80-width cut-off. What would
the proper style be? My inclination would be to wrap at the first comma
but then it is even more odd. I find our 80-width cut-off to be strange
when editors/tmux/window manager/etc can resize and wrap long lines already.
Actually I don't see a width restriction in style(9) at all but surely
we have this rule documented somewhere. My guess is that it is inherited
by KNF.
> It is necessary to make such changes if you
> use indent(1) to generate and check the changes -- otherwise, indent keeps
Do you have an indent configuration I can use?
> reporting the misformatting -- but since cp rarely went near indent it
> may be better to keep its minor misformattings.
>
>> Modified: head/bin/cp/utils.c
>> ==
>>
>> --- head/bin/cp/utils.cMon Jun 8 19:13:04 2015(r284162)
>> +++ head/bin/cp/utils.cMon Jun 8 19:24:18 2015(r284163)
>> ...
>> -/* Small (default) buffer size in bytes. It's inefficient for this to be
>> - * smaller than MAXPHYS */
>> +/*
>> + * Small (default) buffer size in bytes. It's inefficient for this to be
>> + * smaller than MAXPHYS.
>> + */
>
> Still has unusual sentence break of 1 space. cp uses normal sentence
> breaks
I did a minimal effort on comments and didn't clean up grammar or
breaks. I have not adopted 2 space breaks into my style(9) conformation yet.
>> @@ -345,7 +352,7 @@ setfile(struct stat *fs, int fd)
>> fdval = fd != -1;
>> islink = !fdval && S_ISLNK(fs->st_mode);
>> fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
>> - S_IRWXU | S_IRWXG | S_IRWXO;
>> +S_IRWXU | S_IRWXG | S_IRWXO;
>
> Here the formatting was reasonable, but it was in gnu style and was hard to
> maintain since it is not supported by indent(1). It is still hard to
> maintain,
> since it has fancy splitting earlier than necessary to put the S_IS* and
> S_IR* parts of the expressions on separate lines. indent(1) cannot
> reproduce
> this splitting. Also, with the normal indentation of the condinuation
> line,
> the fancy splitting is not so readable.
I'm do not see how this was proper before or how it is worse now. The
indentation is tabs and then 4 spaces. I don't see exceptions to this in
style(9) or in other code.
>
>> @@ -543,8 +550,10 @@ usage(void)
>> {
>>
>> (void)fprintf(stderr, "%s\n%s\n",
>> -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_file
>> target_file",
>> -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpsvx] source_fil
