svn commit: r275987 - in stable/10/sys: compat/freebsd32 kern sys
Author: dchagin
Date: Sun Dec 21 08:00:38 2014
New Revision: 275987
URL: https://svnweb.freebsd.org/changeset/base/275987
Log:
Regen for r275986 (ppoll).
Modified:
stable/10/sys/compat/freebsd32/freebsd32_proto.h
stable/10/sys/compat/freebsd32/freebsd32_syscall.h
stable/10/sys/compat/freebsd32/freebsd32_syscalls.c
stable/10/sys/compat/freebsd32/freebsd32_sysent.c
stable/10/sys/compat/freebsd32/freebsd32_systrace_args.c
stable/10/sys/kern/init_sysent.c
stable/10/sys/kern/syscalls.c
stable/10/sys/kern/systrace_args.c
stable/10/sys/sys/syscall.h
stable/10/sys/sys/syscall.mk
stable/10/sys/sys/sysproto.h
Modified: stable/10/sys/compat/freebsd32/freebsd32_proto.h
==
--- stable/10/sys/compat/freebsd32/freebsd32_proto.hSun Dec 21 07:58:28
2014(r275986)
+++ stable/10/sys/compat/freebsd32/freebsd32_proto.hSun Dec 21 08:00:38
2014(r275987)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 271010
2014-09-03 09:05:16Z kib
+ * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 275986
2014-12-21 07:58:28Z dchagin
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -693,6 +693,12 @@ struct freebsd32_procctl_args {
char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
};
#endif
+struct freebsd32_ppoll_args {
+ char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char
fds_r_[PADR_(struct pollfd *)];
+ char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
+ char ts_l_[PADL_(const struct timespec32 *)]; const struct timespec32 *
ts; char ts_r_[PADR_(const struct timespec32 *)];
+ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char
set_r_[PADR_(const sigset_t *)];
+};
#if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
#define PAD64_REQUIRED
#endif
@@ -826,6 +832,7 @@ int freebsd32_procctl(struct thread *, s
#else
intfreebsd32_procctl(struct thread *, struct freebsd32_procctl_args *);
#endif
+intfreebsd32_ppoll(struct thread *, struct freebsd32_ppoll_args *);
#ifdef COMPAT_43
@@ -1242,6 +1249,7 @@ int freebsd7_freebsd32_shmctl(struct thr
#defineFREEBSD32_SYS_AUE_freebsd32_aio_mlock AUE_NULL
#defineFREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL
#defineFREEBSD32_SYS_AUE_freebsd32_procctl AUE_NULL
+#defineFREEBSD32_SYS_AUE_freebsd32_ppoll AUE_POLL
#undef PAD_
#undef PADL_
Modified: stable/10/sys/compat/freebsd32/freebsd32_syscall.h
==
--- stable/10/sys/compat/freebsd32/freebsd32_syscall.h Sun Dec 21 07:58:28
2014(r275986)
+++ stable/10/sys/compat/freebsd32/freebsd32_syscall.h Sun Dec 21 08:00:38
2014(r275987)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 271010
2014-09-03 09:05:16Z kib
+ * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 275986
2014-12-21 07:58:28Z dchagin
*/
#defineFREEBSD32_SYS_syscall 0
@@ -454,4 +454,5 @@
#defineFREEBSD32_SYS_freebsd32_aio_mlock 543
#defineFREEBSD32_SYS_freebsd32_procctl 544
#defineFREEBSD32_SYS_freebsd32_procctl 544
-#defineFREEBSD32_SYS_MAXSYSCALL545
+#defineFREEBSD32_SYS_freebsd32_ppoll 545
+#defineFREEBSD32_SYS_MAXSYSCALL546
Modified: stable/10/sys/compat/freebsd32/freebsd32_syscalls.c
==
--- stable/10/sys/compat/freebsd32/freebsd32_syscalls.c Sun Dec 21 07:58:28
2014(r275986)
+++ stable/10/sys/compat/freebsd32/freebsd32_syscalls.c Sun Dec 21 08:00:38
2014(r275987)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 271010
2014-09-03 09:05:16Z kib
+ * created from FreeBSD: stable/10/sys/compat/freebsd32/syscalls.master 275986
2014-12-21 07:58:28Z dchagin
*/
const char *freebsd32_syscallnames[] = {
@@ -578,4 +578,5 @@ const char *freebsd32_syscallnames[] = {
#else
"freebsd32_procctl",/* 544 = freebsd32_procctl */
#endif
+ "freebsd32_ppoll", /* 545 = freebsd32_ppoll */
};
Modified: stable/10/sys/compat/freebsd32/freebsd32_sysent.c
==
--- stable/10/sys/compat/freebsd32/freebsd32_sysent.c Sun Dec 21 07:58:28
2014(r275986)
+++ stable/10/sys/compat/freebsd32/freebsd32_sysent.c Sun Dec 21 08:00:38
2014(r275987)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically
Re: svn commit: r275961 - head/sys/arm/conf
On Sat, Dec 20, 2014 at 06:15:24PM +, Andrew Turner wrote: > Author: andrew > Date: Sat Dec 20 18:15:23 2014 > New Revision: 275961 > URL: https://svnweb.freebsd.org/changeset/base/275961 > > Log: > Clean up to use the standard style of "options \t" and "device\t\t" > > options HZ=500 # Scheduling quantum is 2 milliseconds. > [...] > -options KDB # Enable kernel debugger support. > +options KDB # Enable kernel debugger support. > # For minimum debugger support use KDB_TRACE, for interactive use DDB. > -#options KDB_TRACE # Print a stack trace for a panic. > -options DDB # Support DDB. > +#options KDB_TRACE # Print a stack trace for a panic. > +options DDB # Support DDB. > # For full debugger support use this instead: > -#options GDB # Support remote GDB. > +#options GDB # Support remote GDB. > [...] It also would be nice if we removed trailing dots in comments one day, preferreably across all config files we have in the tree. ./danfe ___ 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: r275988 - in stable/10: . contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-c++/detail contrib/atf/atf-c/detail contrib/atf/atf-sh contrib/atf/doc contrib/atf/test-progr...
Author: ngie Date: Sun Dec 21 08:30:18 2014 New Revision: 275988 URL: https://svnweb.freebsd.org/changeset/base/275988 Log: MFC r273929: r273929 (by jmmv): MFV: Import atf-0.21. Added: stable/10/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r273929, head/contrib/atf/atf-c++/atf-c++.3 stable/10/contrib/atf/atf-c/atf-c.3 - copied unchanged from r273929, head/contrib/atf/atf-c/atf-c.3 stable/10/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r273929, head/contrib/atf/atf-sh/atf-sh.3 stable/10/contrib/atf/config.h - copied unchanged from r273929, head/contrib/atf/config.h stable/10/contrib/atf/doc/atf.7.in - copied unchanged from r273929, head/contrib/atf/doc/atf.7.in Deleted: stable/10/contrib/atf/atf-c++/config.cpp stable/10/contrib/atf/atf-c++/config.hpp stable/10/contrib/atf/atf-c++/config_test.cpp stable/10/contrib/atf/atf-c++/detail/sanity_test.cpp stable/10/contrib/atf/atf-c/config.c stable/10/contrib/atf/atf-c/config.h stable/10/contrib/atf/atf-c/config_test.c stable/10/contrib/atf/bconfig.h Modified: stable/10/ObsoleteFiles.inc stable/10/contrib/atf/FREEBSD-Xlist stable/10/contrib/atf/NEWS stable/10/contrib/atf/atf-c++.hpp stable/10/contrib/atf/atf-c++/Kyuafile stable/10/contrib/atf/atf-c++/atf_c++_test.cpp stable/10/contrib/atf/atf-c++/build.cpp stable/10/contrib/atf/atf-c++/build.hpp stable/10/contrib/atf/atf-c++/build_test.cpp stable/10/contrib/atf/atf-c++/check.cpp stable/10/contrib/atf/atf-c++/check.hpp stable/10/contrib/atf/atf-c++/check_test.cpp stable/10/contrib/atf/atf-c++/detail/Kyuafile stable/10/contrib/atf/atf-c++/detail/application.cpp stable/10/contrib/atf/atf-c++/detail/application.hpp stable/10/contrib/atf/atf-c++/detail/application_test.cpp stable/10/contrib/atf/atf-c++/detail/auto_array.hpp stable/10/contrib/atf/atf-c++/detail/auto_array_test.cpp stable/10/contrib/atf/atf-c++/detail/env.cpp stable/10/contrib/atf/atf-c++/detail/env.hpp stable/10/contrib/atf/atf-c++/detail/env_test.cpp stable/10/contrib/atf/atf-c++/detail/exceptions.cpp stable/10/contrib/atf/atf-c++/detail/exceptions.hpp stable/10/contrib/atf/atf-c++/detail/exceptions_test.cpp stable/10/contrib/atf/atf-c++/detail/fs.cpp stable/10/contrib/atf/atf-c++/detail/fs.hpp stable/10/contrib/atf/atf-c++/detail/fs_test.cpp stable/10/contrib/atf/atf-c++/detail/process.cpp stable/10/contrib/atf/atf-c++/detail/process.hpp stable/10/contrib/atf/atf-c++/detail/process_test.cpp stable/10/contrib/atf/atf-c++/detail/sanity.hpp stable/10/contrib/atf/atf-c++/detail/test_helpers.cpp stable/10/contrib/atf/atf-c++/detail/test_helpers.hpp stable/10/contrib/atf/atf-c++/detail/text.cpp stable/10/contrib/atf/atf-c++/detail/text.hpp stable/10/contrib/atf/atf-c++/detail/text_test.cpp stable/10/contrib/atf/atf-c++/detail/version_helper.cpp stable/10/contrib/atf/atf-c++/macros.hpp stable/10/contrib/atf/atf-c++/macros_hpp_test.cpp stable/10/contrib/atf/atf-c++/macros_test.cpp stable/10/contrib/atf/atf-c++/pkg_config_test.sh stable/10/contrib/atf/atf-c++/tests.cpp stable/10/contrib/atf/atf-c++/tests.hpp stable/10/contrib/atf/atf-c++/tests_test.cpp stable/10/contrib/atf/atf-c++/unused_test.cpp stable/10/contrib/atf/atf-c++/utils.cpp stable/10/contrib/atf/atf-c++/utils.hpp stable/10/contrib/atf/atf-c++/utils_test.cpp stable/10/contrib/atf/atf-c.h stable/10/contrib/atf/atf-c/Kyuafile stable/10/contrib/atf/atf-c/atf_c_test.c stable/10/contrib/atf/atf-c/build.c stable/10/contrib/atf/atf-c/build.h stable/10/contrib/atf/atf-c/build_test.c stable/10/contrib/atf/atf-c/check.c stable/10/contrib/atf/atf-c/check.h stable/10/contrib/atf/atf-c/check_test.c stable/10/contrib/atf/atf-c/defs.h.in stable/10/contrib/atf/atf-c/detail/dynstr.c stable/10/contrib/atf/atf-c/detail/dynstr.h stable/10/contrib/atf/atf-c/detail/dynstr_test.c stable/10/contrib/atf/atf-c/detail/env.c stable/10/contrib/atf/atf-c/detail/env.h stable/10/contrib/atf/atf-c/detail/env_test.c stable/10/contrib/atf/atf-c/detail/fs.c stable/10/contrib/atf/atf-c/detail/fs.h stable/10/contrib/atf/atf-c/detail/fs_test.c stable/10/contrib/atf/atf-c/detail/list.c stable/10/contrib/atf/atf-c/detail/list.h stable/10/contrib/atf/atf-c/detail/list_test.c stable/10/contrib/atf/atf-c/detail/map.c stable/10/contrib/atf/atf-c/detail/map.h stable/10/contrib/atf/atf-c/detail/map_test.c stable/10/contrib/atf/atf-c/detail/process.c stable/10/contrib/atf/atf-c/detail/process.h stable/10/contrib/atf/atf-c/detail/process_helpers.c stable/10/contrib/atf/atf-c/detail/process_test.c stable/10/contrib/atf/atf-c/detail/sanity.c stable/10/contrib/atf/atf-c/detail/sanity.h stable/10/contrib/atf/atf-c/detail/sanity_test.c stable/10/contrib/atf/atf-c/detail/test_helpers.c stable/10/contrib/atf/atf-c/detail/test_helpers.h stable/10/contrib/atf/atf-c/detail/text.c stable/10/contrib/atf/atf-c/det
Re: svn commit: r275875 - head/sys/net80211
Adrian, On Thu, Dec 18, 2014 at 05:17:18AM +, Adrian Chadd wrote: A> Log: A> Fix the scan handling for 11b->11g upgrades in a world where, well, A> it's not just 11b/11g. ... A> Thanks to: A> A> * Everyone who kept poking me about this and wondering why the hell A> their wifi would eventually stop seeing scan lists. Grr. A> I eventually snapped this evening and dug back into this code. And thanks to you from all of us :) -- Totus tuus, Glebius. ___ 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: r275990 - head/share/man/man4
Author: brueffer Date: Sun Dec 21 09:53:29 2014 New Revision: 275990 URL: https://svnweb.freebsd.org/changeset/base/275990 Log: Fix various mdoc issues. Found with: mandoc -Tlint Modified: head/share/man/man4/aout.4 head/share/man/man4/ath_ahb.4 head/share/man/man4/ath_pci.4 head/share/man/man4/carp.4 head/share/man/man4/crypto.4 head/share/man/man4/ip.4 head/share/man/man4/ipheth.4 head/share/man/man4/iscsi_initiator.4 head/share/man/man4/isp.4 head/share/man/man4/ispfw.4 head/share/man/man4/iwi.4 head/share/man/man4/multicast.4 head/share/man/man4/net80211.4 head/share/man/man4/netmap.4 head/share/man/man4/nfe.4 head/share/man/man4/ng_ether_echo.4 head/share/man/man4/ng_netflow.4 head/share/man/man4/nvram2env.4 head/share/man/man4/pass.4 head/share/man/man4/pccbb.4 head/share/man/man4/pflog.4 head/share/man/man4/pfsync.4 head/share/man/man4/pts.4 head/share/man/man4/sa.4 head/share/man/man4/send.4 head/share/man/man4/sfxge.4 head/share/man/man4/snd_hda.4 head/share/man/man4/snd_ich.4 head/share/man/man4/ural.4 head/share/man/man4/usfs.4 head/share/man/man4/virtio_console.4 head/share/man/man4/virtio_random.4 head/share/man/man4/vxlan.4 head/share/man/man4/wpi.4 Modified: head/share/man/man4/aout.4 == --- head/share/man/man4/aout.4 Sun Dec 21 09:43:03 2014(r275989) +++ head/share/man/man4/aout.4 Sun Dec 21 09:53:29 2014(r275990) @@ -123,7 +123,7 @@ non-executable mappings. .Xr execve 2 , .Xr a.out 5 , .Xr elf 5 , -.Xr sysctl 8 . +.Xr sysctl 8 .Sh HISTORY The .Xr a.out 5 Modified: head/share/man/man4/ath_ahb.4 == --- head/share/man/man4/ath_ahb.4 Sun Dec 21 09:43:03 2014 (r275989) +++ head/share/man/man4/ath_ahb.4 Sun Dec 21 09:53:29 2014 (r275990) @@ -47,7 +47,7 @@ drivers. This is only relevant for embedded System-on-Chip (SoC) devices such as the Atheros AR913x series, which include an Atheros wireless MAC on-die. .Sh SEE ALSO -.Xr ath 4 +.Xr ath 4 , .Xr ath_hal 4 .Sh HISTORY The Modified: head/share/man/man4/ath_pci.4 == --- head/share/man/man4/ath_pci.4 Sun Dec 21 09:43:03 2014 (r275989) +++ head/share/man/man4/ath_pci.4 Sun Dec 21 09:53:29 2014 (r275990) @@ -44,7 +44,7 @@ and .Xr ath_hal 4 drivers. .Sh SEE ALSO -.Xr ath 4 +.Xr ath 4 , .Xr ath_hal 4 .Sh HISTORY The Modified: head/share/man/man4/carp.4 == --- head/share/man/man4/carp.4 Sun Dec 21 09:43:03 2014(r275989) +++ head/share/man/man4/carp.4 Sun Dec 21 09:53:29 2014(r275990) @@ -306,7 +306,7 @@ tcpdump -npi vlan0 -T carp .Xr rc.conf 5 , .Xr devd.conf 5 , .Xr ifconfig 8 , -.Xr sysctl 8 +.Xr sysctl 8 , .Xr tcpdump 8 .Sh HISTORY The Modified: head/share/man/man4/crypto.4 == --- head/share/man/man4/crypto.4Sun Dec 21 09:43:03 2014 (r275989) +++ head/share/man/man4/crypto.4Sun Dec 21 09:53:29 2014 (r275990) @@ -114,7 +114,6 @@ The two modes are described separately b .Sh THEORY OF OPERATION Regardless of whether symmetric-key or asymmetric-key operations are to be performed, use of the device requires a basic series of steps: -.Pp .Bl -enum .It Open a file descriptor for the device. Modified: head/share/man/man4/ip.4 == --- head/share/man/man4/ip.4Sun Dec 21 09:43:03 2014(r275989) +++ head/share/man/man4/ip.4Sun Dec 21 09:53:29 2014(r275990) @@ -857,12 +857,12 @@ field was not equal to the length of the .Xr recv 2 , .Xr send 2 , .Xr byteorder 3 , +.Xr sourcefilter 3 , .Xr icmp 4 , .Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , -.Xr multicast 4 , -.Xr sourcefilter 3 +.Xr multicast 4 .Rs .%A D. Thaler .%A B. Fenner Modified: head/share/man/man4/ipheth.4 == --- head/share/man/man4/ipheth.4Sun Dec 21 09:43:03 2014 (r275989) +++ head/share/man/man4/ipheth.4Sun Dec 21 09:53:29 2014 (r275990) @@ -80,7 +80,7 @@ Apple iPad tethering (all models) .Xr netintro 4 , .Xr urndis 4 , .Xr usb 4 , -.Xr ifconfig 8 +.Xr ifconfig 8 , .Xr usbconfig 8 .Sh HISTORY The Modified: head/share/man/man4/iscsi_initiator.4 == --- head/share/man/man4/iscsi_initiator.4 Sun Dec 21 09:43:03 2014 (r275989) +++ head/share/man/man4/iscsi_initiator.4 Sun Dec 21 09:53:29 2014 (r275990) @@ -112,6 +112,7 @@ for each new session. iSCSI RFC 3720 .\" .Sh HISTORY .Sh A
svn commit: r275991 - head/share/man/man4
Author: brueffer Date: Sun Dec 21 10:04:26 2014 New Revision: 275991 URL: https://svnweb.freebsd.org/changeset/base/275991 Log: Remove EOL whitespace. Found with: mandoc -Tlint Modified: head/share/man/man4/altera_atse.4 head/share/man/man4/gpioled.4 head/share/man/man4/iicbus.4 head/share/man/man4/iscsi_initiator.4 head/share/man/man4/mpr.4 head/share/man/man4/mrsas.4 head/share/man/man4/netmap.4 head/share/man/man4/tap.4 head/share/man/man4/tun.4 head/share/man/man4/umass.4 head/share/man/man4/wsp.4 Modified: head/share/man/man4/altera_atse.4 == --- head/share/man/man4/altera_atse.4 Sun Dec 21 09:53:29 2014 (r275990) +++ head/share/man/man4/altera_atse.4 Sun Dec 21 10:04:26 2014 (r275991) @@ -80,7 +80,7 @@ Only a single MAC address may be stored If the address begins with the Altera prefix 00:07:ed and ends in 00 then up to 16 addresses will be derived from it by adding the unit number of the interface to the stored address. -For other prefixes, the address will be assigned to atse0 and random +For other prefixes, the address will be assigned to atse0 and random addresses will be used for other interfaces. If the stored address is invalid, for example all zero's, multicast, or the default address shipped on all DE4 boards (00:07:ed:ff:ed:15) then a random Modified: head/share/man/man4/gpioled.4 == --- head/share/man/man4/gpioled.4 Sun Dec 21 09:53:29 2014 (r275990) +++ head/share/man/man4/gpioled.4 Sun Dec 21 10:04:26 2014 (r275991) @@ -52,8 +52,8 @@ The GPIO pin can then be controlled by w in .Xr led 4 . .Pp -On a -.Xr device.hints 5 +On a +.Xr device.hints 5 based system, like .Li MIPS , these values are configurable for Modified: head/share/man/man4/iicbus.4 == --- head/share/man/man4/iicbus.4Sun Dec 21 09:53:29 2014 (r275990) +++ head/share/man/man4/iicbus.4Sun Dec 21 10:04:26 2014 (r275991) @@ -106,11 +106,11 @@ Some I2C interfaces are available: .Sh BUS FREQUENCY CONFIGURATION The operating frequency of an I2C bus may be fixed or configurable. The bus may be used as part of some larger standard interface, and that -interface specification may require a fixed frequency. -The driver for that hardware would not honor an attempt to configure a +interface specification may require a fixed frequency. +The driver for that hardware would not honor an attempt to configure a different speed. A general purpose I2C bus, such as those found in many embedded systems, -will often support multiple bus frequencies. +will often support multiple bus frequencies. .Pp When a system supports multiple I2C busses, a different frequency can be configured for each bus by number, represented by the @@ -145,7 +145,7 @@ The same variable can be changed at any Reset the bus using .Xr i2c 8 or the -.Xr iic 4 +.Xr iic 4 .Va I2CRSTCARD ioctl to make the change take effect. .Sh SEE ALSO Modified: head/share/man/man4/iscsi_initiator.4 == --- head/share/man/man4/iscsi_initiator.4 Sun Dec 21 09:53:29 2014 (r275990) +++ head/share/man/man4/iscsi_initiator.4 Sun Dec 21 10:04:26 2014 (r275991) @@ -47,7 +47,7 @@ iscsi_initiator_load="YES" .Sh DESCRIPTION .Bf -symbolic This driver, along with its userspace counterpart -.Xr iscontrol 8 , +.Xr iscontrol 8 , is obsolete. Users are advised to use .Xr iscsi 4 Modified: head/share/man/man4/mpr.4 == --- head/share/man/man4/mpr.4 Sun Dec 21 09:53:29 2014(r275990) +++ head/share/man/man4/mpr.4 Sun Dec 21 10:04:26 2014(r275991) @@ -59,7 +59,7 @@ mpr_load="YES" .Ed .Sh DESCRIPTION The -.Nm +.Nm driver provides support for LSI Fusion-MPT 3 IT/IR .Tn SAS controllers. Modified: head/share/man/man4/mrsas.4 == --- head/share/man/man4/mrsas.4 Sun Dec 21 09:53:29 2014(r275990) +++ head/share/man/man4/mrsas.4 Sun Dec 21 10:04:26 2014(r275991) @@ -27,7 +27,7 @@ .\" 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. -.\" +.\" .\" The views and conclusions contained in the software and documentation .\" are those of the authors and should not be interpreted as representing .\" official policies, either expressed or implied, of the FreeBSD Project. @@ -57,15 +57,15 @@ mrsas_load="YES" .Ed .Sh DESCRIPTION The -.Nm +.Nm driver will detect LSI's next generation (6Gb/s and 12Gb/s) PCI Express SAS/SATA RAID con
svn commit: r275992 - stable/10/usr.bin/iscsictl
Author: trasz
Date: Sun Dec 21 10:56:06 2014
New Revision: 275992
URL: https://svnweb.freebsd.org/changeset/base/275992
Log:
MFC r274549:
Make it possible to do "iscsictl -Rt xxx -p yyy", to remove a session
that matches both -t and -p.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.bin/iscsictl/iscsictl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/iscsictl/iscsictl.c
==
--- stable/10/usr.bin/iscsictl/iscsictl.c Sun Dec 21 10:04:26 2014
(r275991)
+++ stable/10/usr.bin/iscsictl/iscsictl.c Sun Dec 21 10:56:06 2014
(r275992)
@@ -758,14 +758,9 @@ main(int argc, char **argv)
errx(1, "-n and -p and mutually exclusive");
if (target != NULL)
errx(1, "-n and -t and mutually exclusive");
- } else if (portal != NULL) {
- if (target != NULL)
- errx(1, "-p and -t and mutually exclusive");
- } else if (target != NULL) {
- if (portal != NULL)
- errx(1, "-t and -p and mutually exclusive");
- } else
+ } else if (target == NULL && portal == NULL) {
errx(1, "must specify either -a, -n, -t, or -p");
+ }
if (session_id != -1)
errx(1, "-i cannot be used with -R");
___
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: r275993 - head/share/man/man9
Author: brueffer Date: Sun Dec 21 10:57:42 2014 New Revision: 275993 URL: https://svnweb.freebsd.org/changeset/base/275993 Log: Fix various mdoc issues and some EOL whitespace. Found with: mandoc -Tlint Modified: head/share/man/man9/BUF_ISLOCKED.9 head/share/man/man9/BUS_BIND_INTR.9 head/share/man/man9/BUS_DESCRIBE_INTR.9 head/share/man/man9/DB_COMMAND.9 head/share/man/man9/EVENTHANDLER.9 head/share/man/man9/VFS.9 head/share/man/man9/VFS_CHECKEXP.9 head/share/man/man9/VFS_FHTOVP.9 head/share/man/man9/VFS_SET.9 head/share/man/man9/VOP_LOCK.9 head/share/man/man9/VOP_VPTOCNP.9 head/share/man/man9/accf_data.9 head/share/man/man9/accf_dns.9 head/share/man/man9/acl.9 head/share/man/man9/alq.9 head/share/man/man9/devfs_set_cdevpriv.9 head/share/man/man9/eventtimers.9 head/share/man/man9/ieee80211_crypto.9 head/share/man/man9/ifnet.9 head/share/man/man9/kqueue.9 head/share/man/man9/lock.9 head/share/man/man9/locking.9 head/share/man/man9/mbuf.9 head/share/man/man9/refcount.9 head/share/man/man9/usbdi.9 head/share/man/man9/vm_page_busy.9 head/share/man/man9/vnet.9 head/share/man/man9/vnode.9 head/share/man/man9/zone.9 Modified: head/share/man/man9/BUF_ISLOCKED.9 == --- head/share/man/man9/BUF_ISLOCKED.9 Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/BUF_ISLOCKED.9 Sun Dec 21 10:57:42 2014 (r275993) @@ -59,11 +59,11 @@ A shared lock is held. The lock is not held by anyone. .El .Sh SEE ALSO -.Xr lockstatus 9 , .Xr buf 9 , .Xr BUF_LOCK 9 , .Xr BUF_UNLOCK 9 , -.Xr lockmgr 9 +.Xr lockmgr 9 , +.Xr lockstatus 9 .Sh AUTHORS This manual page was written by .An Attilio Rao Aq Mt atti...@freebsd.org . Modified: head/share/man/man9/BUS_BIND_INTR.9 == --- head/share/man/man9/BUS_BIND_INTR.9 Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/BUS_BIND_INTR.9 Sun Dec 21 10:57:42 2014 (r275993) @@ -86,8 +86,8 @@ The most recent binding request is the o .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO -.Xr BUS_SETUP_INTR 9 , .Xr cpuset 2 , +.Xr BUS_SETUP_INTR 9 , .Xr device 9 .Sh HISTORY The Modified: head/share/man/man9/BUS_DESCRIBE_INTR.9 == --- head/share/man/man9/BUS_DESCRIBE_INTR.9 Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/BUS_DESCRIBE_INTR.9 Sun Dec 21 10:57:42 2014 (r275993) @@ -87,9 +87,9 @@ the interrupt handler name. .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO -.Xr BUS_SETUP_INTR 9 , .Xr systat 1 , .Xr vmstat 8 , +.Xr BUS_SETUP_INTR 9 , .Xr device 9 , .Xr printf 9 .Sh HISTORY Modified: head/share/man/man9/DB_COMMAND.9 == --- head/share/man/man9/DB_COMMAND.9Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/DB_COMMAND.9Sun Dec 21 10:57:42 2014 (r275993) @@ -68,7 +68,7 @@ command, respectively. .Pp The general command syntax: .Cm command Ns Op Li \&/ Ns Ar modifier -.Ar address Ns Op Li , Ns Ar count , +.Ar address Ns Op , Ns Ar count , translates into the following parameters for .Fa command_function : .Bl -tag -width Fa -offset indent Modified: head/share/man/man9/EVENTHANDLER.9 == --- head/share/man/man9/EVENTHANDLER.9 Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/EVENTHANDLER.9 Sun Dec 21 10:57:42 2014 (r275993) @@ -261,7 +261,7 @@ operation. Callbacks invoked when a process exits. .It Vt process_fini Callback invoked when a process memory is destroyed. -This is never called. +This is never called. .It Vt process_fork Callbacks invoked when a process forks a child. .It Vt process_init Modified: head/share/man/man9/VFS.9 == --- head/share/man/man9/VFS.9 Sun Dec 21 10:56:06 2014(r275992) +++ head/share/man/man9/VFS.9 Sun Dec 21 10:57:42 2014(r275993) @@ -54,8 +54,8 @@ rather than implementing empty functions .Xr VFS_SYNC 9 , .Xr VFS_UNMOUNT 9 , .Xr VFS_VGET 9 , -.Xr VOP_VPTOFH 9 , -.Xr vnode 9 +.Xr vnode 9 , +.Xr VOP_VPTOFH 9 .Sh AUTHORS This manual page was written by .An Doug Rabson . Modified: head/share/man/man9/VFS_CHECKEXP.9 == --- head/share/man/man9/VFS_CHECKEXP.9 Sun Dec 21 10:56:06 2014 (r275992) +++ head/share/man/man9/VFS_CHECKEXP.9 Sun Dec 21 10:57:42 2014 (r275993) @@ -81,8 +81,8 @@ and .Sh SEE ALSO .Xr VFS 9 , .Xr VFS_FHTOVP 9 , -.Xr VOP_VPTOFH 9 , -.Xr vnode 9
svn commit: r275994 - stable/10/usr.sbin/autofs
Author: trasz Date: Sun Dec 21 11:00:48 2014 New Revision: 275994 URL: https://svnweb.freebsd.org/changeset/base/275994 Log: MFC r274621: The "intr" option is NFS-specific; fix examples in auto_master(5). Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/autofs/auto_master.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/autofs/auto_master.5 == --- stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 10:57:42 2014 (r275993) +++ stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 11:00:48 2014 (r275994) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 23, 2014 +.Dd November 17, 2014 .Dt AUTO_MASTER 5 .Os .Sh NAME @@ -170,7 +170,7 @@ mount options: .Pp Automatically mount the CD drive on access: .Bd -literal -offset indent -.Li cd -intr,fstype=cd9660 :/dev/cd0 +.Li cd -fstype=cd9660 :/dev/cd0 .Ed .Sh SPECIAL MAPS Special maps have names beginning with @@ -224,7 +224,7 @@ and this in map file: .Bd -literal -offset indent .Li /example/x -intr,nfsv4 192.168.1.1:/share/example/x -.Li /example/cd -intr,fstype=cd9660 :/dev/cd0 +.Li /example/cd -fstype=cd9660 :/dev/cd0 .Ed .Sh DIRECTORY SERVICES Both ___ 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: r275995 - stable/10/usr.sbin/autofs
Author: trasz Date: Sun Dec 21 11:03:59 2014 New Revision: 275995 URL: https://svnweb.freebsd.org/changeset/base/275995 Log: MFC r274723: Make the auto_master(5) man page clearer on how auto_master and map files work together, and add example for smbfs. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/autofs/auto_master.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/autofs/auto_master.5 == --- stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 11:00:48 2014 (r275994) +++ stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 11:03:59 2014 (r275995) @@ -27,13 +27,17 @@ .\" .\" $FreeBSD$ .\" -.Dd November 17, 2014 +.Dd November 19, 2014 .Dt AUTO_MASTER 5 .Os .Sh NAME .Nm auto_master .Nd auto_master and map file format .Sh DESCRIPTION +The automounter configuration consists of the +.Nm +configuration file, which assigns filesystem paths to map names, +and maps, which contain actual mount information. The .Nm configuration file is used by the @@ -132,8 +136,12 @@ The special option .Li fstype is used to specify filesystem type. It is not passed to the mount program as an option. -Instead, it is passed as argument to +Instead, it is passed as an argument to .Cm "mount -t". +The default +.Li fstype +is +.Ql nfs . The special option .Li nobrowse is used to disable creation of top-level directories for special @@ -153,9 +161,11 @@ prefix it with colon. For example, .Li :/dev/cd0 . .Pp -This example, when used with the +This example, when put into +.Pa /etc/auto_example , +and with .Nm -example above, specifies that the NFS share +referring to the map as described above, specifies that the NFS share .Li 192.168.1.1:/share/example/x will be mounted on .Pa /example/x/ @@ -163,11 +173,18 @@ when any process attempts to access that .Li intr and .Li nfsv4 -mount options: +mount options, described in +.Xr mount_nfs 8 : .Bd -literal -offset indent .Li x -intr,nfsv4 192.168.1.1:/share/example/x .Ed .Pp +Automatically mount an SMB share on access, as a guest user, +without prompting for a password: +.Bd -literal -offset indent +.Li share -fstype=smbfs,-N ://@server/share +.Ed +.Pp Automatically mount the CD drive on access: .Bd -literal -offset indent .Li cd -fstype=cd9660 :/dev/cd0 @@ -224,6 +241,7 @@ and this in map file: .Bd -literal -offset indent .Li /example/x -intr,nfsv4 192.168.1.1:/share/example/x +.Li /example/share -fstype=smbfs,-N ://@server/share .Li /example/cd -fstype=cd9660 :/dev/cd0 .Ed .Sh DIRECTORY SERVICES ___ 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: r275996 - in stable/10/lib/libnetbsd: netinet sys
Author: ngie Date: Sun Dec 21 11:11:17 2014 New Revision: 275996 URL: https://svnweb.freebsd.org/changeset/base/275996 Log: MFC r273482,r274078: r273482: The NetBSD libc tests use several definitions/macros that aren't available in FreeBSD Add the missing compat definitions/macros to lib/libnetbsd so the testcases can be compiled with libnetbsd without having to invent ad hoc #define's, or having to convert things over to FreeBSD idioms Reviewed by: brooks Phabric: D993 Sponsored by: EMC / Isilon Storage Division r274078: Commit missing header for sys/time.h compat on NetBSD to unbreak the amd64/i386 build Pointyhat to: me (forgot to svn add it sooner) Added: stable/10/lib/libnetbsd/netinet/ - copied from r273482, head/lib/libnetbsd/netinet/ stable/10/lib/libnetbsd/sys/time.h - copied unchanged from r274078, head/lib/libnetbsd/sys/time.h Modified: stable/10/lib/libnetbsd/sys/cdefs.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libnetbsd/sys/cdefs.h == --- stable/10/lib/libnetbsd/sys/cdefs.h Sun Dec 21 11:03:59 2014 (r275995) +++ stable/10/lib/libnetbsd/sys/cdefs.h Sun Dec 21 11:11:17 2014 (r275996) @@ -42,6 +42,28 @@ #endif /* + * The __CONCAT macro is used to concatenate parts of symbol names, e.g. + * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. + * The __CONCAT macro is a bit tricky -- make sure you don't put spaces + * in between its arguments. __CONCAT can also concatenate double-quoted + * strings produced by the __STRING macro, but this only works with ANSI C. + */ + +#define___STRING(x)__STRING(x) +#define___CONCAT(x,y) __CONCAT(x,y) + +/* + * The following macro is used to remove const cast-away warnings + * from gcc -Wcast-qual; it should be used with caution because it + * can hide valid errors; in particular most valid uses are in + * situations where the API requires it, not to cast away string + * constants. We don't use *intptr_t on purpose here and we are + * explicit about unsigned long so that we don't have additional + * dependencies. + */ +#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) + +/* * Return the number of elements in a statically-allocated array, * __x. */ Copied: stable/10/lib/libnetbsd/sys/time.h (from r274078, head/lib/libnetbsd/sys/time.h) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/lib/libnetbsd/sys/time.h Sun Dec 21 11:11:17 2014 (r275996, copy of r274078, head/lib/libnetbsd/sys/time.h) @@ -0,0 +1,65 @@ +/* $FreeBSD$ */ + +/* + * Copyright (c) 1982, 1986, 1993 + * The Regents of the University of California. 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. + * 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. + * 3. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * + * @(#)time.h 8.5 (Berkeley) 5/4/95 + */ + +#ifndef _LIBNETBSD_SYS_TIME_H_ +#define_LIBNETBSD_SYS_TIME_H_ + +#include_next + +/* Operations on timespecs. */ +#definetimespecclear(tsp) (tsp)->tv_sec = (time_t)((tsp)->tv_nsec = 0L) +#definetimespecisset(tsp) ((tsp)->tv_sec || (tsp)->tv_nsec) +#definetimespeccmp(tsp, usp, cmp) \ + (((tsp)->tv_sec == (usp)->tv_sec) ? \ + ((tsp)->tv_nsec cmp (usp)->tv_nsec) :
svn commit: r275997 - stable/10/usr.sbin/autofs
Author: trasz Date: Sun Dec 21 11:15:35 2014 New Revision: 275997 URL: https://svnweb.freebsd.org/changeset/base/275997 Log: MFC r274796: Document use of wildcards (*) and ampersands (&) in autofs map files. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/autofs/auto_master.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/autofs/auto_master.5 == --- stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 11:11:17 2014 (r275996) +++ stable/10/usr.sbin/autofs/auto_master.5 Sun Dec 21 11:15:35 2014 (r275997) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 19, 2014 +.Dd November 21, 2014 .Dt AUTO_MASTER 5 .Os .Sh NAME @@ -124,6 +124,12 @@ is the path component used by .Xr automountd 8 to find the right map entry to use. It is also used to form the final mountpoint. +A wildcard +.Pq Ql * +can be used for the key. +It matches every directory that does not match other keys. +Those directories will not be visible to the user +until accessed. .Pp The .Ar options @@ -155,9 +161,20 @@ for a single key. The .Ar location field specifies the filesystem to be mounted. -To pass location that begins with +Ampersands +.Pq Ql & +in the +.Ar location +field are replaced with the value of +.Ar key . +This is typically used with wildcards, like: +.Bd -literal -offset indent +.Li * 192.168.1.1:/share/& +.Ed +.Pp +To pass a location that begins with .Li / , -prefix it with colon. +prefix it with a colon. For example, .Li :/dev/cd0 . .Pp ___ 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: r275998 - stable/10/sbin/growfs
Author: trasz Date: Sun Dec 21 11:22:15 2014 New Revision: 275998 URL: https://svnweb.freebsd.org/changeset/base/275998 Log: MFC r274737: Use proper ordering in EXAMPLES section in growfs(8). Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/growfs/growfs.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/growfs/growfs.8 == --- stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:15:35 2014 (r275997) +++ stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:22:15 2014 (r275998) @@ -37,7 +37,7 @@ .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $ .\" $FreeBSD$ .\" -.Dd April 30, 2012 +.Dd November 20, 2014 .Dt GROWFS 8 .Os .Sh NAME @@ -96,12 +96,11 @@ This value defaults to the size of the r will enlarge the file system to the size of the entire partition). .El .Sh EXAMPLES -.Dl growfs -s 2G /dev/ada0p1 -.Pp -will enlarge +Enlarge .Pa /dev/ada0p1 up to 2GB if there is enough space in -.Pa /dev/ada0p1 . +.Pa /dev/ada0p1 : +.Dl growfs -s 2G /dev/ada0p1 .Sh SEE ALSO .Xr dumpfs 8 , .Xr ffsinfo 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: r275999 - stable/10/sbin/growfs
Author: trasz Date: Sun Dec 21 11:23:59 2014 New Revision: 275999 URL: https://svnweb.freebsd.org/changeset/base/275999 Log: MFC r274738: Document growfs(8) feature apparently nobody knows about. Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/growfs/growfs.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/growfs/growfs.8 == --- stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:22:15 2014 (r275998) +++ stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:23:59 2014 (r275999) @@ -101,6 +101,9 @@ Enlarge up to 2GB if there is enough space in .Pa /dev/ada0p1 : .Dl growfs -s 2G /dev/ada0p1 +.Pp +Enlarge root filesystem to fill up available space: +.Dl growfs / .Sh SEE ALSO .Xr dumpfs 8 , .Xr ffsinfo 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: r276000 - stable/10/sbin/growfs
Author: trasz Date: Sun Dec 21 11:25:26 2014 New Revision: 276000 URL: https://svnweb.freebsd.org/changeset/base/276000 Log: MFC r274741: Add example on how to use gpart before growfs. While here, reorder examples so that the simplest one comes first. Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/growfs/growfs.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/growfs/growfs.8 == --- stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:23:59 2014 (r275999) +++ stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:25:26 2014 (r276000) @@ -96,14 +96,14 @@ This value defaults to the size of the r will enlarge the file system to the size of the entire partition). .El .Sh EXAMPLES -Enlarge +Expand root filesystem to fill up available space: +.Dl growfs / +.Pp +Resize .Pa /dev/ada0p1 -up to 2GB if there is enough space in -.Pa /dev/ada0p1 : +partition to 2GB and expand the filesystem: +.Dl gpart resize -i 1 -s 2G ada0 .Dl growfs -s 2G /dev/ada0p1 -.Pp -Enlarge root filesystem to fill up available space: -.Dl growfs / .Sh SEE ALSO .Xr dumpfs 8 , .Xr ffsinfo 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: r276001 - stable/10/sbin/growfs
Author: trasz Date: Sun Dec 21 11:26:51 2014 New Revision: 276001 URL: https://svnweb.freebsd.org/changeset/base/276001 Log: MFC r274742: Uniformly refer to a file system as "file system". Sponsored by: The FreeBSD Foundation Modified: stable/10/sbin/growfs/growfs.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/growfs/growfs.8 == --- stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:25:26 2014 (r276000) +++ stable/10/sbin/growfs/growfs.8 Sun Dec 21 11:26:51 2014 (r276001) @@ -96,12 +96,12 @@ This value defaults to the size of the r will enlarge the file system to the size of the entire partition). .El .Sh EXAMPLES -Expand root filesystem to fill up available space: +Expand root file system to fill up available space: .Dl growfs / .Pp Resize .Pa /dev/ada0p1 -partition to 2GB and expand the filesystem: +partition to 2GB and expand the file system: .Dl gpart resize -i 1 -s 2G ada0 .Dl growfs -s 2G /dev/ada0p1 .Sh SEE ALSO @@ -117,7 +117,7 @@ The .Nm utility first appeared in .Fx 4.4 . -The ability to resize mounted filesystems was added in +The ability to resize mounted file systems was added in .Fx 10.0 . .Sh AUTHORS .An Christoph Herrmann Aq c...@freebsd.org ___ 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: r276002 - stable/10/sys/fs/smbfs
Author: trasz Date: Sun Dec 21 11:33:18 2014 New Revision: 276002 URL: https://svnweb.freebsd.org/changeset/base/276002 Log: MFC r274784: Fix smbfs to not zero out statfs f_flags field. Previously, this made getmntinfo() return empty flags for smbfs filesystems when called with MNT_WAIT. It's not visible with mount(8), since it uses MNT_NOWAIT, but broke autounmount(8) operation. PR: 195161 Sponsored by: The FreeBSD Foundation Modified: stable/10/sys/fs/smbfs/smbfs_vfsops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/smbfs/smbfs_vfsops.c == --- stable/10/sys/fs/smbfs/smbfs_vfsops.c Sun Dec 21 11:26:51 2014 (r276001) +++ stable/10/sys/fs/smbfs/smbfs_vfsops.c Sun Dec 21 11:33:18 2014 (r276002) @@ -401,8 +401,6 @@ smbfs_statfs(struct mount *mp, struct st scred = smbfs_malloc_scred(); smb_makescred(scred, td, td->td_ucred); error = smbfs_smb_statfs(ssp, sbp, scred); - if (error == 0) - sbp->f_flags = 0; /* copy of mount exported flags */ smbfs_free_scred(scred); return (error); } ___ 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: r276003 - head/sys/arm/conf
Author: andrew Date: Sun Dec 21 11:37:00 2014 New Revision: 276003 URL: https://svnweb.freebsd.org/changeset/base/276003 Log: tart to clean up the armv6 kernel configs by reducing the diff between them in the first sections and the later FDT support. Differential Revision:https://reviews.freebsd.org/D1346 Reviewed by: rpaulo (earlier version) Modified: head/sys/arm/conf/ARMADAXP head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/CUBIEBOARD head/sys/arm/conf/CUBIEBOARD2 head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/conf/PANDABOARD head/sys/arm/conf/RK3188 head/sys/arm/conf/RPI-B head/sys/arm/conf/SOCKIT head/sys/arm/conf/SOCKIT-BERI head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VYBRID head/sys/arm/conf/ZEDBOARD Modified: head/sys/arm/conf/ARMADAXP == --- head/sys/arm/conf/ARMADAXP Sun Dec 21 11:33:18 2014(r276002) +++ head/sys/arm/conf/ARMADAXP Sun Dec 21 11:37:00 2014(r276003) @@ -1,8 +1,22 @@ # # Custom kernel for Marvell Armada XP # -# $FreeBSD$ +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. # +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ ident MV-88F78XX0 include"../mv/armadaxp/std.mv78x60" @@ -10,58 +24,75 @@ include "../mv/armadaxp/std.mv78x60" optionsSOC_MV_ARMADAXP makeoptionsMODULES_OVERRIDE="" -makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols makeoptionsWERROR="-Werror" +optionsHZ=1000 #options SCHED_ULE # ULE scheduler optionsSCHED_4BSD # 4BSD scheduler +optionsPREEMPTION # Enable kernel thread preemption optionsINET# InterNETworking optionsINET6 # IPv6 communications protocols +optionsSCTP# Stream Control Transmission Protocol optionsFFS # Berkeley Fast Filesystem -optionsNFSCL # Network Filesystem Client +optionsSOFTUPDATES # Enable FFS soft updates support +optionsUFS_ACL # Support for access control lists +optionsUFS_DIRHASH # Improve performance on big directories +optionsUFS_GJOURNAL# Enable gjournal-based UFS journaling +optionsQUOTA # Enable disk quotas for UFS +optionsNFSCL # New Network Filesystem Client optionsNFSLOCKD# Network Lock Manager -optionsNFS_ROOT# NFS usable as /, requires NFSCLIENT -optionsBOOTP -optionsBOOTP_NFSROOT -optionsBOOTP_NFSV3 -optionsBOOTP_WIRED_TO=mge0 - +optionsNFS_ROOT# NFS usable as /, requires NFSCL +optionsMSDOSFS # MSDOS Filesystem +optionsCD9660 # ISO 9660 Filesystem +optionsPROCFS # Process filesystem (requires PSEUDOFS) +optionsPSEUDOFS# Pseudo-filesystem framework optionsTMPFS # Efficient memory filesystem +optionsGEOM_PART_GPT # GUID Partition Tables optionsGEOM_PART_BSD # BSD partition scheme optionsGEOM_PART_MBR # MBR partition scheme -optionsGEOM_PART_GPT -optionsROOTDEVNAME=\"ufs:/dev/da0p1\" - +optionsKTRACE # ktrace(1) support optionsSYSVSHM # SYSV-style shared memory optionsSYSVMSG # SYSV-style message queues optionsSYSVSEM # SYSV-style semaphores -options_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions -optionsMUTEX_NOINLINE -optionsRWLOCK_NOINLINE -optionsNO_FFS_SNAPSHOT -optionsNO_SWAPPING -optionsVFP - -optionsSMP +options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev +optionsVFP # Enable floating point hardware support +optionsSMP # Enable multiple cores -
svn commit: r276004 - head/sys/arm/conf
Author: andrew Date: Sun Dec 21 11:55:40 2014 New Revision: 276004 URL: https://svnweb.freebsd.org/changeset/base/276004 Log: Fix the indentation to simplify comparing the ARM config files. Modified: head/sys/arm/conf/APALIS-IMX6 head/sys/arm/conf/BEAGLEBONE head/sys/arm/conf/CHROMEBOOK-PEACH-PIT head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/CUBIEBOARD head/sys/arm/conf/CUBIEBOARD2 head/sys/arm/conf/DIGI-CCWMX53 head/sys/arm/conf/DOCKSTAR head/sys/arm/conf/DREAMPLUG-1001 head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/EXYNOS5.common head/sys/arm/conf/HL201 head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX53-QSB head/sys/arm/conf/IMX6 head/sys/arm/conf/RK3188 head/sys/arm/conf/SAM9260EK head/sys/arm/conf/VERSATILEPB head/sys/arm/conf/VYBRID head/sys/arm/conf/WANDBOARD-DUAL head/sys/arm/conf/WANDBOARD-QUAD head/sys/arm/conf/WANDBOARD-SOLO Modified: head/sys/arm/conf/APALIS-IMX6 == --- head/sys/arm/conf/APALIS-IMX6 Sun Dec 21 11:37:00 2014 (r276003) +++ head/sys/arm/conf/APALIS-IMX6 Sun Dec 21 11:55:40 2014 (r276004) @@ -26,6 +26,6 @@ makeoptions MODULES_OVERRIDE="" makeoptionsWITHOUT_MODULES="ahc" # Flattened Device Tree -optionsFDT -optionsFDT_DTB_STATIC -makeoptionsFDT_DTS_FILE=apalis-imx6.dts +optionsFDT +optionsFDT_DTB_STATIC +makeoptionsFDT_DTS_FILE=apalis-imx6.dts Modified: head/sys/arm/conf/BEAGLEBONE == --- head/sys/arm/conf/BEAGLEBONESun Dec 21 11:37:00 2014 (r276003) +++ head/sys/arm/conf/BEAGLEBONESun Dec 21 11:55:40 2014 (r276004) @@ -78,7 +78,7 @@ options WITNESS_SKIPSPIN# Don't run wi #options DIAGNOSTIC # NFS server support -#options NFSD +#options NFSD # NFS root from boopt/dhcp #options BOOTP Modified: head/sys/arm/conf/CHROMEBOOK-PEACH-PIT == --- head/sys/arm/conf/CHROMEBOOK-PEACH-PIT Sun Dec 21 11:37:00 2014 (r276003) +++ head/sys/arm/conf/CHROMEBOOK-PEACH-PIT Sun Dec 21 11:55:40 2014 (r276004) @@ -33,15 +33,15 @@ device kbdmux device ukbd # Uncomment this for NFS root -#options NFS_ROOT# NFS usable as /, requires NFSCL -#options BOOTP_NFSROOT -#options BOOTP_COMPAT -#options BOOTP -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=ue0 -#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/root\" +#options NFS_ROOT# NFS usable as /, requires NFSCL +#options BOOTP_NFSROOT +#options BOOTP_COMPAT +#options BOOTP +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=ue0 +#options ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/root\" #FDT -optionsFDT -optionsFDT_DTB_STATIC +optionsFDT +optionsFDT_DTB_STATIC makeoptionsFDT_DTS_FILE=exynos5420-peach-pit.dts Modified: head/sys/arm/conf/CNS11XXNAS == --- head/sys/arm/conf/CNS11XXNASSun Dec 21 11:37:00 2014 (r276003) +++ head/sys/arm/conf/CNS11XXNASSun Dec 21 11:55:40 2014 (r276004) @@ -103,7 +103,7 @@ device bpf device loop device md -device random # Entropy device +device random # Entropy device device usb @@ -114,12 +114,12 @@ deviceumass device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass -device cfi +device cfi #deviceudav# Davicom DM9601E USB device geom_label device geom_journal -device geom_part_bsd +device geom_part_bsd optionsROOTDEVNAME=\"ufs:da0s1a\" Modified: head/sys/arm/conf/CUBIEBOARD == --- head/sys/arm/conf/CUBIEBOARDSun Dec 21 11:37:00 2014 (r276003) +++ head/sys/arm/conf/CUBIEBOARDSun Dec 21 11:55:40 2014 (r276004) @@ -92,7 +92,7 @@ options ROOTDEVNAME=\"ufs:/dev/da0s2\" # ATA controllers #deviceahci# AHCI-compatible SATA controllers #deviceata # Legacy ATA/SATA controllers -#options ATA_STATIC_ID # Static device numbering +#options ATA_STATIC_ID # Static device numbering # Console and misc device uart Modified: head/sys/arm/conf/CUBIEBOARD2 == --- head/sys/arm/conf/CUBIEBOARD2
svn commit: r276005 - head/share/man/man5
Author: brueffer Date: Sun Dec 21 12:13:49 2014 New Revision: 276005 URL: https://svnweb.freebsd.org/changeset/base/276005 Log: Various mdoc fixes. Found with: mandoc -Tlint Modified: head/share/man/man5/periodic.conf.5 head/share/man/man5/pf.conf.5 head/share/man/man5/pf.os.5 head/share/man/man5/rc.conf.5 head/share/man/man5/services.5 Modified: head/share/man/man5/periodic.conf.5 == --- head/share/man/man5/periodic.conf.5 Sun Dec 21 11:55:40 2014 (r276004) +++ head/share/man/man5/periodic.conf.5 Sun Dec 21 12:13:49 2014 (r276005) @@ -705,7 +705,7 @@ they will be always run unless their or .Va ..._period variable is set to -.Dq No . +.Dq NO . .Bl -tag -offset 4n -width 2n .It Va security_status_diff_flags .Pq Vt str Modified: head/share/man/man5/pf.conf.5 == --- head/share/man/man5/pf.conf.5 Sun Dec 21 11:55:40 2014 (r276004) +++ head/share/man/man5/pf.conf.5 Sun Dec 21 12:13:49 2014 (r276005) @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 29 2012 +.Dd June 29, 2012 .Dt PF.CONF 5 .Os .Sh NAME Modified: head/share/man/man5/pf.os.5 == --- head/share/man/man5/pf.os.5 Sun Dec 21 11:55:40 2014(r276004) +++ head/share/man/man5/pf.os.5 Sun Dec 21 12:13:49 2014(r276005) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 31 2007 +.Dd May 31, 2007 .Dt PF.OS 5 .Os .Sh NAME @@ -217,7 +217,7 @@ almost translates into the following fin 57344:64:1:44:M1460: exampleOS:1.0::exampleOS 1.0 .Ed .Sh SEE ALSO +.Xr tcpdump 1 , .Xr pf 4 , .Xr pf.conf 5 , -.Xr pfctl 8 , -.Xr tcpdump 1 +.Xr pfctl 8 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Sun Dec 21 11:55:40 2014 (r276004) +++ head/share/man/man5/rc.conf.5 Sun Dec 21 12:13:49 2014 (r276005) @@ -4547,9 +4547,9 @@ ruleset to load for .Xr rfcomm_pppd 8 , .Xr route 8 , .Xr routed 8 , -.Xr rpcbind 8 , .Xr rpc.lockd 8 , .Xr rpc.statd 8 , +.Xr rpcbind 8 , .Xr rwhod 8 , .Xr savecore 8 , .Xr sdpd 8 , Modified: head/share/man/man5/services.5 == --- head/share/man/man5/services.5 Sun Dec 21 11:55:40 2014 (r276004) +++ head/share/man/man5/services.5 Sun Dec 21 12:13:49 2014 (r276005) @@ -91,8 +91,8 @@ file resides in .Pa /etc . .El .Sh SEE ALSO -.Xr getservent 3 -.Xr nsswitch.conf 5 +.Xr getservent 3 , +.Xr nsswitch.conf 5 , .Xr services_mkdb 8 .Sh HISTORY The ___ 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: r276006 - in head/lib/libc: gen net posix1e stdlib string sys
Author: brueffer Date: Sun Dec 21 12:36:36 2014 New Revision: 276006 URL: https://svnweb.freebsd.org/changeset/base/276006 Log: Various mdoc fixes and a few EOL whitespace removals. Found with: mandoc -Tlint Modified: head/lib/libc/gen/cap_rights_get.3 head/lib/libc/gen/ftok.3 head/lib/libc/gen/ftw.3 head/lib/libc/gen/getcap.3 head/lib/libc/gen/posix_spawn.3 head/lib/libc/gen/scandir.3 head/lib/libc/net/getaddrinfo.3 head/lib/libc/net/sctp_recvmsg.3 head/lib/libc/net/sctp_send.3 head/lib/libc/posix1e/acl_set_flagset_np.3 head/lib/libc/stdlib/atexit.3 head/lib/libc/stdlib/exit.3 head/lib/libc/string/strspn.3 head/lib/libc/sys/access.2 head/lib/libc/sys/getdirentries.2 head/lib/libc/sys/getrlimit.2 head/lib/libc/sys/poll.2 head/lib/libc/sys/posix_openpt.2 head/lib/libc/sys/procctl.2 head/lib/libc/sys/revoke.2 head/lib/libc/sys/sched_setscheduler.2 head/lib/libc/sys/sigwaitinfo.2 head/lib/libc/sys/vfork.2 Modified: head/lib/libc/gen/cap_rights_get.3 == --- head/lib/libc/gen/cap_rights_get.3 Sun Dec 21 12:13:49 2014 (r276005) +++ head/lib/libc/gen/cap_rights_get.3 Sun Dec 21 12:36:36 2014 (r276006) @@ -100,10 +100,10 @@ argument points at an invalid address. .El .Sh SEE ALSO .Xr cap_rights_limit 2 , -.Xr cap_rights_init 3 , .Xr errno 2 , .Xr open 2 , .Xr assert 3 , +.Xr cap_rights_init 3 , .Xr err 3 , .Xr memcmp 3 , .Xr memset 3 , Modified: head/lib/libc/gen/ftok.3 == --- head/lib/libc/gen/ftok.3Sun Dec 21 12:13:49 2014(r276005) +++ head/lib/libc/gen/ftok.3Sun Dec 21 12:36:36 2014(r276006) @@ -64,9 +64,9 @@ function will return -1 if .Fa path does not exist or if it cannot be accessed by the calling process. .Sh SEE ALSO +.Xr msgget 2 , .Xr semget 2 , -.Xr shmget 2 , -.Xr msgget 2 +.Xr shmget 2 .Sh HISTORY The .Fn ftok Modified: head/lib/libc/gen/ftw.3 == --- head/lib/libc/gen/ftw.3 Sun Dec 21 12:13:49 2014(r276005) +++ head/lib/libc/gen/ftw.3 Sun Dec 21 12:36:36 2014(r276006) @@ -87,8 +87,9 @@ A directory which cannot be read. The directory will not be descended into. .It Dv FTW_DP A directory being visited in post-order -.Fn ( nftw -only). +.Po Fn nftw +only +.Pc . .It Dv FTW_NS A file for which no .Xr stat 2 @@ -100,8 +101,9 @@ structure are undefined. A symbolic link. .It Dv FTW_SLN A symbolic link with a non-existent target -.Fn ( nftw -only). +.Po Fn nftw +only +.Pc . .El .Pp The Modified: head/lib/libc/gen/getcap.3 == --- head/lib/libc/gen/getcap.3 Sun Dec 21 12:13:49 2014(r276005) +++ head/lib/libc/gen/getcap.3 Sun Dec 21 12:36:36 2014(r276006) @@ -137,9 +137,10 @@ It must be called before the call. If a sequential access is being performed (see below), it must be called before the first sequential access call -.Fn ( cgetfirst +.Po Fn cgetfirst or -.Fn cgetnext ) , +.Fn cgetnext +.Pc , or be directly preceded by a .Fn cgetclose call. Modified: head/lib/libc/gen/posix_spawn.3 == --- head/lib/libc/gen/posix_spawn.3 Sun Dec 21 12:13:49 2014 (r276005) +++ head/lib/libc/gen/posix_spawn.3 Sun Dec 21 12:36:36 2014 (r276006) @@ -413,6 +413,10 @@ including trying to close a descriptor t .Xr execve 2 , .Xr fcntl 2 , .Xr open 2 , +.Xr sched_setparam 2 , +.Xr sched_setscheduler 2 , +.Xr setpgid 2 , +.Xr vfork 2 , .Xr posix_spawn_file_actions_addclose 3 , .Xr posix_spawn_file_actions_adddup2 3 , .Xr posix_spawn_file_actions_addopen 3 , @@ -431,11 +435,7 @@ including trying to close a descriptor t .Xr posix_spawnattr_setschedparam 3 , .Xr posix_spawnattr_setschedpolicy 3 , .Xr posix_spawnattr_setsigdefault 3 , -.Xr posix_spawnattr_setsigmask 3 , -.Xr sched_setparam 2 , -.Xr sched_setscheduler 2 , -.Xr setpgid 2 , -.Xr vfork 2 +.Xr posix_spawnattr_setsigmask 3 .Sh STANDARDS The .Fn posix_spawn Modified: head/lib/libc/gen/scandir.3 == --- head/lib/libc/gen/scandir.3 Sun Dec 21 12:13:49 2014(r276005) +++ head/lib/libc/gen/scandir.3 Sun Dec 21 12:36:36 2014(r276006) @@ -92,7 +92,7 @@ by freeing each pointer in the array and .Pp The .Fn scandir_b -function behaves in the same way as +function behaves in the same way as .Fn scandir , but takes blocks as arguments instead of function pointers and calls .Fn qsort_b @@ -106,8 +106,8 @@ cannot allocate enough memory to hold al .Xr directory 3 , .Xr malloc 3 , .Xr qsort 3 , -.Xr dir 5 , -.Xr strcoll 3 +.Xr strcoll 3 , +.Xr dir 5 .Sh HISTORY The .Fn scandir Modified: head/lib/libc/net/ge
svn commit: r276007 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/ext2fs fs/msdosfs fs/nandfs fs/tmpfs ufs/ufs
Author: kib
Date: Sun Dec 21 13:29:33 2014
New Revision: 276007
URL: https://svnweb.freebsd.org/changeset/base/276007
Log:
Handle MAKEENTRY cnp flag in the VOP_CREATE(). Curiously, some
fs, e.g. smbfs, already did it.
Tested by:pho (previous version)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
head/sys/fs/ext2fs/ext2_vnops.c
head/sys/fs/msdosfs/msdosfs_vnops.c
head/sys/fs/nandfs/nandfs_vnops.c
head/sys/fs/tmpfs/tmpfs_vnops.c
head/sys/ufs/ufs/ufs_vnops.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Dec
21 12:36:36 2014(r276006)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sun Dec
21 13:29:33 2014(r276007)
@@ -6180,15 +6180,20 @@ zfs_freebsd_create(ap)
{
struct componentname *cnp = ap->a_cnp;
vattr_t *vap = ap->a_vap;
- int mode;
+ int error, mode;
ASSERT(cnp->cn_flags & SAVENAME);
vattr_init_mask(vap);
mode = vap->va_mode & ALLPERMS;
- return (zfs_create(ap->a_dvp, cnp->cn_nameptr, vap, !EXCL, mode,
- ap->a_vpp, cnp->cn_cred, cnp->cn_thread));
+ error = zfs_create(ap->a_dvp, cnp->cn_nameptr, vap, !EXCL, mode,
+ ap->a_vpp, cnp->cn_cred, cnp->cn_thread);
+#ifdef FREEBSD_NAMECACHE
+ if (error == 0 && (cnp->cn_flags & MAKEENTRY) != 0)
+ cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
+#endif
+ return (error);
}
static int
Modified: head/sys/fs/ext2fs/ext2_vnops.c
==
--- head/sys/fs/ext2fs/ext2_vnops.c Sun Dec 21 12:36:36 2014
(r276006)
+++ head/sys/fs/ext2fs/ext2_vnops.c Sun Dec 21 13:29:33 2014
(r276007)
@@ -239,8 +239,10 @@ ext2_create(struct vop_create_args *ap)
error =
ext2_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode),
ap->a_dvp, ap->a_vpp, ap->a_cnp);
- if (error)
+ if (error != 0)
return (error);
+ if ((ap->a_cnp->cn_flags & MAKEENTRY) != 0)
+ cache_enter(ap->a_dvp, *ap->a_vpp, ap->a_cnp);
return (0);
}
Modified: head/sys/fs/msdosfs/msdosfs_vnops.c
==
--- head/sys/fs/msdosfs/msdosfs_vnops.c Sun Dec 21 12:36:36 2014
(r276006)
+++ head/sys/fs/msdosfs/msdosfs_vnops.c Sun Dec 21 13:29:33 2014
(r276007)
@@ -184,6 +184,8 @@ msdosfs_create(ap)
if (error)
goto bad;
*ap->a_vpp = DETOV(dep);
+ if ((cnp->cn_flags & MAKEENTRY) != 0)
+ cache_enter(ap->a_dvp, *ap->a_vpp, cnp);
return (0);
bad:
Modified: head/sys/fs/nandfs/nandfs_vnops.c
==
--- head/sys/fs/nandfs/nandfs_vnops.c Sun Dec 21 12:36:36 2014
(r276006)
+++ head/sys/fs/nandfs/nandfs_vnops.c Sun Dec 21 13:29:33 2014
(r276007)
@@ -1411,6 +1411,8 @@ nandfs_create(struct vop_create_args *ap
return (error);
}
*vpp = NTOV(node);
+ if ((cnp->cn_flags & MAKEENTRY) != 0)
+ cache_enter(dvp, *vpp, cnp);
DPRINTF(VNCALL, ("created file vp %p nandnode %p ino %jx\n", *vpp, node,
(uintmax_t)node->nn_ino));
Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==
--- head/sys/fs/tmpfs/tmpfs_vnops.c Sun Dec 21 12:36:36 2014
(r276006)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c Sun Dec 21 13:29:33 2014
(r276007)
@@ -213,10 +213,14 @@ tmpfs_create(struct vop_create_args *v)
struct vnode **vpp = v->a_vpp;
struct componentname *cnp = v->a_cnp;
struct vattr *vap = v->a_vap;
+ int error;
MPASS(vap->va_type == VREG || vap->va_type == VSOCK);
- return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
+ error = tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
+ if (error == 0 && (cnp->cn_flags & MAKEENTRY) != 0)
+ cache_enter(dvp, *vpp, cnp);
+ return (error);
}
static int
Modified: head/sys/ufs/ufs/ufs_vnops.c
==
--- head/sys/ufs/ufs/ufs_vnops.cSun Dec 21 12:36:36 2014
(r276006)
+++ head/sys/ufs/ufs/ufs_vnops.cSun Dec 21 13:29:33 2014
(r276007)
@@ -205,8 +205,10 @@ ufs_create(ap)
error =
ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode),
ap->a_dvp, ap->a_vpp, ap->a_cnp);
- if (error)
+ if (error != 0)
return (error);
+ if ((ap->a_cnp->cn_flags & MAKEENTRY) != 0)
+
svn commit: r276008 - in head/sys: kern sys
Author: kib Date: Sun Dec 21 13:32:07 2014 New Revision: 276008 URL: https://svnweb.freebsd.org/changeset/base/276008 Log: Add VN_OPEN_NAMECACHE flag for vn_open_cred(9), which requests that the created file name was cached. Use the flag for core dumps. Requested by: rpaulo Tested by:pho (previous version) Sponsored by: The FreeBSD Foundation MFC after:2 weeks Modified: head/sys/kern/kern_sig.c head/sys/kern/vfs_vnops.c head/sys/sys/vnode.h Modified: head/sys/kern/kern_sig.c == --- head/sys/kern/kern_sig.cSun Dec 21 13:29:33 2014(r276007) +++ head/sys/kern/kern_sig.cSun Dec 21 13:32:07 2014(r276008) @@ -3167,7 +3167,8 @@ corefile_open(const char *comm, uid_t ui sbuf_delete(&sb); cmode = S_IRUSR | S_IWUSR; - oflags = VN_OPEN_NOAUDIT | (capmode_coredump ? VN_OPEN_NOCAPCHECK : 0); + oflags = VN_OPEN_NOAUDIT | VN_OPEN_NAMECACHE | + (capmode_coredump ? VN_OPEN_NOCAPCHECK : 0); /* * If the core format has a %I in it, then we need to check Modified: head/sys/kern/vfs_vnops.c == --- head/sys/kern/vfs_vnops.c Sun Dec 21 13:29:33 2014(r276007) +++ head/sys/kern/vfs_vnops.c Sun Dec 21 13:32:07 2014(r276008) @@ -217,6 +217,8 @@ restart: return (error); goto restart; } + if ((vn_open_flags & VN_OPEN_NAMECACHE) != 0) + ndp->ni_cnd.cn_flags |= MAKEENTRY; #ifdef MAC error = mac_vnode_check_create(cred, ndp->ni_dvp, &ndp->ni_cnd, vap); Modified: head/sys/sys/vnode.h == --- head/sys/sys/vnode.hSun Dec 21 13:29:33 2014(r276007) +++ head/sys/sys/vnode.hSun Dec 21 13:32:07 2014(r276008) @@ -580,6 +580,7 @@ typedef void vop_getpages_iodone_t(void /* vn_open_flags */ #defineVN_OPEN_NOAUDIT 0x0001 #defineVN_OPEN_NOCAPCHECK 0x0002 +#defineVN_OPEN_NAMECACHE 0x0004 /* * Public vnode manipulation functions. ___ 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: r276009 - head/sys/netinet
Author: tuexen
Date: Sun Dec 21 13:58:53 2014
New Revision: 276009
URL: https://svnweb.freebsd.org/changeset/base/276009
Log:
Don't check twice that inp is not NULL.
Reported by: Coverity
CID: 748671
MFC after:3 days
Modified:
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Sun Dec 21 13:32:07 2014(r276008)
+++ head/sys/netinet/sctputil.c Sun Dec 21 13:58:53 2014(r276009)
@@ -1949,7 +1949,7 @@ sctp_timer_start(int t_type, struct sctp
* though we use a different timer. We also add the HB timer
* PLUS a random jitter.
*/
- if ((inp == NULL) || (stcb == NULL) || (net == NULL)) {
+ if ((stcb == NULL) || (net == NULL)) {
return;
} else {
uint32_t rndval;
@@ -2004,9 +2004,6 @@ sctp_timer_start(int t_type, struct sctp
* nothing needed but the endpoint here ususually about 60
* minutes.
*/
- if (inp == NULL) {
- return;
- }
tmr = &inp->sctp_ep.signature_change;
to_ticks = inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_SIGNATURE];
break;
@@ -2023,9 +2020,6 @@ sctp_timer_start(int t_type, struct sctp
* timer since that has stopped and we are in the GONE
* state.
*/
- if (inp == NULL) {
- return;
- }
tmr = &inp->sctp_ep.signature_change;
to_ticks = MSEC_TO_TICKS(SCTP_INP_KILL_TIMEOUT);
break;
@@ -2034,10 +2028,7 @@ sctp_timer_start(int t_type, struct sctp
* Here we use the value found in the EP for PMTU ususually
* about 10 minutes.
*/
- if ((stcb == NULL) || (inp == NULL)) {
- return;
- }
- if (net == NULL) {
+ if ((stcb == NULL) || (net == NULL)) {
return;
}
if (net->dest_state & SCTP_ADDR_NO_PMTUD) {
@@ -2063,7 +2054,7 @@ sctp_timer_start(int t_type, struct sctp
* Here we use the endpoints shutdown guard timer usually
* about 3 minutes.
*/
- if ((inp == NULL) || (stcb == NULL)) {
+ if (stcb == NULL) {
return;
}
to_ticks =
inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN];
___
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: r276008 - in head/sys: kern sys
On 21/12/2014 15:32, Konstantin Belousov wrote: > Author: kib > Date: Sun Dec 21 13:32:07 2014 > New Revision: 276008 > URL: https://svnweb.freebsd.org/changeset/base/276008 > > Log: > Add VN_OPEN_NAMECACHE flag for vn_open_cred(9), which requests that > the created file name was cached. Use the flag for core dumps. Just curious about a rationale for using the new flag for core dumps. Sorry if I missed any public discussion about this and that I wasn't able to figure out the rationale myself. > Requested by: rpaulo > Tested by: pho (previous version) -- Andriy Gapon ___ 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: r276008 - in head/sys: kern sys
On Sun, Dec 21, 2014 at 04:25:49PM +0200, Andriy Gapon wrote: > On 21/12/2014 15:32, Konstantin Belousov wrote: > > Author: kib > > Date: Sun Dec 21 13:32:07 2014 > > New Revision: 276008 > > URL: https://svnweb.freebsd.org/changeset/base/276008 > > > > Log: > > Add VN_OPEN_NAMECACHE flag for vn_open_cred(9), which requests that > > the created file name was cached. Use the flag for core dumps. > > Just curious about a rationale for using the new flag for core dumps. > Sorry if I missed any public discussion about this and that I wasn't able to > figure out the rationale myself. I am not sure I understand the question. Are you asking or objecting ? Is this a question about new flag being used vs. detecting the core dumps by some other means ? Or, are you asking why caching of the name could be needed for core dump files at all ? ___ 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: r276008 - in head/sys: kern sys
On 21/12/2014 16:41, Konstantin Belousov wrote: > On Sun, Dec 21, 2014 at 04:25:49PM +0200, Andriy Gapon wrote: >> On 21/12/2014 15:32, Konstantin Belousov wrote: >>> Author: kib >>> Date: Sun Dec 21 13:32:07 2014 >>> New Revision: 276008 >>> URL: https://svnweb.freebsd.org/changeset/base/276008 >>> >>> Log: >>> Add VN_OPEN_NAMECACHE flag for vn_open_cred(9), which requests that >>> the created file name was cached. Use the flag for core dumps. >> >> Just curious about a rationale for using the new flag for core dumps. >> Sorry if I missed any public discussion about this and that I wasn't able to >> figure out the rationale myself. > > I am not sure I understand the question. Are you asking or objecting ? Asking. > Is this a question about new flag being used vs. detecting the core > dumps by some other means ? > > Or, are you asking why caching of the name could be needed for > core dump files at all ? Sort of. Why VN_OPEN_NAMECACHE is useful in the case of core dumps? What does it make better? -- Andriy Gapon ___ 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: r276008 - in head/sys: kern sys
On Sun, Dec 21, 2014 at 04:45:28PM +0200, Andriy Gapon wrote: > On 21/12/2014 16:41, Konstantin Belousov wrote: > > Or, are you asking why caching of the name could be needed for > > core dump files at all ? > > Sort of. Why VN_OPEN_NAMECACHE is useful in the case of core dumps? > What does it make better? The vn_fullpath() mostly works for the core files after the change, comparing with the non-working state at all before. ___ 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: r276010 - stable/10/sys/dev/oce
Author: smh Date: Sun Dec 21 15:39:19 2014 New Revision: 276010 URL: https://svnweb.freebsd.org/changeset/base/276010 Log: MFC r268156: Various bugfixes from Stefano GarzarellaA This has been proved to fix reproducable panics on 10.x. Sponsored by: Multiplay Modified: stable/10/sys/dev/oce/oce_if.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/oce/oce_if.c == --- stable/10/sys/dev/oce/oce_if.c Sun Dec 21 13:58:53 2014 (r276009) +++ stable/10/sys/dev/oce/oce_if.c Sun Dec 21 15:39:19 2014 (r276010) @@ -563,9 +563,6 @@ oce_multiq_start(struct ifnet *ifp, stru int queue_index = 0; int status = 0; - if (!sc->link_status) - return ENXIO; - if ((m->m_flags & M_FLOWID) != 0) queue_index = m->m_pkthdr.flowid % sc->nwqs; @@ -1274,7 +1271,6 @@ oce_multiq_transmit(struct ifnet *ifp, s drbr_putback(ifp, br, next); wq->tx_stats.tx_stops ++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; - status = drbr_enqueue(ifp, br, next); } break; } @@ -1285,7 +1281,7 @@ oce_multiq_transmit(struct ifnet *ifp, s ETHER_BPF_MTAP(ifp, next); } - return status; + 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: r276012 - head/sys/dev/ahci
Author: smh
Date: Sun Dec 21 16:07:46 2014
New Revision: 276012
URL: https://svnweb.freebsd.org/changeset/base/276012
Log:
Add a constant AHCI_MAX_IRQS removing magic number
Sponsored by: Multiplay
Modified:
head/sys/dev/ahci/ahci.h
Modified: head/sys/dev/ahci/ahci.h
==
--- head/sys/dev/ahci/ahci.hSun Dec 21 15:40:15 2014(r276011)
+++ head/sys/dev/ahci/ahci.hSun Dec 21 16:07:46 2014(r276012)
@@ -143,6 +143,7 @@
#define AHCI_MAX_PORTS 32
#define AHCI_MAX_SLOTS 32
+#define AHCI_MAX_IRQS 16
/* SATA AHCI v1.0 register defines */
#define AHCI_CAP0x00
@@ -494,7 +495,7 @@ struct ahci_controller {
#defineAHCI_IRQ_MODE_ALL 0
#defineAHCI_IRQ_MODE_AFTER 1
#defineAHCI_IRQ_MODE_ONE 2
- } irqs[16];
+ } irqs[AHCI_MAX_IRQS];
uint32_tcaps; /* Controller capabilities */
uint32_tcaps2; /* Controller capabilities */
uint32_tcapsem; /* Controller capabilities */
___
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: r276013 - head/sys/dev/ahci
Author: smh
Date: Sun Dec 21 16:15:29 2014
New Revision: 276013
URL: https://svnweb.freebsd.org/changeset/base/276013
Log:
Clamp ahci max irq's to AHCI_MAX_IRQS
This prevents the possiblity of any overruns on the statically allocated
struct irqs field.
Differential Revision:D838
MFC after:2 weeks
X-MFC-With: r276012
Sponsored by: Multiplay
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cSun Dec 21 16:07:46 2014(r276012)
+++ head/sys/dev/ahci/ahci.cSun Dec 21 16:15:29 2014(r276013)
@@ -356,6 +356,14 @@ ahci_setup_interrupt(device_t dev)
device_printf(dev, "Falling back to one MSI\n");
ctlr->numirqs = 1;
}
+
+ /* Ensure we don't overrun irqs. */
+ if (ctlr->numirqs > AHCI_MAX_IRQS) {
+ device_printf(dev, "Too many irqs %d > %d (clamping)\n",
+ ctlr->numirqs, AHCI_MAX_IRQS);
+ ctlr->numirqs = AHCI_MAX_IRQS;
+ }
+
/* Allocate all IRQs. */
for (i = 0; i < ctlr->numirqs; i++) {
ctlr->irqs[i].ctlr = ctlr;
___
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: r276015 - head/sys/arm/arm
Author: andrew
Date: Sun Dec 21 16:21:56 2014
New Revision: 276015
URL: https://svnweb.freebsd.org/changeset/base/276015
Log:
Reduce the diff to the arm_intrng project branch by having the read/write
macros take the softc they are accessing.
Modified:
head/sys/arm/arm/gic.c
Modified: head/sys/arm/arm/gic.c
==
--- head/sys/arm/arm/gic.c Sun Dec 21 16:21:28 2014(r276014)
+++ head/sys/arm/arm/gic.c Sun Dec 21 16:21:56 2014(r276015)
@@ -118,14 +118,14 @@ static struct resource_spec arm_gic_spec
static struct arm_gic_softc *arm_gic_sc = NULL;
-#definegic_c_read_4(reg) \
-bus_space_read_4(arm_gic_sc->gic_c_bst, arm_gic_sc->gic_c_bsh, reg)
-#definegic_c_write_4(reg, val) \
-bus_space_write_4(arm_gic_sc->gic_c_bst, arm_gic_sc->gic_c_bsh, reg, val)
-#definegic_d_read_4(reg) \
-bus_space_read_4(arm_gic_sc->gic_d_bst, arm_gic_sc->gic_d_bsh, reg)
-#definegic_d_write_4(reg, val) \
-bus_space_write_4(arm_gic_sc->gic_d_bst, arm_gic_sc->gic_d_bsh, reg, val)
+#definegic_c_read_4(_sc, _reg) \
+bus_space_read_4((_sc)->gic_c_bst, (_sc)->gic_c_bsh, (_reg))
+#definegic_c_write_4(_sc, _reg, _val) \
+bus_space_write_4((_sc)->gic_c_bst, (_sc)->gic_c_bsh, (_reg), (_val))
+#definegic_d_read_4(_sc, _reg) \
+bus_space_read_4((_sc)->gic_d_bst, (_sc)->gic_d_bsh, (_reg))
+#definegic_d_write_4(_sc, _reg, _val) \
+bus_space_write_4((_sc)->gic_d_bst, (_sc)->gic_d_bsh, (_reg), (_val))
static int gic_config_irq(int irq, enum intr_trigger trig,
enum intr_polarity pol);
@@ -158,35 +158,36 @@ arm_gic_probe(device_t dev)
void
gic_init_secondary(void)
{
+ struct arm_gic_softc *sc = arm_gic_sc;
int i, nirqs;
/* Get the number of interrupts */
- nirqs = gic_d_read_4(GICD_TYPER);
+ nirqs = gic_d_read_4(sc, GICD_TYPER);
nirqs = 32 * ((nirqs & 0x1f) + 1);
for (i = 0; i < nirqs; i += 4)
- gic_d_write_4(GICD_IPRIORITYR(i >> 2), 0);
+ gic_d_write_4(sc, GICD_IPRIORITYR(i >> 2), 0);
/* Set all the interrupts to be in Group 0 (secure) */
for (i = 0; i < nirqs; i += 32) {
- gic_d_write_4(GICD_IGROUPR(i >> 5), 0);
+ gic_d_write_4(sc, GICD_IGROUPR(i >> 5), 0);
}
/* Enable CPU interface */
- gic_c_write_4(GICC_CTLR, 1);
+ gic_c_write_4(sc, GICC_CTLR, 1);
/* Set priority mask register. */
- gic_c_write_4(GICC_PMR, 0xff);
+ gic_c_write_4(sc, GICC_PMR, 0xff);
/* Enable interrupt distribution */
- gic_d_write_4(GICD_CTLR, 0x01);
+ gic_d_write_4(sc, GICD_CTLR, 0x01);
/*
* Activate the timer interrupts: virtual, secure, and non-secure.
*/
- gic_d_write_4(GICD_ISENABLER(27 >> 5), (1UL << (27 & 0x1F)));
- gic_d_write_4(GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F)));
- gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F)));
+ gic_d_write_4(sc, GICD_ISENABLER(27 >> 5), (1UL << (27 & 0x1F)));
+ gic_d_write_4(sc, GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F)));
+ gic_d_write_4(sc, GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F)));
}
int
@@ -266,49 +267,50 @@ arm_gic_attach(device_t dev)
arm_gic_sc = sc;
/* Disable interrupt forwarding to the CPU interface */
- gic_d_write_4(GICD_CTLR, 0x00);
+ gic_d_write_4(sc, GICD_CTLR, 0x00);
/* Get the number of interrupts */
- sc->nirqs = gic_d_read_4(GICD_TYPER);
+ sc->nirqs = gic_d_read_4(sc, GICD_TYPER);
sc->nirqs = 32 * ((sc->nirqs & 0x1f) + 1);
/* Set up function pointers */
arm_post_filter = gic_post_filter;
arm_config_irq = gic_config_irq;
- icciidr = gic_c_read_4(GICC_IIDR);
+ icciidr = gic_c_read_4(sc, GICC_IIDR);
device_printf(dev,"pn 0x%x, arch 0x%x, rev 0x%x, implementer 0x%x irqs
%u\n",
icciidr>>20, (icciidr>>16) & 0xF, (icciidr>>12) & 0xf,
(icciidr & 0xfff), sc->nirqs);
/* Set all global interrupts to be level triggered, active low. */
for (i = 32; i < sc->nirqs; i += 16) {
- gic_d_write_4(GICD_ICFGR(i >> 4), 0x);
+ gic_d_write_4(sc, GICD_ICFGR(i >> 4), 0x);
}
/* Disable all interrupts. */
for (i = 32; i < sc->nirqs; i += 32) {
- gic_d_write_4(GICD_ICENABLER(i >> 5), 0x);
+ gic_d_write_4(sc, GICD_ICENABLER(i >> 5), 0x);
}
for (i = 0; i < sc->nirqs; i += 4) {
- gic_d_write_4(GICD_IPRIORITYR(i >> 2), 0);
- gic_d_write_4(GICD_ITARGETSR(i >> 2), 1 << 0 | 1 << 8 | 1 << 16
| 1 << 24);
+ gic_d_write_4(sc, GICD_IPRIORITYR(i
Re: svn commit: r276008 - in head/sys: kern sys
On 21/12/2014 17:14, Konstantin Belousov wrote: > On Sun, Dec 21, 2014 at 04:45:28PM +0200, Andriy Gapon wrote: >> On 21/12/2014 16:41, Konstantin Belousov wrote: >>> Or, are you asking why caching of the name could be needed for >>> core dump files at all ? >> >> Sort of. Why VN_OPEN_NAMECACHE is useful in the case of core dumps? >> What does it make better? > The vn_fullpath() mostly works for the core files after the change, > comparing with the non-working state at all before. > Ah, vn_fullpath(). Thank you. -- Andriy Gapon ___ 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: r276016 - head/sys/dev/ahci
Author: smh
Date: Sun Dec 21 16:32:57 2014
New Revision: 276016
URL: https://svnweb.freebsd.org/changeset/base/276016
Log:
Return the error from ahci_setup_interrupt in ahci_attach
Previously ahci_attach returned a hard coded ENXIO instead of the value
from ahci_setup_interrupt. This is effectively a NOOP change as currently
ahci_setup_interrupt only ever returns 0 or ENXIO, so just there to protect
against any future changes to that.
Differential Revision:D838
MFC after:2 weeks
Sponsored by: Multiplay
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cSun Dec 21 16:21:56 2014(r276015)
+++ head/sys/dev/ahci/ahci.cSun Dec 21 16:32:57 2014(r276016)
@@ -231,12 +231,12 @@ ahci_attach(device_t dev)
ahci_ctlr_setup(dev);
/* Setup interrupts. */
- if (ahci_setup_interrupt(dev)) {
+ if ((error = ahci_setup_interrupt(dev)) != 0) {
bus_dma_tag_destroy(ctlr->dma_tag);
bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
ctlr->r_mem);
rman_fini(&ctlr->sc_iomem);
- return ENXIO;
+ return error;
}
i = 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: r276017 - head/sys/arm/broadcom/bcm2835
Author: andrew
Date: Sun Dec 21 16:35:42 2014
New Revision: 276017
URL: https://svnweb.freebsd.org/changeset/base/276017
Log:
Reduce the diff between head and arm_intrng with the bcm2835 interrupt
controller.
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_intr.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_intr.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_intr.cSun Dec 21 16:32:57
2014(r276016)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_intr.cSun Dec 21 16:35:42
2014(r276017)
@@ -83,10 +83,10 @@ struct bcm_intc_softc {
static struct bcm_intc_softc *bcm_intc_sc = NULL;
-#defineintc_read_4(reg)\
-bus_space_read_4(bcm_intc_sc->intc_bst, bcm_intc_sc->intc_bsh, reg)
-#defineintc_write_4(reg, val) \
-bus_space_write_4(bcm_intc_sc->intc_bst, bcm_intc_sc->intc_bsh, reg, val)
+#defineintc_read_4(_sc, reg) \
+bus_space_read_4((_sc)->intc_bst, (_sc)->intc_bsh, (reg))
+#defineintc_write_4(_sc, reg, val) \
+bus_space_write_4((_sc)->intc_bst, (_sc)->intc_bsh, (reg), (val))
static int
bcm_intc_probe(device_t dev)
@@ -145,6 +145,7 @@ DRIVER_MODULE(intc, simplebus, bcm_intc_
int
arm_get_next_irq(int last_irq)
{
+ struct bcm_intc_softc *sc = bcm_intc_sc;
uint32_t pending;
int32_t irq = last_irq + 1;
@@ -154,7 +155,7 @@ arm_get_next_irq(int last_irq)
/* TODO: should we mask last_irq? */
if (irq < BANK1_START) {
- pending = intc_read_4(INTC_PENDING_BASIC);
+ pending = intc_read_4(sc, INTC_PENDING_BASIC);
if ((pending & 0xFF) == 0) {
irq = BANK1_START; /* skip to next bank */
} else do {
@@ -164,7 +165,7 @@ arm_get_next_irq(int last_irq)
} while (irq < BANK1_START);
}
if (irq < BANK2_START) {
- pending = intc_read_4(INTC_PENDING_BANK1);
+ pending = intc_read_4(sc, INTC_PENDING_BANK1);
if (pending == 0) {
irq = BANK2_START; /* skip to next bank */
} else do {
@@ -174,7 +175,7 @@ arm_get_next_irq(int last_irq)
} while (irq < BANK2_START);
}
if (irq < BANK3_START) {
- pending = intc_read_4(INTC_PENDING_BANK2);
+ pending = intc_read_4(sc, INTC_PENDING_BANK2);
if (pending != 0) do {
if (pending & (1 << IRQ_BANK2(irq)))
return irq;
@@ -187,14 +188,15 @@ arm_get_next_irq(int last_irq)
void
arm_mask_irq(uintptr_t nb)
{
+ struct bcm_intc_softc *sc = bcm_intc_sc;
dprintf("%s: %d\n", __func__, nb);
if (IS_IRQ_BASIC(nb))
- intc_write_4(INTC_DISABLE_BASIC, (1 << nb));
+ intc_write_4(sc, INTC_DISABLE_BASIC, (1 << nb));
else if (IS_IRQ_BANK1(nb))
- intc_write_4(INTC_DISABLE_BANK1, (1 << IRQ_BANK1(nb)));
+ intc_write_4(sc, INTC_DISABLE_BANK1, (1 << IRQ_BANK1(nb)));
else if (IS_IRQ_BANK2(nb))
- intc_write_4(INTC_DISABLE_BANK2, (1 << IRQ_BANK2(nb)));
+ intc_write_4(sc, INTC_DISABLE_BANK2, (1 << IRQ_BANK2(nb)));
else
printf("arm_mask_irq: Invalid IRQ number: %d\n", nb);
}
@@ -202,14 +204,15 @@ arm_mask_irq(uintptr_t nb)
void
arm_unmask_irq(uintptr_t nb)
{
+ struct bcm_intc_softc *sc = bcm_intc_sc;
dprintf("%s: %d\n", __func__, nb);
if (IS_IRQ_BASIC(nb))
- intc_write_4(INTC_ENABLE_BASIC, (1 << nb));
+ intc_write_4(sc, INTC_ENABLE_BASIC, (1 << nb));
else if (IS_IRQ_BANK1(nb))
- intc_write_4(INTC_ENABLE_BANK1, (1 << IRQ_BANK1(nb)));
+ intc_write_4(sc, INTC_ENABLE_BANK1, (1 << IRQ_BANK1(nb)));
else if (IS_IRQ_BANK2(nb))
- intc_write_4(INTC_ENABLE_BANK2, (1 << IRQ_BANK2(nb)));
+ intc_write_4(sc, INTC_ENABLE_BANK2, (1 << IRQ_BANK2(nb)));
else
printf("arm_mask_irq: Invalid IRQ number: %d\n", nb);
}
___
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: r276019 - head/sys/dev/ahci
Author: smh
Date: Sun Dec 21 16:38:29 2014
New Revision: 276019
URL: https://svnweb.freebsd.org/changeset/base/276019
Log:
style (9) nits
Use return (val); instead of return val;
Differential Revision:D838
MFC after:2 weeks
Sponsored by: Multiplay
Modified:
head/sys/dev/ahci/ahci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cSun Dec 21 16:37:24 2014(r276018)
+++ head/sys/dev/ahci/ahci.cSun Dec 21 16:38:29 2014(r276019)
@@ -142,7 +142,7 @@ ahci_ctlr_reset(device_t dev)
}
if (timeout == 0) {
device_printf(dev, "AHCI controller reset failure\n");
- return ENXIO;
+ return (ENXIO);
}
/* Reenable AHCI mode */
ATA_OUTL(ctlr->r_mem, AHCI_GHC, AHCI_GHC_AE);
@@ -225,7 +225,7 @@ ahci_attach(device_t dev)
bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
ctlr->r_mem);
rman_fini(&ctlr->sc_iomem);
- return ENXIO;
+ return (ENXIO);
}
ahci_ctlr_setup(dev);
@@ -236,7 +236,7 @@ ahci_attach(device_t dev)
bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid,
ctlr->r_mem);
rman_fini(&ctlr->sc_iomem);
- return error;
+ return (error);
}
i = 0;
@@ -315,7 +315,7 @@ ahci_attach(device_t dev)
device_set_ivars(child, (void *)(intptr_t)-1);
}
bus_generic_attach(dev);
- return 0;
+ return (0);
}
int
@@ -380,7 +380,7 @@ ahci_setup_interrupt(device_t dev)
if (!(ctlr->irqs[i].r_irq = bus_alloc_resource_any(dev,
SYS_RES_IRQ,
&ctlr->irqs[i].r_irq_rid, RF_SHAREABLE | RF_ACTIVE))) {
device_printf(dev, "unable to map interrupt\n");
- return ENXIO;
+ return (ENXIO);
}
if ((bus_setup_intr(dev, ctlr->irqs[i].r_irq, ATA_INTR_FLAGS,
NULL,
(ctlr->irqs[i].mode != AHCI_IRQ_MODE_ONE) ? ahci_intr :
@@ -389,7 +389,7 @@ ahci_setup_interrupt(device_t dev)
&ctlr->irqs[i], &ctlr->irqs[i].handle))) {
/* SOS XXX release r_irq */
device_printf(dev, "unable to setup interrupt\n");
- return ENXIO;
+ return (ENXIO);
}
if (ctlr->numirqs > 1) {
bus_describe_intr(dev, ctlr->irqs[i].r_irq,
@@ -537,7 +537,7 @@ ahci_release_resource(device_t dev, devi
return (0);
case SYS_RES_IRQ:
if (rid != ATA_IRQ_RID)
- return ENOENT;
+ return (ENOENT);
return (0);
}
return (EINVAL);
___
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: r276020 - stable/10/sys/dev/ahci
Author: smh
Date: Sun Dec 21 16:43:56 2014
New Revision: 276020
URL: https://svnweb.freebsd.org/changeset/base/276020
Log:
MFC r272223:
Prevent possible use after free in ahci direct mode
Sponsored by: Multiplay
Modified:
stable/10/sys/dev/ahci/ahci.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ahci/ahci.c
==
--- stable/10/sys/dev/ahci/ahci.c Sun Dec 21 16:38:29 2014
(r276019)
+++ stable/10/sys/dev/ahci/ahci.c Sun Dec 21 16:43:56 2014
(r276020)
@@ -1580,6 +1580,7 @@ ahci_ch_intr_direct(void *arg)
struct ahci_channel *ch = device_get_softc(dev);
struct ccb_hdr *ccb_h;
uint32_t istatus;
+ STAILQ_HEAD(, ccb_hdr) tmp_doneq = STAILQ_HEAD_INITIALIZER(tmp_doneq);
/* Read interrupt statuses. */
istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
@@ -1590,9 +1591,14 @@ ahci_ch_intr_direct(void *arg)
ch->batch = 1;
ahci_ch_intr_main(ch, istatus);
ch->batch = 0;
+ /*
+* Prevent the possibility of issues caused by processing the queue
+* while unlocked below by moving the contents to a local queue.
+*/
+ STAILQ_CONCAT(&tmp_doneq, &ch->doneq);
mtx_unlock(&ch->mtx);
- while ((ccb_h = STAILQ_FIRST(&ch->doneq)) != NULL) {
- STAILQ_REMOVE_HEAD(&ch->doneq, sim_links.stqe);
+ while ((ccb_h = STAILQ_FIRST(&tmp_doneq)) != NULL) {
+ STAILQ_REMOVE_HEAD(&tmp_doneq, sim_links.stqe);
xpt_done_direct((union ccb *)ccb_h);
}
}
___
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: r275961 - head/sys/arm/conf
On Sun, 2014-12-21 at 08:07 +, Alexey Dokuchaev wrote: > On Sat, Dec 20, 2014 at 06:15:24PM +, Andrew Turner wrote: > > Author: andrew > > Date: Sat Dec 20 18:15:23 2014 > > New Revision: 275961 > > URL: https://svnweb.freebsd.org/changeset/base/275961 > > > > Log: > > Clean up to use the standard style of "options \t" and "device\t\t" > > > > optionsHZ=500 # Scheduling quantum is 2 milliseconds. > > [...] > > -optionsKDB # Enable kernel debugger support. > > +optionsKDB # Enable kernel debugger support. > > # For minimum debugger support use KDB_TRACE, for interactive use DDB. > > -#options KDB_TRACE # Print a stack trace for a panic. > > -optionsDDB # Support DDB. > > +#options KDB_TRACE # Print a stack trace for a panic. > > +optionsDDB # Support DDB. > > # For full debugger support use this instead: > > -#options GDB # Support remote GDB. > > +#options GDB # Support remote GDB. > > [...] > > It also would be nice if we removed trailing dots in comments one day, > preferreably across all config files we have in the tree. > > ./danfe > Why? I thought our rule about comments is that they're complete sentences, punctuated as such. Of course, I also thought we had a rule that 'device' and 'options' in kernel config is always followed by two spaces then a tab, so that you can comment out lines without ruining the indent, and apparently that's not true either (and I have no idea where I got that notion). -- Ian ___ 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: r276021 - head/sys/arm/ti
Author: andrew
Date: Sun Dec 21 16:48:57 2014
New Revision: 276021
URL: https://svnweb.freebsd.org/changeset/base/276021
Log:
Reduce the diff in the Ti aintc between head and arm_intrng
Modified:
head/sys/arm/ti/aintc.c
Modified: head/sys/arm/ti/aintc.c
==
--- head/sys/arm/ti/aintc.c Sun Dec 21 16:43:56 2014(r276020)
+++ head/sys/arm/ti/aintc.c Sun Dec 21 16:48:57 2014(r276021)
@@ -72,10 +72,10 @@ static struct resource_spec ti_aintc_spe
static struct ti_aintc_softc *ti_aintc_sc = NULL;
-#defineaintc_read_4(reg) \
-bus_space_read_4(ti_aintc_sc->aintc_bst, ti_aintc_sc->aintc_bsh, reg)
-#defineaintc_write_4(reg, val) \
-bus_space_write_4(ti_aintc_sc->aintc_bst, ti_aintc_sc->aintc_bsh, reg, val)
+#defineaintc_read_4(_sc, reg) \
+bus_space_read_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg))
+#defineaintc_write_4(_sc, reg, val)\
+bus_space_write_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg), (val))
static int
@@ -112,17 +112,17 @@ ti_aintc_attach(device_t dev)
ti_aintc_sc = sc;
- x = aintc_read_4(INTC_REVISION);
+ x = aintc_read_4(sc, INTC_REVISION);
device_printf(dev, "Revision %u.%u\n",(x >> 4) & 0xF, x & 0xF);
/* SoftReset */
- aintc_write_4(INTC_SYSCONFIG, 2);
+ aintc_write_4(sc, INTC_SYSCONFIG, 2);
/* Wait for reset to complete */
- while(!(aintc_read_4(INTC_SYSSTATUS) & 1));
+ while(!(aintc_read_4(sc, INTC_SYSSTATUS) & 1));
/*Set Priority Threshold */
- aintc_write_4(INTC_THRESHOLD, 0xFF);
+ aintc_write_4(sc, INTC_THRESHOLD, 0xFF);
return (0);
}
@@ -146,22 +146,23 @@ DRIVER_MODULE(aintc, simplebus, ti_aintc
int
arm_get_next_irq(int last_irq)
{
+ struct ti_aintc_softc *sc = ti_aintc_sc;
uint32_t active_irq;
if (last_irq != -1) {
- aintc_write_4(INTC_ISR_CLEAR(last_irq >> 5),
+ aintc_write_4(sc, INTC_ISR_CLEAR(last_irq >> 5),
1UL << (last_irq & 0x1F));
- aintc_write_4(INTC_CONTROL,1);
+ aintc_write_4(sc, INTC_CONTROL, 1);
}
/* Get the next active interrupt */
- active_irq = aintc_read_4(INTC_SIR_IRQ);
+ active_irq = aintc_read_4(sc, INTC_SIR_IRQ);
/* Check for spurious interrupt */
if ((active_irq & 0xff80)) {
- device_printf(ti_aintc_sc->sc_dev,
- "Spurious interrupt detected (0x%08x)\n", active_irq);
- aintc_write_4(INTC_SIR_IRQ, 0);
+ device_printf(sc->sc_dev,
+ "Spurious interrupt detected (0x%08x)\n", active_irq);
+ aintc_write_4(sc, INTC_SIR_IRQ, 0);
return -1;
}
@@ -174,13 +175,16 @@ arm_get_next_irq(int last_irq)
void
arm_mask_irq(uintptr_t nb)
{
- aintc_write_4(INTC_MIR_SET(nb >> 5), (1UL << (nb & 0x1F)));
+ struct ti_aintc_softc *sc = ti_aintc_sc;
+
+ aintc_write_4(sc, INTC_MIR_SET(nb >> 5), (1UL << (nb & 0x1F)));
}
void
arm_unmask_irq(uintptr_t nb)
{
+ struct ti_aintc_softc *sc = ti_aintc_sc;
arm_irq_memory_barrier(nb);
- aintc_write_4(INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F)));
+ aintc_write_4(sc, INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F)));
}
___
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: r275875 - head/sys/net80211
On 21 December 2014 at 00:45, Gleb Smirnoff wrote: > Adrian, > > On Thu, Dec 18, 2014 at 05:17:18AM +, Adrian Chadd wrote: > A> Log: > A> Fix the scan handling for 11b->11g upgrades in a world where, well, > A> it's not just 11b/11g. > ... > A> Thanks to: > A> > A> * Everyone who kept poking me about this and wondering why the hell > A> their wifi would eventually stop seeing scan lists. Grr. > A> I eventually snapped this evening and dug back into this code. > > And thanks to you from all of us :) :) Thanks! -adrian > -- > Totus tuus, Glebius. ___ 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: r276023 - head/sys/arm/lpc
Author: andrew
Date: Sun Dec 21 16:59:41 2014
New Revision: 276023
URL: https://svnweb.freebsd.org/changeset/base/276023
Log:
Reduce the diff between the lpc interrupt controller in head and arm_intrng
Modified:
head/sys/arm/lpc/lpc_intc.c
Modified: head/sys/arm/lpc/lpc_intc.c
==
--- head/sys/arm/lpc/lpc_intc.c Sun Dec 21 16:49:42 2014(r276022)
+++ head/sys/arm/lpc/lpc_intc.c Sun Dec 21 16:59:41 2014(r276023)
@@ -59,10 +59,10 @@ static void lpc_intc_eoi(void *);
static struct lpc_intc_softc *intc_softc = NULL;
-#defineintc_read_4(reg)\
-bus_space_read_4(intc_softc->li_bst, intc_softc->li_bsh, reg)
-#defineintc_write_4(reg, val) \
-bus_space_write_4(intc_softc->li_bst, intc_softc->li_bsh, reg, val)
+#defineintc_read_4(_sc, _reg) \
+bus_space_read_4((_sc)->li_bst, (_sc)->li_bsh, (_reg))
+#defineintc_write_4(_sc, _reg, _val) \
+bus_space_write_4((_sc)->li_bst, (_sc)->li_bsh, (_reg), (_val))
static int
lpc_intc_probe(device_t dev)
@@ -100,12 +100,12 @@ lpc_intc_attach(device_t dev)
arm_post_filter = lpc_intc_eoi;
/* Clear interrupt status registers and disable all interrupts */
- intc_write_4(LPC_INTC_MIC_ER, 0);
- intc_write_4(LPC_INTC_SIC1_ER, 0);
- intc_write_4(LPC_INTC_SIC2_ER, 0);
- intc_write_4(LPC_INTC_MIC_RSR, ~0);
- intc_write_4(LPC_INTC_SIC1_RSR, ~0);
- intc_write_4(LPC_INTC_SIC2_RSR, ~0);
+ intc_write_4(sc, LPC_INTC_MIC_ER, 0);
+ intc_write_4(sc, LPC_INTC_SIC1_ER, 0);
+ intc_write_4(sc, LPC_INTC_SIC2_ER, 0);
+ intc_write_4(sc, LPC_INTC_MIC_RSR, ~0);
+ intc_write_4(sc, LPC_INTC_SIC1_RSR, ~0);
+ intc_write_4(sc, LPC_INTC_SIC2_RSR, ~0);
return (0);
}
@@ -128,25 +128,26 @@ DRIVER_MODULE(pic, simplebus, lpc_intc_d
int
arm_get_next_irq(int last)
{
+ struct lpc_intc_softc *sc = intc_softc;
uint32_t value;
int i;
/* IRQs 0-31 are mapped to LPC_INTC_MIC_SR */
- value = intc_read_4(LPC_INTC_MIC_SR);
+ value = intc_read_4(sc, LPC_INTC_MIC_SR);
for (i = 0; i < 32; i++) {
if (value & (1 << i))
return (i);
}
/* IRQs 32-63 are mapped to LPC_INTC_SIC1_SR */
- value = intc_read_4(LPC_INTC_SIC1_SR);
+ value = intc_read_4(sc, LPC_INTC_SIC1_SR);
for (i = 0; i < 32; i++) {
if (value & (1 << i))
return (i + 32);
}
/* IRQs 64-95 are mapped to LPC_INTC_SIC2_SR */
- value = intc_read_4(LPC_INTC_SIC2_SR);
+ value = intc_read_4(sc, LPC_INTC_SIC2_SR);
for (i = 0; i < 32; i++) {
if (value & (1 << i))
return (i + 64);
@@ -158,6 +159,7 @@ arm_get_next_irq(int last)
void
arm_mask_irq(uintptr_t nb)
{
+ struct lpc_intc_softc *sc = intc_softc;
int reg;
uint32_t value;
@@ -174,14 +176,15 @@ arm_mask_irq(uintptr_t nb)
reg = LPC_INTC_MIC_ER;
/* Clear bit in ER register */
- value = intc_read_4(reg);
+ value = intc_read_4(sc, reg);
value &= ~(1 << nb);
- intc_write_4(reg, value);
+ intc_write_4(sc, reg, value);
}
void
arm_unmask_irq(uintptr_t nb)
{
+ struct lpc_intc_softc *sc = intc_softc;
int reg;
uint32_t value;
@@ -195,14 +198,15 @@ arm_unmask_irq(uintptr_t nb)
reg = LPC_INTC_MIC_ER;
/* Set bit in ER register */
- value = intc_read_4(reg);
+ value = intc_read_4(sc, reg);
value |= (1 << nb);
- intc_write_4(reg, value);
+ intc_write_4(sc, reg, value);
}
static void
lpc_intc_eoi(void *data)
{
+ struct lpc_intc_softc *sc = intc_softc;
int reg;
int nb = (int)data;
uint32_t value;
@@ -217,9 +221,9 @@ lpc_intc_eoi(void *data)
reg = LPC_INTC_MIC_RSR;
/* Set bit in RSR register */
- value = intc_read_4(reg);
+ value = intc_read_4(sc, reg);
value |= (1 << nb);
- intc_write_4(reg, value);
+ intc_write_4(sc, reg, value);
}
___
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: r276026 - head/sys/boot/uboot/common
Author: ian
Date: Sun Dec 21 17:10:24 2014
New Revision: 276026
URL: https://svnweb.freebsd.org/changeset/base/276026
Log:
Allow whitspace to appear between device name and unit number in loaderdev.
This allows the same value to be used in u-boot commands and the loaderdev
env var that gets passed to ubldr, for example 'fatload mmc 1 ${bootfile}".
Modified:
head/sys/boot/uboot/common/main.c
Modified: head/sys/boot/uboot/common/main.c
==
--- head/sys/boot/uboot/common/main.c Sun Dec 21 17:09:01 2014
(r276025)
+++ head/sys/boot/uboot/common/main.c Sun Dec 21 17:10:24 2014
(r276026)
@@ -212,10 +212,11 @@ get_load_device(int *type, int *unit, in
p = get_device_type(devstr, type);
- /*
-* Empty device string, or unknown device name, or a bare, known
-* device name.
-*/
+ /* Ignore optional spaces after the device name. */
+ while (*p == ' ')
+ p++;
+
+ /* Unknown device name, or a known name without unit number. */
if ((*type == -1) || (*p == '\0')) {
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: r276027 - head/usr.sbin/bsdinstall/scripts
Author: smh
Date: Sun Dec 21 17:21:29 2014
New Revision: 276027
URL: https://svnweb.freebsd.org/changeset/base/276027
Log:
Switch zfsboot installer force 4K option to use vfs.zfs.min_auto_ashift=12
Previously we used gnop(8) to fake 4K sector size disks but ZFS now has a
sysctl to control this when creating new top level vdev's so use that
instead.
Differential Revision:D566
MFC after:1 month
Sponsored by: Multiplay
Modified:
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==
--- head/usr.sbin/bsdinstall/scripts/zfsbootSun Dec 21 17:10:24 2014
(r276026)
+++ head/usr.sbin/bsdinstall/scripts/zfsbootSun Dec 21 17:21:29 2014
(r276027)
@@ -65,9 +65,9 @@ f_include $BSDCFG_SHARE/variable.subr
: ${ZFSBOOT_VDEV_TYPE:=stripe}
#
-# Should we use gnop(8) to configure a transparent mapping to 4K sectors?
+# Should we use sysctl(8) vfs.zfs.min_auto_ashift=12 to force 4K sectors?
#
-: ${ZFSBOOT_GNOP_4K_FORCE_ALIGN:=1}
+: ${ZFSBOOT_FORCE_4K_SECTORS:=1}
#
# Should we use geli(8) to encrypt the drives?
@@ -185,8 +185,6 @@ ECHO_APPEND='echo "%s" >> "%s"'
GELI_ATTACH='geli attach -j - -k "%s" "%s"'
GELI_DETACH_F='geli detach -f "%s"'
GELI_PASSWORD_INIT='geli init -b -B "%s" -e %s -J - -K "%s" -l 256 -s 4096
"%s"'
-GNOP_CREATE='gnop create -S 4096 "%s"'
-GNOP_DESTROY='gnop destroy "%s"'
GPART_ADD='gpart add -t %s "%s"'
GPART_ADD_INDEX='gpart add -i %s -t %s "%s"'
GPART_ADD_INDEX_WITH_SIZE='gpart add -i %s -t %s -s %s "%s"'
@@ -205,6 +203,7 @@ PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s
PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
SHELL_TRUNCATE=':> "%s"'
SWAP_GMIRROR_LABEL='gmirror label swap %s'
+SYSCTL_ZFS_MIN_ASHIFT_12='sysctl vfs.zfs.min_auto_ashift=12'
UMOUNT='umount "%s"'
ZFS_CREATE_WITH_OPTIONS='zfs create %s "%s"'
ZFS_SET='zfs set "%s" "%s"'
@@ -236,7 +235,7 @@ msg_encrypt_disks="Encrypt Disks?"
msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions"
msg_error="Error"
msg_force_4k_sectors="Force 4K Sectors?"
-msg_force_4k_sectors_help="Use gnop(8) to configure forced 4K sector alignment"
+msg_force_4k_sectors_help="Use sysctl(8) vfs.zfs.min_auto_ashift=12 to force
4K sectors"
msg_freebsd_installer="FreeBSD Installer"
msg_geli_password="Enter a strong passphrase, used to protect your encryption
keys. You will be required to enter this passphrase each time the system is
booted"
msg_geli_setup="Initializing encryption on selected disks,\n this will take
several seconds per disk"
@@ -315,7 +314,7 @@ dialog_menu_main()
local usegeli="$msg_no"
local swapgeli="$msg_no"
local swapmirror="$msg_no"
- [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ] && force4k="$msg_yes"
+ [ "$ZFSBOOT_FORCE_4K_SECTORS" ] && force4k="$msg_yes"
[ "$ZFSBOOT_GELI_ENCRYPTION" ] && usegeli="$msg_yes"
[ "$ZFSBOOT_SWAP_ENCRYPTION" ] && swapgeli="$msg_yes"
[ "$ZFSBOOT_SWAP_MIRROR" ] && swapmirror="$msg_yes"
@@ -1062,36 +1061,22 @@ zfs_create_boot()
# Prepare the disks and build pool device list(s)
#
f_dprintf "$funcname: Preparing disk partitions for ZFS pool..."
- [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ] &&
- f_dprintf "$funcname: With 4k alignment using gnop(8)..."
+
+ # Force 4K sectors using vfs.zfs.min_auto_ashift=12
+ if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
+ f_dprintf "$funcname: With 4K sectors..."
+ f_eval_catch $funcname sysctl "$SYSCTL_ZFS_MIN_ASHIFT_12" \
+ || return $FAILURE
+ fi
local n=0
for disk in $disks; do
zfs_create_diskpart $disk $n || return $FAILURE
# Now $bootpart, $targetpart, and $swappart are set (suffix
# for $disk)
-
- # Forced 4k alignment support using Geom NOP (see gnop(8))
- if [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ]; then
- if [ "$ZFSBOOT_BOOT_POOL" ]; then
- boot_vdevs="$boot_vdevs $disk$bootpart.nop"
- f_eval_catch $funcname gnop "$GNOP_CREATE" \
-$disk$bootpart || return $FAILURE
- fi
- # Don't gnop encrypted partition
- if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
- zroot_vdevs="$zroot_vdevs $disk$targetpart.eli"
- else
- zroot_vdevs="$zroot_vdevs $disk$targetpart.nop"
- f_eval_catch $funcname gnop "$GNOP_CREATE" \
-$disk$targetpart ||
-return $FAILURE
- fi
- else
- if [ "$ZFSBOOT_BOOT_POOL
svn commit: r276028 - head/sys/arm/arm
Author: andrew
Date: Sun Dec 21 17:25:21 2014
New Revision: 276028
URL: https://svnweb.freebsd.org/changeset/base/276028
Log:
Further reduce the diff between the arm_intrng gic driver and the version
in head.
Modified:
head/sys/arm/arm/gic.c
Modified: head/sys/arm/arm/gic.c
==
--- head/sys/arm/arm/gic.c Sun Dec 21 17:21:29 2014(r276027)
+++ head/sys/arm/arm/gic.c Sun Dec 21 17:25:21 2014(r276028)
@@ -99,13 +99,13 @@ __FBSDID("$FreeBSD$");
#define GICD_ICFGR_TRIG_MASK 0x2
struct arm_gic_softc {
+ device_tgic_dev;
struct resource * gic_res[3];
bus_space_tag_t gic_c_bst;
bus_space_tag_t gic_d_bst;
bus_space_handle_t gic_c_bsh;
bus_space_handle_t gic_d_bsh;
uint8_t ver;
- device_tdev;
struct mtx mutex;
uint32_tnirqs;
};
@@ -159,17 +159,13 @@ void
gic_init_secondary(void)
{
struct arm_gic_softc *sc = arm_gic_sc;
- int i, nirqs;
+ int i;
- /* Get the number of interrupts */
- nirqs = gic_d_read_4(sc, GICD_TYPER);
- nirqs = 32 * ((nirqs & 0x1f) + 1);
-
- for (i = 0; i < nirqs; i += 4)
+ for (i = 0; i < sc->nirqs; i += 4)
gic_d_write_4(sc, GICD_IPRIORITYR(i >> 2), 0);
/* Set all the interrupts to be in Group 0 (secure) */
- for (i = 0; i < nirqs; i += 32) {
+ for (i = 0; i < sc->nirqs; i += 32) {
gic_d_write_4(sc, GICD_IGROUPR(i >> 5), 0);
}
@@ -246,13 +242,15 @@ arm_gic_attach(device_t dev)
return (ENXIO);
sc = device_get_softc(dev);
- sc->dev = dev;
if (bus_alloc_resources(dev, arm_gic_spec, sc->gic_res)) {
device_printf(dev, "could not allocate resources\n");
return (ENXIO);
}
+ sc->gic_dev = dev;
+ arm_gic_sc = sc;
+
/* Initialize mutex */
mtx_init(&sc->mutex, "GIC lock", "", MTX_SPIN);
@@ -264,8 +262,6 @@ arm_gic_attach(device_t dev)
sc->gic_c_bst = rman_get_bustag(sc->gic_res[1]);
sc->gic_c_bsh = rman_get_bushandle(sc->gic_res[1]);
- arm_gic_sc = sc;
-
/* Disable interrupt forwarding to the CPU interface */
gic_d_write_4(sc, GICD_CTLR, 0x00);
@@ -315,25 +311,6 @@ arm_gic_attach(device_t dev)
return (0);
}
-static device_method_t arm_gic_methods[] = {
- DEVMETHOD(device_probe, arm_gic_probe),
- DEVMETHOD(device_attach,arm_gic_attach),
- { 0, 0 }
-};
-
-static driver_t arm_gic_driver = {
- "gic",
- arm_gic_methods,
- sizeof(struct arm_gic_softc),
-};
-
-static devclass_t arm_gic_devclass;
-
-EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0,
-BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
-EARLY_DRIVER_MODULE(gic, ofwbus, arm_gic_driver, arm_gic_devclass, 0, 0,
-BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
-
static void
gic_post_filter(void *arg)
{
@@ -395,6 +372,7 @@ gic_config_irq(int irq, enum intr_trigge
enum intr_polarity pol)
{
struct arm_gic_softc *sc = arm_gic_sc;
+ device_t dev = sc->gic_dev;
uint32_t reg;
uint32_t mask;
@@ -439,7 +417,7 @@ gic_config_irq(int irq, enum intr_trigge
return (0);
invalid_args:
- device_printf(sc->dev, "gic_config_irg, invalid parameters\n");
+ device_printf(dev, "gic_config_irg, invalid parameters\n");
return (EINVAL);
}
@@ -470,6 +448,7 @@ pic_ipi_get(int i)
return (0);
return (i);
}
+
return (0x3ff);
}
@@ -479,3 +458,22 @@ pic_ipi_clear(int ipi)
}
#endif
+static device_method_t arm_gic_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, arm_gic_probe),
+ DEVMETHOD(device_attach,arm_gic_attach),
+ { 0, 0 }
+};
+
+static driver_t arm_gic_driver = {
+ "gic",
+ arm_gic_methods,
+ sizeof(struct arm_gic_softc),
+};
+
+static devclass_t arm_gic_devclass;
+
+EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0,
+BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(gic, ofwbus, arm_gic_driver, arm_gic_devclass, 0, 0,
+BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
___
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: r276029 - head/sys/arm/ti
Author: ian
Date: Sun Dec 21 21:11:54 2014
New Revision: 276029
URL: https://svnweb.freebsd.org/changeset/base/276029
Log:
Remove a volatile qualifier on return type that is ignored and results in
a -Wreturn-type warning when compiled with gcc.
Modified:
head/sys/arm/ti/ti_wdt.c
Modified: head/sys/arm/ti/ti_wdt.c
==
--- head/sys/arm/ti/ti_wdt.cSun Dec 21 17:25:21 2014(r276028)
+++ head/sys/arm/ti/ti_wdt.cSun Dec 21 21:11:54 2014(r276029)
@@ -95,7 +95,7 @@ static devclass_t ti_wdt_devclass;
DRIVER_MODULE(ti_wdt, simplebus, ti_wdt_driver, ti_wdt_devclass, 0, 0);
-static volatile __inline uint32_t
+static __inline uint32_t
ti_wdt_reg_read(struct ti_wdt_softc *sc, uint32_t reg)
{
___
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: r276030 - head/sys/arm/at91
Author: ian
Date: Sun Dec 21 21:23:53 2014
New Revision: 276030
URL: https://svnweb.freebsd.org/changeset/base/276030
Log:
Eliminate a redundant declaration.
Modified:
head/sys/arm/at91/at91_machdep.c
Modified: head/sys/arm/at91/at91_machdep.c
==
--- head/sys/arm/at91/at91_machdep.cSun Dec 21 21:11:54 2014
(r276029)
+++ head/sys/arm/at91/at91_machdep.cSun Dec 21 21:23:53 2014
(r276030)
@@ -117,8 +117,6 @@ extern struct bus_space at91_bs_tag;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern uint32_t at91_master_clock;
-
/* Static device mappings. */
const struct arm_devmap_entry at91_devmap[] = {
/*
___
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: r276031 - head/sys/dev/beri/virtio
Author: ian
Date: Sun Dec 21 21:24:19 2014
New Revision: 276031
URL: https://svnweb.freebsd.org/changeset/base/276031
Log:
Eliminate a "cast discards qualifiers" warning when building with gcc.
Modified:
head/sys/dev/beri/virtio/virtio.c
Modified: head/sys/dev/beri/virtio/virtio.c
==
--- head/sys/dev/beri/virtio/virtio.c Sun Dec 21 21:23:53 2014
(r276030)
+++ head/sys/dev/beri/virtio/virtio.c Sun Dec 21 21:24:19 2014
(r276031)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -156,7 +157,7 @@ vq_getchain(uint32_t offs, struct vqueue
break;
next = be16toh(vp->next);
}
- paddr_unmap((void *)vindir, be32toh(vdir->len));
+ paddr_unmap(__DEVOLATILE(void *, vindir),
be32toh(vdir->len));
}
if ((be16toh(vdir->flags) & VRING_DESC_F_NEXT) == 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: r276032 - in head/sys/arm: arm include
Author: andrew
Date: Sun Dec 21 21:27:12 2014
New Revision: 276032
URL: https://svnweb.freebsd.org/changeset/base/276032
Log:
Pull out the fdt mapping code into intr.c. The arm_intrng branch also
defines this function allowing the mapping method to change when we move
to it.
Modified:
head/sys/arm/arm/intr.c
head/sys/arm/arm/nexus.c
head/sys/arm/include/intr.h
Modified: head/sys/arm/arm/intr.c
==
--- head/sys/arm/arm/intr.c Sun Dec 21 21:24:19 2014(r276031)
+++ head/sys/arm/arm/intr.c Sun Dec 21 21:27:12 2014(r276032)
@@ -36,8 +36,11 @@
* Soft interrupt and other generic interrupt functions.
*/
+#include "opt_platform.h"
+
#include
__FBSDID("$FreeBSD$");
+
#include
#include
#include
@@ -47,10 +50,16 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+
#include
#include
#include
+#ifdef FDT
+#include
+#include
+#endif
+
#defineINTRNAME_LEN(MAXCOMLEN + 1)
typedef void (*mask_fn)(void *);
@@ -89,6 +98,36 @@ intr_init(void *unused)
SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
+#ifdef FDT
+int
+arm_fdt_map_irq(phandle_t iparent, pcell_t *intr, int icells)
+{
+ fdt_pic_decode_t intr_decode;
+ phandle_t intr_parent;
+ int i, rv, interrupt, trig, pol;
+
+ intr_parent = OF_node_from_xref(iparent);
+ for (i = 0; i < icells; i++)
+ intr[i] = cpu_to_fdt32(intr[i]);
+
+ for (i = 0; fdt_pic_table[i] != NULL; i++) {
+ intr_decode = fdt_pic_table[i];
+ rv = intr_decode(intr_parent, intr, &interrupt, &trig, &pol);
+
+ if (rv == 0) {
+ /* This was recognized as our PIC and decoded. */
+ interrupt = FDT_MAP_IRQ(intr_parent, interrupt);
+ return (interrupt);
+ }
+ }
+
+ /* Not in table, so guess */
+ interrupt = FDT_MAP_IRQ(intr_parent, fdt32_to_cpu(intr[0]));
+
+ return (interrupt);
+}
+#endif
+
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
Modified: head/sys/arm/arm/nexus.c
==
--- head/sys/arm/arm/nexus.cSun Dec 21 21:24:19 2014(r276031)
+++ head/sys/arm/arm/nexus.cSun Dec 21 21:27:12 2014(r276032)
@@ -39,6 +39,8 @@
* and I/O memory address space.
*/
+#include "opt_platform.h"
+
#include
__FBSDID("$FreeBSD$");
@@ -60,10 +62,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "opt_platform.h"
-
#ifdef FDT
-#include
#include
#include "ofw_bus_if.h"
#endif
@@ -351,28 +350,7 @@ static int
nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells,
pcell_t *intr)
{
- fdt_pic_decode_t intr_decode;
- phandle_t intr_parent;
- int i, rv, interrupt, trig, pol;
-
- intr_parent = OF_node_from_xref(iparent);
- for (i = 0; i < icells; i++)
- intr[i] = cpu_to_fdt32(intr[i]);
-
- for (i = 0; fdt_pic_table[i] != NULL; i++) {
- intr_decode = fdt_pic_table[i];
- rv = intr_decode(intr_parent, intr, &interrupt, &trig, &pol);
-
- if (rv == 0) {
- /* This was recognized as our PIC and decoded. */
- interrupt = FDT_MAP_IRQ(intr_parent, interrupt);
- return (interrupt);
- }
- }
-
- /* Not in table, so guess */
- interrupt = FDT_MAP_IRQ(intr_parent, fdt32_to_cpu(intr[0]));
- return (interrupt);
+ return (arm_fdt_map_irq(iparent, intr, icells));
}
#endif
Modified: head/sys/arm/include/intr.h
==
--- head/sys/arm/include/intr.h Sun Dec 21 21:24:19 2014(r276031)
+++ head/sys/arm/include/intr.h Sun Dec 21 21:27:12 2014(r276032)
@@ -39,6 +39,10 @@
#ifndef _MACHINE_INTR_H_
#define _MACHINE_INTR_H_
+#ifdef FDT
+#include
+#endif
+
/* XXX move to std.* files? */
#ifdef CPU_XSCALE_81342
#define NIRQ 128
@@ -85,4 +89,8 @@ void gic_init_secondary(void);
int gic_decode_fdt(uint32_t iparentnode, uint32_t *intrcells, int *interrupt,
int *trig, int *pol);
+#ifdef FDT
+int arm_fdt_map_irq(phandle_t, pcell_t *, int);
+#endif
+
#endif /* _MACHINE_INTR_H */
___
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: r276033 - head/sys/arm/arm
Author: andrew
Date: Sun Dec 21 21:38:12 2014
New Revision: 276033
URL: https://svnweb.freebsd.org/changeset/base/276033
Log:
Fix the unwinder to get past functions with no stack but may cause an
exception. In this case no registers will be updated but the link register
will be copied to the program counter to be used to find the calling
function. In this case the program counter may be updated and we should
continue with the trace.
Modified:
head/sys/arm/arm/db_trace.c
Modified: head/sys/arm/arm/db_trace.c
==
--- head/sys/arm/arm/db_trace.c Sun Dec 21 21:27:12 2014(r276032)
+++ head/sys/arm/arm/db_trace.c Sun Dec 21 21:38:12 2014(r276033)
@@ -345,9 +345,16 @@ db_unwind_tab(struct unwind_state *state
/*
* The program counter was not updated, load it from the link register.
*/
- if (state->registers[PC] == 0)
+ if (state->registers[PC] == 0) {
state->registers[PC] = state->registers[LR];
+ /*
+* If the program counter changed, flag it in the update mask.
+*/
+ if (state->start_pc != state->registers[PC])
+ state->update_mask |= 1 << PC;
+ }
+
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"
Re: svn commit: r276031 - head/sys/dev/beri/virtio
On Sun, 21 Dec 2014 21:24:20 + (UTC)
Ian Lepore wrote:
> Author: ian
> Date: Sun Dec 21 21:24:19 2014
> New Revision: 276031
> URL: https://svnweb.freebsd.org/changeset/base/276031
>
> Log:
> Eliminate a "cast discards qualifiers" warning when building with
> gcc.
>
> Modified:
> head/sys/dev/beri/virtio/virtio.c
>
> Modified: head/sys/dev/beri/virtio/virtio.c
> ==
> --- head/sys/dev/beri/virtio/virtio.c Sun Dec 21 21:23:53
> 2014 (r276030) +++ head/sys/dev/beri/virtio/virtio.c
> Sun Dec 21 21:24:19 2014 (r276031) @@ -38,6 +38,7 @@
> __FBSDID("$FreeBSD$");
> #include
> #include
> #include
> +#include
Don't we already have this include just above the __FBSDID line?
Andrew
___
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: r276037 - head/bin/sh
Author: jilles
Date: Sun Dec 21 22:18:30 2014
New Revision: 276037
URL: https://svnweb.freebsd.org/changeset/base/276037
Log:
sh: Remove EXP_REDIR.
EXP_REDIR was supposed to generate pathnames in redirection if exactly one
file matches, as permitted but not required by POSIX in interactive mode. It
is unlikely this will be implemented.
No functional change is intended.
MFC after:1 week
Modified:
head/bin/sh/eval.c
head/bin/sh/expand.c
head/bin/sh/expand.h
Modified: head/bin/sh/eval.c
==
--- head/bin/sh/eval.c Sun Dec 21 22:08:17 2014(r276036)
+++ head/bin/sh/eval.c Sun Dec 21 22:18:30 2014(r276037)
@@ -539,13 +539,13 @@ expredir(union node *n)
case NFROMTO:
case NAPPEND:
case NCLOBBER:
- expandarg(redir->nfile.fname, &fn, EXP_TILDE |
EXP_REDIR);
+ expandarg(redir->nfile.fname, &fn, EXP_TILDE);
redir->nfile.expfname = fn.list->text;
break;
case NFROMFD:
case NTOFD:
if (redir->ndup.vname) {
- expandarg(redir->ndup.vname, &fn, EXP_TILDE |
EXP_REDIR);
+ expandarg(redir->ndup.vname, &fn, EXP_TILDE);
fixredir(redir, fn.list->text, 1);
}
break;
Modified: head/bin/sh/expand.c
==
--- head/bin/sh/expand.cSun Dec 21 22:08:17 2014(r276036)
+++ head/bin/sh/expand.cSun Dec 21 22:18:30 2014(r276037)
@@ -171,17 +171,12 @@ expandarg(union node *arg, struct arglis
STPUTC('\0', expdest);
p = grabstackstr(expdest);
exparg.lastp = &exparg.list;
- /*
-* TODO - EXP_REDIR
-*/
if (flag & EXP_FULL) {
ifsbreakup(p, &exparg);
*exparg.lastp = NULL;
exparg.lastp = &exparg.list;
expandmeta(exparg.list, flag);
} else {
- if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */
- rmescapes(p);
sp = (struct strlist *)stalloc(sizeof (struct strlist));
sp->text = p;
*exparg.lastp = sp;
@@ -209,7 +204,7 @@ expandarg(union node *arg, struct arglis
* expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE.
* Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'.
* This is used to expand word in ${var+word} etc.
- * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC
+ * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC
* characters to allow for further processing.
* If EXP_FULL is set, also preserve CTLQUOTEMARK characters.
*/
@@ -217,7 +212,7 @@ static char *
argstr(char *p, int flag)
{
char c;
- int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
+ int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
int firsteq = 1;
int split_lit;
int lit_quoted;
@@ -303,7 +298,7 @@ exptilde(char *p, int flag)
char c, *startp = p;
struct passwd *pw;
char *home;
- int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+ int quotes = flag & (EXP_FULL | EXP_CASE);
while ((c = *p) != '\0') {
switch(c) {
@@ -437,7 +432,7 @@ expbackq(union node *cmd, int quoted, in
char lastc;
int startloc = dest - stackblock();
char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
- int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+ int quotes = flag & (EXP_FULL | EXP_CASE);
size_t nnl;
INTOFF;
@@ -637,7 +632,7 @@ evalvar(char *p, int flag)
int varlen;
int varlenb;
int easy;
- int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
+ int quotes = flag & (EXP_FULL | EXP_CASE);
varflags = (unsigned char)*p++;
subtype = varflags & VSTYPE;
@@ -862,7 +857,7 @@ varisset(const char *name, int nulok)
static void
strtodest(const char *p, int flag, int subtype, int quoted)
{
- if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH)
+ if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH)
STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest);
else
STPUTS(p, expdest);
@@ -1104,7 +1099,6 @@ expandmeta(struct strlist *str, int flag
struct strlist **savelastp;
struct strlist *sp;
char c;
- /* TODO - EXP_REDIR */
while (str) {
savelastp = exparg.lastp;
Modified: head/bin/sh/expand.h
==
--- head/bin/s
svn commit: r276038 - head/bin/sh
Author: jilles
Date: Sun Dec 21 23:09:59 2014
New Revision: 276038
URL: https://svnweb.freebsd.org/changeset/base/276038
Log:
sh: Move some code from onint() to onsig(), making onint() noreturn.
As a result, the INTON macro which is used many times generates fewer
bytes of code.
Modified:
head/bin/sh/error.c
head/bin/sh/error.h
head/bin/sh/trap.c
head/bin/sh/trap.h
Modified: head/bin/sh/error.c
==
--- head/bin/sh/error.c Sun Dec 21 22:18:30 2014(r276037)
+++ head/bin/sh/error.c Sun Dec 21 23:09:59 2014(r276038)
@@ -90,13 +90,14 @@ exraise(int e)
/*
- * Called from trap.c when a SIGINT is received. (If the user specifies
- * that SIGINT is to be trapped or ignored using the trap builtin, then
- * this routine is not called.) Suppressint is nonzero when interrupts
- * are held using the INTOFF macro. If SIGINTs are not suppressed and
- * the shell is not a root shell, then we want to be terminated if we
- * get here, as if we were terminated directly by a SIGINT. Arrange for
- * this here.
+ * Called from trap.c when a SIGINT is received and not suppressed, or when
+ * an interrupt is pending and interrupts are re-enabled using INTON.
+ * (If the user specifies that SIGINT is to be trapped or ignored using the
+ * trap builtin, then this routine is not called.) Suppressint is nonzero
+ * when interrupts are held using the INTOFF macro. If SIGINTs are not
+ * suppressed and the shell is not a root shell, then we want to be
+ * terminated if we get here, as if we were terminated directly by a SIGINT.
+ * Arrange for this here.
*/
void
@@ -104,16 +105,6 @@ onint(void)
{
sigset_t sigs;
- /*
-* The !in_dotrap here is safe. The only way we can arrive here
-* with in_dotrap set is that a trap handler set SIGINT to SIG_DFL
-* and killed itself.
-*/
-
- if (suppressint && !in_dotrap) {
- intpending++;
- return;
- }
intpending = 0;
sigemptyset(&sigs);
sigprocmask(SIG_SETMASK, &sigs, NULL);
@@ -130,6 +121,7 @@ onint(void)
else {
signal(SIGINT, SIG_DFL);
kill(getpid(), SIGINT);
+ _exit(128 + SIGINT);
}
}
Modified: head/bin/sh/error.h
==
--- head/bin/sh/error.h Sun Dec 21 22:18:30 2014(r276037)
+++ head/bin/sh/error.h Sun Dec 21 23:09:59 2014(r276038)
@@ -75,11 +75,12 @@ extern volatile sig_atomic_t intpending;
#define is_int_on() suppressint
#define SETINTON(s) suppressint = (s)
#define FORCEINTON {suppressint = 0; if (intpending) onint();}
+#define SET_PENDING_INT intpending = 1
#define CLEAR_PENDING_INT intpending = 0
#define int_pending() intpending
void exraise(int) __dead2;
-void onint(void);
+void onint(void) __dead2;
void warning(const char *, ...) __printflike(1, 2);
void error(const char *, ...) __printf0like(1, 2) __dead2;
void exerror(int, const char *, ...) __printf0like(2, 3) __dead2;
Modified: head/bin/sh/trap.c
==
--- head/bin/sh/trap.c Sun Dec 21 22:18:30 2014(r276037)
+++ head/bin/sh/trap.c Sun Dec 21 23:09:59 2014(r276038)
@@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$");
static char sigmode[NSIG]; /* current value of signal */
volatile sig_atomic_t pendingsig; /* indicates some signal received */
volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT
received */
-int in_dotrap; /* do we execute in a trap handler? */
+static int in_dotrap; /* do we execute in a trap handler? */
static char *volatile trap[NSIG]; /* trap handler commands */
static volatile sig_atomic_t gotsig[NSIG];
/* indicates specified signal received */
@@ -380,7 +380,15 @@ onsig(int signo)
{
if (signo == SIGINT && trap[SIGINT] == NULL) {
- onint();
+ /*
+* The !in_dotrap here is safe. The only way we can arrive
+* here with in_dotrap set is that a trap handler set SIGINT to
+* SIG_DFL and killed itself.
+*/
+ if (suppressint && !in_dotrap)
+ SET_PENDING_INT;
+ else
+ onint();
return;
}
Modified: head/bin/sh/trap.h
==
--- head/bin/sh/trap.h Sun Dec 21 22:18:30 2014(r276037)
+++ head/bin/sh/trap.h Sun Dec 21 23:09:59 2014(r276038)
@@ -35,7 +35,6 @@
extern volatile sig_atomic_t pendingsig;
extern volatile sig_atomic_t pendingsig_waitcmd;
-extern int in_dotrap;
void clear_traps(void);
int have_traps(void);
_
svn commit: r276041 - stable/9/usr.bin/truncate
Author: jilles
Date: Sun Dec 21 23:22:12 2014
New Revision: 276041
URL: https://svnweb.freebsd.org/changeset/base/276041
Log:
MFC r267265: truncate: Detect integer overflow, fix relative sizes.
The change to expand_number (r204654) broke detection of too large sizes and
relative sizes ('+'/'-').
There are no tests in the MFC because stable/9 lacks the test framework.
PR: 190735
Submitted by: Kirk Russell
Modified:
stable/9/usr.bin/truncate/truncate.c
Directory Properties:
stable/9/usr.bin/truncate/ (props changed)
Modified: stable/9/usr.bin/truncate/truncate.c
==
--- stable/9/usr.bin/truncate/truncate.cSun Dec 21 23:22:11 2014
(r276040)
+++ stable/9/usr.bin/truncate/truncate.cSun Dec 21 23:22:12 2014
(r276041)
@@ -54,8 +54,8 @@ main(int argc, char **argv)
{
struct stat sb;
mode_t omode;
- off_t oflow, rsize, tsize;
- int64_t sz;
+ off_t oflow, rsize, sz, tsize;
+ uint64_t usz;
int ch, error, fd, oflags;
char *fname, *rname;
@@ -73,11 +73,13 @@ main(int argc, char **argv)
rname = optarg;
break;
case 's':
- if (expand_number(optarg, &sz) == -1)
+ do_relative = *optarg == '+' || *optarg == '-';
+ if (expand_number(do_relative ? optarg + 1 : optarg,
+ &usz) == -1 || (off_t)usz < 0)
errx(EXIT_FAILURE,
"invalid size argument `%s'", optarg);
- if (*optarg == '+' || *optarg == '-')
- do_relative = 1;
+
+ sz = (*optarg == '-') ? -(off_t)usz : (off_t)usz;
got_size = 1;
break;
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: r276045 - head/contrib/gcc/config/arm
Author: ian
Date: Sun Dec 21 23:45:13 2014
New Revision: 276045
URL: https://svnweb.freebsd.org/changeset/base/276045
Log:
Allow -march=armv7a on the gcc command line, for compatibility with clang.
This will result in __ARM_ARCH_7A__ being defined during the compile.
When compiling with gcc, it will still only generate armv6 opcodes itself,
but should pass the arch to gas so that inline asm can use v7 opcodes.
Modified:
head/contrib/gcc/config/arm/arm.c
Modified: head/contrib/gcc/config/arm/arm.c
==
--- head/contrib/gcc/config/arm/arm.c Sun Dec 21 23:28:53 2014
(r276044)
+++ head/contrib/gcc/config/arm/arm.c Sun Dec 21 23:45:13 2014
(r276045)
@@ -604,6 +604,8 @@ static const struct processors all_archi
{"armv6k", mpcore,"6K", FL_CO_PROC | FL_FOR_ARCH6K, NULL},
{"armv6z", arm1176jzs, "6Z", FL_CO_PROC | FL_FOR_ARCH6Z, NULL},
{"armv6zk", arm1176jzs, "6ZK", FL_CO_PROC | FL_FOR_ARCH6ZK,
NULL},
+ /* Clang compatibility... define __ARM_ARCH_7A__, but codegen is still 6ZK.
*/
+ {"armv7a", arm1176jzs, "7A", FL_CO_PROC | FL_FOR_ARCH6ZK,
NULL},
{"ep9312", ep9312, "4T", FL_LDSCHED | FL_CIRRUS | FL_FOR_ARCH4, NULL},
{"iwmmxt", iwmmxt, "5TE", FL_LDSCHED | FL_STRONG | FL_FOR_ARCH5TE |
FL_XSCALE | FL_IWMMXT , NULL},
{NULL, arm_none, NULL, 0 , NULL}
___
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: r276046 - head/contrib/netbsd-tests/lib/libc/stdlib
Author: ngie
Date: Sun Dec 21 23:47:30 2014
New Revision: 276046
URL: https://svnweb.freebsd.org/changeset/base/276046
Log:
Add __FreeBSD_version guards around hsearch_r to ease MFCing the code to
stable/10
It was added when __FreeBSD_version was ~1100027
Modified:
head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
Modified: head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c
==
--- head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Sun Dec 21
23:45:13 2014(r276045)
+++ head/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Sun Dec 21
23:47:30 2014(r276046)
@@ -231,6 +231,7 @@ ATF_TC_BODY(hsearch_two, tc)
hdestroy();
}
+#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version
#ifdef __NetBSD__
ATF_TC(hsearch_r_basic);
ATF_TC_HEAD(hsearch_r_basic, tc)
@@ -385,6 +386,7 @@ ATF_TC_BODY(hsearch_r_two, tc)
hdestroy_r(&t);
}
+#endif
ATF_TP_ADD_TCS(tp)
{
@@ -395,13 +397,15 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, hsearch_duplicate);
ATF_TP_ADD_TC(tp, hsearch_nonexistent);
ATF_TP_ADD_TC(tp, hsearch_two);
-
+
+#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version
#ifdef __NetBSD__
ATF_TP_ADD_TC(tp, hsearch_r_basic);
#endif
ATF_TP_ADD_TC(tp, hsearch_r_duplicate);
ATF_TP_ADD_TC(tp, hsearch_r_nonexistent);
ATF_TP_ADD_TC(tp, hsearch_r_two);
+#endif
return atf_no_error();
}
___
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: r276047 - in head/sys/arm: allwinner allwinner/a20 altera/socfpga broadcom/bcm2835 freescale/imx freescale/vybrid mv rockchip samsung/exynos ti xilinx
Author: ian Date: Sun Dec 21 23:48:32 2014 New Revision: 276047 URL: https://svnweb.freebsd.org/changeset/base/276047 Log: Add -march=armv7a to the kernel compile for all ARM systems which are v7a. Submitted by: Michal Meloun Modified: head/sys/arm/allwinner/a20/std.a20 head/sys/arm/allwinner/std.a10 head/sys/arm/altera/socfpga/std.socfpga head/sys/arm/broadcom/bcm2835/std.bcm2835 head/sys/arm/freescale/imx/std.imx51 head/sys/arm/freescale/imx/std.imx53 head/sys/arm/freescale/imx/std.imx6 head/sys/arm/freescale/vybrid/std.vybrid head/sys/arm/mv/std-pj4b.mv head/sys/arm/rockchip/std.rk30xx head/sys/arm/samsung/exynos/std.exynos5250 head/sys/arm/samsung/exynos/std.exynos5420 head/sys/arm/ti/std.ti head/sys/arm/xilinx/std.zynq7 Modified: head/sys/arm/allwinner/a20/std.a20 == --- head/sys/arm/allwinner/a20/std.a20 Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/allwinner/a20/std.a20 Sun Dec 21 23:48:32 2014 (r276047) @@ -3,6 +3,7 @@ cpuCPU_CORTEXA machinearm armv6 +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" makeoption ARM_LITTLE_ENDIAN # Physical memory starts at 0x4020. We assume images are loaded at Modified: head/sys/arm/allwinner/std.a10 == --- head/sys/arm/allwinner/std.a10 Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/allwinner/std.a10 Sun Dec 21 23:48:32 2014 (r276047) @@ -3,6 +3,7 @@ cpuCPU_CORTEXA machinearm armv6 +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" makeoption ARM_LITTLE_ENDIAN # Physical memory starts at 0x4020. We assume images are loaded at Modified: head/sys/arm/altera/socfpga/std.socfpga == --- head/sys/arm/altera/socfpga/std.socfpga Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/altera/socfpga/std.socfpga Sun Dec 21 23:48:32 2014 (r276047) @@ -4,6 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpuCPU_CORTEXA machinearm armv6 +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" optionsPHYSADDR=0x Modified: head/sys/arm/broadcom/bcm2835/std.bcm2835 == --- head/sys/arm/broadcom/bcm2835/std.bcm2835 Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/broadcom/bcm2835/std.bcm2835 Sun Dec 21 23:48:32 2014 (r276047) @@ -2,6 +2,7 @@ machinearm armv6 cpuCPU_ARM1176 +makeoptionsCONF_CFLAGS="-mcpu=arm1176jzf-s -Wa,-mcpu=arm1176jzf-s" files "../broadcom/bcm2835/files.bcm2835" Modified: head/sys/arm/freescale/imx/std.imx51 == --- head/sys/arm/freescale/imx/std.imx51Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/freescale/imx/std.imx51Sun Dec 21 23:48:32 2014 (r276047) @@ -1,6 +1,7 @@ # $FreeBSD$ machinearm armv6 cpuCPU_CORTEXA +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" makeoptionsARM_LITTLE_ENDIAN optionsARM_L2_PIPT Modified: head/sys/arm/freescale/imx/std.imx53 == --- head/sys/arm/freescale/imx/std.imx53Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/freescale/imx/std.imx53Sun Dec 21 23:48:32 2014 (r276047) @@ -1,6 +1,7 @@ # $FreeBSD$ machinearm armv6 cpuCPU_CORTEXA +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" makeoptionsARM_LITTLE_ENDIAN optionsARM_L2_PIPT Modified: head/sys/arm/freescale/imx/std.imx6 == --- head/sys/arm/freescale/imx/std.imx6 Sun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/freescale/imx/std.imx6 Sun Dec 21 23:48:32 2014 (r276047) @@ -1,6 +1,7 @@ # $FreeBSD$ machinearm armv6 cpuCPU_CORTEXA +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" makeoptionsARM_LITTLE_ENDIAN optionsARM_L2_PIPT Modified: head/sys/arm/freescale/vybrid/std.vybrid == --- head/sys/arm/freescale/vybrid/std.vybridSun Dec 21 23:47:30 2014 (r276046) +++ head/sys/arm/freescale/vybrid/std.vybridSun Dec 21 23:48:32 2014 (r276047) @@ -4,6 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpuCPU_CORTEXA machinearm armv6 +makeoptionsCONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" optionsPHYSADDR=0x8
svn commit: r276048 - stable/10/share/mk
Author: ngie
Date: Mon Dec 22 00:21:24 2014
New Revision: 276048
URL: https://svnweb.freebsd.org/changeset/base/276048
Log:
MFC r273186,r273873:
r273186:
Don't define rules based on PROGS if PROGS is empty.
Reviewed by:sjg, ngie
Sponsored by: EMC / Isilon Storage Division
r273873:
Use the right depend file for each program.
bsd.progs.mk generates a separate depend file for every program being
built, but then it does not properly tell each submake to use those
individual files. Properly propagate the depend file to use.
Discovered while preparing the update of atf to 0.21 and noticing that
the test programs were not being relinked to the new library.
This change is "make tinderbox" clean.
Modified:
stable/10/share/mk/bsd.progs.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/mk/bsd.progs.mk
==
--- stable/10/share/mk/bsd.progs.mk Sun Dec 21 23:48:32 2014
(r276047)
+++ stable/10/share/mk/bsd.progs.mk Mon Dec 22 00:21:24 2014
(r276048)
@@ -90,18 +90,24 @@ x.$p= PROG_CXX=$p
$p ${p}_p: .PHONY .MAKE
(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
- SUBDIR= PROG=$p ${x.$p})
+ SUBDIR= PROG=$p \
+ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+ ${x.$p})
.for t in ${PROGS_TARGETS:O:u}
$p.$t: .PHONY .MAKE
(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
- SUBDIR= PROG=$p ${x.$p} ${@:E})
+ SUBDIR= PROG=$p \
+ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+ ${x.$p} ${@:E})
.endfor
.endfor
+.if !empty(PROGS)
.for t in ${PROGS_TARGETS:O:u}
$t: ${PROGS:%=%.$t}
.endfor
+.endif
.if empty(PROGS) && !empty(SCRIPTS)
___
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: r275961 - head/sys/arm/conf
On Sun, 21 Dec 2014, Ian Lepore wrote: On Sun, 2014-12-21 at 08:07 +, Alexey Dokuchaev wrote: On Sat, Dec 20, 2014 at 06:15:24PM +, Andrew Turner wrote: Log: Clean up to use the standard style of "options \t" and "device\t\t" optionsHZ=500 # Scheduling quantum is 2 milliseconds. [...] -optionsKDB # Enable kernel debugger support. +optionsKDB # Enable kernel debugger support. # For minimum debugger support use KDB_TRACE, for interactive use DDB. -#options KDB_TRACE # Print a stack trace for a panic. -optionsDDB # Support DDB. +#options KDB_TRACE # Print a stack trace for a panic. +optionsDDB # Support DDB. # For full debugger support use this instead: -#options GDB # Support remote GDB. +#options GDB # Support remote GDB. [...] It also would be nice if we removed trailing dots in comments one day, preferreably across all config files we have in the tree. Why? I thought our rule about comments is that they're complete sentences, punctuated as such. That rule is for C source code and doesn't apply to comments to the right of code even there. The rule for options files is to never terminate options or device lines with periods. This rule was broken in only 1 places in the RELENG_4 i386 GENERIC (for the tun device). Also, it is not even broken for 2 options: X options AHC_REG_PRETTY_PRINT# Print register bitfields in debug X # output. Adds ~128k to driver. X options AHD_REG_PRETTY_PRINT # Print register bitfields in debug X # output. Adds ~215k to driver. These lines break many other rules: - that comments to the right of code actually be at the right of code and not spread across multiple lines - that man pages not be written in comments. Especially ones at the right of code where there is less space. - various anti-verbosity rules stricter than the previous one. The i386 GENERIC is still relatively clean, but the breakage of this rule has expanded to include 2 GEOM options, PRINTR_BUFR_SIZE (ick; its description also breaks the line length limit rule), most KDB/DDB options, aic, ie, an, bwi, bwn, ipw, ipi, iwi, iwn, malo, mwl, ral, wi, wl and wpi. aic, ie, an, bwi, iwi, ral and wi also break the line length limit rule. Of course, I also thought we had a rule that 'device' and 'options' in kernel config is always followed by two spaces then a tab, so that you can comment out lines without ruining the indent, and apparently that's not true either (and I have no idea where I got that notion). The rule for `options' is that it is always followed by _one_ space and a tab. This rule os currently followed by all options lines in i386 GENERIC. `device' lines used to follow Rafferty's rules. They used to be mostly formatted with `device' followed by a single tab, and comments to the right of them lined up in subsections but globally random. This has been cleaned up a bit, at the cost of breaking the line length limit rule in many places. `device' is now consistently followed by _two_ tabs in i386 GENERIC, and comments are consistently lined up starting in column 40 for both `options' and `device' lines. The fancy space+tab rule is less needed for `device' lines, since a single comment character can be prefixed without breaking the formatting. I use this to distinguish local modifications: - GENERIC shouldn't have any commented-out device lines, but i386 GENERIC actually has about 10 (formatted with a single comment character so as not to break the formatting) - local modifications comment out device lines using '# '. This breaks the formatting. NOTES files provide many more bad examples than i386 GENERIC. Bruce ___ 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: r276049 - head/sys/arm/ti
Author: ian
Date: Mon Dec 22 00:50:01 2014
New Revision: 276049
URL: https://svnweb.freebsd.org/changeset/base/276049
Log:
Replace the clock divisor terms with values that also result in a 1 MHz
clock, but actually work on real hardware, unlike the original set of
values I chose.
PR: 195009
Submitted by: Scott Ellis
Modified:
head/sys/arm/ti/ti_i2c.c
Modified: head/sys/arm/ti/ti_i2c.c
==
--- head/sys/arm/ti/ti_i2c.cMon Dec 22 00:21:24 2014(r276048)
+++ head/sys/arm/ti/ti_i2c.cMon Dec 22 00:50:01 2014(r276049)
@@ -119,7 +119,7 @@ struct ti_i2c_clock_config
static struct ti_i2c_clock_config ti_omap4_i2c_clock_configs[] = {
{ 10, 23, 13, 15, 0, 0},
{ 40, 9, 5, 7, 0, 0},
- { 100, 5, 1, 3, 0, 0},
+ { 100, 3, 5, 7, 0, 0},
/* { 320, 1, 113, 115, 7, 10}, - HS mode */
{ 0 /* Table terminator */ }
};
___
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: r276050 - stable/10/share/mk
Author: ngie
Date: Mon Dec 22 00:50:08 2014
New Revision: 276050
URL: https://svnweb.freebsd.org/changeset/base/276050
Log:
MFC r273803,r273810:
r273803:
Filter out TESTS_SUBDIRS already added to SUBDIR instead of blindly
appending the TESTS_SUBDIRS variable to SUBDIR
Duplicate directory entries can cause unexpected side effects, like
installing the same files multiple times. This can be easily
reproduced via the following testcase prior to this commit:
SUBDIR= dir
TESTS_SUBDIRS+= dir
.include
Sponsored by: EMC / Isilon Storage Division
r273810:
Fix the logic inversion in the previous commit by ensuring that the matched
expression (:M) is empty, not the not matched (:N) is empty. The former case
means we have not found the TEST_SUBDIR value in SUBDIR
Reported by: rodrigc
Pointyhat to: me (did not use a clean install root)
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/share/mk/bsd.test.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/mk/bsd.test.mk
==
--- stable/10/share/mk/bsd.test.mk Mon Dec 22 00:50:01 2014
(r276049)
+++ stable/10/share/mk/bsd.test.mk Mon Dec 22 00:50:08 2014
(r276050)
@@ -54,9 +54,11 @@ _TESTS=
.include
.include
-.if !empty(TESTS_SUBDIRS)
-SUBDIR+= ${TESTS_SUBDIRS}
+.for ts in ${TESTS_SUBDIRS}
+.if empty(SUBDIR:M${ts})
+SUBDIR+= ${ts}
.endif
+.endfor
# it is rare for test cases to have man pages
.if !defined(MAN)
___
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: r276051 - stable/10
Author: ngie
Date: Mon Dec 22 02:22:01 2014
New Revision: 276051
URL: https://svnweb.freebsd.org/changeset/base/276051
Log:
MFC r275622:
Add makewhatis to ITOOLS if MK_MAN != no
This will fix installation with differing host targets in installworld, so
one can build i386/i386 on an amd64 host, then install to an i386/i386
target
Reported by: alfred
Phabric: D1280
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Mon Dec 22 00:50:08 2014(r276050)
+++ stable/10/Makefile.inc1 Mon Dec 22 02:22:01 2014(r276051)
@@ -782,6 +782,11 @@ ITOOLS=[ awk cap_mkdb cat chflags chmod
rm sed sh sysctl test true uname wc ${_zoneinfo} \
${LOCAL_ITOOLS}
+# Needed for share/man
+.if ${MK_MAN} != "no"
+ITOOLS+=makewhatis
+.endif
+
#
# distributeworld
#
___
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: r276052 - head
Author: ngie
Date: Mon Dec 22 04:52:24 2014
New Revision: 276052
URL: https://svnweb.freebsd.org/changeset/base/276052
Log:
Build selective portions of gnu/usr.bin/texinfo as part of build-tools to
ensure that building on a host without makeinfo (i.e. a host where
make delete-old -DWITHOUT_INFO was run), then building with MK_INFO == yes
doesn't manifest in build errors when building info pages
This manifested itself like the following when I was build testing an MFC
change on stable/10:
makeinfo --no-split -I /usr/src/gnu/lib/libregex/doc -I
/usr/src/gnu/lib/libregex/doc regex.texi -o regex.info
makeinfo: not found
*** [regex.info] Error code 127
make[6]: stopped in /usr/src/gnu/lib/libregex/doc
1 error
Tested on a head VM without makeinfo installed and by building with
MK_INFO=yes
MFC after: 1 week
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon Dec 22 02:22:01 2014(r276051)
+++ head/Makefile.inc1 Mon Dec 22 04:52:24 2014(r276052)
@@ -1367,6 +1367,11 @@ _share= share/syscons/scrnmaps
_gcc_tools= gnu/usr.bin/cc/cc_tools
.endif
+.if ${MK_INFO} != "no"
+_texinfo= gnu/usr.bin/texinfo/libtxi \
+ gnu/usr.bin/texinfo/makeinfo
+.endif
+
.if ${MK_RESCUE} != "no"
_rescue= rescue/rescue
.endif
@@ -1398,6 +1403,16 @@ build-tools: .MAKE
${MAKE} DIRPRFX=${_tool}/ depend && \
${MAKE} DIRPRFX=${_tool}/ all
.endfor
+.for _tool in \
+${_texinfo}
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
+ ${MAKE} DIRPRFX=${_tool}/ all && \
+ ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
+.endfor
+
#
# kernel-tools: Build kernel-building tools
___
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: r276053 - head
Author: ngie
Date: Mon Dec 22 04:54:57 2014
New Revision: 276053
URL: https://svnweb.freebsd.org/changeset/base/276053
Log:
Update the text for building texinfo with build-tools to reflect the fact
that make install is being called as well
MFC after: 1 week
X-MFC with: r276052
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon Dec 22 04:52:24 2014(r276052)
+++ head/Makefile.inc1 Mon Dec 22 04:54:57 2014(r276053)
@@ -1405,7 +1405,7 @@ build-tools: .MAKE
.endfor
.for _tool in \
${_texinfo}
- ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool} && \
${MAKE} DIRPRFX=${_tool}/ obj && \
${MAKE} DIRPRFX=${_tool}/ depend && \
___
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"
