svn commit: r245784 - in projects/counters: . bin/sh contrib/libcxxrt etc gnu/usr.bin/gdb/kgdb gnu/usr.bin/grep lib/libc/sys lib/libvmmapi release share/info share/man/man4 share/man/man5 share/man...
Gleb Smirnoff
glebius at FreeBSD.org
Tue Jan 22 10:22:21 UTC 2013
Author: glebius
Date: Tue Jan 22 10:22:12 2013
New Revision: 245784
URL: http://svnweb.freebsd.org/changeset/base/245784
Log:
Merge head r243428 through r245783.
Added:
projects/counters/usr.sbin/bsdinstall/partedit/scripted.c
- copied unchanged from r245783, head/usr.sbin/bsdinstall/partedit/scripted.c
projects/counters/usr.sbin/bsdinstall/scripts/script
- copied unchanged from r245783, head/usr.sbin/bsdinstall/scripts/script
Modified:
projects/counters/Makefile.inc1
projects/counters/bin/sh/TOUR
projects/counters/bin/sh/eval.c
projects/counters/bin/sh/init.h
projects/counters/bin/sh/input.c
projects/counters/bin/sh/main.c
projects/counters/bin/sh/mkinit.c
projects/counters/bin/sh/sh.1
projects/counters/bin/sh/var.c
projects/counters/contrib/libcxxrt/exception.cc
projects/counters/etc/Makefile
projects/counters/gnu/usr.bin/gdb/kgdb/main.c
projects/counters/gnu/usr.bin/grep/grep.c
projects/counters/lib/libc/sys/kqueue.2
projects/counters/release/rc.local
projects/counters/share/info/Makefile
projects/counters/share/man/man4/Makefile
projects/counters/share/man/man5/make.conf.5
projects/counters/share/man/man9/VFS_SET.9
projects/counters/share/mk/bsd.incs.mk
projects/counters/share/mk/bsd.info.mk
projects/counters/share/mk/bsd.lib.mk
projects/counters/share/mk/bsd.links.mk
projects/counters/share/mk/bsd.man.mk
projects/counters/share/mk/bsd.own.mk
projects/counters/sys/amd64/include/vmm.h (contents, props changed)
projects/counters/sys/amd64/include/vmm_dev.h (contents, props changed)
projects/counters/sys/amd64/vmm/vmm.c (contents, props changed)
projects/counters/sys/boot/arm/uboot/Makefile
projects/counters/sys/boot/fdt/dts/beaglebone.dts
projects/counters/sys/boot/i386/efi/Makefile
projects/counters/sys/boot/sparc64/loader/main.c
projects/counters/sys/conf/Makefile.arm
projects/counters/sys/conf/files.amd64
projects/counters/sys/conf/files.i386
projects/counters/sys/conf/ldscript.arm
projects/counters/sys/contrib/dev/acpica/include/acglobal.h
projects/counters/sys/contrib/octeon-sdk/cvmx-helper-board.c
projects/counters/sys/dev/ath/if_ath_tx.c
projects/counters/sys/dev/ath/if_athvar.h
projects/counters/sys/dev/hpt27xx/hpt27xx_config.c
projects/counters/sys/dev/hpt27xx/os_bsd.h
projects/counters/sys/dev/hpt27xx/osm_bsd.c
projects/counters/sys/dev/mmc/mmc.c
projects/counters/sys/dev/mmc/mmcreg.h
projects/counters/sys/dev/usb/quirk/usb_quirk.c
projects/counters/sys/dev/usb/usbdevs
projects/counters/sys/modules/hpt27xx/Makefile
projects/counters/sys/net/if_lagg.c
projects/counters/sys/netinet/tcp_input.c
projects/counters/tools/install.sh
projects/counters/usr.bin/grep/grep.c
projects/counters/usr.bin/tr/tr.c
projects/counters/usr.sbin/bhyve/bhyverun.c (contents, props changed)
projects/counters/usr.sbin/bhyve/pci_emul.h (contents, props changed)
projects/counters/usr.sbin/bhyve/pci_passthru.c (contents, props changed)
projects/counters/usr.sbin/bhyvectl/bhyvectl.c (contents, props changed)
projects/counters/usr.sbin/bsdconfig/share/script.subr
projects/counters/usr.sbin/bsdinstall/bsdinstall.8
projects/counters/usr.sbin/bsdinstall/partedit/Makefile
projects/counters/usr.sbin/bsdinstall/partedit/diskeditor.c
projects/counters/usr.sbin/bsdinstall/partedit/part_wizard.c
projects/counters/usr.sbin/bsdinstall/partedit/partedit.c
projects/counters/usr.sbin/bsdinstall/partedit/partedit.h
projects/counters/usr.sbin/bsdinstall/scripts/Makefile
projects/counters/usr.sbin/inetd/inetd.c
Directory Properties:
projects/counters/ (props changed)
projects/counters/contrib/libcxxrt/ (props changed)
projects/counters/gnu/usr.bin/gdb/ (props changed)
projects/counters/lib/libc/ (props changed)
projects/counters/lib/libvmmapi/ (props changed)
projects/counters/lib/libvmmapi/Makefile (props changed)
projects/counters/lib/libvmmapi/vmmapi.c (props changed)
projects/counters/lib/libvmmapi/vmmapi.h (props changed)
projects/counters/lib/libvmmapi/vmmapi_freebsd.c (props changed)
projects/counters/share/man/man4/ (props changed)
projects/counters/sys/ (props changed)
projects/counters/sys/amd64/vmm/ (props changed)
projects/counters/sys/amd64/vmm/amd/amdv.c (props changed)
projects/counters/sys/amd64/vmm/intel/ept.c (props changed)
projects/counters/sys/amd64/vmm/intel/ept.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmcs.c (props changed)
projects/counters/sys/amd64/vmm/intel/vmcs.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmx.c (props changed)
projects/counters/sys/amd64/vmm/intel/vmx.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_controls.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_cpufunc.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_genassym.c (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_msr.c (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_msr.h (props changed)
projects/counters/sys/amd64/vmm/intel/vmx_support.S (props changed)
projects/counters/sys/amd64/vmm/intel/vtd.c (props changed)
projects/counters/sys/amd64/vmm/io/iommu.c (props changed)
projects/counters/sys/amd64/vmm/io/iommu.h (props changed)
projects/counters/sys/amd64/vmm/io/ppt.c (props changed)
projects/counters/sys/amd64/vmm/io/ppt.h (props changed)
projects/counters/sys/amd64/vmm/io/vdev.c (props changed)
projects/counters/sys/amd64/vmm/io/vdev.h (props changed)
projects/counters/sys/amd64/vmm/io/vlapic.c (props changed)
projects/counters/sys/amd64/vmm/io/vlapic.h (props changed)
projects/counters/sys/amd64/vmm/vmm_dev.c (props changed)
projects/counters/sys/amd64/vmm/vmm_ipi.c (props changed)
projects/counters/sys/amd64/vmm/vmm_ipi.h (props changed)
projects/counters/sys/amd64/vmm/vmm_ktr.h (props changed)
projects/counters/sys/amd64/vmm/vmm_lapic.c (props changed)
projects/counters/sys/amd64/vmm/vmm_lapic.h (props changed)
projects/counters/sys/amd64/vmm/vmm_mem.c (props changed)
projects/counters/sys/amd64/vmm/vmm_mem.h (props changed)
projects/counters/sys/amd64/vmm/vmm_msr.c (props changed)
projects/counters/sys/amd64/vmm/vmm_msr.h (props changed)
projects/counters/sys/amd64/vmm/vmm_stat.c (props changed)
projects/counters/sys/amd64/vmm/vmm_stat.h (props changed)
projects/counters/sys/amd64/vmm/vmm_support.S (props changed)
projects/counters/sys/amd64/vmm/vmm_util.c (props changed)
projects/counters/sys/amd64/vmm/vmm_util.h (props changed)
projects/counters/sys/amd64/vmm/x86.c (props changed)
projects/counters/sys/amd64/vmm/x86.h (props changed)
projects/counters/sys/boot/ (props changed)
projects/counters/sys/boot/i386/efi/ (props changed)
projects/counters/sys/conf/ (props changed)
projects/counters/sys/contrib/dev/acpica/ (props changed)
projects/counters/sys/contrib/dev/acpica/include/ (props changed)
projects/counters/sys/contrib/octeon-sdk/ (props changed)
projects/counters/sys/dev/blackhole/ (props changed)
projects/counters/sys/dev/blackhole/blackhole.c (props changed)
projects/counters/sys/dev/bvm/ (props changed)
projects/counters/sys/dev/bvm/bvm_console.c (props changed)
projects/counters/sys/dev/bvm/bvm_dbg.c (props changed)
projects/counters/sys/modules/blackhole/ (props changed)
projects/counters/sys/modules/blackhole/Makefile (props changed)
projects/counters/sys/modules/vmm/ (props changed)
projects/counters/sys/modules/vmm/Makefile (props changed)
projects/counters/usr.sbin/bhyve/ (props changed)
projects/counters/usr.sbin/bhyve/Makefile (props changed)
projects/counters/usr.sbin/bhyve/atpic.c (props changed)
projects/counters/usr.sbin/bhyve/bhyverun.h (props changed)
projects/counters/usr.sbin/bhyve/consport.c (props changed)
projects/counters/usr.sbin/bhyve/dbgport.c (props changed)
projects/counters/usr.sbin/bhyve/dbgport.h (props changed)
projects/counters/usr.sbin/bhyve/elcr.c (props changed)
projects/counters/usr.sbin/bhyve/inout.c (props changed)
projects/counters/usr.sbin/bhyve/inout.h (props changed)
projects/counters/usr.sbin/bhyve/mevent.c (props changed)
projects/counters/usr.sbin/bhyve/mevent.h (props changed)
projects/counters/usr.sbin/bhyve/mevent_test.c (props changed)
projects/counters/usr.sbin/bhyve/mptbl.c (props changed)
projects/counters/usr.sbin/bhyve/pci_emul.c (props changed)
projects/counters/usr.sbin/bhyve/pci_hostbridge.c (props changed)
projects/counters/usr.sbin/bhyve/pci_virtio_block.c (props changed)
projects/counters/usr.sbin/bhyve/pci_virtio_net.c (props changed)
projects/counters/usr.sbin/bhyve/pit_8254.c (props changed)
projects/counters/usr.sbin/bhyve/pit_8254.h (props changed)
projects/counters/usr.sbin/bhyve/post.c (props changed)
projects/counters/usr.sbin/bhyve/rtc.c (props changed)
projects/counters/usr.sbin/bhyve/uart.c (props changed)
projects/counters/usr.sbin/bhyve/virtio.h (props changed)
projects/counters/usr.sbin/bhyve/xmsr.c (props changed)
projects/counters/usr.sbin/bhyve/xmsr.h (props changed)
projects/counters/usr.sbin/bhyvectl/ (props changed)
projects/counters/usr.sbin/bhyvectl/Makefile (props changed)
Modified: projects/counters/Makefile.inc1
==============================================================================
--- projects/counters/Makefile.inc1 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/Makefile.inc1 Tue Jan 22 10:22:12 2013 (r245784)
@@ -12,7 +12,6 @@
# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_DOCUPDATE do not update doc in ${MAKE} update
-# -DNO_WWWUPDATE do not update www in ${MAKE} update
# -DDB_FROM_SRC use the user/group databases in src/etc instead of
# the system database when installing.
# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
@@ -968,6 +967,13 @@ update:
@echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}"
@echo "--------------------------------------------------------------"
+ @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!"
+ @echo "!! Update methods with ${SUP} are deprecated."
+ @echo "!! Please see http://www.freebsd.org/handbook/svn.html"
+ @echo "!! and convert your update method to SVN_UPDATE or"
+ @echo "!! freebsd-update(8)."
+ @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!"
+ @sleep 5
.if defined(SUPFILE)
@${SUP} ${SUPFLAGS} ${SUPFILE}
.endif
@@ -983,9 +989,6 @@ update:
.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
.endif
-.if defined(WWWSUPFILE) && !defined(NO_WWWUPDATE)
- @${SUP} ${SUPFLAGS} ${WWWSUPFILE}
-.endif
.endif
.if defined(CVS_UPDATE)
@cd ${.CURDIR} ; \
@@ -993,6 +996,13 @@ update:
echo "--------------------------------------------------------------" ; \
echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
echo "--------------------------------------------------------------" ; \
+ echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
+ echo "!! Update methods with ${SUP} are deprecated." ; \
+ echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \
+ echo "!! and convert your update method to SVN_UPDATE or" ; \
+ echo "!! freebsd-update(8)." ; \
+ echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
+ sleep 5 ; \
echo ${CVS} -R -q update ${CVSFLAGS} ; \
${CVS} -R -q update ${CVSFLAGS} ; \
fi
@@ -1072,7 +1082,7 @@ _lex= usr.bin/lex
_yacc= usr.bin/yacc
.endif
-.if defined(DB_FROM_SRC) && ${BOOTSTRAPPING} < 1000026
+.if ${BOOTSTRAPPING} < 1000026
_nmtree= lib/libnetbsd \
usr.sbin/nmtree
.endif
Modified: projects/counters/bin/sh/TOUR
==============================================================================
--- projects/counters/bin/sh/TOUR Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/TOUR Tue Jan 22 10:22:12 2013 (r245784)
@@ -33,10 +33,6 @@ programs is:
There are undoubtedly too many of these. Mkinit searches all the
C source files for entries looking like:
- INIT {
- x = 1; /* executed during initialization */
- }
-
RESET {
x = 2; /* executed when the shell does a longjmp
back to the main command loop */
Modified: projects/counters/bin/sh/eval.c
==============================================================================
--- projects/counters/bin/sh/eval.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/eval.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -193,7 +193,9 @@ evaltree(union node *n, int flags)
{
int do_etest;
union node *next;
+ struct stackmark smark;
+ setstackmark(&smark);
do_etest = 0;
if (n == NULL) {
TRACE(("evaltree(NULL) called\n"));
@@ -292,8 +294,10 @@ evaltree(union node *n, int flags)
break;
}
n = next;
+ popstackmark(&smark);
} while (n != NULL);
out:
+ popstackmark(&smark);
if (pendingsigs)
dotrap();
if (eflag && exitstatus != 0 && do_etest)
@@ -347,10 +351,8 @@ evalfor(union node *n, int flags)
struct arglist arglist;
union node *argp;
struct strlist *sp;
- struct stackmark smark;
int status;
- setstackmark(&smark);
arglist.lastp = &arglist.list;
for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
oexitstatus = exitstatus;
@@ -375,7 +377,6 @@ evalfor(union node *n, int flags)
}
}
loopnest--;
- popstackmark(&smark);
exitstatus = status;
}
@@ -392,16 +393,13 @@ evalcase(union node *n)
union node *cp;
union node *patp;
struct arglist arglist;
- struct stackmark smark;
- setstackmark(&smark);
arglist.lastp = &arglist.list;
oexitstatus = exitstatus;
expandarg(n->ncase.expr, &arglist, EXP_TILDE);
for (cp = n->ncase.cases ; cp ; cp = cp->nclist.next) {
for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
if (casematch(patp, arglist.list->text)) {
- popstackmark(&smark);
while (cp->nclist.next &&
cp->type == NCLISTFALLTHRU &&
cp->nclist.body == NULL)
@@ -415,7 +413,6 @@ evalcase(union node *n)
}
}
}
- popstackmark(&smark);
exitstatus = 0;
return (NULL);
}
@@ -610,7 +607,7 @@ evalbackcmd(union node *n, struct backcm
{
int pip[2];
struct job *jp;
- struct stackmark smark; /* unnecessary */
+ struct stackmark smark;
struct jmploc jmploc;
struct jmploc *savehandler;
struct localvar *savelocalvars;
@@ -751,7 +748,6 @@ safe_builtin(int idx, int argc, char **a
static void
evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
{
- struct stackmark smark;
union node *argp;
struct arglist arglist;
struct arglist varlist;
@@ -778,7 +774,6 @@ evalcommand(union node *cmd, int flags,
/* First expand the arguments. */
TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags));
- setstackmark(&smark);
arglist.lastp = &arglist.list;
varlist.lastp = &varlist.list;
varflag = 1;
@@ -1149,7 +1144,6 @@ out:
setvar("_", lastarg, 0);
if (do_clearcmdentry)
clearcmdentry();
- popstackmark(&smark);
}
Modified: projects/counters/bin/sh/init.h
==============================================================================
--- projects/counters/bin/sh/init.h Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/init.h Tue Jan 22 10:22:12 2013 (r245784)
@@ -33,5 +33,4 @@
* $FreeBSD$
*/
-void init(void);
void reset(void);
Modified: projects/counters/bin/sh/input.c
==============================================================================
--- projects/counters/bin/sh/input.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/input.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
-MKINIT
struct strpush {
struct strpush *prev; /* preceding string on stack */
char *prevstring;
@@ -78,7 +77,6 @@ struct strpush {
* contains information about the current file being read.
*/
-MKINIT
struct parsefile {
struct parsefile *prev; /* preceding file on stack */
int linno; /* current line */
@@ -96,8 +94,11 @@ int plinno = 1; /* input line number *
int parsenleft; /* copy of parsefile->nleft */
MKINIT int parselleft; /* copy of parsefile->lleft */
char *parsenextc; /* copy of parsefile->nextc */
-MKINIT struct parsefile basepf; /* top level input file */
-char basebuf[BUFSIZ + 1]; /* buffer for top level input file */
+static char basebuf[BUFSIZ + 1];/* buffer for top level input file */
+static struct parsefile basepf = { /* top level input file */
+ .nextc = basebuf,
+ .buf = basebuf
+};
static struct parsefile *parsefile = &basepf; /* current input file */
int whichprompt; /* 1 == PS1, 2 == PS2 */
@@ -111,12 +112,6 @@ static void popstring(void);
INCLUDE "input.h"
INCLUDE "error.h"
-MKINIT char basebuf[];
-
-INIT {
- basepf.nextc = basepf.buf = basebuf;
-}
-
RESET {
popallfiles();
parselleft = parsenleft = 0; /* clear input buffer */
Modified: projects/counters/bin/sh/main.c
==============================================================================
--- projects/counters/bin/sh/main.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/main.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
#endif
rootpid = getpid();
rootshell = 1;
- init();
+ initvar();
setstackmark(&smark);
setstackmark(&smark2);
procargs(argc, argv);
Modified: projects/counters/bin/sh/mkinit.c
==============================================================================
--- projects/counters/bin/sh/mkinit.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/mkinit.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -101,7 +101,7 @@ struct block {
*/
struct event {
- const char *name; /* name of event (e.g. INIT) */
+ const char *name; /* name of event (e.g. RESET) */
const char *routine; /* name of routine called on event */
const char *comment; /* comment describing routine */
struct text code; /* code for handling event */
@@ -114,11 +114,6 @@ char writer[] = "\
*/\n\
\n";
-char init[] = "\
-/*\n\
- * Initialization code.\n\
- */\n";
-
char reset[] = "\
/*\n\
* This routine is called when an error or an interrupt occurs in an\n\
@@ -127,7 +122,6 @@ char reset[] = "\
struct event event[] = {
- { "INIT", "init", init, { NULL, 0, NULL, NULL } },
{ "RESET", "reset", reset, { NULL, 0, NULL, NULL } },
{ NULL, NULL, NULL, { NULL, 0, NULL, NULL } }
};
Modified: projects/counters/bin/sh/sh.1
==============================================================================
--- projects/counters/bin/sh/sh.1 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/sh.1 Tue Jan 22 10:22:12 2013 (r245784)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd January 14, 2013
+.Dd January 20, 2013
.Dt SH 1
.Os
.Sh NAME
@@ -138,10 +138,10 @@ variable to some file by placing the fol
.Pa .profile
in the home directory,
substituting for
-.Pa .shinit
+.Pa .shrc
the filename desired:
.Pp
-.Dl "ENV=$HOME/.shinit; export ENV"
+.Dl "ENV=$HOME/.shrc; export ENV"
.Pp
The first non-option argument specified on the command line
will be treated as the
Modified: projects/counters/bin/sh/var.c
==============================================================================
--- projects/counters/bin/sh/var.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/bin/sh/var.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -146,29 +146,11 @@ static int varequal(const char *, const
static struct var *find_var(const char *, struct var ***, int *);
static int localevar(const char *);
-/*
- * Initialize the variable symbol tables and import the environment.
- */
-
-#ifdef mkinit
-INCLUDE "var.h"
-MKINIT char **environ;
-INIT {
- char **envp;
-
- initvar();
- for (envp = environ ; *envp ; envp++) {
- if (strchr(*envp, '=')) {
- setvareq(*envp, VEXPORT|VTEXTFIXED);
- }
- }
-}
-#endif
-
+extern char **environ;
/*
- * This routine initializes the builtin variables. It is called when the
- * shell is initialized.
+ * This routine initializes the builtin variables and imports the environment.
+ * It is called when the shell is initialized.
*/
void
@@ -178,6 +160,7 @@ initvar(void)
const struct varinit *ip;
struct var *vp;
struct var **vpp;
+ char **envp;
for (ip = varinit ; (vp = ip->var) != NULL ; ip++) {
if (find_var(ip->text, &vpp, &vp->name_len) != NULL)
@@ -201,6 +184,11 @@ initvar(void)
fmtstr(ppid, sizeof(ppid), "%d", (int)getppid());
setvarsafe("PPID", ppid, 0);
}
+ for (envp = environ ; *envp ; envp++) {
+ if (strchr(*envp, '=')) {
+ setvareq(*envp, VEXPORT|VTEXTFIXED);
+ }
+ }
}
/*
@@ -356,7 +344,7 @@ setvareq(char *s, int flags)
* a regular variable function callback, but why bother?
*
* Note: this assumes iflag is not set to 1 initially.
- * As part of init(), this is called before arguments
+ * As part of initvar(), this is called before arguments
* are looked at.
*/
if ((vp == &vmpath || (vp == &vmail && ! mpathset())) &&
Modified: projects/counters/contrib/libcxxrt/exception.cc
==============================================================================
--- projects/counters/contrib/libcxxrt/exception.cc Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/contrib/libcxxrt/exception.cc Tue Jan 22 10:22:12 2013 (r245784)
@@ -801,7 +801,7 @@ extern "C" void __cxa_decrement_exceptio
*/
extern "C" void __cxa_rethrow()
{
- __cxa_thread_info *ti = thread_info_fast();
+ __cxa_thread_info *ti = thread_info();
__cxa_eh_globals *globals = &ti->globals;
// Note: We don't remove this from the caught list here, because
// __cxa_end_catch will be called when we unwind out of the try block. We
Modified: projects/counters/etc/Makefile
==============================================================================
--- projects/counters/etc/Makefile Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/etc/Makefile Tue Jan 22 10:22:12 2013 (r245784)
@@ -324,26 +324,29 @@ distrib-dirs:
-f $$m -p $$d; \
${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
done; true
- ln -sfh usr/src/sys ${DESTDIR}/sys
+ ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
cd ${DESTDIR}/usr/share/man; \
for mandir in man*; do \
- ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
- ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \
+ ${INSTALL_SYMLINK} ../$$mandir \
+ ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+ ${INSTALL_SYMLINK} ../$$mandir \
+ ${DESTDIR}/usr/share/man/en.UTF-8/; \
done
cd ${DESTDIR}/usr/share/openssl/man; \
for mandir in man*; do \
- ln -sfh ../$$mandir \
+ ${INSTALL_SYMLINK} ../$$mandir \
${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
done
set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
while [ $$# -gt 0 ] ; do \
- ln -sfh "$$2" "${DESTDIR}/usr/share/man/$$1"; \
- ln -sfh "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" \
+ "${DESTDIR}/usr/share/openssl/man/$$1"; \
shift; shift; \
done
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
while [ $$# -gt 0 ] ; do \
- ln -sfh "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
+ ${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
shift; shift; \
done
Modified: projects/counters/gnu/usr.bin/gdb/kgdb/main.c
==============================================================================
--- projects/counters/gnu/usr.bin/gdb/kgdb/main.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/gnu/usr.bin/gdb/kgdb/main.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -333,11 +333,24 @@ main(int argc, char *argv[])
args.argv = malloc(sizeof(char *));
args.argv[0] = argv[0];
- while ((ch = getopt(argc, argv, "ac:d:fn:qr:vw")) != -1) {
+ while ((ch = getopt(argc, argv, "ab:c:d:fn:qr:vw")) != -1) {
switch (ch) {
case 'a':
annotation_level++;
break;
+ case 'b':
+ {
+ int i;
+ char *p;
+
+ i = strtol (optarg, &p, 0);
+ if (i == 0 && p == optarg)
+ warnx("warning: could not set baud rate to `%s'.\n",
+ optarg);
+ else
+ baud_rate = i;
+ }
+ break;
case 'c': /* use given core file. */
if (vmcore != NULL) {
warnx("option %c: can only be specified once",
Modified: projects/counters/gnu/usr.bin/grep/grep.c
==============================================================================
--- projects/counters/gnu/usr.bin/grep/grep.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/gnu/usr.bin/grep/grep.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -304,7 +304,7 @@ reset (int fd, char const *file, struct
if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode))
return 0;
#ifndef DJGPP
- if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode)))
+ if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode) || S_ISFIFO(stats->stat.st_mode)))
#else
if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode)))
#endif
@@ -942,6 +942,7 @@ grepfile (char const *file, struct stats
int desc;
int count;
int status;
+ int flags;
if (! file)
{
@@ -950,7 +951,7 @@ grepfile (char const *file, struct stats
}
else
{
- while ((desc = open (file, O_RDONLY)) < 0 && errno == EINTR)
+ while ((desc = open (file, O_RDONLY | O_NONBLOCK)) < 0 && errno == EINTR)
continue;
if (desc < 0)
@@ -990,6 +991,9 @@ grepfile (char const *file, struct stats
return 1;
}
+ flags = fcntl(desc, F_GETFL);
+ flags &= ~O_NONBLOCK;
+ fcntl(desc, F_SETFL, flags);
filename = file;
}
Modified: projects/counters/lib/libc/sys/kqueue.2
==============================================================================
--- projects/counters/lib/libc/sys/kqueue.2 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/lib/libc/sys/kqueue.2 Tue Jan 22 10:22:12 2013 (r245784)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2012
+.Dd January 21, 2013
.Dt KQUEUE 2
.Os
.Sh NAME
@@ -417,7 +417,9 @@ and
facilities, and has a lower precedence.
The filter will record
all attempts to deliver a signal to a process, even if the signal has
-been marked as SIG_IGN.
+been marked as SIG_IGN, except for the
+.Dv SIGCHLD
+signal, which, if ignored, won't be recorded by the filter.
Event notification happens after normal
signal delivery processing.
.Va data
Modified: projects/counters/release/rc.local
==============================================================================
--- projects/counters/release/rc.local Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/release/rc.local Tue Jan 22 10:22:12 2013 (r245784)
@@ -45,6 +45,16 @@ else
fi
export TERM
+if [ -f /etc/installerconfig ]; then
+ if bsdinstall script /etc/installerconfig; then
+ dialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10
+ reboot
+ else
+ dialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0
+ fi
+ exit
+fi
+
dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0
case $? in
Modified: projects/counters/share/info/Makefile
==============================================================================
--- projects/counters/share/info/Makefile Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/info/Makefile Tue Jan 22 10:22:12 2013 (r245784)
@@ -17,6 +17,6 @@ beforeinstall:
@exit 3;
.endif
.if !exists(${DESTDIR}${INFODIR}/dir)
- ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \
+ ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m 644 \
dir-tmpl ${DESTDIR}${INFODIR}/dir
.endif
Modified: projects/counters/share/man/man4/Makefile
==============================================================================
--- projects/counters/share/man/man4/Makefile Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/man/man4/Makefile Tue Jan 22 10:22:12 2013 (r245784)
@@ -70,6 +70,7 @@ MAN= aac.4 \
bce.4 \
bfe.4 \
bge.4 \
+ ${_bhyve.4} \
bktr.4 \
blackhole.4 \
bpf.4 \
@@ -784,6 +785,7 @@ MLINKS+=lindev.4 full.4
.endif
.if ${MACHINE_CPUARCH} == "amd64"
+_bhyve.4= bhyve.4
_qlxgb.4= qlxgb.4
_sfxge.4= sfxge.4
Modified: projects/counters/share/man/man5/make.conf.5
==============================================================================
--- projects/counters/share/man/man5/make.conf.5 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/man/man5/make.conf.5 Tue Jan 22 10:22:12 2013 (r245784)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 14, 2012
+.Dd January 21, 2013
.Dt MAKE.CONF 5
.Os
.Sh NAME
@@ -255,10 +255,6 @@ Set this to not update the doc tree duri
.Pq Vt bool
Set this to not update the ports tree during
.Dq Li "make update" .
-.It Va NO_WWWUPDATE
-.Pq Vt bool
-Set this to not update the www tree during
-.Dq Li "make update" .
.It Va SUP
.Pq Vt str
The location of the
@@ -309,6 +305,11 @@ and
.Pa ports
trees with
.Dq Li "make update" .
+This option is deprecated.
+Please use
+.Va SVN_UPDATE
+or
+.Xr freebsd-update 8 .
.It Va SVN_UPDATE
.Pq Vt bool
Set this to use
Modified: projects/counters/share/man/man9/VFS_SET.9
==============================================================================
--- projects/counters/share/man/man9/VFS_SET.9 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/man/man9/VFS_SET.9 Tue Jan 22 10:22:12 2013 (r245784)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 5, 2007
+.Dd January 22, 2012
.Dt VFS_SET 9
.Os
.Sh NAME
@@ -87,23 +87,13 @@ sysctl is set to
* fill in the ones we use, and use the vfs_std for the rest.
*/
static struct vfsops myfs_vfsops = {
- myfs_mount,
- vfs_stdstart,
- myfs_unmount,
- myfs_root,
- vfs_stdquotactl,
- myfs_statfs,
- vfs_stdsync,
- vfs_stdvget,
- vfs_stdfhtovp,
- vfs_stdcheckexp,
- vfs_stdvptofh,
- vfs_stdinit,
- vfs_stduninit,
- vfs_stdextattrctl,
+ .vfs_mount = myfs_mount,
+ .vfs_root = myfs_root,
+ .vfs_statfs = myfs_statfs,
+ .vfs_unmount = myfs_unmount,
};
-VFS_SET(myfs_vfsops, skelfs, 0);
+VFS_SET(myfs_vfsops, myfs, 0);
.Ed
.Sh SEE ALSO
.Xr jail 2 ,
Modified: projects/counters/share/mk/bsd.incs.mk
==============================================================================
--- projects/counters/share/mk/bsd.incs.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.incs.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -73,7 +73,7 @@ installincludes:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -fs $$l $$t; \
+ ${INSTALL_SYMLINK} $$l $$t; \
done; true
.endif
.endif # !target(installincludes)
Modified: projects/counters/share/mk/bsd.info.mk
==============================================================================
--- projects/counters/share/mk/bsd.info.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.info.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -113,7 +113,7 @@ DVIPS2ASCII?= dvips2ascii
.info.html:
${INFO2HTML} ${.IMPSRC}
- ln -f ${.TARGET:R}.info.Top.html ${.TARGET}
+ ${INSTALL_LINK} ${.TARGET:R}.info.Top.html ${.TARGET}
.PATH: ${.CURDIR} ${SRCDIR}
Modified: projects/counters/share/mk/bsd.lib.mk
==============================================================================
--- projects/counters/share/mk/bsd.lib.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.lib.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -184,7 +184,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
- @ln -fs ${SHLIB_NAME} ${SHLIB_LINK}
+ @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -309,9 +309,9 @@ _libinstall:
${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.else
.if ${SHLIBDIR} == ${LIBDIR}
- ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+ ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.else
- ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
+ ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${LIBDIR}/${SHLIB_LINK}
.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME})
-chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
Modified: projects/counters/share/mk/bsd.links.mk
==============================================================================
--- projects/counters/share/mk/bsd.links.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.links.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -15,7 +15,7 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -f $$l $$t; \
+ ${INSTALL_LINK} $$l $$t; \
done; true
.endif
.if defined(SYMLINKS) && !empty(SYMLINKS)
@@ -26,6 +26,6 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ln -fs $$l $$t; \
+ ${INSTALL_SYMLINK} $$l $$t; \
done; true
.endif
Modified: projects/counters/share/mk/bsd.man.mk
==============================================================================
--- projects/counters/share/mk/bsd.man.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.man.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -216,7 +216,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ln $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
@@ -231,7 +231,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ln $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.endif
.endif
Modified: projects/counters/share/mk/bsd.own.mk
==============================================================================
--- projects/counters/share/mk/bsd.own.mk Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/share/mk/bsd.own.mk Tue Jan 22 10:22:12 2013 (r245784)
@@ -181,6 +181,15 @@ NLSMODE?= ${NOBINMODE}
INCLUDEDIR?= /usr/include
+#
+# install(1) parameters.
+#
+HRDLINK?= -l h
+SYMLINK?= -l s
+
+INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
+
# Common variables
.if !defined(DEBUG_FLAGS)
STRIP?= -s
Modified: projects/counters/sys/amd64/include/vmm.h
==============================================================================
--- projects/counters/sys/amd64/include/vmm.h Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/amd64/include/vmm.h Tue Jan 22 10:22:12 2013 (r245784)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: vmm.h 482 2011-05-09 21:22:43Z grehan $
+ * $FreeBSD$
*/
#ifndef _VMM_H_
Modified: projects/counters/sys/amd64/include/vmm_dev.h
==============================================================================
--- projects/counters/sys/amd64/include/vmm_dev.h Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/amd64/include/vmm_dev.h Tue Jan 22 10:22:12 2013 (r245784)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: vmm_dev.h 482 2011-05-09 21:22:43Z grehan $
+ * $FreeBSD$
*/
#ifndef _VMM_DEV_H_
Modified: projects/counters/sys/amd64/vmm/vmm.c
==============================================================================
--- projects/counters/sys/amd64/vmm/vmm.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/amd64/vmm/vmm.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -249,11 +249,15 @@ static moduledata_t vmm_kmod = {
};
/*
- * Execute the module load handler after the pci passthru driver has had
- * a chance to claim devices. We need this information at the time we do
- * iommu initialization.
+ * vmm initialization has the following dependencies:
+ *
+ * - iommu initialization must happen after the pci passthru driver has had
+ * a chance to attach to any passthru devices (after SI_SUB_CONFIGURE).
+ *
+ * - VT-x initialization requires smp_rendezvous() and therefore must happen
+ * after SMP is fully functional (after SI_SUB_SMP).
*/
-DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_CONFIGURE + 1, SI_ORDER_ANY);
+DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_SMP + 1, SI_ORDER_ANY);
MODULE_VERSION(vmm, 1);
SYSCTL_NODE(_hw, OID_AUTO, vmm, CTLFLAG_RW, NULL, NULL);
Modified: projects/counters/sys/boot/arm/uboot/Makefile
==============================================================================
--- projects/counters/sys/boot/arm/uboot/Makefile Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/boot/arm/uboot/Makefile Tue Jan 22 10:22:12 2013 (r245784)
@@ -112,8 +112,8 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/li
# clang doesn't understand %D as a specifier to printf
NO_WERROR.clang=
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBGCC}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand -lgcc
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: projects/counters/sys/boot/fdt/dts/beaglebone.dts
==============================================================================
--- projects/counters/sys/boot/fdt/dts/beaglebone.dts Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/boot/fdt/dts/beaglebone.dts Tue Jan 22 10:22:12 2013 (r245784)
@@ -161,7 +161,7 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "ti,cpsw";
- reg = <0x4A100000 0x3000>;
+ reg = <0x4A100000 0x4000>;
interrupts = <40 41 42 43>;
interrupt-parent = <&AINTC>;
phy-handle = <&phy0>;
Modified: projects/counters/sys/boot/i386/efi/Makefile
==============================================================================
--- projects/counters/sys/boot/i386/efi/Makefile Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/boot/i386/efi/Makefile Tue Jan 22 10:22:12 2013 (r245784)
@@ -36,7 +36,7 @@ FILES= loader.efi
FILESMODE_loader.efi= ${BINMODE}
LDSCRIPT= ${.CURDIR}/ldscript.i386
-LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
+LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared
${PROG}: ${LDSCRIPT}
Modified: projects/counters/sys/boot/sparc64/loader/main.c
==============================================================================
--- projects/counters/sys/boot/sparc64/loader/main.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/boot/sparc64/loader/main.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -142,6 +142,10 @@ static vm_offset_t heapva;
static char bootpath[64];
static phandle_t root;
+#ifdef LOADER_ZFS_SUPPORT
+static struct zfs_devdesc zfs_currdev;
+#endif
+
/*
* Machine dependent structures that the machine independent
* loader part uses.
@@ -732,7 +736,6 @@ static void
sparc64_zfs_probe(void)
{
struct vtoc8 vtoc;
- struct zfs_devdesc zfs_currdev;
char alias[64], devname[sizeof(alias) + sizeof(":x") - 1];
char type[sizeof("device_type")];
char *bdev, *dev, *odev;
@@ -805,9 +808,6 @@ sparc64_zfs_probe(void)
zfs_currdev.root_guid = 0;
zfs_currdev.d_dev = &zfs_dev;
zfs_currdev.d_type = zfs_currdev.d_dev->dv_type;
- (void)strncpy(bootpath, zfs_fmtdev(&zfs_currdev),
- sizeof(bootpath) - 1);
- bootpath[sizeof(bootpath) - 1] = '\0';
}
}
#endif /* LOADER_ZFS_SUPPORT */
@@ -878,10 +878,14 @@ main(int (*openfirm)(void *))
if ((*dp)->dv_init != 0)
(*dp)->dv_init();
- /*
- * Now that sparc64_zfs_probe() might have altered bootpath,
- * export it.
- */
+#ifdef LOADER_ZFS_SUPPORT
+ if (zfs_currdev.pool_guid != 0) {
+ (void)strncpy(bootpath, zfs_fmtdev(&zfs_currdev),
+ sizeof(bootpath) - 1);
+ bootpath[sizeof(bootpath) - 1] = '\0';
+ }
+#endif
+
env_setenv("currdev", EV_VOLATILE, bootpath,
ofw_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, bootpath,
Modified: projects/counters/sys/conf/Makefile.arm
==============================================================================
--- projects/counters/sys/conf/Makefile.arm Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/conf/Makefile.arm Tue Jan 22 10:22:12 2013 (r245784)
@@ -41,6 +41,8 @@ STRIP_FLAGS = -S
.if empty(DDB_ENABLED)
CFLAGS += -mno-apcs-frame
+.elif defined(WITH_ARM_EABI)
+CFLAGS += -funwind-tables
.endif
SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \
Modified: projects/counters/sys/conf/files.amd64
==============================================================================
--- projects/counters/sys/conf/files.amd64 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/conf/files.amd64 Tue Jan 22 10:22:12 2013 (r245784)
@@ -190,8 +190,7 @@ dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
dev/hpt27xx/os_bsd.c optional hpt27xx
-dev/hpt27xx/osm_bsd.c optional hpt27xx \
- compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}"
+dev/hpt27xx/osm_bsd.c optional hpt27xx
dev/hpt27xx/hpt27xx_config.c optional hpt27xx
dev/hptmv/entry.c optional hptmv
dev/hptmv/mv.c optional hptmv
Modified: projects/counters/sys/conf/files.i386
==============================================================================
--- projects/counters/sys/conf/files.i386 Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/conf/files.i386 Tue Jan 22 10:22:12 2013 (r245784)
@@ -181,8 +181,7 @@ dev/glxiic/glxiic.c optional glxiic
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
dev/hpt27xx/os_bsd.c optional hpt27xx
-dev/hpt27xx/osm_bsd.c optional hpt27xx \
- compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}"
+dev/hpt27xx/osm_bsd.c optional hpt27xx
dev/hpt27xx/hpt27xx_config.c optional hpt27xx
dev/hptmv/entry.c optional hptmv
dev/hptmv/mv.c optional hptmv
Modified: projects/counters/sys/conf/ldscript.arm
==============================================================================
--- projects/counters/sys/conf/ldscript.arm Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/conf/ldscript.arm Tue Jan 22 10:22:12 2013 (r245784)
@@ -56,6 +56,18 @@ SECTIONS
.init : { *(.init) } =0x9090
.plt : { *(.plt) }
+ _extab_start = .;
+ PROVIDE(extab_start = .);
+ .ARM.extab : { *(.ARM.extab) }
+ _extab.end = .;
+ PROVIDE(extab_end = .);
+
+ _exidx_start = .;
+ PROVIDE(exidx_start = .);
+ .ARM.exidx : { *(.ARM.exidx) }
+ _exidx_end = .;
+ PROVIDE(exidx_end = .);
+
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN(0x1000) + (. & (0x1000 - 1)) ;
Modified: projects/counters/sys/contrib/dev/acpica/include/acglobal.h
==============================================================================
--- projects/counters/sys/contrib/dev/acpica/include/acglobal.h Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/contrib/dev/acpica/include/acglobal.h Tue Jan 22 10:22:12 2013 (r245784)
@@ -420,7 +420,7 @@ ACPI_EXTERN UINT8
#ifdef ACPI_DISASSEMBLER
-BOOLEAN ACPI_INIT_GLOBAL (AcpiGbl_IgnoreNoopOperator, FALSE);
+ACPI_EXTERN BOOLEAN ACPI_INIT_GLOBAL (AcpiGbl_IgnoreNoopOperator, FALSE);
ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_disasm;
ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_verbose;
Modified: projects/counters/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- projects/counters/sys/contrib/octeon-sdk/cvmx-helper-board.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/contrib/octeon-sdk/cvmx-helper-board.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -1394,6 +1394,21 @@ int __cvmx_helper_board_hardware_enable(
}
}
}
+#if defined(OCTEON_VENDOR_UBIQUITI)
+ else if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_UBIQUITI_E100)
+ {
+ /* Configure ASX cloks for all ports on interface 0. */
+ if (interface == 0)
+ {
+ int port;
+
+ for (port = 0; port < 3; port++) {
+ cvmx_write_csr(CVMX_ASXX_TX_CLK_SETX(port, interface), 16);
+ cvmx_write_csr(CVMX_ASXX_RX_CLK_SETX(port, interface), 0);
+ }
+ }
+ }
+#endif
return 0;
}
Modified: projects/counters/sys/dev/ath/if_ath_tx.c
==============================================================================
--- projects/counters/sys/dev/ath/if_ath_tx.c Tue Jan 22 09:44:21 2013 (r245783)
+++ projects/counters/sys/dev/ath/if_ath_tx.c Tue Jan 22 10:22:12 2013 (r245784)
@@ -1397,12 +1397,13 @@ static void
ath_tx_update_clrdmask(struct ath_softc *sc, struct ath_tid *tid,
struct ath_buf *bf)
{
+ struct ath_node *an = ATH_NODE(bf->bf_node);
ATH_TX_LOCK_ASSERT(sc);
- if (tid->clrdmask == 1) {
+ if (an->clrdmask == 1) {
bf->bf_state.bfs_txflags |= HAL_TXDESC_CLRDMASK;
- tid->clrdmask = 0;
+ an->clrdmask = 0;
}
}
@@ -2888,6 +2889,29 @@ ath_tx_swq(struct ath_softc *sc, struct
}
/*
+ * Only set the clrdmask bit if none of the nodes are currently
+ * filtered.
+ *
+ * XXX TODO: go through all the callers and check to see
+ * which are being called in the context of looping over all
+ * TIDs (eg, if all tids are being paused, resumed, etc.)
+ * That'll avoid O(n^2) complexity here.
+ */
+static void
+ath_tx_set_clrdmask(struct ath_softc *sc, struct ath_node *an)
+{
+ int i;
+
+ ATH_TX_LOCK_ASSERT(sc);
+
+ for (i = 0; i < IEEE80211_TID_SIZE; i++) {
+ if (an->an_tid[i].isfiltered == 1)
+ return;
+ }
+ an->clrdmask = 1;
+}
+
+/*
* Configure the per-TID node state.
*
* This likely belongs in if_ath_node.c but I can't think of anywhere
@@ -2918,12 +2942,12 @@ ath_tx_tid_init(struct ath_softc *sc, st
atid->sched = 0;
atid->hwq_depth = 0;
atid->cleanup_inprogress = 0;
- atid->clrdmask = 1; /* Always start by setting this bit */
if (i == IEEE80211_NONQOS_TID)
atid->ac = ATH_NONQOS_TID_AC;
else
atid->ac = TID_TO_WME_AC(i);
}
+ an->clrdmask = 1; /* Always start by setting this bit */
}
/*
@@ -2949,7 +2973,6 @@ ath_tx_tid_pause(struct ath_softc *sc, s
static void
ath_tx_tid_resume(struct ath_softc *sc, struct ath_tid *tid)
{
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list