PERFORCE change 183454 for review
Garrett Cooper
gcooper at FreeBSD.org
Tue Sep 7 03:32:54 UTC 2010
http://p4web.freebsd.org/@@183454?ac=10
Change 183454 by gcooper at gcooper-bayonetta on 2010/09/07 03:31:53
IFC
Affected files ...
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/cleartmp#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/connect.2#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libedit/term.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libedit/term.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/libpmc.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthr/thread/thr_sig.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/dhclient/dhclient-script.8#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fdisk/fdisk.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#8 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/aesni.4#1 branch
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/bwn.4#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ddb.4#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/powermac_nvram.4#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/make_dev.9#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-ports.dot#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-src.dot#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpi_support/acpi_hp.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/hwpmc/hwpmc_core.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/powermac_nvram/powermac_nvramvar.h#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfsclient/nfs_clbio.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_et.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/iodi.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_machdep.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_pci.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ipfw/ip_fw_nat.c#2 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_output.c#7 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#9 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#9 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/nexus.c#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_mmap.c#6 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/calendar/calendars/calendar.freebsd#5 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/bsdcpio.1#4 integrate
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/printf/printf.1#2 integrate
Differences ...
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#7 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.67 2010/08/22 21:18:21 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.68 2010/09/05 21:12:48 jilles Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -138,12 +138,18 @@
/*
- * Perform variable substitution and command substitution on an argument,
- * placing the resulting list of arguments in arglist. If EXP_FULL is true,
- * perform splitting and file name expansion. When arglist is NULL, perform
- * here document expansion.
+ * Perform expansions on an argument, placing the resulting list of arguments
+ * in arglist. Parameter expansion, command substitution and arithmetic
+ * expansion are always performed; additional expansions can be requested
+ * via flag (EXP_*).
+ * The result is left in the stack string.
+ * When arglist is NULL, perform here document expansion. A partial result
+ * may be written to herefd, which is then not included in the stack string.
+ *
+ * Caution: this function uses global state and is not reentrant.
+ * However, a new invocation after an interrupted invocation is safe
+ * and will reset the global state for the new call.
*/
-
void
expandarg(union node *arg, struct arglist *arglist, int flag)
{
@@ -195,11 +201,14 @@
/*
- * Perform variable and command substitution. If EXP_FULL is set, output CTLESC
- * characters to allow for further processing. Otherwise treat
- * $@ like $* since no splitting will be performed.
+ * Perform parameter expansion, command substitution and arithmetic
+ * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE.
+ * Processing ends at a CTLENDVAR 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
+ * characters to allow for further processing.
+ * If EXP_FULL is set, also preserve CTLQUOTEMARK characters.
*/
-
STATIC void
argstr(char *p, int flag)
{
@@ -212,7 +221,7 @@
for (;;) {
switch (c = *p++) {
case '\0':
- case CTLENDVAR: /* ??? */
+ case CTLENDVAR:
goto breakloop;
case CTLQUOTEMARK:
/* "$@" syntax adherence hack */
@@ -262,6 +271,10 @@
breakloop:;
}
+/*
+ * Perform tilde expansion, placing the result in the stack string and
+ * returning the next position in the input string to process.
+ */
STATIC char *
exptilde(char *p, int flag)
{
@@ -367,12 +380,11 @@
int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
int quoted;
-
/*
* This routine is slightly over-complicated for
* efficiency. First we make sure there is
* enough space for the result, which may be bigger
- * than the expression if we add exponentiation. Next we
+ * than the expression. Next we
* scan backwards looking for the start of arithmetic. If the
* next previous character is a CTLESC character, then we
* have to rescan starting from the beginning since CTLESC
@@ -413,9 +425,8 @@
/*
- * Expand stuff in backwards quotes.
+ * Perform command substitution.
*/
-
STATIC void
expbackq(union node *cmd, int quoted, int flag)
{
@@ -974,6 +985,12 @@
* Break the argument string into pieces based upon IFS and add the
* strings to the argument list. The regions of the string to be
* searched for IFS characters have been stored by recordregion.
+ * CTLESC characters are preserved but have little effect in this pass
+ * other than escaping CTL* characters. In particular, they do not escape
+ * IFS characters: that should be done with the ifsregion mechanism.
+ * CTLQUOTEMARK characters are used to preserve empty quoted strings.
+ * This pass treats them as a regular character, making the string non-empty.
+ * Later, they are removed along with the other CTL* characters.
*/
STATIC void
ifsbreakup(char *string, struct arglist *arglist)
@@ -1075,15 +1092,14 @@
}
+STATIC char expdir[PATH_MAX];
+#define expdir_end (expdir + sizeof(expdir))
/*
- * Expand shell metacharacters. At this point, the only control characters
- * should be escapes. The results are stored in the list exparg.
+ * Perform pathname generation and remove control characters.
+ * At this point, the only control characters should be CTLESC and CTLQUOTEMARK.
+ * The results are stored in the list exparg.
*/
-
-STATIC char expdir[PATH_MAX];
-#define expdir_end (expdir + sizeof(expdir))
-
STATIC void
expandmeta(struct strlist *str, int flag __unused)
{
@@ -1469,7 +1485,7 @@
/*
- * Remove any CTLESC characters from a string.
+ * Remove any CTLESC and CTLQUOTEMARK characters from a string.
*/
void
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/cleartmp#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/cleartmp,v 1.20 2009/10/10 22:17:03 dougb Exp $
+# $FreeBSD: src/etc/rc.d/cleartmp,v 1.21 2010/09/05 05:44:40 daichi Exp $
#
# PROVIDE: cleartmp
@@ -36,7 +36,10 @@
# it can prevent foot-shooting in future.
# + /tmp/lost+found is preserved, but its contents are removed.
# + lost+found and quota.* in subdirectories are removed.
+ # + .sujournal and .snap are preserved.
find -x ${tmp}/. ! -name . \
+ ! \( -name .sujournal -type f -user root \) \
+ ! \( -name .snap -type d -user root \) \
! \( -name lost+found -type d -user root \) \
! \( \( -name quota.user -or -name quota.group \) \
-type f -user root \) \
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/connect.2#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)connect.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.29 2007/01/09 00:28:14 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.30 2010/09/06 21:39:54 gjb Exp $
.\"
-.Dd August 16, 2006
+.Dd September 5, 2010
.Dt CONNECT 2
.Os
.Sh NAME
@@ -95,6 +95,8 @@
Connection establishment timed out without establishing a connection.
.It Bq Er ECONNREFUSED
The attempt to connect was forcefully rejected.
+.It Bq Er ECONNRESET
+The connection was reset by the remote host.
.It Bq Er ENETUNREACH
The network is not reachable from this host.
.It Bq Er EHOSTUNREACH
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libedit/term.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#endif /* not lint && not SCCSID */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.21 2007/06/10 19:06:09 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libedit/term.c,v 1.22 2010/09/05 16:12:10 jilles Exp $");
/*
* term.c: Editor/termcap-curses interface
@@ -223,7 +223,9 @@
{ "kh", "send cursor home" },
#define T_at7 37
{ "@7", "send cursor end" },
-#define T_str 38
+#define T_kD 38
+ { "kD", "send cursor delete" },
+#define T_str 39
{ NULL, NULL }
};
@@ -1062,6 +1064,11 @@
arrow[A_K_EN].key = T_at7;
arrow[A_K_EN].fun.cmd = ED_MOVE_TO_END;
arrow[A_K_EN].type = XK_CMD;
+
+ arrow[A_K_DE].name = "delete";
+ arrow[A_K_DE].key = T_kD;
+ arrow[A_K_DE].fun.cmd = ED_DELETE_NEXT_CHAR;
+ arrow[A_K_DE].type = XK_CMD;
}
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libedit/term.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
*
* @(#)term.h 8.1 (Berkeley) 6/4/93
* $NetBSD: term.h,v 1.18 2006/11/24 00:01:17 christos Exp $
- * $FreeBSD: src/lib/libedit/term.h,v 1.8 2007/06/10 19:06:09 stefanf Exp $
+ * $FreeBSD: src/lib/libedit/term.h,v 1.9 2010/09/05 16:12:10 jilles Exp $
*/
/*
@@ -79,7 +79,8 @@
#define A_K_RT 3
#define A_K_HO 4
#define A_K_EN 5
-#define A_K_NKEYS 6
+#define A_K_DE 6
+#define A_K_NKEYS 7
protected void term_move_to_line(EditLine *, int);
protected void term_move_to_char(EditLine *, int);
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/libpmc.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.27 2010/05/01 21:59:06 rstone Exp $");
+__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.28 2010/09/05 13:31:14 fabient Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -2695,7 +2695,8 @@
*/
cpu_has_iaf_counters = 0;
for (t = 0; t < cpu_info.pm_nclass; t++)
- if (cpu_info.pm_classes[t].pm_class == PMC_CLASS_IAF)
+ if (cpu_info.pm_classes[t].pm_class == PMC_CLASS_IAF &&
+ cpu_info.pm_classes[t].pm_num > 0)
cpu_has_iaf_counters = 1;
#endif
@@ -2708,9 +2709,8 @@
#define PMC_MDEP_INIT_INTEL_V2(C) do { \
PMC_MDEP_INIT(C); \
- if (cpu_has_iaf_counters) \
- pmc_class_table[n++] = &iaf_class_table_descr; \
- else \
+ pmc_class_table[n++] = &iaf_class_table_descr; \
+ if (!cpu_has_iaf_counters) \
pmc_mdep_event_aliases = \
C##_aliases_without_iaf; \
pmc_class_table[n] = &C##_class_table_descr; \
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthr/thread/thr_sig.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.35 2010/09/01 13:22:55 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.36 2010/09/06 03:00:54 davidxu Exp $
*/
#include "namespace.h"
@@ -418,6 +418,7 @@
void
_thr_sigact_unload(struct dl_phdr_info *phdr_info)
{
+#if 0
struct pthread *curthread = _get_curthread();
struct urwlock *rwlp;
struct sigaction *actp;
@@ -426,13 +427,13 @@
int sig;
_thr_signal_block(curthread);
- for (sig = 1; sig < _SIG_MAXSIG; sig++) {
- actp = &_thr_sigact[sig].sigact;
+ for (sig = 1; sig <= _SIG_MAXSIG; sig++) {
+ actp = &_thr_sigact[sig-1].sigact;
retry:
handler = actp->sa_handler;
if (handler != SIG_DFL && handler != SIG_IGN &&
__elf_phdr_match_addr(phdr_info, handler)) {
- rwlp = &_thr_sigact[sig].lock;
+ rwlp = &_thr_sigact[sig-1].lock;
_thr_rwl_wrlock(rwlp);
if (handler != actp->sa_handler) {
_thr_rwl_unlock(rwlp);
@@ -449,6 +450,7 @@
}
}
_thr_signal_unblock(curthread);
+#endif
}
void
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.113 2010/05/12 19:24:31 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.114 2010/09/06 11:02:50 brueffer Exp $
#
#
@@ -107,7 +107,6 @@
run i386,amd64
safe i386,pc98,amd64
sbp i386,sparc64,ia64,amd64
-sis i386,pc98,ia64,amd64
sn i386,amd64
snc pc98
snd_ad1816 i386,amd64
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/dhclient/dhclient-script.8#2 (text+ko) ====
@@ -36,9 +36,9 @@
.\" see ``http://www.isc.org/isc''. To learn more about Vixie
.\" Enterprises, see ``http://www.vix.com''.
.\"
-.\" $FreeBSD: src/sbin/dhclient/dhclient-script.8,v 1.2 2005/06/22 14:55:59 ru Exp $
+.\" $FreeBSD: src/sbin/dhclient/dhclient-script.8,v 1.3 2010/09/06 09:59:10 brian Exp $
.\"
-.Dd January 1, 1997
+.Dd September 6, 2010
.Dt DHCLIENT-SCRIPT 8
.Os
.Sh NAME
@@ -218,6 +218,29 @@
If not, it should exit with a nonzero value.
.El
.Pp
+Before taking action according to
+.Va $reason ,
+.Nm
+will check for the existence of
+.Pa /etc/dhclient-enter-hooks .
+If found, it will be sourced
+.Pq see Xr sh 1 .
+After taking action according to
+.Va $reason ,
+.Nm
+will check for the existence of
+.Pa /etc/dhclient-exit-hooks .
+If found, it will be sourced
+.Pq see Xr sh 1 .
+These hooks scripts can be used to dynamically modify the enviornment at
+appropriate times during the DHCP negotiations.
+For example, if the administrator wishes to disable alias IP numbers on
+the DHCP interface, they might want to put the following in
+.Pa /etc/dhclient-enter-hooks :
+.Bd -literal -offset indent
+[ ."$reason" = .PREINIT ] && ifconfig $interface 0.0.0.0
+.Ed
+.Pp
The usual way to test a lease is to set up the network as with
.Li REBIND
(since this may be called to test more than one lease) and then ping
@@ -239,6 +262,7 @@
.\" and bear the names of the operating systems on which they are intended
.\" to work.
.Sh SEE ALSO
+.Xr sh 1 ,
.Xr dhclient.conf 5 ,
.Xr dhclient.leases 5 ,
.Xr dhclient 8 ,
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fdisk/fdisk.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.95 2009/06/17 06:41:10 lulf Exp $");
+__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.96 2010/09/06 04:15:49 brian Exp $");
#include <sys/disk.h>
#include <sys/disklabel.h>
@@ -1461,6 +1461,7 @@
* /dev/ad0s1a => /dev/ad0
* /dev/da0a => /dev/da0
* /dev/vinum/root => /dev/vinum/root
+ * A ".eli" part is removed if it exists (see geli(8)).
*/
static char *
get_rootdisk(void)
@@ -1469,7 +1470,7 @@
regex_t re;
#define NMATCHES 2
regmatch_t rm[NMATCHES];
- char *s;
+ char dev[PATH_MAX], *s;
int rv;
if (statfs("/", &rootfs) == -1)
@@ -1478,7 +1479,11 @@
if ((rv = regcomp(&re, "^(/dev/[a-z/]+[0-9]+)([sp][0-9]+)?[a-h]?$",
REG_EXTENDED)) != 0)
errx(1, "regcomp() failed (%d)", rv);
- if ((rv = regexec(&re, rootfs.f_mntfromname, NMATCHES, rm, 0)) != 0)
+ strlcpy(dev, rootfs.f_mntfromname, sizeof (dev));
+ if ((s = strstr(dev, ".eli")) != NULL)
+ memmove(s, s+4, strlen(s + 4) + 1);
+
+ if ((rv = regexec(&re, dev, NMATCHES, rm, 0)) != 0)
errx(1,
"mounted root fs resource doesn't match expectations (regexec returned %d)",
rv);
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_unionfs/mount_unionfs.8#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount_union.8 8.6 (Berkeley) 3/27/94
-.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.23 2007/10/14 13:55:37 daichi Exp $
+.\" $FreeBSD: src/sbin/mount_unionfs/mount_unionfs.8,v 1.24 2010/09/05 04:58:16 daichi Exp $
.\"
.Dd November 30, 2006
.Dt MOUNT_UNIONFS 8
@@ -363,9 +363,10 @@
Without whiteout support from the file system backing the upper layer,
there is no way that delete and rename operations on lower layer
objects can be done.
-.Er EROFS
-is returned for this kind of operations along with any others
-which would make modifications to the lower layer, such as
+.Er EOPNOTSUPP
+is returned for this kind of operations as generated by VOP_WHITEOUT()
+along with any others which would make modifications to the lower
+layer, such as
.Xr chmod 1 .
.Pp
Running
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.487 2010/08/23 22:24:11 imp Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.488 2010/09/06 20:35:48 kib Exp $
MAN= aac.4 \
acpi.4 \
@@ -18,6 +18,7 @@
adv.4 \
adw.4 \
ae.4 \
+ ${_aesni.4} \
age.4 \
agp.4 \
aha.4 \
@@ -638,6 +639,7 @@
_acpi_sony.4= acpi_sony.4
_acpi_toshiba.4=acpi_toshiba.4
_acpi_wmi.4= acpi_wmi.4
+_aesni.4= aesni.4
_aibs.4= aibs.4
_amdsbwd.4= amdsbwd.4
_amdsmb.4= amdsmb.4
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/bwn.4#3 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/bwn.4,v 1.3 2010/04/29 18:32:14 delphij Exp $
+.\" $FreeBSD: src/share/man/man4/bwn.4,v 1.6 2010/09/06 22:23:35 weongyo Exp $
.\"
-.Dd February 25, 2010
+.Dd September 6, 2010
.Dt BWN 4
.Os
.Sh NAME
@@ -110,8 +110,23 @@
ifconfig wlan create wlandev bwn0 ssid my_net \e
wepmode on wepkey 0x1234567890 weptxkey 1 up
.Ed
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+.Bl -tag -width indent
+.It Va hw.bwn.msi_disable
+This tunable disables MSI support on the hardware.
+The default value is 0.
+.It Va hw.bwn.usedma
+This tunable enables DMA operations on the hardware.
+If the value is 0, PIO mode would be used.
+The default value is 1.
+.El
.Sh SEE ALSO
.Xr arp 4 ,
+.Xr bwi 4 ,
.Xr cardbus 4 ,
.Xr intro 4 ,
.Xr pci 4 ,
@@ -124,6 +139,9 @@
.Nm
driver first appeared in
.Fx 8.1 .
+.Sh CAVEATS
+Some LP PHY devices have DMA operation problems that in that case try to
+use PIO mode.
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ddb.4#3 (text+ko) ====
@@ -58,9 +58,9 @@
.\" Created.
.\" [90/08/30 dbg]
.\"
-.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.66 2010/05/27 13:56:47 uqs Exp $
+.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.67 2010/09/05 14:52:27 kib Exp $
.\"
-.Dd May 24, 2010
+.Dd September 5, 2010
.Dt DDB 4
.Os
.Sh NAME
@@ -589,6 +589,12 @@
Show brief information about the TTY subsystem.
.\"
.Pp
+.It Ic show Cm cdev
+Without argument, show the list of all created cdev's, consisting of devfs
+node name and struct cdev address.
+When address of cdev is supplied, show some internal devfs state of the cdev.
+.\"
+.Pp
.It Ic show Cm conifhk
Lists hooks currently waiting for completion in
run_interrupt_driven_config_hooks().
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/powermac_nvram.4#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/man4.powerpc/powermac_nvram.4,v 1.2 2006/08/02 07:02:19 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/man4.powerpc/powermac_nvram.4,v 1.3 2010/09/05 20:04:02 mav Exp $
.\"
-.Dd August 1, 2006
+.Dd September 5, 2010
.Dt POWERMAC_NVRAM 4 powerpc
.Os
.Sh NAME
@@ -63,8 +63,3 @@
.Nm
driver was written by
.An Maxim Sobolev Aq sobomax at FreeBSD.org .
-.Sh BUGS
-Currently, the
-.Nm
-driver only supports systems equipped with an AMD flash part and is only
-tested on Apple G4-based Mac Mini machines.
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/rc.conf.5#4 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.382 2010/08/03 19:25:58 bcr Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.383 2010/09/05 20:04:54 gjb Exp $
.\"
-.Dd August 3, 2010
+.Dd September 4, 2010
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3503,7 +3503,8 @@
This is purely a configuration aid to help identify and
configure multiple jails.
The names specified in this list will be used to
-identify settings common to an instance of a jail.
+identify settings common to an instance of a jail,
+and should contain alphanumeric characters only.
Assuming that the jail in question was named
.Li vjail ,
you would have the following dependent variables:
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/make_dev.9#5 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.30 2010/08/01 21:54:25 pjd Exp $
+.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.31 2010/09/05 14:47:46 kib Exp $
.\"
-.Dd May 6, 2010
+.Dd September 5, 2010
.Dt MAKE_DEV 9
.Os
.Sh NAME
@@ -135,6 +135,7 @@
MAKEDEV_REF reference the created device
MAKEDEV_NOWAIT do not sleep, may return NULL
MAKEDEV_WAITOK allow the function to sleep to satisfy malloc
+MAKEDEV_ETERNAL created device will be never destroyed
.Ed
.Pp
The
@@ -154,6 +155,18 @@
drops his reference to cdev.
.Pp
The
+.Dv MAKEDEV_ETERNAL
+flag allows the kernel to not acquire some locks when translating system
+calls into the cdevsw methods calls.
+It is responsibility of the driver author to make sure that
+.Fn destroy_dev
+is never called on the returned cdev.
+For the convenience, use the
+.Dv MAKEDEV_ETERNAL_KLD
+flag for the code that can be compiled into kernel or loaded
+(and unloaded) as loadable module.
+.Pp
+The
.Fn make_dev_cred
function is equivalent to the call
.Bd -literal -offset indent
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-ports.dot#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-ports.dot,v 1.95 2010/08/02 16:18:41 glarkin Exp $
+# $FreeBSD: src/share/misc/committers-ports.dot,v 1.96 2010/09/05 01:58:21 swills Exp $
# This file is meant to list all FreeBSD ports committers and describe the
# mentor-mentee relationships between them.
@@ -154,6 +154,7 @@
sobomax[label="Maxim Sobolev\nsobomax at FreeBSD.org\n2000/05/17"]
stas [label="Stanislav Sedov\nstas at FreeBSD.org\n2006/09/18"]
stefan [label="Stefan Walter\nstefan at FreeBSD.org\n2006/05/07"]
+swills [label="Steve Wills\nswills at FreeBSD.org\n2010/09/03"]
tabthorpe [label="Thomas Abthorpe\ntabthorpe at FreeBSD.org\n2007/08/20"]
tdb [label="Tim Bishop\ntdb at FreeBSD.org\n2005/11/30"]
timur [label="Timur Bakeyev\ntimur at FreeBSD.org\n2007/06/07"]
@@ -331,6 +332,8 @@
pgj -> ashish
pgj -> jacula
+pgollucci -> swills
+
philip -> koitsu
rafan -> chinsan
@@ -373,5 +376,6 @@
wxs -> jsa
wxs -> sahil
wxs -> skreuzer
+wxs -> swills
}
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/committers-src.dot#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.120 2010/08/30 21:18:59 dim Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.122 2010/09/06 20:16:10 andreast Exp $
# This file is meant to list all FreeBSD src committers and describe the
# mentor-mentee relationships between them.
@@ -58,6 +58,7 @@
ambrisko [label="Doug Ambrisko\nambrisko at FreeBSD.org\n2001/12/19"]
anchie [label="Ana Kukec\nanchie at FreeBSD.org\n2010/04/14"]
andre [label="Andre Oppermann\nandre at FreeBSD.org\n2003/11/12"]
+andreast [label="Andreas Tobler\nandreast at FreeBSD.org\n2010/09/05"]
andrew [label="Andrew Turner\nandrew at FreeBSD.org\n2010/07/19"]
anholt [label="Eric Anholt\nanholt at FreeBSD.org\n2002/04/22"]
antoine [label="Antoine Brodin\nantoine at FreeBSD.org\n2008/02/03"]
@@ -410,6 +411,8 @@
njl -> rpaulo
njl -> sepotvin
+nwhitehorn -> andreast
+
obrien -> benno
obrien -> groudier
obrien -> gshapiro
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpi_support/acpi_hp.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_hp.c,v 1.5 2010/06/11 19:53:42 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_hp.c,v 1.6 2010/09/06 07:34:32 avg Exp $");
/*
* Driver for extra ACPI-controlled features found on HP laptops
@@ -49,6 +49,7 @@
#include <sys/uio.h>
#include <sys/proc.h>
#include <sys/kernel.h>
+#include <sys/limits.h>
#include <sys/bus.h>
#include <sys/sbuf.h>
#include <sys/module.h>
@@ -116,7 +117,6 @@
struct acpi_hp_softc {
device_t dev;
- ACPI_HANDLE handle;
device_t wmi_dev;
int has_notify; /* notification GUID found */
int has_cmi; /* CMI GUID found */
@@ -289,6 +289,7 @@
ACPI_SERIAL_DECL(hp, "HP ACPI-WMI Mapping");
+static void acpi_hp_identify(driver_t *driver, device_t parent);
static int acpi_hp_probe(device_t dev);
static int acpi_hp_attach(device_t dev);
static int acpi_hp_detach(device_t dev);
@@ -320,6 +321,7 @@
};
static device_method_t acpi_hp_methods[] = {
+ DEVMETHOD(device_identify, acpi_hp_identify),
DEVMETHOD(device_probe, acpi_hp_probe),
DEVMETHOD(device_attach, acpi_hp_attach),
DEVMETHOD(device_detach, acpi_hp_detach),
@@ -405,7 +407,7 @@
"WLAN on air changed to %i "
"(new_wlan_status is %i)\n",
sc->was_wlan_on_air, new_wlan_status);
- acpi_UserNotify("HP", sc->handle,
+ acpi_UserNotify("HP", ACPI_ROOT_OBJECT,
0xc0+sc->was_wlan_on_air);
}
}
@@ -420,7 +422,7 @@
" to %i (new_bluetooth_status is %i)\n",
sc->was_bluetooth_on_air,
new_bluetooth_status);
- acpi_UserNotify("HP", sc->handle,
+ acpi_UserNotify("HP", ACPI_ROOT_OBJECT,
0xd0+sc->was_bluetooth_on_air);
}
}
@@ -433,16 +435,43 @@
"WWAN on air changed to %i"
" (new_wwan_status is %i)\n",
sc->was_wwan_on_air, new_wwan_status);
- acpi_UserNotify("HP", sc->handle,
+ acpi_UserNotify("HP", ACPI_ROOT_OBJECT,
0xe0+sc->was_wwan_on_air);
}
}
}
+static void
+acpi_hp_identify(driver_t *driver, device_t parent)
+{
+
+ /* Don't do anything if driver is disabled. */
+ if (acpi_disabled("hp"))
+ return;
+
+ /* Add only a single device instance. */
+ if (device_find_child(parent, "acpi_hp", -1) != NULL)
+ return;
+
+ /* Make sure acpi_wmi driver is present. */
+ if (devclass_find("acpi_wmi") == NULL)
+ return;
+
+ /*
+ * Add our device with late order, so that it is hopefully
+ * probed after acpi_wmi.
+ * XXX User proper constant instead of UINT_MAX for order.
+ */
+ if (BUS_ADD_CHILD(parent, UINT_MAX, "acpi_hp", -1) == NULL)
+ device_printf(parent, "add acpi_hp child failed\n");
+}
+
static int
acpi_hp_probe(device_t dev)
{
- if (acpi_disabled("hp") || device_get_unit(dev) != 0)
+
+ /* Skip auto-enumerated devices from ACPI namespace. */
+ if (acpi_get_handle(dev) != NULL)
return (ENXIO);
device_set_desc(dev, "HP ACPI-WMI Mapping");
@@ -460,7 +489,6 @@
sc = device_get_softc(dev);
sc->dev = dev;
- sc->handle = acpi_get_handle(dev);
sc->has_notify = 0;
sc->has_cmi = 0;
sc->bluetooth_enable_if_radio_on = 0;
@@ -477,7 +505,7 @@
sc->verbose = 0;
memset(sc->cmi_order, 0, sizeof(sc->cmi_order));
- if (!(wmi_devclass = devclass_find ("acpi_wmi"))) {
+ if (!(wmi_devclass = devclass_find("acpi_wmi"))) {
device_printf(dev, "Couldn't find acpi_wmi devclass\n");
return (EINVAL);
}
==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_hpet.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.27 2010/07/20 15:48:29 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.28 2010/09/05 19:24:32 mav Exp $");
#include "opt_acpi.h"
#if defined(__amd64__) || defined(__ia64__)
@@ -74,6 +74,7 @@
int irq;
int useirq;
int legacy_route;
+ uint32_t allowed_irqs;
struct resource *mem_res;
struct resource *intr_res;
void *intr_handle;
@@ -146,7 +147,7 @@
struct hpet_timer *mt = (struct hpet_timer *)et->et_priv;
struct hpet_timer *t;
struct hpet_softc *sc = mt->sc;
- uint32_t fdiv;
+ uint32_t fdiv, cmp;
t = (mt->pcpu_master < 0) ? mt : &sc->t[mt->pcpu_slaves[curcpu]];
if (period != NULL) {
@@ -164,23 +165,31 @@
fdiv += sc->freq * first->sec;
} else
fdiv = t->div;
+ if (t->irq < 0)
+ bus_write_4(sc->mem_res, HPET_ISR, 1 << t->num);
+ t->caps |= HPET_TCNF_INT_ENB;
t->last = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER);
+restart:
+ cmp = t->last + fdiv;
if (t->mode == 1 && (t->caps & HPET_TCAP_PER_INT)) {
t->caps |= HPET_TCNF_TYPE;
bus_write_4(sc->mem_res, HPET_TIMER_CAP_CNF(t->num),
t->caps | HPET_TCNF_VAL_SET);
- bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num),
- t->last + fdiv);
+ bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num), cmp);
+ bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num), t->div);
+ } else {
+ t->caps &= ~HPET_TCNF_TYPE;
+ bus_write_4(sc->mem_res, HPET_TIMER_CAP_CNF(t->num), t->caps);
+ bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num), cmp);
+ }
+ if (fdiv < 5000) {
bus_read_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num));
- bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num),
- t->div);
- } else {
- bus_write_4(sc->mem_res, HPET_TIMER_COMPARATOR(t->num),
- t->last + fdiv);
+ t->last = bus_read_4(sc->mem_res, HPET_MAIN_COUNTER);
+ if ((int32_t)(t->last - cmp) < 0) {
+ fdiv *= 2;
+ goto restart;
+ }
}
- t->caps |= HPET_TCNF_INT_ENB;
- bus_write_4(sc->mem_res, HPET_ISR, 1 << t->num);
- bus_write_4(sc->mem_res, HPET_TIMER_CAP_CNF(t->num), t->caps);
return (0);
}
@@ -321,7 +330,7 @@
int i, j, num_msi, num_timers, num_percpu_et, num_percpu_t, cur_cpu;
int pcpu_master;
static int maxhpetet = 0;
- uint32_t val, val2, cvectors;
+ uint32_t val, val2, cvectors, dvectors;
uint16_t vendor, rev;
ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
@@ -438,10 +447,9 @@
sc->t[1].vectors = 0;
}
- num_msi = 0;
- sc->useirq = 0;
- /* Find common legacy IRQ vectors for all timers. */
- cvectors = 0xffff0000;
+ /* Check what IRQs we want use. */
+ /* By default allow any PCI IRQs. */
+ sc->allowed_irqs = 0xffff0000;
/*
* HPETs in AMD chipsets before SB800 have problems with IRQs >= 16
* Lower are also not always working for different reasons.
@@ -450,7 +458,25 @@
* interrupt loss. Avoid legacy IRQs for AMD.
*/
if (vendor == HPET_VENDID_AMD)
- cvectors = 0x00000000;
+ sc->allowed_irqs = 0x00000000;
+ /*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list