svn commit: r236352 - head/share/man/man5
Author: eadler Date: Thu May 31 07:16:50 2012 New Revision: 236352 URL: http://svn.freebsd.org/changeset/base/236352 Log: Bump date for content missed in r236290 Submitted by: gjb Approved by: cperciva (implicit) MFC after:3 days X-MFC-With: r236290 Modified: head/share/man/man5/periodic.conf.5 Modified: head/share/man/man5/periodic.conf.5 == --- head/share/man/man5/periodic.conf.5 Thu May 31 02:53:28 2012 (r236351) +++ head/share/man/man5/periodic.conf.5 Thu May 31 07:16:50 2012 (r236352) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2012 +.Dd May 30, 2012 .Dt PERIODIC.CONF 5 .Os .Sh NAME ___ 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: r236354 - stable/9/tools/build/mk
Author: eadler
Date: Thu May 31 07:44:27 2012
New Revision: 236354
URL: http://svn.freebsd.org/changeset/base/236354
Log:
MFC r235204:
Add some missing files to OLD_FILES
PR: conf/166460
Approved by: cperciva (implicit)
Modified:
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/tools/build/ (props changed)
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu May 31 07:40:37
2012(r236353)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu May 31 07:44:27
2012(r236354)
@@ -2179,6 +2179,8 @@ OLD_FILES+=usr/share/man/man8/ipfstat.8.
OLD_FILES+=usr/share/man/man8/ipmon.8.gz
OLD_FILES+=usr/share/man/man8/ipnat.8.gz
OLD_FILES+=usr/share/man/man8/ippool.8.gz
+OLD_FILES+=etc/periodic/security/510.ipfdenied
+OLD_FILES+=etc/periodic/security/610.ipf6denied
.endif
.if ${MK_IPFW} == no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236355 - head/sbin/mca
Author: eadler
Date: Thu May 31 08:22:02 2012
New Revision: 236355
URL: http://svn.freebsd.org/changeset/base/236355
Log:
Fix a variety of compile errors with gcc48 and clang
PR: bin/165699
Submitted by: Arne Meyer
Approved by: cperciva
MFC after:1 week
Modified:
head/sbin/mca/Makefile
head/sbin/mca/mca.c
Modified: head/sbin/mca/Makefile
==
--- head/sbin/mca/Makefile Thu May 31 07:44:27 2012(r236354)
+++ head/sbin/mca/Makefile Thu May 31 08:22:02 2012(r236355)
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= mca
-WARNS?=4
MAN= mca.8
.include
Modified: head/sbin/mca/mca.c
==
--- head/sbin/mca/mca.c Thu May 31 07:44:27 2012(r236354)
+++ head/sbin/mca/mca.c Thu May 31 08:22:02 2012(r236355)
@@ -55,10 +55,10 @@ __FBSDID("$FreeBSD$");
#defineHW_MCA_MAX_CPUID255
-static char hw_mca_count[] = "hw.mca.count";
-static char hw_mca_first[] = "hw.mca.first";
-static char hw_mca_last[] = "hw.mca.last";
-static char hw_mca_recid[] = "hw.mca.%lu.%u";
+static const char hw_mca_count[] = "hw.mca.count";
+static const char hw_mca_first[] = "hw.mca.first";
+static const char hw_mca_last[] = "hw.mca.last";
+static const char hw_mca_recid[] = "hw.mca.%d.%u";
static char default_dumpfile[] = "/var/log/mca.log";
@@ -162,7 +162,9 @@ show_cpu(struct mca_cpu_record *cpu)
char var[16];
struct mca_cpu_mod *mod;
struct mca_cpu_cpuid *cpuid;
+#ifdef notyet
struct mca_cpu_psi *psi;
+#endif
int i, n;
printf("\n");
@@ -200,8 +202,10 @@ show_cpu(struct mca_cpu_record *cpu)
show_value(6, var, "0x%016llx", (long long)cpuid->cpuid[i]);
}
- psi = (struct mca_cpu_psi*)(cpuid + 1);
- /* TODO: Dump PSI */
+#ifdef notyet
+psi = (struct mca_cpu_psi*)(cpuid + 1);
+#endif
+/* TODO: Dump PSI */
printf("\n");
}
___
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: r236356 - stable/9/usr.sbin/jail
Author: jamie
Date: Thu May 31 14:18:19 2012
New Revision: 236356
URL: http://svn.freebsd.org/changeset/base/236356
Log:
MFC r235949, r236198:
Don't try to set a null TERM environment.
When writing the jid via the -i flag, do it right when the jail is created,
before any commands run. /etc/rc.d/jail depends on this.
Modified:
stable/9/usr.sbin/jail/command.c
stable/9/usr.sbin/jail/jail.c
stable/9/usr.sbin/jail/jailp.h
Directory Properties:
stable/9/usr.sbin/jail/ (props changed)
Modified: stable/9/usr.sbin/jail/command.c
==
--- stable/9/usr.sbin/jail/command.cThu May 31 08:22:02 2012
(r236355)
+++ stable/9/usr.sbin/jail/command.cThu May 31 14:18:19 2012
(r236356)
@@ -246,7 +246,7 @@ next_proc(int nonblock)
/*
* Run a single command for a jail, possible inside the jail.
*/
-int
+static int
run_command(struct cfjail *j)
{
const struct passwd *pwd;
@@ -290,6 +290,8 @@ run_command(struct cfjail *j)
} else {
if (create_jail(j) < 0)
return -1;
+ if (iflag)
+ printf("%d\n", j->jid);
if (verbose >= 0 && (j->name || verbose > 0))
jail_note(j, "created\n");
dep_done(j, DF_LIGHT);
@@ -584,7 +586,8 @@ run_command(struct cfjail *j)
term = getenv("TERM");
environ = &cleanenv;
setenv("PATH", "/bin:/usr/bin", 0);
- setenv("TERM", term, 1);
+ if (term != NULL)
+ setenv("TERM", term, 1);
}
if (setusercontext(lcap, pwd, pwd->pw_uid, username
? LOGIN_SETALL & ~LOGIN_SETGROUP & ~LOGIN_SETLOGIN
Modified: stable/9/usr.sbin/jail/jail.c
==
--- stable/9/usr.sbin/jail/jail.c Thu May 31 08:22:02 2012
(r236355)
+++ stable/9/usr.sbin/jail/jail.c Thu May 31 14:18:19 2012
(r236356)
@@ -55,6 +55,7 @@ struct permspec {
};
const char *cfname;
+int iflag;
int note_remove;
int verbose;
@@ -129,7 +130,7 @@ main(int argc, char **argv)
size_t sysvallen;
unsigned op, pi;
int ch, docf, error, i, oldcl, sysval;
- int dflag, iflag, Rflag;
+ int dflag, Rflag;
char enforce_statfs[4];
#if defined(INET) || defined(INET6)
char *cs, *ncs;
@@ -139,7 +140,7 @@ main(int argc, char **argv)
#endif
op = 0;
- dflag = iflag = Rflag = 0;
+ dflag = Rflag = 0;
docf = 1;
cfname = CONF_FILE;
JidFile = NULL;
@@ -415,8 +416,6 @@ main(int argc, char **argv)
continue;
jail_create_done:
clear_persist(j);
- if (iflag)
- printf("%d\n", j->jid);
if (jfp != NULL)
print_jail(jfp, j, oldcl);
dep_done(j, 0);
Modified: stable/9/usr.sbin/jail/jailp.h
==
--- stable/9/usr.sbin/jail/jailp.h Thu May 31 08:22:02 2012
(r236355)
+++ stable/9/usr.sbin/jail/jailp.h Thu May 31 14:18:19 2012
(r236356)
@@ -228,6 +228,7 @@ extern struct cfjails cfjails;
extern struct cfjails ready;
extern struct cfjails depend;
extern const char *cfname;
+extern int iflag;
extern int note_remove;
extern int paralimit;
extern int verbose;
___
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: r236357 - head/usr.bin/ktrace
Author: jhb Date: Thu May 31 14:46:02 2012 New Revision: 236357 URL: http://svn.freebsd.org/changeset/base/236357 Log: Don't trace or dump page fault records in the default set of tracepoints as they can be quite noisy. Requested by: Peter Jeremy MFC after:3 days Modified: head/usr.bin/ktrace/ktrace.1 head/usr.bin/ktrace/ktrace.h Modified: head/usr.bin/ktrace/ktrace.1 == --- head/usr.bin/ktrace/ktrace.1Thu May 31 14:18:19 2012 (r236356) +++ head/usr.bin/ktrace/ktrace.1Thu May 31 14:46:02 2012 (r236357) @@ -28,7 +28,7 @@ .\"@(#)ktrace.18.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd April 5, 2012 +.Dd May 31, 2012 .Dt KTRACE 1 .Os .Sh NAME @@ -131,7 +131,7 @@ trace requests .It Cm + trace the default set of trace points - -.Cm c , f , i , n , p , s , t , u , y +.Cm c , i , n , p , s , t , u , y .El .It Ar command Execute Modified: head/usr.bin/ktrace/ktrace.h == --- head/usr.bin/ktrace/ktrace.hThu May 31 14:18:19 2012 (r236356) +++ head/usr.bin/ktrace/ktrace.hThu May 31 14:46:02 2012 (r236357) @@ -32,12 +32,12 @@ #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \ KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | \ - KTRFAC_STRUCT | KTRFAC_SYSCTL | KTRFAC_CAPFAIL | \ - KTRFAC_FAULT | KTRFAC_FAULTEND) + KTRFAC_STRUCT | KTRFAC_SYSCTL | KTRFAC_CAPFAIL) #define PROC_ABI_POINTS (KTRFAC_PROCCTOR | KTRFAC_PROCDTOR) -#define ALL_POINTS (DEF_POINTS | KTRFAC_CSW | PROC_ABI_POINTS) +#define ALL_POINTS (DEF_POINTS | KTRFAC_CSW | PROC_ABI_POINTS | \ + KTRFAC_FAULT | KTRFAC_FAULTEND) #define DEF_TRACEFILE "ktrace.out" ___ 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: r233925 - in head: sys/kern sys/sys sys/vm usr.bin/kdump usr.bin/ktrace
On Wednesday, May 30, 2012 11:11:57 pm Peter Jeremy wrote: > On 2012-Apr-05 17:13:14 +, John Baldwin wrote: > >Log: > > Add new ktrace records for the start and end of VM faults. This gives > > a pair of records similar to syscall entry and return that a user can > > use to determine how long page faults take. The new ktrace records are > > enabled via the 'p' trace type, and are enabled in the default set of > > trace points. > > I've just found a case where this is very useful but I find that > the PFLT/PRET entries are clutter much of the time and would suggest > that they be off by default. I'm not opposed to doing that. I also find that it results in clutter more often than not. > > MFC after: 2 weeks > > This expired some time ago, do you intend to MFC these changes in > the near future? Yes, I have that and some other changes I need to MFC. These require a bit more testing than simple fixes which I have been more diligent about merging. -- John Baldwin ___ 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: r236359 - head/sys/kern
Author: imp
Date: Thu May 31 17:27:05 2012
New Revision: 236359
URL: http://svn.freebsd.org/changeset/base/236359
Log:
Unlock in the error path to prevent a lock leak.
PR: 162174
Submitted by: Ian Lepore
MFC after:2 weeks
Modified:
head/sys/kern/subr_rman.c
Modified: head/sys/kern/subr_rman.c
==
--- head/sys/kern/subr_rman.c Thu May 31 14:47:02 2012(r236358)
+++ head/sys/kern/subr_rman.c Thu May 31 17:27:05 2012(r236359)
@@ -161,6 +161,7 @@ int
rman_manage_region(struct rman *rm, u_long start, u_long end)
{
struct resource_i *r, *s, *t;
+ int rv = 0;
DPRINTF(("rman_manage_region: <%s> request: start %#lx, end %#lx\n",
rm->rm_descr, start, end));
@@ -188,13 +189,17 @@ rman_manage_region(struct rman *rm, u_lo
TAILQ_INSERT_TAIL(&rm->rm_list, r, r_link);
} else {
/* Check for any overlap with the current region. */
- if (r->r_start <= s->r_end && r->r_end >= s->r_start)
- return EBUSY;
+ if (r->r_start <= s->r_end && r->r_end >= s->r_start) {
+ rv = EBUSY;
+ goto out;
+ }
/* Check for any overlap with the next region. */
t = TAILQ_NEXT(s, r_link);
- if (t && r->r_start <= t->r_end && r->r_end >= t->r_start)
- return EBUSY;
+ if (t && r->r_start <= t->r_end && r->r_end >= t->r_start) {
+ rv = EBUSY;
+ goto out;
+ }
/*
* See if this region can be merged with the next region. If
@@ -225,9 +230,9 @@ rman_manage_region(struct rman *rm, u_lo
TAILQ_INSERT_BEFORE(s, r, r_link);
}
}
-
+out:
mtx_unlock(rm->rm_mtx);
- return 0;
+ return rv;
}
int
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r236360 - head/sys/kern
Author: pjd Date: Thu May 31 19:31:28 2012 New Revision: 236360 URL: http://svn.freebsd.org/changeset/base/236360 Log: There is no rmdirat system call. Weird, I know. MFC after:3 days Modified: head/sys/kern/capabilities.conf Modified: head/sys/kern/capabilities.conf == --- head/sys/kern/capabilities.conf Thu May 31 17:27:05 2012 (r236359) +++ head/sys/kern/capabilities.conf Thu May 31 19:31:28 2012 (r236360) @@ -447,7 +447,6 @@ fstatat fchmodat futimesat mkdirat -rmdirat mkfifoat mknodat openat ___ 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: r236361 - head/sys/kern
Author: pjd Date: Thu May 31 19:32:37 2012 New Revision: 236361 URL: http://svn.freebsd.org/changeset/base/236361 Log: Add missing system calls. MFC after:3 days Modified: head/sys/kern/capabilities.conf Modified: head/sys/kern/capabilities.conf == --- head/sys/kern/capabilities.conf Thu May 31 19:31:28 2012 (r236360) +++ head/sys/kern/capabilities.conf Thu May 31 19:32:37 2012 (r236361) @@ -445,12 +445,17 @@ olio_listio faccessat fstatat fchmodat +fchownat futimesat +linkat mkdirat mkfifoat mknodat openat +readlinkat renameat +symlinkat +unlinkat ## ## Allow entry into open(2). This system call will fail, since access to 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: r236362 - head/share/misc
Author: tj (ports committer) Date: Thu May 31 19:33:51 2012 New Revision: 236362 URL: http://svn.freebsd.org/changeset/base/236362 Log: - Fix my botched merge and correct mentor ordering. (Spotted by flo) - Fix missing new line in node block. (Spotted by gavin) - Sort the node list while I'm here. Approved by: eadler (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotThu May 31 19:32:37 2012 (r236361) +++ head/share/misc/committers-ports.dotThu May 31 19:33:51 2012 (r236362) @@ -59,8 +59,8 @@ az [label="Andrej Zverev\n...@freebsd.org bapt [label="Baptiste Daroussin\nb...@freebsd.org\n2010/07/27"] beat [label="Beat Gaetzi\nb...@freebsd.org\n2009/01/28"] beech [label="Beech Rintoul\nbe...@freebsd.org\n2007/05/30"] -bland [label="Alexander Nedotsukov\nbl...@freebsd.org\n2003/08/14"] bf [label="Brendan Fabeny\n...@freebsd.org\n2010/06/02"] +bland [label="Alexander Nedotsukov\nbl...@freebsd.org\n2003/08/14"] brix [label="Henrik Brix Andersen\nb...@freebsd.org\n2007/10/31"] brooks [label="Brooks Davies\nbro...@freebsd.org\n2004/05/03"] bsam [label="Boris Samorodov\nb...@freebsd.org\n2006/07/20"] @@ -112,11 +112,11 @@ jpaetzel [label="Josh Paetzel\njpaetzel@ jsa [label="Joseph S. Atkinson\n...@freebsd.org\n2010/07/15"] jylefort [label="Jean-Yves Lefort\njylef...@freebsd.org\n2005/04/12"] kevlo [label="Kevin Lo\nke...@freebsd.org\n2003/02/21"] +kmoore [label="Kris Moore\nkmo...@freebsd.org\n2009/04/14"] knu [label="Akinori Musha\n...@freebsd.org\n2000/03/22"] +koitsu [label="Jeremy Chadwick\nkoi...@freebsd.org\n2006/11/10"] krion [label="Kirill Ponomarew\nkr...@freebsd.org\n2003/07/20"] -kmoore [label="Kris Moore\nkmo...@freebsd.org\n2009/04/14"] kwm [label="Koop Mast\n...@freebsd.org\n2004/09/14"] -koitsu [label="Jeremy Chadwick\nkoi...@freebsd.org\n2006/11/10"] laszlof [label="Frank Laszlo\nlasz...@freebsd.org\n2006/11/07"] lawrance [label="Sam Lawrance\nlawra...@freebsd.org\n2005/04/11\n2007/02/21"] lbr [label="Lars Balker Rasmussen\n...@freebsd.org\n2006/04/30"] @@ -139,6 +139,7 @@ martymac [label="Ganael Laplanche\nmarty mat [label="Mathieu Arnold\n...@freebsd.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatt...@freebsd.org\n2012/02/07"] mezz [label="Jeremy Messenger\nm...@freebsd.org\n2004/04/30"] +mharo [label="Michael Haro\nmh...@freebsd.org\n1999/04/13"] miwi [label="Martin Wilke\nm...@freebsd.org\n2006/06/04"] mm [label="Martin Matuska\n...@freebsd.org\n2007/04/04"] mnag [label="Marcus Alves Grando\nm...@freebsd.org\n2005/09/15"] @@ -151,14 +152,13 @@ novel [label="Roman Bogorodskiy\nnovel@F nox [label="Juergen Lock\n...@freebsd.org\n2006/12/22"] obrien [label="David E. O'Brien\nobr...@freebsd.org\n1996/10/29"] olivierd [label="Olivier Duchateau\nolivi...@freebsd.org\n2012/05/29"] -mharo [label="Michael Haro\nmh...@freebsd.org\n1999/04/13"] osa [label="Sergey A. Osokin\n...@freebsd.org\n2003/06/04"] pat [label="Patrick Li\n...@freebsd.org\n2001/11/14"] pav [label="Pav Lucistnik\n...@freebsd.org\n2003/11/12"] pawel [label="Pawel Pekala\npa...@freebsd.org\n2011/03/11"] pgj [label="Gabor Pali\n...@freebsd.org\n2009/04/12"] -philip [label="Philip Paeps\nphi...@freebsd.org\n2005/10/19"] pgollucci [label="Philip M. Gollucci\npgollu...@freebsd.org\n2008/07/21"] +philip [label="Philip Paeps\nphi...@freebsd.org\n2005/10/19"] rafan [label="Rong-En Fan\nra...@freebsd.org\n2006/06/23"] rakuco [label="Raphael Kubo da Costa\nrak...@freebsd.org\n2011/08/22"] rene [label="Rene Ladan\nr...@freebsd.org\n2010/04/11"] @@ -180,17 +180,17 @@ stas [label="Stanislav Sedov\nstas@FreeB stefan [label="Stefan Walter\nste...@freebsd.org\n2006/05/07"] stephen [label="Stephen Montgomery-Smith\nstep...@freebsd.org\n2011/06/13"] sunpoet [label="Po-Chuan Hsieh\nsunp...@freebsd.org\n2010/09/21"] -sylvio [label="Sylvio Cesar Teixeira\nsyl...@freebsd.org\n2009/10/29"] swills [label="Steve Wills\nswi...@freebsd.org\n2010/09/03"] +sylvio [label="Sylvio Cesar Teixeira\nsyl...@freebsd.org\n2009/10/29"] tabthorpe [label="Thomas Abthorpe\ntabtho...@freebsd.org\n2007/08/20"] tdb [label="Tim Bishop\n...@freebsd.org\n2005/11/30"] +thierry [label="Thierry Thomas\nthie...@freebsd.org\n2004/03/15"] timur [label="Timur Bakeyev\nti...@freebsd.org\n2007/06/07"] -tj [label="Tom Judge\t...@freebsd.org\n2012/05/28"] +tj [label="Tom Judge\n...@freebsd.org\n2012/05/28"] +tmclaugh [label="Tom McLaughlin\ntmcla...@freebsd.org\n2005/09/15"] tota [label="TAKATSU Tomonari\nt...@freebsd.org\n2009/03/30"] trasz [label="Edward Tomasz Napierala\ntr...@freebsd.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrho...@freebsd.org\n2004/07/06"] -thierry [label="Thierry Thomas\nthie...@freebsd.org\n2004/03/15"] -tmclaugh [label="Tom McLaughlin\ntmcla...@freebsd.org\n2005/09/15"] uqs [label="Ulrich Spoerlein\n...
svn commit: r236363 - head/sys/kern
Author: pjd
Date: Thu May 31 19:34:53 2012
New Revision: 236363
URL: http://svn.freebsd.org/changeset/base/236363
Log:
Regenerate after r236361.
MFC after:3 days
Modified:
head/sys/kern/init_sysent.c
Modified: head/sys/kern/init_sysent.c
==
--- head/sys/kern/init_sysent.c Thu May 31 19:33:51 2012(r236362)
+++ head/sys/kern/init_sysent.c Thu May 31 19:34:53 2012(r236363)
@@ -525,19 +525,19 @@ struct sysent sysent[] = {
{ AS(cpuset_setaffinity_args), (sy_call_t *)sys_cpuset_setaffinity,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 488 = cpuset_setaffinity */
{ AS(faccessat_args), (sy_call_t *)sys_faccessat, AUE_FACCESSAT, NULL,
0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 489 = faccessat */
{ AS(fchmodat_args), (sy_call_t *)sys_fchmodat, AUE_FCHMODAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 490 = fchmodat */
- { AS(fchownat_args), (sy_call_t *)sys_fchownat, AUE_FCHOWNAT, NULL, 0,
0, 0, SY_THR_STATIC }, /* 491 = fchownat */
+ { AS(fchownat_args), (sy_call_t *)sys_fchownat, AUE_FCHOWNAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 491 = fchownat */
{ AS(fexecve_args), (sy_call_t *)sys_fexecve, AUE_FEXECVE, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 492 = fexecve */
{ AS(fstatat_args), (sy_call_t *)sys_fstatat, AUE_FSTATAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 493 = fstatat */
{ AS(futimesat_args), (sy_call_t *)sys_futimesat, AUE_FUTIMESAT, NULL,
0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 494 = futimesat */
- { AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 495 = linkat */
+ { AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC },/* 495 = linkat */
{ AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 496 = mkdirat */
{ AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 497 = mkfifoat */
{ AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 498 = mknodat */
{ AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 499 = openat */
- { AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 500 = readlinkat */
+ { AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },/* 500 = readlinkat */
{ AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 501 = renameat */
- { AS(symlinkat_args), (sy_call_t *)sys_symlinkat, AUE_SYMLINKAT, NULL,
0, 0, 0, SY_THR_STATIC },/* 502 = symlinkat */
- { AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0,
0, 0, SY_THR_STATIC }, /* 503 = unlinkat */
+ { AS(symlinkat_args), (sy_call_t *)sys_symlinkat, AUE_SYMLINKAT, NULL,
0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 502 = symlinkat */
+ { AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 503 = unlinkat */
{ AS(posix_openpt_args), (sy_call_t *)sys_posix_openpt,
AUE_POSIX_OPENPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 504 = posix_openpt */
{ AS(gssd_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0,
0, SY_THR_ABSENT }, /* 505 = gssd_syscall */
{ AS(jail_get_args), (sy_call_t *)sys_jail_get, AUE_NULL, NULL, 0, 0,
0, SY_THR_STATIC }, /* 506 = jail_get */
___
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: r236364 - head/sys/contrib/pf/net
Author: eri
Date: Thu May 31 20:10:05 2012
New Revision: 236364
URL: http://svn.freebsd.org/changeset/base/236364
Log:
Correct table counter functionality to not panic.
This was caused by not proper initialization of necessary parameters.
PR: 168200
Reviewed by: bz@, glebius@
MFC after:1 week
Modified:
head/sys/contrib/pf/net/pf_ioctl.c
head/sys/contrib/pf/net/pf_table.c
head/sys/contrib/pf/net/pfvar.h
Modified: head/sys/contrib/pf/net/pf_ioctl.c
==
--- head/sys/contrib/pf/net/pf_ioctl.c Thu May 31 19:34:53 2012
(r236363)
+++ head/sys/contrib/pf/net/pf_ioctl.c Thu May 31 20:10:05 2012
(r236364)
@@ -298,7 +298,7 @@ init_zone_var(void)
V_pf_altq_pl = V_pf_pooladdr_pl = NULL;
V_pf_frent_pl = V_pf_frag_pl = V_pf_cache_pl = V_pf_cent_pl = NULL;
V_pf_state_scrub_pl = NULL;
- V_pfr_ktable_pl = V_pfr_kentry_pl = NULL;
+ V_pfr_ktable_pl = V_pfr_kentry_pl = V_pfr_kcounters_pl = NULL;
}
void
@@ -317,6 +317,7 @@ cleanup_pf_zone(void)
UMA_DESTROY(V_pf_cent_pl);
UMA_DESTROY(V_pfr_ktable_pl);
UMA_DESTROY(V_pfr_kentry_pl);
+ UMA_DESTROY(V_pfr_kcounters_pl);
UMA_DESTROY(V_pf_state_scrub_pl);
UMA_DESTROY(V_pfi_addr_pl);
}
@@ -337,6 +338,7 @@ pfattach(void)
UMA_CREATE(V_pf_pooladdr_pl,struct pf_pooladdr,
"pfpooladdrpl");
UMA_CREATE(V_pfr_ktable_pl, struct pfr_ktable, "pfrktable");
UMA_CREATE(V_pfr_kentry_pl, struct pfr_kentry, "pfrkentry");
+ UMA_CREATE(V_pfr_kcounters_pl, struct pfr_kcounters,
"pfrkcounters");
UMA_CREATE(V_pf_frent_pl, struct pf_frent, "pffrent");
UMA_CREATE(V_pf_frag_pl,struct pf_fragment, "pffrag");
UMA_CREATE(V_pf_cache_pl, struct pf_fragment,
"pffrcache");
Modified: head/sys/contrib/pf/net/pf_table.c
==
--- head/sys/contrib/pf/net/pf_table.c Thu May 31 19:34:53 2012
(r236363)
+++ head/sys/contrib/pf/net/pf_table.c Thu May 31 20:10:05 2012
(r236364)
@@ -179,7 +179,6 @@ struct pfr_walktree {
VNET_DEFINE(uma_zone_t,pfr_ktable_pl);
VNET_DEFINE(uma_zone_t,pfr_kentry_pl);
VNET_DEFINE(uma_zone_t,pfr_kcounters_pl);
-#defineV_pfr_kcounters_pl VNET(pfr_kcounters_pl)
VNET_DEFINE(struct sockaddr_in,pfr_sin);
#defineV_pfr_sin VNET(pfr_sin)
VNET_DEFINE(struct sockaddr_in6, pfr_sin6);
Modified: head/sys/contrib/pf/net/pfvar.h
==
--- head/sys/contrib/pf/net/pfvar.h Thu May 31 19:34:53 2012
(r236363)
+++ head/sys/contrib/pf/net/pfvar.h Thu May 31 20:10:05 2012
(r236364)
@@ -1868,6 +1868,8 @@ VNET_DECLARE(uma_zone_t, pfr_ktable_pl
#defineV_pfr_ktable_pl VNET(pfr_ktable_pl)
VNET_DECLARE(uma_zone_t,pfr_kentry_pl);
#defineV_pfr_kentry_pl VNET(pfr_kentry_pl)
+VNET_DECLARE(uma_zone_t,pfr_kcounters_pl);
+#defineV_pfr_kcounters_pl VNET(pfr_kcounters_pl)
VNET_DECLARE(uma_zone_t,pf_cache_pl);
#defineV_pf_cache_plVNET(pf_cache_pl)
VNET_DECLARE(uma_zone_t,pf_cent_pl);
___
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: r236365 - head/usr.bin/make
Author: obrien Date: Thu May 31 20:13:44 2012 New Revision: 236365 URL: http://svn.freebsd.org/changeset/base/236365 Log: Update date for r236338 & r236346. Modified: head/usr.bin/make/make.1 Modified: head/usr.bin/make/make.1 == --- head/usr.bin/make/make.1Thu May 31 20:10:05 2012(r236364) +++ head/usr.bin/make/make.1Thu May 31 20:13:44 2012(r236365) @@ -32,7 +32,7 @@ .\"@(#)make.1 8.8 (Berkeley) 6/13/95 .\" $FreeBSD$ .\" -.Dd November 5, 2011 +.Dd May 30, 2012 .Dt MAKE 1 .Os .Sh NAME ___ 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: r236368 - stable/9/sys/dev/powermac_nvram
Author: jhibbits Date: Thu May 31 23:05:07 2012 New Revision: 236368 URL: http://svn.freebsd.org/changeset/base/236368 Log: MFC r235678: "nvram,flash" may not be the first in the compatible list property of the nvram ofw node, so check all strings in the list. Approved by: nwhitehorn (mentor) Modified: stable/9/sys/dev/powermac_nvram/powermac_nvram.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/powermac_nvram/powermac_nvram.c == --- stable/9/sys/dev/powermac_nvram/powermac_nvram.cThu May 31 22:54:08 2012(r236367) +++ stable/9/sys/dev/powermac_nvram/powermac_nvram.cThu May 31 23:05:07 2012(r236368) @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -118,7 +119,7 @@ powermac_nvram_probe(device_t dev) if (strcmp(type, "nvram") != 0) return ENXIO; if (strcmp(compatible, "amd-0137") != 0 && - strcmp(compatible, "nvram,flash") != 0) + !ofw_bus_is_compatible(dev, "nvram,flash")) return ENXIO; device_set_desc(dev, "Apple NVRAM"); ___ 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: r236371 - head/sys/dev/bge
Author: yongari
Date: Thu May 31 23:56:10 2012
New Revision: 236371
URL: http://svn.freebsd.org/changeset/base/236371
Log:
Remove unnecessary device_printfs.
Pointed out by: marius
Modified:
head/sys/dev/bge/if_bge.c
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Thu May 31 23:22:00 2012(r236370)
+++ head/sys/dev/bge/if_bge.c Thu May 31 23:56:10 2012(r236371)
@@ -2776,17 +2776,9 @@ bge_mbox_reorder(struct bge_softc *sc)
for (;;) {
dev = device_get_parent(bus);
bus = device_get_parent(dev);
- device_printf(sc->bge_dev, "dev : %s%d, bus : %s%d\n",
- device_get_name(dev), device_get_unit(dev),
- device_get_name(bus), device_get_unit(bus));
if (device_get_devclass(dev) != pcib)
break;
for (i = 0; i < count; i++) {
- device_printf(sc->bge_dev,
- "probing dev : %s%d, vendor : 0x%04x "
- "device : 0x%04x\n",
- device_get_name(dev), device_get_unit(dev),
- pci_get_vendor(dev), pci_get_device(dev));
if (pci_get_vendor(dev) ==
mbox_reorder_lists[i].vendor &&
pci_get_device(dev) ==
___
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: r236362 - head/share/misc
On 5/31/2012 12:33 PM, Tom Judge wrote: > - Sort the node list while I'm here. This falls under the category of a "whitespace" change, which should have been done as a separate commit (usually first, then substantive changes second). This is a tiny bit more work for you, but down the road when someone who is !tj is reviewing the logs, diffs, etc. it really helps to make the substantive changes stand out. Doug -- This .signature sanitized for your protection ___ 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: r236362 - head/share/misc
On 31 May 2012 18:29, Doug Barton wrote: > On 5/31/2012 12:33 PM, Tom Judge wrote: >> - Sort the node list while I'm here. > > This falls under the category of a "whitespace" change, which should > have been done as a separate commit (usually first, then substantive > changes second). I figured none of the changes were really substantive so it was okay to sort and fix the \n at the same time. -- Eitan Adler Source & Ports committer X11, Bugbusting teams ___ 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: r236362 - head/share/misc
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 31/05/2012 21:29, Doug Barton wrote: > On 5/31/2012 12:33 PM, Tom Judge wrote: >> - Sort the node list while I'm here. > > This falls under the category of a "whitespace" change, which > should have been done as a separate commit (usually first, then > substantive changes second). > > This is a tiny bit more work for you, but down the road when > someone who is !tj is reviewing the logs, diffs, etc. it really > helps to make the substantive changes stand out. Feedback noted for next time. Tom -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPyCMZAAoJEEJSM9yB4iIWo1cH/130Fb9qDCpI8jJnukHR4EI1 4LJj7q0TLSNoocvB+JleVpO1i3wOuFJX+jj64yTC/BOuMU9Z/FJ7MxoyBTEOXpBO AfUibDN3jquHKIP1eZLZzGYVSOLUg9sXCTG+yryPKfGvaC5iNhkhH3rL3+QBCLzA pQLEG65rcG2yTgzohEejCyJxSBxNl+8O5WmLRUvn+GQlmefBYh2kHyphLAA2iFE+ J8jC7afDZQMg3TA8OhllEcfg3ErbIpzI/CPoHbr+6A2tKTlbzcb1AKUBFkZPLDib 1uSHkEvLUT+ZTsB+8qDiGbbZ42eMlF206jGf5vXdG5AD9C2Xp2zwVVeya8G5o9Y= =LwiQ -END PGP SIGNATURE- ___ 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: r236338 - head/usr.bin/make
What are your MFC plans for 9.x and 8.x?
Warner
On May 30, 2012, at 4:23 PM, David E. O'Brien wrote:
> Author: obrien
> Date: Wed May 30 22:23:08 2012
> New Revision: 236338
> URL: http://svn.freebsd.org/changeset/base/236338
>
> Log:
> Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower case)
> modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into
> NetBSD's make, which is the source for the Portable Berkeley Make.
>
> Submitted by:Simon Gerraty
>
> Modified:
> head/usr.bin/make/Makefile
> head/usr.bin/make/make.1
> head/usr.bin/make/var.c
>
> Modified: head/usr.bin/make/Makefile
> ==
> --- head/usr.bin/make/MakefileWed May 30 22:21:25 2012
> (r236337)
> +++ head/usr.bin/make/MakefileWed May 30 22:23:08 2012
> (r236338)
> @@ -15,7 +15,7 @@ NO_SHARED?= YES
> .endif
>
> # Version has the RMMDDX format, where R is from RELENG_
> -CFLAGS+=-DMAKE_VERSION=\"520300\"
> +CFLAGS+=-DMAKE_VERSION=\"10201120530\"
>
> # There is no obvious performance improvement currently.
> # CFLAGS+=-DUSE_KQUEUE
>
> Modified: head/usr.bin/make/make.1
> ==
> --- head/usr.bin/make/make.1 Wed May 30 22:21:25 2012(r236337)
> +++ head/usr.bin/make/make.1 Wed May 30 22:23:08 2012(r236338)
> @@ -902,6 +902,7 @@ Replaces each word in the variable with
> Replaces each word in the variable with everything but the last component.
> .It Cm :L
> Converts variable to lower-case letters.
> +(deprecated)
> .It Cm :M Ns Ar pattern
> Select only those words that match the rest of the modifier.
> The standard shell wildcard characters
> @@ -993,8 +994,13 @@ to be replaced in
> .Ar new_string .
> .It Cm :T
> Replaces each word in the variable with its last component.
> +.It Cm :tl
> +Converts variable to lower-case letters.
> +.It Cm :tu
> +Converts variable to upper-case letters.
> .It Cm :U
> Converts variable to upper-case letters.
> +(deprecated)
> .It Cm :u
> Remove adjacent duplicate words (like
> .Xr uniq 1 ) .
> @@ -1742,6 +1748,19 @@ is set to the same value as
> .Va .MAKE ;
> support for this may be removed in the future.
> .Pp
> +The use of the
> +.Cm :L
> +and
> +.Cm :U
> +modifiers are deprecated
> +in
> +.Fx 10.0
> +and the more portable (among Pmake decedents)
> +.Cm :tl
> +and
> +.Cm :tu
> +should be used instead.
> +.Pp
> Most of the more esoteric features of
> .Nm
> should probably be avoided for greater compatibility.
>
> Modified: head/usr.bin/make/var.c
> ==
> --- head/usr.bin/make/var.c Wed May 30 22:21:25 2012(r236337)
> +++ head/usr.bin/make/var.c Wed May 30 22:23:08 2012(r236338)
> @@ -1746,6 +1746,19 @@ ParseModifier(VarParser *vp, char startc
> case 'C':
> newStr = modifier_C(vp, value, v);
> break;
> + case 't':
> + /* :tl :tu for OSF ODE & NetBSD make compatibility */
> + switch (vp->ptr[1]) {
> + case 'l':
> + vp->ptr++;
> + goto mod_lower;
> + break;
> + case 'u':
> + vp->ptr++;
> + goto mod_upper;
> + break;
> + }
> + /* FALLTHROUGH */
> default:
> if (vp->ptr[1] != endc && vp->ptr[1] != ':') {
> #ifdef SUNSHCMD
> @@ -1774,6 +1787,7 @@ ParseModifier(VarParser *vp, char startc
>
> switch (vp->ptr[0]) {
> case 'L':
> + mod_lower:
> {
> const char *cp;
> Buffer *buf;
> @@ -1799,6 +1813,7 @@ ParseModifier(VarParser *vp, char startc
> vp->ptr++;
> break;
> case 'U':
> + mod_upper:
> {
> const char *cp;
> Buffer *buf;
>
>
___
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: r236372 - head/sys/arm/at91
Author: imp
Date: Fri Jun 1 02:55:42 2012
New Revision: 236372
URL: http://svn.freebsd.org/changeset/base/236372
Log:
Initialize the clocks before we call cninit() so that the serial
console so initialized will work upon return from cninit. While this
is the very next line, other platforms setup all this stuff before
calling cninit. Also, initialize the SDRAM base register in the inner
block in at91_ramsize().
Modified:
head/sys/arm/at91/at91_machdep.c
head/sys/arm/at91/at91_mci.c
head/sys/arm/at91/at91reg.h
head/sys/arm/at91/at91rm92reg.h
head/sys/arm/at91/files.at91sam9
head/sys/arm/at91/std.at91sam9
Modified: head/sys/arm/at91/at91_machdep.c
==
--- head/sys/arm/at91/at91_machdep.cThu May 31 23:56:10 2012
(r236371)
+++ head/sys/arm/at91/at91_machdep.cFri Jun 1 02:55:42 2012
(r236372)
@@ -209,12 +209,11 @@ const struct pmap_devmap at91_devmap[] =
long
at91_ramsize(void)
{
- uint32_t *SDRAMC = (uint32_t *)(AT91_BASE + AT91RM92_SDRAMC_BASE);
uint32_t cr, mr;
int banks, rows, cols, bw;
if (at91_is_rm92()) {
- SDRAMC = (uint32_t *)(AT91_BASE + AT91RM92_SDRAMC_BASE);
+ uint32_t *SDRAMC = (uint32_t *)(AT91_BASE +
AT91RM92_SDRAMC_BASE);
cr = SDRAMC[AT91RM92_SDRAMC_CR / 4];
mr = SDRAMC[AT91RM92_SDRAMC_MR / 4];
banks = (cr & AT91RM92_SDRAMC_CR_NB_4) ? 2 : 1;
@@ -222,9 +221,9 @@ at91_ramsize(void)
cols = (cr & AT91RM92_SDRAMC_CR_NC_MASK) + 8;
bw = (mr & AT91RM92_SDRAMC_MR_DBW_16) ? 1 : 2;
} else {
- /* This should be good for the 9260, 9261 and 9G20 as addresses
+ /* This should be good for the 9260, 9261, 9G20, 9G35 and 9X25
as addresses
* and registers are the same */
- SDRAMC = (uint32_t *)(AT91_BASE + AT91SAM9G20_SDRAMC_BASE);
+ uint32_t *SDRAMC = (uint32_t *)(AT91_BASE +
AT91SAM9G20_SDRAMC_BASE);
cr = SDRAMC[AT91SAM9G20_SDRAMC_CR / 4];
mr = SDRAMC[AT91SAM9G20_SDRAMC_MR / 4];
banks = (cr & AT91SAM9G20_SDRAMC_CR_NB_4) ? 2 : 1;
@@ -361,12 +360,13 @@ initarm(void *arg, void *arg2)
cpu_tlb_flushID();
cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2));
- cninit();
+ /* Initialize all the clocks, so that the console can work */
+ at91_pmc_init_clock();
-at91_pmc_init_clock();
/* Get chip id so device drivers know about differences */
- at91_chip_id = *(volatile uint32_t *)
- (AT91_BASE + AT91_DBGU_BASE + DBGU_C1R);
+ at91_chip_id = *(uint32_t *)(AT91_BASE + AT91_DBGU_BASE + DBGU_C1R);
+
+ cninit();
memsize = board_init();
physmem = memsize / PAGE_SIZE;
Modified: head/sys/arm/at91/at91_mci.c
==
--- head/sys/arm/at91/at91_mci.cThu May 31 23:56:10 2012
(r236371)
+++ head/sys/arm/at91/at91_mci.cFri Jun 1 02:55:42 2012
(r236372)
@@ -69,6 +69,11 @@ __FBSDID("$FreeBSD$");
#define BBSZ 512
+/*
+ * Note: This driver only supports the SlotA card. No attempt has been made
+ * to support SlotB.
+ */
+
struct at91_mci_softc {
void *intrhand; /* Interrupt handle */
device_t dev;
@@ -244,6 +249,13 @@ at91_mci_attach(device_t dev)
sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
sc->host.caps = 0;
+ /*
+* The in-tree Linux driver doesn't allow 4-wire operation for the
+* at91rm9200, but does for other members of the family. The atmel
+* patches to this do allow it, or have in the past. It is unclear
+* that the hardware even works, but my boot loader uses 4-bit bus
+* in polling mode successfully.
+*/
if (sc->sc_cap & CAP_HAS_4WIRE)
sc->host.caps |= MMC_CAP_4_BIT_DATA;
child = device_add_child(dev, "mmc", 0);
@@ -363,9 +375,9 @@ at91_mci_update_ios(device_t brdev, devi
clkdiv = (at91_master_clock / ios->clock) / 2;
}
if (ios->bus_width == bus_width_4)
- WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS);
+ WR4(sc, MCI_SDCR, MCI_SDCR_SDCBUS);
else
- WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
+ WR4(sc, MCI_SDCR, 0);
WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
/* Do we need a settle time here? */
/* XXX We need to turn the device on/off here with a GPIO pin */
@@ -407,7 +419,9 @@ at91_mci_start_cmd(struct at91_mci_softc
if (!data) {
// The no data case is fairly simple
at91_mci_pdc_disable(sc);
-// printf("CMDR %x ARGR %x\n", cmdr, cmd->arg);
+#ifdef AT91_MCI_DEBUG
svn commit: r236373 - head/sys/arm/at91
Author: imp
Date: Fri Jun 1 03:00:36 2012
New Revision: 236373
URL: http://svn.freebsd.org/changeset/base/236373
Log:
Revert debug and other immature code accidentally committed in r236372.
Modified:
head/sys/arm/at91/at91_mci.c
head/sys/arm/at91/at91reg.h
head/sys/arm/at91/at91rm92reg.h
head/sys/arm/at91/files.at91sam9
head/sys/arm/at91/std.at91sam9
Modified: head/sys/arm/at91/at91_mci.c
==
--- head/sys/arm/at91/at91_mci.cFri Jun 1 02:55:42 2012
(r236372)
+++ head/sys/arm/at91/at91_mci.cFri Jun 1 03:00:36 2012
(r236373)
@@ -69,11 +69,6 @@ __FBSDID("$FreeBSD$");
#define BBSZ 512
-/*
- * Note: This driver only supports the SlotA card. No attempt has been made
- * to support SlotB.
- */
-
struct at91_mci_softc {
void *intrhand; /* Interrupt handle */
device_t dev;
@@ -249,13 +244,6 @@ at91_mci_attach(device_t dev)
sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
sc->host.caps = 0;
- /*
-* The in-tree Linux driver doesn't allow 4-wire operation for the
-* at91rm9200, but does for other members of the family. The atmel
-* patches to this do allow it, or have in the past. It is unclear
-* that the hardware even works, but my boot loader uses 4-bit bus
-* in polling mode successfully.
-*/
if (sc->sc_cap & CAP_HAS_4WIRE)
sc->host.caps |= MMC_CAP_4_BIT_DATA;
child = device_add_child(dev, "mmc", 0);
@@ -375,9 +363,9 @@ at91_mci_update_ios(device_t brdev, devi
clkdiv = (at91_master_clock / ios->clock) / 2;
}
if (ios->bus_width == bus_width_4)
- WR4(sc, MCI_SDCR, MCI_SDCR_SDCBUS);
+ WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS);
else
- WR4(sc, MCI_SDCR, 0);
+ WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
/* Do we need a settle time here? */
/* XXX We need to turn the device on/off here with a GPIO pin */
@@ -419,9 +407,7 @@ at91_mci_start_cmd(struct at91_mci_softc
if (!data) {
// The no data case is fairly simple
at91_mci_pdc_disable(sc);
-#ifdef AT91_MCI_DEBUG
- printf("CMDR %x ARGR %x\n", cmdr, cmd->arg);
-#endif
+// printf("CMDR %x ARGR %x\n", cmdr, cmd->arg);
WR4(sc, MCI_ARGR, cmd->arg);
WR4(sc, MCI_CMDR, cmdr);
WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY);
@@ -493,9 +479,7 @@ at91_mci_start_cmd(struct at91_mci_softc
ier = MCI_SR_TXBUFE;
}
}
-#ifdef AT91_MCI_DEBUG
- printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg);
-#endif
+// printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg);
WR4(sc, MCI_ARGR, cmd->arg);
if (cmdr & MCI_CMDR_TRCMD_START) {
if (cmdr & MCI_CMDR_TRDIR) {
@@ -534,14 +518,6 @@ at91_mci_start(struct at91_mci_softc *sc
sc->req = NULL;
sc->curcmd = NULL;
req->done(req);
- /*
-* Attempted hack-a-round for the DMA bug for multiple reads.
-*/
- if (req->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) {
- at91_mci_fini(sc->dev);
- at91_mci_init(sc->dev);
- at91_mci_update_ios(sc->dev, NULL);
- }
}
static int
@@ -602,9 +578,7 @@ at91_mci_read_done(struct at91_mci_softc
uint32_t *walker;
struct mmc_command *cmd;
int i, len;
-#ifdef AT91_MCI_DEBUG
- char *w2;
-#endif
+
cmd = sc->curcmd;
bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(sc->dmatag, sc->map);
@@ -615,15 +589,6 @@ at91_mci_read_done(struct at91_mci_softc
for (i = 0; i < len; i++)
walker[i] = bswap32(walker[i]);
}
-#ifdef AT91_MCI_DEBUG
- printf("Read data\n");
- for (i = 0, w2 = cmd->data->data; i < cmd->data->len; i++) {
- if (i % 16 == 0)
- printf("%08x ", cmd->arg + i);
- printf("%02x%s", w2[i], (i + 1) % 16 ? " " : "\n");
- }
- printf("\n");
-#endif
// Finish up the sequence...
WR4(sc, MCI_IDR, MCI_SR_ENDRX);
WR4(sc, MCI_IER, MCI_SR_RXBUFF);
@@ -659,19 +624,14 @@ at91_mci_intr(void *arg)
if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND ||
cmd->opcode == ACMD_SD_SEND_OP_COND))
cmd->error = MMC_ERR_NONE;
- else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE)) {
- printf("TIMEOUT %#x\n", sr);
+ else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE))
cmd->error = MMC_ERR_TIMEOUT;
- } else if (sr & (MCI_SR
Re: svn commit: r236362 - head/share/misc
On 5/31/2012 6:59 PM, Eitan Adler wrote: > On 31 May 2012 18:29, Doug Barton wrote: >> On 5/31/2012 12:33 PM, Tom Judge wrote: >>> - Sort the node list while I'm here. >> >> This falls under the category of a "whitespace" change, which should >> have been done as a separate commit (usually first, then substantive >> changes second). > > I figured none of the changes were really substantive so it was okay > to sort and fix the \n at the same time. These were the changes: Log: - Fix my botched merge and correct mentor ordering. (Spotted by flo) - Fix missing new line in node block. (Spotted by gavin) - Sort the node list while I'm here. The last is definitely WS, the second probably is, the first definitely isn't. hth, Doug -- This .signature sanitized for your protection ___ 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: r236374 - in stable/9: contrib/bind9 contrib/bind9/bin/named contrib/bind9/bin/named/unix contrib/bind9/lib/bind9 contrib/bind9/lib/dns contrib/bind9/lib/dns/include/dns contrib/bind9/l...
Author: dougb Date: Fri Jun 1 03:46:28 2012 New Revision: 236374 URL: http://svn.freebsd.org/changeset/base/236374 Log: MFV r236171, MFC r236196: Upgrade to BIND version 9.8.3, the latest from ISC. Feature Change * BIND now recognizes the TLSA resource record type, created to support IETF DANE (DNS-based Authentication of Named Entities) Bug Fix * The locking strategy around the handling of iterative queries has been tuned to reduce unnecessary contention in a multi- threaded environment. Other critical bug fixes are included. All BIND users are encouraged to upgrade. Added: stable/9/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c - copied unchanged from r236373, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.c stable/9/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h - copied unchanged from r236373, vendor/bind9/dist/lib/dns/rdata/generic/tlsa_52.h Modified: stable/9/contrib/bind9/CHANGES stable/9/contrib/bind9/README stable/9/contrib/bind9/bin/named/builtin.c stable/9/contrib/bind9/bin/named/query.c stable/9/contrib/bind9/bin/named/server.c stable/9/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c stable/9/contrib/bind9/lib/bind9/api stable/9/contrib/bind9/lib/bind9/check.c stable/9/contrib/bind9/lib/dns/api stable/9/contrib/bind9/lib/dns/dnssec.c stable/9/contrib/bind9/lib/dns/include/dns/ecdb.h stable/9/contrib/bind9/lib/dns/include/dns/rpz.h stable/9/contrib/bind9/lib/dns/include/dns/sdb.h stable/9/contrib/bind9/lib/dns/include/dns/stats.h stable/9/contrib/bind9/lib/dns/include/dns/tsec.h stable/9/contrib/bind9/lib/dns/include/dns/view.h stable/9/contrib/bind9/lib/dns/rbtdb.c stable/9/contrib/bind9/lib/dns/resolver.c stable/9/contrib/bind9/lib/dns/sdb.c stable/9/contrib/bind9/lib/dns/tkey.c stable/9/contrib/bind9/lib/dns/zone.c stable/9/contrib/bind9/lib/isc/pthreads/mutex.c stable/9/contrib/bind9/lib/isccfg/api stable/9/contrib/bind9/lib/isccfg/parser.c stable/9/contrib/bind9/version stable/9/lib/bind/dns/code.h stable/9/lib/bind/dns/dns/enumtype.h stable/9/lib/bind/dns/dns/rdatastruct.h Directory Properties: stable/9/contrib/bind9/ (props changed) stable/9/lib/bind/ (props changed) Modified: stable/9/contrib/bind9/CHANGES == --- stable/9/contrib/bind9/CHANGES Fri Jun 1 03:00:36 2012 (r236373) +++ stable/9/contrib/bind9/CHANGES Fri Jun 1 03:46:28 2012 (r236374) @@ -1,3 +1,56 @@ + --- 9.8.3 released --- + +3318. [tuning]Reduce the amount of work performed while holding a + bucket lock when finshed with a fetch context. + [RT #29239] + +3314. [bug] The masters list could be updated while refesh_callback + and stub_callback were using it. [RT #26732] + +3313. [protocol] Add TLSA record type. [RT #28989] + +3312. [bug] named-checkconf didn't detect a bad dns64 clients acl. + [RT #27631] + +3311. [bug] Abort the zone dump if zone->db is NULL in + zone.c:zone_gotwritehandle. [RT #29028] + +3310. [test] Increase table size for mutex profiling. [RT #28809] + +3309. [bug] resolver.c:fctx_finddone() was not threadsafe. + [RT #27995] + +3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS. + [RT #28956] + +3306. [bug] Improve DNS64 reverse zone performance. [RT #28563] + +3305. [func] Add wire format lookup method to sdb. [RT #28563] + +3304. [bug] Use hmctx, not mctx when freeing rbtdb->heaps. + [RT #28571] + +3302. [bug] dns_dnssec_findmatchingkeys could fail to find + keys if the zone name contained character that + required special mappings. [RT #28600] + +3301. [contrib] Update queryperf to build on darwin. Add -R flag + for non-recursive queries. [RT #28565] + +3300. [bug] Named could die if gssapi was enabled in named.conf + but was not compiled in. [RT #28338] + +3299. [bug] Make SDB handle errors from database drivers better. + [RT #28534] + +3232. [bug] Zero zone->curmaster before return in + dns_zone_setmasterswithkeys(). [RT #26732] + +3183. [bug] Added RTLD_GLOBAL flag to dlopen call. [RT #26301] + +3197. [bug] Don't try to log the filename and line number when + the config parser can't open a file. [RT #22263] + --- 9.8.2 released --- 3298. [bug] Named could dereference a NULL pointer in @@ -58,9 +111,9 @@ 3274. [bug] Log when a zone is not reusable. Only set loadtime on successful
svn commit: r236375 - head/sys/ia64/ia64
Author: alc
Date: Fri Jun 1 03:56:12 2012
New Revision: 236375
URL: http://svn.freebsd.org/changeset/base/236375
Log:
pmap_alloc_vhpt() doesn't need the pages that it allocates to be mapped
into the kernel map, so vm_page_alloc_contig() can be used in place of
contigmalloc().
Reviewed by: marcel
Modified:
head/sys/ia64/ia64/pmap.c
Modified: head/sys/ia64/ia64/pmap.c
==
--- head/sys/ia64/ia64/pmap.c Fri Jun 1 03:46:28 2012(r236374)
+++ head/sys/ia64/ia64/pmap.c Fri Jun 1 03:56:12 2012(r236375)
@@ -289,21 +289,23 @@ pmap_initialize_vhpt(vm_offset_t vhpt)
}
#ifdef SMP
-MALLOC_DECLARE(M_SMP);
-
vm_offset_t
pmap_alloc_vhpt(void)
{
vm_offset_t vhpt;
+ vm_page_t m;
vm_size_t size;
size = 1UL << pmap_vhpt_log2size;
- vhpt = (uintptr_t)contigmalloc(size, M_SMP, 0, 0UL, ~0UL, size, 0UL);
- if (vhpt != 0) {
- vhpt = IA64_PHYS_TO_RR7(ia64_tpa(vhpt));
+ m = vm_page_alloc_contig(NULL, 0, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ |
+ VM_ALLOC_WIRED, atop(size), 0UL, ~0UL, size, 0UL,
+ VM_MEMATTR_DEFAULT);
+ if (m != NULL) {
+ vhpt = IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m));
pmap_initialize_vhpt(vhpt);
+ return (vhpt);
}
- return (vhpt);
+ return (0);
}
#endif
___
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: r236376 - in head: lib/libncp sys/netncp
Author: eadler
Date: Fri Jun 1 03:59:08 2012
New Revision: 236376
URL: http://svn.freebsd.org/changeset/base/236376
Log:
Add characters mapping for codepages used in Germany.
(not verified by me to be accurate)
PR: bin/163847
Submitted by: Gabor Fischer
Reviewed by: bp
Approved by: cperciva
MFC after:3 weeks
Modified:
head/lib/libncp/ncpl_nls.c
head/sys/netncp/ncp_nls.h
Modified: head/lib/libncp/ncpl_nls.c
==
--- head/lib/libncp/ncpl_nls.c Fri Jun 1 03:56:12 2012(r236375)
+++ head/lib/libncp/ncpl_nls.c Fri Jun 1 03:59:08 2012(r236376)
@@ -200,6 +200,79 @@ static u_int8_t se_unix2nw[] = {
0x9c, 0x9b, 0x87, 0x98, 0x9d, 0x99, 0x97, 0x9a
};
+/*
+ * Characters mapping for codepages used in Germany.
+ */
+static u_int8_t de_nw2unix[] = {
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0xb6, 0xa7, 0x5f, 0x5f, /* 0x10 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
+ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
+ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
+ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+ 0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7, /* 0x80 */
+ 0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
+ 0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9, /* 0x90 */
+ 0xff, 0xd6, 0xdc, 0xa2, 0xa3, 0xa5, 0x5f, 0x5f,
+ 0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba, /* 0xA0 */
+ 0xbf, 0x5f, 0xac, 0xbd, 0xbc, 0xa1, 0xab, 0xbb,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xB0 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xC0 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0xD0 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0xdf, 0x5f, 0x5f, 0x5f, 0x5f, 0xb5, 0x5f, /* 0xE0 */
+ 0x5f, 0x5f, 0x5f, 0xf0, 0x5f, 0xf8, 0x5f, 0x5f,
+ 0x5f, 0xb1, 0x5f, 0x5f, 0x5f, 0x5f, 0xf7, 0x5f, /* 0xF0 */
+ 0xb0, 0x5f, 0xb7, 0x5f, 0x5f, 0xb2, 0x5f, 0xa0
+};
+
+static u_int8_t de_unix2nw[] = {
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x00 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x10 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 */
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* 0x30 */
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* 0x40 */
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, /* 0x50 */
+ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 0x60 */
+ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, /* 0x70 */
+ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x80 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, /* 0x90 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0xff, 0xad, 0x9b, 0x9c, 0x5f, 0x9d, 0x5f, 0x15, /* 0xA0 */
+ 0x5f, 0x5f, 0xa6, 0xae, 0xaa, 0x5f, 0x5f, 0x5f,
+ 0xf8, 0xf1, 0xfd, 0x5f, 0x5f, 0xe6, 0x14, 0xfa, /* 0xB0 */
+ 0x5f, 0x5f, 0xa7, 0xaf, 0xac, 0xab, 0x5f, 0xa8,
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x8e, 0x8f, 0x92, 0x80, /* 0xC0 */
+ 0x5f, 0x90, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
+ 0x5f, 0xa5, 0x5f, 0x5f, 0x5f, 0x5f, 0x99, 0x5f, /* 0xD0 */
+ 0x5f, 0x5f, 0x5f, 0x5f, 0x9a, 0x5f, 0x5f, 0xe1,
+ 0x85, 0xa0, 0x83, 0x5f, 0x84, 0x86, 0x91, 0x87, /* 0xE0 */
+ 0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b,
+ 0xeb, 0xa4, 0x95, 0xa2, 0x93, 0x5f, 0x94, 0xf6, /* 0xF0 */
+ 0xed, 0x97, 0xa3, 0x96, 0x81, 0x5f, 0x5f, 0x98
+};
+
static u_int8_t def2lower[256];
static u_int8_t def2upper[256];
@@ -225,6 +298,9 @@ static struct ncp_nlsdesc ncp_nlslist
svn commit: r236377 - head/sys/dev/vxge/vxgehal
Author: eadler
Date: Fri Jun 1 04:23:20 2012
New Revision: 236377
URL: http://svn.freebsd.org/changeset/base/236377
Log:
Fix warning generated by clang;
warning: equality comparison with extraneous parentheses
[-Wparentheses-equality]
Reported by: arundel
Reviewed by: gnn
Approved by: cperciva
MFC after:3 days
Modified:
head/sys/dev/vxge/vxgehal/vxgehal-channel.h
Modified: head/sys/dev/vxge/vxgehal/vxgehal-channel.h
==
--- head/sys/dev/vxge/vxgehal/vxgehal-channel.h Fri Jun 1 03:59:08 2012
(r236376)
+++ head/sys/dev/vxge/vxgehal/vxgehal-channel.h Fri Jun 1 04:23:20 2012
(r236377)
@@ -291,7 +291,7 @@ __hal_channel_dtr_restore(__hal_channel_
else
dtr_index = channel->reserve_index - 1;
- if ((channel->dtr_arr[dtr_index].dtr == dtrh)) {
+ if ((channel->dtr_arr[dtr_index].dtr = dtrh) != NULL) {
channel->reserve_index = dtr_index;
channel->dtr_arr[dtr_index].state = VXGE_HAL_CHANNEL_DTR_FREE;
___
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: r236378 - in head/sys: amd64/amd64 i386/i386 i386/xen
Author: alc
Date: Fri Jun 1 04:26:50 2012
New Revision: 236378
URL: http://svn.freebsd.org/changeset/base/236378
Log:
Eliminate code duplication in free_pv_entry() and pmap_remove_pages() by
introducing free_pv_chunk().
Modified:
head/sys/amd64/amd64/pmap.c
head/sys/i386/i386/pmap.c
head/sys/i386/xen/pmap.c
Modified: head/sys/amd64/amd64/pmap.c
==
--- head/sys/amd64/amd64/pmap.c Fri Jun 1 04:23:20 2012(r236377)
+++ head/sys/amd64/amd64/pmap.c Fri Jun 1 04:26:50 2012(r236378)
@@ -218,6 +218,7 @@ caddr_t CADDR1 = 0;
*/
static caddr_t crashdumpmap;
+static voidfree_pv_chunk(struct pv_chunk *pc);
static voidfree_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try);
static voidpmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
@@ -2174,7 +2175,6 @@ pmap_pv_reclaim(pmap_t locked_pmap)
static void
free_pv_entry(pmap_t pmap, pv_entry_t pv)
{
- vm_page_t m;
struct pv_chunk *pc;
int idx, field, bit;
@@ -2198,6 +2198,14 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
return;
}
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
+ free_pv_chunk(pc);
+}
+
+static void
+free_pv_chunk(struct pv_chunk *pc)
+{
+ vm_page_t m;
+
TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
PV_STAT(pv_entry_spare -= _NPCPV);
PV_STAT(pc_chunk_count--);
@@ -4211,15 +4219,8 @@ pmap_remove_pages(pmap_t pmap)
}
}
if (allfree) {
- PV_STAT(pv_entry_spare -= _NPCPV);
- PV_STAT(pc_chunk_count--);
- PV_STAT(pc_chunk_frees++);
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
- TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
- m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
- dump_drop_page(m->phys_addr);
- vm_page_unwire(m, 0);
- vm_page_free(m);
+ free_pv_chunk(pc);
}
}
pmap_invalidate_all(pmap);
Modified: head/sys/i386/i386/pmap.c
==
--- head/sys/i386/i386/pmap.c Fri Jun 1 04:23:20 2012(r236377)
+++ head/sys/i386/i386/pmap.c Fri Jun 1 04:26:50 2012(r236378)
@@ -286,6 +286,7 @@ SYSCTL_INT(_debug, OID_AUTO, PMAP1unchan
"Number of times pmap_pte_quick didn't change PMAP1");
static struct mtx PMAP2mutex;
+static voidfree_pv_chunk(struct pv_chunk *pc);
static voidfree_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try);
static voidpmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
@@ -2343,7 +2344,6 @@ out:
static void
free_pv_entry(pmap_t pmap, pv_entry_t pv)
{
- vm_page_t m;
struct pv_chunk *pc;
int idx, field, bit;
@@ -2364,6 +2364,14 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list);
return;
}
+ free_pv_chunk(pc);
+}
+
+static void
+free_pv_chunk(struct pv_chunk *pc)
+{
+ vm_page_t m;
+
TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
PV_STAT(pv_entry_spare -= _NPCPV);
PV_STAT(pc_chunk_count--);
@@ -4445,16 +4453,8 @@ pmap_remove_pages(pmap_t pmap)
}
}
if (allfree) {
- PV_STAT(pv_entry_spare -= _NPCPV);
- PV_STAT(pc_chunk_count--);
- PV_STAT(pc_chunk_frees++);
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
- TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
- m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc));
- pmap_qremove((vm_offset_t)pc, 1);
- vm_page_unwire(m, 0);
- vm_page_free(m);
- pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc);
+ free_pv_chunk(pc);
}
}
sched_unpin();
Modified: head/sys/i386/xen/pmap.c
==
--- head/sys/i386/xen/pmap.cFri Jun 1 04:23:20 2012(r236377)
+++ head/sys/i386/xen/pmap.cFri Jun 1 04:26:50 2012(r236378)
@@ -277,6 +277,7 @@ SYSCTL_INT(_debug, OID_AUTO, PMAP1unchan
"Number of times pmap_pte_quick didn't change PMAP1");
static struct mtx PMAP2mutex;
+static voidfree_pv_chunk(struct pv_chunk *pc);
static voidfree_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try);
static voidpmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va);
@@ -209
svn commit: r236379 - in head/sys/dev: hptiop hptmv isp
Author: eadler
Date: Fri Jun 1 04:34:49 2012
New Revision: 236379
URL: http://svn.freebsd.org/changeset/base/236379
Log:
Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as
modules.
PR: kern/166239
Submitted by: Pavel Timofeev
Discussed on: -stable, -scsi
Reviewed by: scottl
No objection from: mjacob
Approved by: cperciva
MFC after:3 days
Modified:
head/sys/dev/hptiop/hptiop.c
head/sys/dev/hptmv/entry.c
head/sys/dev/isp/isp_pci.c
head/sys/dev/isp/isp_sbus.c
Modified: head/sys/dev/hptiop/hptiop.c
==
--- head/sys/dev/hptiop/hptiop.cFri Jun 1 04:26:50 2012
(r236378)
+++ head/sys/dev/hptiop/hptiop.cFri Jun 1 04:34:49 2012
(r236379)
@@ -1268,6 +1268,7 @@ static driver_t hptiop_pci_driver = {
};
DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
+MODULE_DEPEND(hptiop, cam, 1, 1, 1);
static int hptiop_probe(device_t dev)
{
Modified: head/sys/dev/hptmv/entry.c
==
--- head/sys/dev/hptmv/entry.c Fri Jun 1 04:26:50 2012(r236378)
+++ head/sys/dev/hptmv/entry.c Fri Jun 1 04:34:49 2012(r236379)
@@ -108,6 +108,7 @@ static devclass_t hpt_devclass;
#define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4,
p5, p6)
__DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
+MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
#define ccb_ccb_ptr spriv_ptr0
#define ccb_adapter ccb_h.spriv_ptr1
Modified: head/sys/dev/isp/isp_pci.c
==
--- head/sys/dev/isp/isp_pci.c Fri Jun 1 04:26:50 2012(r236378)
+++ head/sys/dev/isp/isp_pci.c Fri Jun 1 04:34:49 2012(r236379)
@@ -372,6 +372,8 @@ static driver_t isp_pci_driver = {
};
static devclass_t isp_devclass;
DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
static int
isp_pci_probe(device_t dev)
Modified: head/sys/dev/isp/isp_sbus.c
==
--- head/sys/dev/isp/isp_sbus.c Fri Jun 1 04:26:50 2012(r236378)
+++ head/sys/dev/isp/isp_sbus.c Fri Jun 1 04:34:49 2012(r236379)
@@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
};
static devclass_t isp_devclass;
DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
static int
isp_sbus_probe(device_t dev)
___
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: r236380 - head/sys/vm
Author: eadler
Date: Fri Jun 1 04:42:52 2012
New Revision: 236380
URL: http://svn.freebsd.org/changeset/base/236380
Log:
Add sysctl to query amount of swap space free
PR: kern/166780
Submitted by: Radim Kolar
Approved by: cperciva
MFC after:1 week
Modified:
head/sys/vm/swap_pager.c
Modified: head/sys/vm/swap_pager.c
==
--- head/sys/vm/swap_pager.cFri Jun 1 04:34:49 2012(r236379)
+++ head/sys/vm/swap_pager.cFri Jun 1 04:42:52 2012(r236380)
@@ -2692,3 +2692,18 @@ swaponvp(struct thread *td, struct vnode
NODEV);
return (0);
}
+
+static int
+sysctl_vm_swap_free(SYSCTL_HANDLER_ARGS) {
+ int swap_free, used;
+ int total;
+
+ swap_pager_status(&total, &used);
+
+ swap_free = (total - used) * PAGE_SIZE;
+ return SYSCTL_OUT(req, &swap_free, sizeof(swap_free));
+}
+
+SYSCTL_OID(_vm, OID_AUTO, swap_free, CTLTYPE_INT|CTLFLAG_RD|CTLFLAG_MPSAFE,
+ NULL, 0, sysctl_vm_swap_free, "Q",
+ "Blocks of free swap storage.");
___
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: r236377 - head/sys/dev/vxge/vxgehal
On Fri, 1 Jun 2012, Eitan Adler wrote:
Author: eadler
Date: Fri Jun 1 04:23:20 2012
New Revision: 236377
URL: http://svn.freebsd.org/changeset/base/236377
Log:
Fix warning generated by clang;
warning: equality comparison with extraneous parentheses
[-Wparentheses-equality]
Reported by: arundel
Reviewed by: gnn
Approved by: cperciva
MFC after: 3 days
Modified:
head/sys/dev/vxge/vxgehal/vxgehal-channel.h
Modified: head/sys/dev/vxge/vxgehal/vxgehal-channel.h
==
--- head/sys/dev/vxge/vxgehal/vxgehal-channel.h Fri Jun 1 03:59:08 2012
(r236376)
+++ head/sys/dev/vxge/vxgehal/vxgehal-channel.h Fri Jun 1 04:23:20 2012
(r236377)
@@ -291,7 +291,7 @@ __hal_channel_dtr_restore(__hal_channel_
else
dtr_index = channel->reserve_index - 1;
- if ((channel->dtr_arr[dtr_index].dtr == dtrh)) {
+ if ((channel->dtr_arr[dtr_index].dtr = dtrh) != NULL) {
channel->reserve_index = dtr_index;
channel->dtr_arr[dtr_index].state = VXGE_HAL_CHANNEL_DTR_FREE;
This seems to change a style by (excessive parentheses for a normal
equality test) into logic bug (assignment of dtrh instead of compariing
with it).
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"
