Re: svn commit: r326458 - head/lib/libefivar
Am Sat, 2 Dec 2017 07:29:19 + (UTC)
Warner Losh schrieb:
> Author: imp
> Date: Sat Dec 2 07:29:19 2017
> New Revision: 326458
> URL: https://svnweb.freebsd.org/changeset/base/326458
>
> Log:
> Create a function to translate UEFI paths to unix paths
>
> efivar_device_path_to_unix_path translates from UEFI to Unix
> efivar_unix_path_to_device_path translates from Unix to UEFI
>
> At present, only HD() device types are supported (both GPT and
> MBR). CdRom and floppy devices aren't supported. ZFS isn't supported
> because there's no way in the UEFI standard to specify a ZFS datastore.
> Network devices aren't supported either.
>
> Three forms of Unix path are accepted: /path/to/file (for a mounted
> filesystem), //path/to/file (uses the EFI partition on the same disk
> as /), and dev:/path/to/file (for unmounted filesystem). Two forms are
> produced (the first and last).
>
> Sponsored by: Netflix
>
> Added:
> head/lib/libefivar/efivar-dp-xlate.c (contents, props changed)
> Modified:
> head/lib/libefivar/Makefile
> head/lib/libefivar/efivar-dp-format.c
> head/lib/libefivar/efivar-dp.h
>
> Modified: head/lib/libefivar/Makefile
> ==
> --- head/lib/libefivar/Makefile Sat Dec 2 07:29:07 2017
> (r326457)
> +++ head/lib/libefivar/Makefile Sat Dec 2 07:29:19 2017
> (r326458)
> @@ -35,6 +35,7 @@ PACKAGE=lib${LIB}
> LIB= efivar
> SRCS=efivar.c efichar.c efivar-dp-format.c \
> efivar-dp-parse.c \
> + efivar-dp-xlate.c \
> uefi-guid.c uefi-dputil.c
> INCS=efivar.h efivar-dp.h
> SHLIB_MAJOR= 1
>
> Modified: head/lib/libefivar/efivar-dp-format.c
> ==
> --- head/lib/libefivar/efivar-dp-format.c Sat Dec 2 07:29:07 2017
> (r326457) +++ head/lib/libefivar/efivar-dp-format.c Sat Dec 2 07:29:19
> 2017 (r326458) @@ -2432,7 +2432,7 @@ efidp_format_device_path(char *buf,
> size_t
> len, const_ }
>
> ssize_t
> -efidp_format_device_path_node(char *buf, size_t len, const_efidp dp, ssize_t
> max)
> +efidp_format_device_path_node(char *buf, size_t len, const_efidp dp)
> {
> char *str;
> ssize_t retval;
> @@ -2453,4 +2453,15 @@ efidp_size(const_efidp dp)
> {
>
> return GetDevicePathSize(__DECONST(EFI_DEVICE_PATH_PROTOCOL *, dp));
> +}
> +
> +char *
> +efidp_extract_file_path(const_efidp dp)
> +{
> + const FILEPATH_DEVICE_PATH *fp;
> + char *name = NULL;
> +
> + fp = (const void *)dp;
> + ucs2_to_utf8(fp->PathName, &name);
> + return name;
> }
>
> Added: head/lib/libefivar/efivar-dp-xlate.c
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/lib/libefivar/efivar-dp-xlate.c Sat Dec 2 07:29:19 2017
> (r326458) @@ -0,0 +1,715 @@
> +/*-
> + * Copyright (c) 2017 Netflix, Inc.
> + * All rights reserved.
> + *
> + * 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
> + *in this position and unchanged.
> + * 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 ``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 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
> +#include
> +
> +#undef MAX
> +#undef MIN
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include "efichar.h"
> +
> +#include "efi-osdep.h"
> +#include "efivar-dp.h"
> +
> +#include "uefi-dplib.h"
> +
> +#define MAX_DP_SANITY4096/* Biggest device path in bytes
> */
> +#define MAX_DP_TEXT_LEN 4096/* Longest string rep of dp */
> +
> +#define G_PART "PART"
>
svn commit: r326471 - head/share/man/man5
Author: trasz Date: Sat Dec 2 13:12:00 2017 New Revision: 326471 URL: https://svnweb.freebsd.org/changeset/base/326471 Log: Document autofs(6) sysctl variables. PR: 219414 MFC after:2 weeks Modified: head/share/man/man5/autofs.5 Modified: head/share/man/man5/autofs.5 == --- head/share/man/man5/autofs.5Sat Dec 2 12:47:34 2017 (r326470) +++ head/share/man/man5/autofs.5Sat Dec 2 13:12:00 2017 (r326471) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 3, 2014 +.Dd December 2, 2017 .Dt AUTOFS 5 .Os .Sh NAME @@ -67,6 +67,45 @@ file systems: Mount options for all filesystems specified in the map entry. .It Cm master_prefix Filesystem mountpoint prefix. +.El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va vfs.autofs.debug +Verbosity level for log messages from the +.Nm +driver. +Set to 0 to disable logging or 1 to warn about potential problems. +Larger values enable debugging output. +Defaults to 1. +.It Va vfs.autofs.interruptible +Set to 1 to allow mount requests to be interrupted by signal. +Defaults to 1. +.It Va vfs.autofs.retry_delay +Number of seconds before retrying mount requests. +Defaults to 1. +.It Va vfs.autofs.retry_attempts +Number of attempts before failing mount. +Defaults to 3. +.It Va vfs.autofs.cache +Number of seconds to wait before reinvoking +.Xr automountd 8 +for any given file or directory. +Defaults to 600. +.It Va vfs.autofs.timeout +Number of seconds to wait for +.Xr automountd 8 +to handle the mount request. +Defaults to 30. +.It Va vfs.autofs.mount_on_stat +Set to 1 to trigger mount on +.Xr stat 2 +on mountpoint. +Defaults to 0. .El .Sh EXAMPLES To unmount all mounted ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326472 - head/usr.sbin/efivar
Author: imp Date: Sat Dec 2 15:25:45 2017 New Revision: 326472 URL: https://svnweb.freebsd.org/changeset/base/326472 Log: Add forgotten libgeom. Sponsored by: Netflix Modified: head/usr.sbin/efivar/Makefile Modified: head/usr.sbin/efivar/Makefile == --- head/usr.sbin/efivar/Makefile Sat Dec 2 13:12:00 2017 (r326471) +++ head/usr.sbin/efivar/Makefile Sat Dec 2 15:25:45 2017 (r326472) @@ -3,7 +3,7 @@ PROG= efivar MAN= efivar.8 -LIBADD= efivar +LIBADD= efivar geom SRCS= efivar.c efiutil.c ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r326472 - head/usr.sbin/efivar
Am Sat, 2 Dec 2017 15:25:45 + (UTC) Warner Losh schrieb: > Author: imp > Date: Sat Dec 2 15:25:45 2017 > New Revision: 326472 > URL: https://svnweb.freebsd.org/changeset/base/326472 > > Log: > Add forgotten libgeom. > > Sponsored by: Netflix > > Modified: > head/usr.sbin/efivar/Makefile > > Modified: head/usr.sbin/efivar/Makefile > == > --- head/usr.sbin/efivar/Makefile Sat Dec 2 13:12:00 2017 > (r326471) > +++ head/usr.sbin/efivar/Makefile Sat Dec 2 15:25:45 2017 > (r326472) > @@ -3,7 +3,7 @@ > PROG=efivar > MAN= efivar.8 > > -LIBADD= efivar > +LIBADD= efivar geom > > SRCS=efivar.c efiutil.c > > ___ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" Thank you very much. Kind regards, oh -- O. Hartmann Ich widerspreche der Nutzung oder Übermittlung meiner Daten für Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG). pgpwEhkyZrde1.pgp Description: OpenPGP digital signature
Re: svn commit: r326458 - head/lib/libefivar
On Sat, Dec 2, 2017 at 4:22 AM, O. Hartmann wrote:
> Am Sat, 2 Dec 2017 07:29:19 + (UTC)
> Warner Losh schrieb:
>
> > Author: imp
> > Date: Sat Dec 2 07:29:19 2017
> > New Revision: 326458
> > URL: https://svnweb.freebsd.org/changeset/base/326458
> >
> > Log:
> > Create a function to translate UEFI paths to unix paths
> >
> > efivar_device_path_to_unix_path translates from UEFI to Unix
> > efivar_unix_path_to_device_path translates from Unix to UEFI
> >
> > At present, only HD() device types are supported (both GPT and
> > MBR). CdRom and floppy devices aren't supported. ZFS isn't supported
> > because there's no way in the UEFI standard to specify a ZFS datastore.
> > Network devices aren't supported either.
> >
> > Three forms of Unix path are accepted: /path/to/file (for a mounted
> > filesystem), //path/to/file (uses the EFI partition on the same disk
> > as /), and dev:/path/to/file (for unmounted filesystem). Two forms are
> > produced (the first and last).
> >
> > Sponsored by: Netflix
> >
> > Added:
> > head/lib/libefivar/efivar-dp-xlate.c (contents, props changed)
> > Modified:
> > head/lib/libefivar/Makefile
> > head/lib/libefivar/efivar-dp-format.c
> > head/lib/libefivar/efivar-dp.h
> >
> > Modified: head/lib/libefivar/Makefile
> >
> ==
> > --- head/lib/libefivar/Makefile Sat Dec 2 07:29:07 2017
> (r326457)
> > +++ head/lib/libefivar/Makefile Sat Dec 2 07:29:19 2017
> (r326458)
> > @@ -35,6 +35,7 @@ PACKAGE=lib${LIB}
> > LIB= efivar
> > SRCS=efivar.c efichar.c efivar-dp-format.c \
> > efivar-dp-parse.c \
> > + efivar-dp-xlate.c \
> > uefi-guid.c uefi-dputil.c
> > INCS=efivar.h efivar-dp.h
> > SHLIB_MAJOR= 1
> >
> > Modified: head/lib/libefivar/efivar-dp-format.c
> >
> ==
> > --- head/lib/libefivar/efivar-dp-format.c Sat Dec 2 07:29:07 2017
> > (r326457) +++ head/lib/libefivar/efivar-dp-format.c Sat Dec 2
> 07:29:19
> > 2017 (r326458) @@ -2432,7 +2432,7 @@ efidp_format_device_path(char
> *buf, size_t
> > len, const_ }
> >
> > ssize_t
> > -efidp_format_device_path_node(char *buf, size_t len, const_efidp dp,
> ssize_t max)
> > +efidp_format_device_path_node(char *buf, size_t len, const_efidp dp)
> > {
> > char *str;
> > ssize_t retval;
> > @@ -2453,4 +2453,15 @@ efidp_size(const_efidp dp)
> > {
> >
> > return GetDevicePathSize(__DECONST(EFI_DEVICE_PATH_PROTOCOL *,
> dp));
> > +}
> > +
> > +char *
> > +efidp_extract_file_path(const_efidp dp)
> > +{
> > + const FILEPATH_DEVICE_PATH *fp;
> > + char *name = NULL;
> > +
> > + fp = (const void *)dp;
> > + ucs2_to_utf8(fp->PathName, &name);
> > + return name;
> > }
> >
> > Added: head/lib/libefivar/efivar-dp-xlate.c
> >
> ==
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/lib/libefivar/efivar-dp-xlate.c Sat Dec 2 07:29:19 2017
> > (r326458) @@ -0,0 +1,715 @@
> > +/*-
> > + * Copyright (c) 2017 Netflix, Inc.
> > + * All rights reserved.
> > + *
> > + * 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
> > + *in this position and unchanged.
> > + * 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 ``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 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
> > +#include
> > +
> > +#undef MAX
> > +#undef MIN
> > +
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#include "efichar.h"
Re: svn commit: r326458 - head/lib/libefivar
On Sat, Dec 02, 2017 at 08:38:17AM -0700, Warner Losh wrote: > On Sat, Dec 2, 2017 at 4:22 AM, O. Hartmann wrote: > > Am Sat, 2 Dec 2017 07:29:19 + (UTC) > > Warner Losh schrieb: > > > Author: imp > > > Date: Sat Dec 2 07:29:19 2017 > > > New Revision: 326458 > > > URL: https://svnweb.freebsd.org/changeset/base/326458 > > > ... > > > > It seems this broke buildworld, as my attempt to build fails with this > > error on r326459: [...] > > > > make[4]: stopped in /usr/src/usr.sbin/efivar > > .ERROR_TARGET='efivar' > > Yea, I added a libgeom dependency for libefivar and simply forgot about > this program. Now, guys, please remember that the Internet is still delivered via punched cards for some of us, and trim your replies down to actual relevant context. Thank you, ./danfe ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326473 - in head/tools/diag: . httpd-error
Author: eadler Date: Sat Dec 2 17:10:13 2017 New Revision: 326473 URL: https://svnweb.freebsd.org/changeset/base/326473 Log: diag/httpd-error: remove This is a script for a web server in a specific configuration. Current web servers don't produce similar log files and it isn't FreeBSD's goal to produce a log file analyzer. Deleted: head/tools/diag/httpd-error/ Modified: head/tools/diag/README Modified: head/tools/diag/README == --- head/tools/diag/README Sat Dec 2 15:25:45 2017(r326472) +++ head/tools/diag/README Sat Dec 2 17:10:13 2017(r326473) @@ -10,6 +10,5 @@ Please make a subdir per program, and add a brief desc dumpvfscache program that can be used to examine the contents of the vfs name cache. -httpd-errorcheck for Web files which does not exists on your host localeck check for invalid/incomplete locales ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326474 - head/sys/fs/ext2fs
Author: pfg Date: Sat Dec 2 17:22:55 2017 New Revision: 326474 URL: https://svnweb.freebsd.org/changeset/base/326474 Log: SPDX: Complete license IDs for ext2fs. Modified: head/sys/fs/ext2fs/ext2_acl.c head/sys/fs/ext2fs/ext2_acl.h head/sys/fs/ext2fs/ext2_csum.c head/sys/fs/ext2fs/ext2_extattr.c head/sys/fs/ext2fs/ext2_extattr.h head/sys/fs/ext2fs/ext2_inode_cnv.c Modified: head/sys/fs/ext2fs/ext2_acl.c == --- head/sys/fs/ext2fs/ext2_acl.c Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_acl.c Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017, Fedor Uporov * All rights reserved. * Modified: head/sys/fs/ext2fs/ext2_acl.h == --- head/sys/fs/ext2fs/ext2_acl.h Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_acl.h Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017, Fedor Uporov * All rights reserved. * Modified: head/sys/fs/ext2fs/ext2_csum.c == --- head/sys/fs/ext2fs/ext2_csum.c Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_csum.c Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017, Fedor Uporov * All rights reserved. * Modified: head/sys/fs/ext2fs/ext2_extattr.c == --- head/sys/fs/ext2fs/ext2_extattr.c Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_extattr.c Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017, Fedor Uporov * All rights reserved. * Modified: head/sys/fs/ext2fs/ext2_extattr.h == --- head/sys/fs/ext2fs/ext2_extattr.h Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_extattr.h Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * * Copyright (c) 2017, Fedor Uporov * All rights reserved. * Modified: head/sys/fs/ext2fs/ext2_inode_cnv.c == --- head/sys/fs/ext2fs/ext2_inode_cnv.c Sat Dec 2 17:10:13 2017 (r326473) +++ head/sys/fs/ext2fs/ext2_inode_cnv.c Sat Dec 2 17:22:55 2017 (r326474) @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: MIT-CMU + * * Copyright (c) 1995 The University of Utah and * the Computer Systems Laboratory at the University of Utah (CSL). * All rights reserved. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326475 - head/lib/libclang_rt
Author: dim
Date: Sat Dec 2 17:39:04 2017
New Revision: 326475
URL: https://svnweb.freebsd.org/changeset/base/326475
Log:
Make the assignment of CRTARCH conditional, even in the armhf case, and
slightly rework the .if statement. While here, fix a minor typo.
Modified:
head/lib/libclang_rt/Makefile.inc
Modified: head/lib/libclang_rt/Makefile.inc
==
--- head/lib/libclang_rt/Makefile.inc Sat Dec 2 17:22:55 2017
(r326474)
+++ head/lib/libclang_rt/Makefile.inc Sat Dec 2 17:39:04 2017
(r326475)
@@ -3,12 +3,13 @@
.include
# armv[67] is a bit special since we allow a soft-floating version via
-# CPUTYPE matching *soft*. This variant is may not actually work though.
+# CPUTYPE matching *soft*. This variant may not actually work though.
.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
(!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
-CRTARCH= armhf
-.endif
+CRTARCH?= armhf
+.else
CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/}
+.endif
CRTSRC=${SRCTOP}/contrib/compiler-rt
.PATH: ${CRTSRC}/lib
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326478 - head/share/man/man3
Author: eadler Date: Sat Dec 2 19:10:52 2017 New Revision: 326478 URL: https://svnweb.freebsd.org/changeset/base/326478 Log: Add missing word Reported by: swild...@dragonflybsd.org Modified: head/share/man/man3/pthread_join.3 Modified: head/share/man/man3/pthread_join.3 == --- head/share/man/man3/pthread_join.3 Sat Dec 2 18:41:01 2017 (r326477) +++ head/share/man/man3/pthread_join.3 Sat Dec 2 19:10:52 2017 (r326478) @@ -134,7 +134,7 @@ function conforms to .St -p1003.1-96 . The .Fn pthread_timedjoin_np -is a +function is a .Fx extension which first appeared in .Fx 6.1 . ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326479 - head/lib/libc/include
Author: eadler
Date: Sat Dec 2 19:42:08 2017
New Revision: 326479
URL: https://svnweb.freebsd.org/changeset/base/326479
Log:
Add include guard to fpmath.h
Submitted by: kargl
Modified:
head/lib/libc/include/fpmath.h
Modified: head/lib/libc/include/fpmath.h
==
--- head/lib/libc/include/fpmath.h Sat Dec 2 19:10:52 2017
(r326478)
+++ head/lib/libc/include/fpmath.h Sat Dec 2 19:42:08 2017
(r326479)
@@ -29,6 +29,9 @@
* $FreeBSD$
*/
+#ifndef _FPMATH_H_
+#define _FPMATH_H_
+
#include
#include "_fpmath.h"
@@ -75,3 +78,5 @@ union IEEEd2bits {
#endif
} bits;
};
+
+#endif /* !_FPMATH_H */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r326454 - in head/sys: conf dev/bwn gnu/dev/bwn/phy_n modules/bwn modules/bwn_pci
On Fri, Dec 1, 2017 at 11:21 PM, Kyle Evans wrote: On Dec 1, 2017 8:21 PM, "Landon J. Fuller" wrote: Log: Introduce bwn(4) support for the bhnd(4) bus. Hi, I'm pretty sure we've discussed this, but I don't recall to what detail that was- I recall that the 4313 is BCMA, but does it have one of the PHYs that we support already? If so, I'll happily test there. The BCM4313 uses an LCN PHY; we're probably going to have to bring over Broadcom's ISC-licensed LCN-PHY support from their Linux brcmsmac driver before we can bring up the 4313. Cheers, Landon ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326480 - head/sys/net
Author: bryanv
Date: Sat Dec 2 22:04:00 2017
New Revision: 326480
URL: https://svnweb.freebsd.org/changeset/base/326480
Log:
Add if media and link status events to vxlan
PR: 214359
MFC after:2 weeks
Modified:
head/sys/net/if_vxlan.c
Modified: head/sys/net/if_vxlan.c
==
--- head/sys/net/if_vxlan.c Sat Dec 2 19:42:08 2017(r326479)
+++ head/sys/net/if_vxlan.c Sat Dec 2 22:04:00 2017(r326480)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -177,6 +178,7 @@ struct vxlan_softc {
uint8_t vxl_hwaddr[ETHER_ADDR_LEN];
int vxl_mc_ifindex;
struct ifnet*vxl_mc_ifp;
+ struct ifmedia vxl_media;
char vxl_mc_ifname[IFNAMSIZ];
LIST_ENTRY(vxlan_softc) vxl_entry;
LIST_ENTRY(vxlan_softc) vxl_ifdetach_list;
@@ -342,6 +344,8 @@ static void vxlan_clone_destroy(struct ifnet *);
static uint32_t vxlan_mac_hash(struct vxlan_softc *, const uint8_t *);
static voidvxlan_fakeaddr(struct vxlan_softc *);
+static int vxlan_media_change(struct ifnet *);
+static voidvxlan_media_status(struct ifnet *, struct ifmediareq *);
static int vxlan_sockaddr_cmp(const union vxlan_sockaddr *,
const struct sockaddr *);
@@ -1655,6 +1659,7 @@ vxlan_init(void *xsc)
vxlan_timer, sc);
VXLAN_WUNLOCK(sc);
+ if_link_state_change(ifp, LINK_STATE_UP);
out:
vxlan_init_complete(sc);
}
@@ -1710,6 +1715,7 @@ vxlan_teardown_locked(struct vxlan_softc *sc)
sc->vxl_sock = NULL;
VXLAN_WUNLOCK(sc);
+ if_link_state_change(ifp, LINK_STATE_DOWN);
if (vso != NULL) {
vxlan_socket_remove_softc(vso, sc);
@@ -2219,6 +2225,12 @@ vxlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t dat
case SIOCSIFFLAGS:
error = vxlan_ioctl_ifflags(sc);
break;
+
+ case SIOCSIFMEDIA:
+ case SIOCGIFMEDIA:
+ error = ifmedia_ioctl(ifp, ifr, &sc->vxl_media, cmd);
+ break;
+
default:
error = ether_ioctl(ifp, cmd, data);
break;
@@ -2685,6 +2697,10 @@ vxlan_clone_create(struct if_clone *ifc, int unit, cad
ifp->if_transmit = vxlan_transmit;
ifp->if_qflush = vxlan_qflush;
+ ifmedia_init(&sc->vxl_media, 0, vxlan_media_change, vxlan_media_status);
+ ifmedia_add(&sc->vxl_media, IFM_ETHER | IFM_AUTO, 0, NULL);
+ ifmedia_set(&sc->vxl_media, IFM_ETHER | IFM_AUTO);
+
vxlan_fakeaddr(sc);
ether_ifattach(ifp, sc->vxl_hwaddr);
@@ -2711,6 +2727,7 @@ vxlan_clone_destroy(struct ifnet *ifp)
ether_ifdetach(ifp);
if_free(ifp);
+ ifmedia_removeall(&sc->vxl_media);
vxlan_ftable_fini(sc);
@@ -2768,6 +2785,22 @@ vxlan_fakeaddr(struct vxlan_softc *sc)
arc4rand(sc->vxl_hwaddr, ETHER_ADDR_LEN, 1);
sc->vxl_hwaddr[0] &= ~1;
sc->vxl_hwaddr[0] |= 2;
+}
+
+static int
+vxlan_media_change(struct ifnet *ifp)
+{
+
+ /* Ignore. */
+ return (0);
+}
+
+static void
+vxlan_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
+{
+
+ ifmr->ifm_status = IFM_ACTIVE | IFM_AVALID;
+ ifmr->ifm_active = IFM_ETHER | IFM_FDX;
}
static int
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326482 - head/lib/msun/src
Author: emaste
Date: Sun Dec 3 01:56:03 2017
New Revision: 326482
URL: https://svnweb.freebsd.org/changeset/base/326482
Log:
lib/msun: remove trailing whitespace from e_pow.c
Submitted by: Steve Kargl
MFC after:1 week
Modified:
head/lib/msun/src/e_pow.c
Modified: head/lib/msun/src/e_pow.c
==
--- head/lib/msun/src/e_pow.c Sun Dec 3 00:24:22 2017(r326481)
+++ head/lib/msun/src/e_pow.c Sun Dec 3 01:56:03 2017(r326482)
@@ -4,7 +4,7 @@
* Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
+ * software is freely granted, provided that this notice
* is preserved.
*
*/
@@ -19,7 +19,7 @@ __FBSDID("$FreeBSD$");
* 1. Compute and return log2(x) in two pieces:
* log2(x) = w1 + w2,
*where w1 has 53-24 = 29 bit trailing zeros.
- * 2. Perform y*log2(x) = n+y' by simulating multi-precision
+ * 2. Perform y*log2(x) = n+y' by simulating multi-precision
*arithmetic, where |y'|<=0.5.
* 3. Return x**y = 2**n*exp(y'*log2)
*
@@ -47,13 +47,13 @@ __FBSDID("$FreeBSD$");
* Accuracy:
* pow(x,y) returns x**y nearly rounded. In particular
* pow(integer,integer)
- * always returns the correct integer provided it is
+ * always returns the correct integer provided it is
* representable.
*
* Constants :
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
* to produce the hexadecimal values shown.
*/
@@ -107,14 +107,14 @@ __ieee754_pow(double x, double y)
ix = hx&0x7fff; iy = hy&0x7fff;
/* y==zero: x**0 = 1 */
- if((iy|ly)==0) return one;
+ if((iy|ly)==0) return one;
/* x==1: 1**y = 1, even if y is NaN */
if (hx==0x3ff0 && lx == 0) return one;
/* y!=zero: result is NaN if either arg is NaN */
if(ix > 0x7ff0 || ((ix==0x7ff0)&&(lx!=0)) ||
- iy > 0x7ff0 || ((iy==0x7ff0)&&(ly!=0)))
+ iy > 0x7ff0 || ((iy==0x7ff0)&&(ly!=0)))
return (x+0.0)+(y+0.0);
/* determine if y is an odd int when x < 0
@@ -123,7 +123,7 @@ __ieee754_pow(double x, double y)
* yisint = 2 ... y is an even int
*/
yisint = 0;
- if(hx<0) {
+ if(hx<0) {
if(iy>=0x4340) yisint = 2; /* even integer y */
else if(iy>=0x3ff0) {
k = (iy>>20)-0x3ff;/* exponent */
@@ -134,11 +134,11 @@ __ieee754_pow(double x, double y)
j = iy>>(20-k);
if((j<<(20-k))==iy) yisint = 2-(j&1);
}
- }
- }
+ }
+ }
/* special value of y */
- if(ly==0) {
+ if(ly==0) {
if (iy==0x7ff0) { /* y is +-inf */
if(((ix-0x3ff0)|lx)==0)
return one;/* (-1)**+-inf is 1 */
@@ -146,14 +146,14 @@ __ieee754_pow(double x, double y)
return (hy>=0)? y: zero;
else/* (|x|<1)**-,+inf = inf,0 */
return (hy<0)?-y: zero;
- }
+ }
if(iy==0x3ff0) {/* y is +-1 */
if(hy<0) return one/x; else return x;
}
if(hy==0x4000) return x*x; /* y is 2 */
if(hy==0x3fe0) {/* y is 0.5 */
if(hx>=0) /* x >= +0 */
- return sqrt(x);
+ return sqrt(x);
}
}
@@ -166,13 +166,13 @@ __ieee754_pow(double x, double y)
if(hx<0) {
if(((ix-0x3ff0)|yisint)==0) {
z = (z-z)/(z-z); /* (-1)**non-int is NaN */
- } else if(yisint==1)
+ } else if(yisint==1)
z = -z; /* (x<0)**odd = -(|x|**odd) */
}
return z;
}
}
-
+
/* CYGNUS LOCAL + fdlibm-5.3 fix: This used to be
n = (hx>>31)+1;
but ANSI C says a right shift of a signed negative quantity is
@@ -194,7 +194,7 @@ __ieee754_pow(double x, double y)
/* over/underflow if x is not close to one */
if(ix<0x3fef) return (hy<0)? s*huge*huge:s*tiny*tiny;
if(ix>0x3ff0) return (hy>0)? s*huge*huge:s*tiny*tiny;
- /* now |1-x| is tiny <= 2**-20, suffice to
svn commit: r326483 - head/usr.bin/grep/tests
Author: kevans Date: Sun Dec 3 02:23:29 2017 New Revision: 326483 URL: https://svnweb.freebsd.org/changeset/base/326483 Log: grep test: Fix copyright notice The copyright notice was erroneously introduced as one from the NetBSD foundation due to it being copied from a file in the NetBSD test suite, but this file itself is not derived from or supplied with the NetBSD test suite. MFC after:3 days Modified: head/usr.bin/grep/tests/grep_freebsd_test.sh Modified: head/usr.bin/grep/tests/grep_freebsd_test.sh == --- head/usr.bin/grep/tests/grep_freebsd_test.shSun Dec 3 01:56:03 2017(r326482) +++ head/usr.bin/grep/tests/grep_freebsd_test.shSun Dec 3 02:23:29 2017(r326483) @@ -11,17 +11,17 @@ #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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. +# 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. # # $FreeBSD$ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r326482 - head/lib/msun/src
On Sun, 3 Dec 2017, Ed Maste wrote: Log: lib/msun: remove trailing whitespace from e_pow.c Submitted by: Steve Kargl MFC after: 1 week This undoes parts of r141296. Trailing whitespace was previously removed in r8880. This was warmly received, and r141296 backed out the change. Bruce ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326484 - head/stand/ofw/libofw
Author: imp
Date: Sun Dec 3 04:54:18 2017
New Revision: 326484
URL: https://svnweb.freebsd.org/changeset/base/326484
Log:
Const poison the propname. It's never set and we often pass it const
char *.
Sponsored by: Netflix
Modified:
head/stand/ofw/libofw/openfirm.c
head/stand/ofw/libofw/openfirm.h
Modified: head/stand/ofw/libofw/openfirm.c
==
--- head/stand/ofw/libofw/openfirm.cSun Dec 3 02:23:29 2017
(r326483)
+++ head/stand/ofw/libofw/openfirm.cSun Dec 3 04:54:18 2017
(r326484)
@@ -242,7 +242,7 @@ OF_instance_to_package(ihandle_t instance)
/* Get the length of a property of a package. */
int
-OF_getproplen(phandle_t package, char *propname)
+OF_getproplen(phandle_t package, const char *propname)
{
static struct {
cell_t name;
@@ -266,7 +266,7 @@ OF_getproplen(phandle_t package, char *propname)
/* Get the value of a property of a package. */
int
-OF_getprop(phandle_t package, char *propname, void *buf, int buflen)
+OF_getprop(phandle_t package, const char *propname, void *buf, int buflen)
{
static struct {
cell_t name;
@@ -294,7 +294,7 @@ OF_getprop(phandle_t package, char *propname, void *bu
/* Get the next property of a package. */
int
-OF_nextprop(phandle_t package, char *previous, char *buf)
+OF_nextprop(phandle_t package, const char *previous, char *buf)
{
static struct {
cell_t name;
@@ -321,7 +321,7 @@ OF_nextprop(phandle_t package, char *previous, char *b
/* Set the value of a property of a package. */
/* XXX Has a bug on FirePower */
int
-OF_setprop(phandle_t package, char *propname, void *buf, int len)
+OF_setprop(phandle_t package, const char *propname, void *buf, int len)
{
static struct {
cell_t name;
Modified: head/stand/ofw/libofw/openfirm.h
==
--- head/stand/ofw/libofw/openfirm.hSun Dec 3 02:23:29 2017
(r326483)
+++ head/stand/ofw/libofw/openfirm.hSun Dec 3 04:54:18 2017
(r326484)
@@ -89,10 +89,10 @@ phandle_t OF_peer(phandle_t);
phandle_t OF_child(phandle_t);
phandle_t OF_parent(phandle_t);
phandle_t OF_instance_to_package(ihandle_t);
-intOF_getproplen(phandle_t, char *);
-intOF_getprop(phandle_t, char *, void *, int);
-intOF_nextprop(phandle_t, char *, char *);
-intOF_setprop(phandle_t, char *, void *, int);
+intOF_getproplen(phandle_t, const char *);
+intOF_getprop(phandle_t, const char *, void *, int);
+intOF_nextprop(phandle_t, const char *, char *);
+intOF_setprop(phandle_t, const char *, void *, int);
intOF_canon(const char *, char *, int);
phandle_t OF_finddevice(const char *);
intOF_instance_to_path(ihandle_t, char *, int);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326488 - head/stand/ofw/libofw
Author: imp Date: Sun Dec 3 04:55:04 2017 New Revision: 326488 URL: https://svnweb.freebsd.org/changeset/base/326488 Log: e_entry can be smaller than a pointer. Cast it to an intptr_t before casting it to a uint64_t *. Modified: head/stand/ofw/libofw/ppc64_elf_freebsd.c Modified: head/stand/ofw/libofw/ppc64_elf_freebsd.c == --- head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:54:59 2017 (r326487) +++ head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:55:04 2017 (r326488) @@ -82,7 +82,7 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp) if ((e->e_flags & 3) == 2) entry = e->e_entry; else - entry = *(uint64_t *)e->e_entry; + entry = *(uint64_t *)(intptr_t)e->e_entry; if ((error = md_load64(fp->f_args, &mdp, &dtbp)) != 0) return (error); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326485 - in head/stand: ofw/libofw sparc64/loader
Author: imp
Date: Sun Dec 3 04:54:49 2017
New Revision: 326485
URL: https://svnweb.freebsd.org/changeset/base/326485
Log:
Delcare md_load in libofw.h. Make all prototypes match for ofw
provided md_load functions.
Sponsored by: Netflix
Modified:
head/stand/ofw/libofw/libofw.h
head/stand/sparc64/loader/main.c
head/stand/sparc64/loader/metadata.c
Modified: head/stand/ofw/libofw/libofw.h
==
--- head/stand/ofw/libofw/libofw.h Sun Dec 3 04:54:18 2017
(r326484)
+++ head/stand/ofw/libofw/libofw.h Sun Dec 3 04:54:49 2017
(r326485)
@@ -67,6 +67,10 @@ struct file_format;
intofw_elf_loadfile(char *, vm_offset_t, struct preloaded_file **);
intofw_elf_exec(struct preloaded_file *);
+/* MD code implementing MI interfaces */
+vm_offset_t md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtb);
+vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb);
+
extern struct file_format ofw_elf;
#ifdef __powerpc__
extern struct file_format ofw_elf64;
Modified: head/stand/sparc64/loader/main.c
==
--- head/stand/sparc64/loader/main.cSun Dec 3 04:54:18 2017
(r326484)
+++ head/stand/sparc64/loader/main.cSun Dec 3 04:54:49 2017
(r326485)
@@ -101,7 +101,6 @@ static inline u_long itlb_get_data_sun4u(u_int, u_int)
static int itlb_enter_sun4u(u_int, u_long data, vm_offset_t);
static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t);
static void itlb_relocate_locked0_sun4u(void);
-extern vm_offset_t md_load(char *, vm_offset_t *, vm_offset_t *);
static int sparc64_autoload(void);
static ssize_t sparc64_readin(const int, vm_offset_t, const size_t);
static ssize_t sparc64_copyin(const void *, vm_offset_t, size_t);
Modified: head/stand/sparc64/loader/metadata.c
==
--- head/stand/sparc64/loader/metadata.cSun Dec 3 04:54:18 2017
(r326484)
+++ head/stand/sparc64/loader/metadata.cSun Dec 3 04:54:49 2017
(r326485)
@@ -275,7 +275,7 @@ md_copymodules(vm_offset_t addr)
* - The kernel environment is copied into kernel space.
* - Module metadata are formatted and placed in kernel space.
*/
-int
+vm_offset_t
md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtbp)
{
struct preloaded_file *kfp;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326490 - head/stand/powerpc/ofw
Author: imp
Date: Sun Dec 3 04:55:14 2017
New Revision: 326490
URL: https://svnweb.freebsd.org/changeset/base/326490
Log:
Declare our strange brand of main().
Sponsored by: Netflix
Modified:
head/stand/powerpc/ofw/start.c
Modified: head/stand/powerpc/ofw/start.c
==
--- head/stand/powerpc/ofw/start.c Sun Dec 3 04:55:09 2017
(r326489)
+++ head/stand/powerpc/ofw/start.c Sun Dec 3 04:55:14 2017
(r326490)
@@ -67,6 +67,8 @@ _start: \n\
2: b startup \n\
");
+void main(int (*openfirm)(void *));
+
void
startup(void *vpd, int res, int (*openfirm)(void *), char *arg, int argl)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326487 - head/stand/ofw/libofw
Author: imp
Date: Sun Dec 3 04:54:59 2017
New Revision: 326487
URL: https://svnweb.freebsd.org/changeset/base/326487
Log:
Cast mdp (a vm_offset_t) to void * to match prototype.
Sponsored by: Netflix
Modified:
head/stand/ofw/libofw/elf_freebsd.c
head/stand/ofw/libofw/ppc64_elf_freebsd.c
Modified: head/stand/ofw/libofw/elf_freebsd.c
==
--- head/stand/ofw/libofw/elf_freebsd.c Sun Dec 3 04:54:54 2017
(r326486)
+++ head/stand/ofw/libofw/elf_freebsd.c Sun Dec 3 04:54:59 2017
(r326487)
@@ -91,7 +91,7 @@ __elfN(ofw_exec)(struct preloaded_file *fp)
if (dtbp != 0) {
OF_quiesce();
((int (*)(u_long, u_long, u_long, void *, u_long))entry)(dtbp,
0, 0,
- mdp, sizeof(mdp));
+ (void *)mdp, sizeof(mdp));
} else {
OF_chain((void *)reloc, end - (char *)reloc, (void *)entry,
(void *)mdp, 0xfb5d104d);
Modified: head/stand/ofw/libofw/ppc64_elf_freebsd.c
==
--- head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:54:54 2017
(r326486)
+++ head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:54:59 2017
(r326487)
@@ -95,7 +95,7 @@ ppc64_ofw_elf_exec(struct preloaded_file *fp)
if (dtbp != 0) {
OF_quiesce();
((int (*)(u_long, u_long, u_long, void *, u_long))entry)(dtbp,
- 0, 0, mdp, 0xfb5d104d);
+ 0, 0, (void *)mdp, 0xfb5d104d);
} else {
OF_chain((void *)reloc, end - (char *)reloc, (void *)entry,
(void *)mdp, 0xfb5d104d);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326486 - in head/stand: ofw/libofw powerpc/boot1.chrp
Author: imp
Date: Sun Dec 3 04:54:54 2017
New Revision: 326486
URL: https://svnweb.freebsd.org/changeset/base/326486
Log:
Include machine/md_var to pick up __syncicache prototype.
Sponsored by: Netflix
Modified:
head/stand/ofw/libofw/elf_freebsd.c
head/stand/ofw/libofw/ppc64_elf_freebsd.c
head/stand/powerpc/boot1.chrp/boot1.c
Modified: head/stand/ofw/libofw/elf_freebsd.c
==
--- head/stand/ofw/libofw/elf_freebsd.c Sun Dec 3 04:54:49 2017
(r326485)
+++ head/stand/ofw/libofw/elf_freebsd.c Sun Dec 3 04:54:54 2017
(r326486)
@@ -32,6 +32,9 @@ __FBSDID("$FreeBSD$");
#include
#include
+#if defined(__powerpc__)
+#include
+#endif
#include
Modified: head/stand/ofw/libofw/ppc64_elf_freebsd.c
==
--- head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:54:49 2017
(r326485)
+++ head/stand/ofw/libofw/ppc64_elf_freebsd.c Sun Dec 3 04:54:54 2017
(r326486)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
Modified: head/stand/powerpc/boot1.chrp/boot1.c
==
--- head/stand/powerpc/boot1.chrp/boot1.c Sun Dec 3 04:54:49 2017
(r326485)
+++ head/stand/powerpc/boot1.chrp/boot1.c Sun Dec 3 04:54:54 2017
(r326486)
@@ -22,6 +22,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include "paths.h"
@@ -74,8 +75,6 @@ static int __puts(const char *s, putc_func_t *putc, vo
static int __sputc(char c, void *arg);
static char *__uitoa(char *buf, u_int val, int base);
static char *__ultoa(char *buf, u_long val, int base);
-
-void __syncicache(void *, int);
/*
* Open Firmware interface functions
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326491 - head/stand/powerpc
Author: imp
Date: Sun Dec 3 04:55:19 2017
New Revision: 326491
URL: https://svnweb.freebsd.org/changeset/base/326491
Log:
Disconnet ps3 from the build. There's too many warnings to fix. Also,
it's going to be removed soon anyway once the final lingering issues
with kboot are resolved. Go ahead and disconnect it from the build a
little early.
Sponsored by: Netflix
OK'd by: nathanw@
Modified:
head/stand/powerpc/Makefile
Modified: head/stand/powerpc/Makefile
==
--- head/stand/powerpc/Makefile Sun Dec 3 04:55:14 2017(r326490)
+++ head/stand/powerpc/Makefile Sun Dec 3 04:55:19 2017(r326491)
@@ -3,9 +3,6 @@
.include
SUBDIR=boot1.chrp ofw uboot
-.if ${MACHINE_ARCH} != "powerpcspe"
-SUBDIR+= ps3
-.endif
.if ${MK_FDT} == "yes"
SUBDIR+= kboot
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326493 - head/stand/powerpc/kboot
Author: imp Date: Sun Dec 3 04:55:28 2017 New Revision: 326493 URL: https://svnweb.freebsd.org/changeset/base/326493 Log: Provide a md_load64 prototype. Sponsored by: Netflix Modified: head/stand/powerpc/kboot/ppc64_elf_freebsd.c Modified: head/stand/powerpc/kboot/ppc64_elf_freebsd.c == --- head/stand/powerpc/kboot/ppc64_elf_freebsd.cSun Dec 3 04:55:23 2017(r326492) +++ head/stand/powerpc/kboot/ppc64_elf_freebsd.cSun Dec 3 04:55:28 2017(r326493) @@ -46,6 +46,8 @@ extern size_t szkerneltramp; extern int nkexec_segments; extern void * loaded_segments; +vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); + int ppc64_elf_loadfile(char *filename, u_int64_t dest, struct preloaded_file **result) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326492 - head/stand/powerpc/kboot
Author: imp
Date: Sun Dec 3 04:55:23 2017
New Revision: 326492
URL: https://svnweb.freebsd.org/changeset/base/326492
Log:
Cast void * pointer to char * so the arg matches the %s format.
Sponsored by: Netflix
Modified:
head/stand/powerpc/kboot/hostdisk.c
Modified: head/stand/powerpc/kboot/hostdisk.c
==
--- head/stand/powerpc/kboot/hostdisk.c Sun Dec 3 04:55:19 2017
(r326491)
+++ head/stand/powerpc/kboot/hostdisk.c Sun Dec 3 04:55:23 2017
(r326492)
@@ -94,7 +94,7 @@ hostdisk_open(struct open_file *f, ...)
if (desc->d_unit <= 0) {
printf("hostdisk_open: couldn't open %s: %d\n",
- desc->d_opendata, desc->d_unit);
+ (char *)desc->d_opendata, desc->d_unit);
return (ENOENT);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326489 - head/sys/sys
Author: imp Date: Sun Dec 3 04:55:09 2017 New Revision: 326489 URL: https://svnweb.freebsd.org/changeset/base/326489 Log: Allow this file to be used in libsa without warning... Sponsored by: Netflix Modified: head/sys/sys/syslimits.h Modified: head/sys/sys/syslimits.h == --- head/sys/sys/syslimits.hSun Dec 3 04:55:04 2017(r326488) +++ head/sys/sys/syslimits.hSun Dec 3 04:55:09 2017(r326489) @@ -35,7 +35,7 @@ #ifndef _SYS_SYSLIMITS_H_ #define _SYS_SYSLIMITS_H_ -#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_) +#if !defined(_STANDALONE) && !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_) #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326495 - head/stand
Author: imp
Date: Sun Dec 3 04:55:38 2017
New Revision: 326495
URL: https://svnweb.freebsd.org/changeset/base/326495
Log:
Now it's safe to bump WARNS to 1.
Sponsored by: Netflix
Modified:
head/stand/defs.mk
Modified: head/stand/defs.mk
==
--- head/stand/defs.mk Sun Dec 3 04:55:33 2017(r326494)
+++ head/stand/defs.mk Sun Dec 3 04:55:38 2017(r326495)
@@ -2,7 +2,7 @@
.include
-WARNS?=0
+WARNS?=1
.if !defined(__BOOT_DEFS_MK__)
__BOOT_DEFS_MK__=${MFILE}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r326494 - in head: stand/zfs sys/cddl/boot/zfs
Author: imp
Date: Sun Dec 3 04:55:33 2017
New Revision: 326494
URL: https://svnweb.freebsd.org/changeset/base/326494
Log:
Mark two things as unused (since they are only sometimes used) and
toss in a DECONST to remove a const in some tricky code that would
require too extensive a change to unwind otherwise.
Sponsored by: Netflix
Modified:
head/stand/zfs/zfsimpl.c
head/sys/cddl/boot/zfs/zfssubr.c
Modified: head/stand/zfs/zfsimpl.c
==
--- head/stand/zfs/zfsimpl.cSun Dec 3 04:55:28 2017(r326493)
+++ head/stand/zfs/zfsimpl.cSun Dec 3 04:55:33 2017(r326494)
@@ -43,7 +43,7 @@ struct zfsmount {
objset_phys_t objset;
uint64_trootobj;
};
-static struct zfsmount zfsmount;
+static struct zfsmount zfsmount __unused;
/*
* List of all vdevs, chained through v_alllink.
Modified: head/sys/cddl/boot/zfs/zfssubr.c
==
--- head/sys/cddl/boot/zfs/zfssubr.cSun Dec 3 04:55:28 2017
(r326493)
+++ head/sys/cddl/boot/zfs/zfssubr.cSun Dec 3 04:55:33 2017
(r326494)
@@ -250,7 +250,7 @@ zio_checksum_template_init(enum zio_checksum checksum,
* all of the checksum context templates and deallocates any that were
* initialized using the algorithm-specific template init function.
*/
-static void
+static void __unused
zio_checksum_templates_free(spa_t *spa)
{
for (enum zio_checksum checksum = 0;
@@ -284,7 +284,7 @@ zio_checksum_verify(const spa_t *spa, const blkptr_t *
return (EINVAL);
if (spa != NULL) {
- zio_checksum_template_init(checksum, (spa_t *) spa);
+ zio_checksum_template_init(checksum, __DECONST(spa_t *,spa));
ctx = spa->spa_cksum_tmpls[checksum];
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
