Re: svn commit: r204145 - head/sys/net
On Sun, 21 Feb 2010, Andrew Thompson wrote: On Sat, Feb 20, 2010 at 10:09:48PM +, Bjoern A. Zeeb wrote: Author: bz Date: Sat Feb 20 22:09:48 2010 New Revision: 204145 URL: http://svn.freebsd.org/changeset/base/204145 Log: Start to implement ifnet DDB support: - 'show ifnets' prints a list of ifnet *s per virtual network stack, - 'show ifnet ' prints fields matching the given ifp. The existing style for this is 'show all xxx', maybe you want to follow that. show allxxx, yeah I can do that, along with fixing the overlong show vnet_sysuninit. I'll need to update the man page after that as well. We do not yet print the complete set of fields and might want to factor this out to an extra if_debug.c file in case this grows a lot[1]. We may also want to grow 'show ifnet ' support[1]. Sponsored by: ISPsystem Suggested by: rwatson [1] Reviewed by: rwatson MFC after:5 days Modified: head/sys/net/if.c -- Bjoern A. Zeeb It will not break if you know what you are doing. ___ 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: r204164 - head/sys/sparc64/include
Author: marius Date: Sun Feb 21 09:25:53 2010 New Revision: 204164 URL: http://svn.freebsd.org/changeset/base/204164 Log: Some machines can not only consist of CPUs running at different speeds but also of different types, f.e. Sun Fire V890 can be equipped with a mix of UltraSPARC IV and IV+ CPUs, requiring different MMU initialization and different workarounds for model specific errata. Therefore move the CPU implementation number from a global variable to the per-CPU data. Functions which are called before the latter is available are passed the implementation number as a parameter now. This file was missed in r204152. Modified: head/sys/sparc64/include/tick.h Modified: head/sys/sparc64/include/tick.h == --- head/sys/sparc64/include/tick.h Sun Feb 21 04:41:28 2010 (r204163) +++ head/sys/sparc64/include/tick.h Sun Feb 21 09:25:53 2010 (r204164) @@ -31,8 +31,8 @@ extern u_int hardclock_use_stick; -void tick_clear(void); +void tick_clear(u_int cpu_impl); void tick_start(void); -void tick_stop(void); +void tick_stop(u_int cpu_impl); #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"
Re: svn commit: r204136 - head/sys/mips/rmi
On Sat, 20 Feb 2010, Randall Stewart wrote: > Author: rrs > Date: Sat Feb 20 17:19:16 2010 > New Revision: 204136 > URL: http://svn.freebsd.org/changeset/base/204136 > > Log: > Changes for pci and pci-e support > - add bus_space_rmi_pci.c for PCI bus space [snip] > > Modified: > head/sys/mips/rmi/bus_space_rmi_pci.c This file now appears to contain two copies of the same text. Gavin ___ 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: r204165 - head/usr.sbin/chown
Author: gavin
Date: Sun Feb 21 10:14:06 2010
New Revision: 204165
URL: http://svn.freebsd.org/changeset/base/204165
Log:
Add a "-x" option to chown(8)/chgrp(1) similar to the same option in
du(1), cp(1) etc, to prevent the crossing of mountpoints whilst using the
commands recursively.
PR: bin/130855
Submitted by: keramida
MFC after:1 month
Modified:
head/usr.sbin/chown/chgrp.1
head/usr.sbin/chown/chown.8
head/usr.sbin/chown/chown.c
Modified: head/usr.sbin/chown/chgrp.1
==
--- head/usr.sbin/chown/chgrp.1 Sun Feb 21 09:25:53 2010(r204164)
+++ head/usr.sbin/chown/chgrp.1 Sun Feb 21 10:14:06 2010(r204165)
@@ -31,7 +31,7 @@
.\" @(#)chgrp.18.3 (Berkeley) 3/31/94
.\" $FreeBSD$
.\"
-.Dd April 25, 2003
+.Dd February 21, 2010
.Dt CHGRP 1
.Os
.Sh NAME
@@ -39,7 +39,7 @@
.Nd change group
.Sh SYNOPSIS
.Nm
-.Op Fl fhv
+.Op Fl fhvx
.Oo
.Fl R
.Op Fl H | Fl L | Fl P
@@ -89,6 +89,8 @@ If the
flag is specified more than once,
.Nm
will print the filename, followed by the old and new numeric group ID.
+.It Fl x
+File system mount points are not traversed.
.El
.Pp
The
@@ -125,7 +127,9 @@ In previous versions of this system, sym
.Pp
The
.Fl v
-option is non-standard and its use in scripts is not recommended.
+and
+.Fl x
+options are non-standard and their use in scripts is not recommended.
.Sh SEE ALSO
.Xr chown 2 ,
.Xr fts 3 ,
Modified: head/usr.sbin/chown/chown.8
==
--- head/usr.sbin/chown/chown.8 Sun Feb 21 09:25:53 2010(r204164)
+++ head/usr.sbin/chown/chown.8 Sun Feb 21 10:14:06 2010(r204165)
@@ -28,7 +28,7 @@
.\" @(#)chown.88.3 (Berkeley) 3/31/94
.\" $FreeBSD$
.\"
-.Dd April 25, 2003
+.Dd February 21, 2010
.Dt CHOWN 8
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd change file owner and group
.Sh SYNOPSIS
.Nm
-.Op Fl fhv
+.Op Fl fhvx
.Oo
.Fl R
.Op Fl H | Fl L | Fl P
@@ -44,7 +44,7 @@
.Ar owner Ns Op : Ns Ar group
.Ar
.Nm
-.Op Fl fhv
+.Op Fl fhvx
.Oo
.Fl R
.Op Fl H | Fl L | Fl P
@@ -97,6 +97,8 @@ If the
flag is specified more than once,
.Nm
will print the filename, followed by the old and new numeric user/group ID.
+.It Fl x
+File system mount points are not traversed.
.El
.Pp
The
@@ -146,7 +148,9 @@ owners.
.Pp
The
.Fl v
-option is non-standard and its use in scripts is not recommended.
+and
+.Fl x
+options are non-standard and their use in scripts is not recommended.
.Sh SEE ALSO
.Xr chgrp 1 ,
.Xr find 1 ,
Modified: head/usr.sbin/chown/chown.c
==
--- head/usr.sbin/chown/chown.c Sun Feb 21 09:25:53 2010(r204164)
+++ head/usr.sbin/chown/chown.c Sun Feb 21 10:14:06 2010(r204165)
@@ -73,14 +73,14 @@ main(int argc, char **argv)
{
FTS *ftsp;
FTSENT *p;
- int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+ int Hflag, Lflag, Rflag, fflag, hflag, vflag, xflag;
int ch, fts_options, rval;
char *cp;
ischown = (strcmp(basename(argv[0]), "chown") == 0);
- Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
- while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
+ Hflag = Lflag = Rflag = fflag = hflag = vflag = xflag = 0;
+ while ((ch = getopt(argc, argv, "HLPRfhvx")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@@ -105,6 +105,9 @@ main(int argc, char **argv)
case 'v':
vflag++;
break;
+ case 'x':
+ xflag = 1;
+ break;
case '?':
default:
usage();
@@ -128,6 +131,8 @@ main(int argc, char **argv)
}
} else
fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
+ if (xflag)
+ fts_options |= FTS_XDEV;
uid = (uid_t)-1;
gid = (gid_t)-1;
@@ -301,11 +306,11 @@ usage(void)
if (ischown)
(void)fprintf(stderr, "%s\n%s\n",
- "usage: chown [-fhv] [-R [-H | -L | -P]] owner[:group]"
+ "usage: chown [-fhvx] [-R [-H | -L | -P]] owner[:group]"
" file ...",
- " chown [-fhv] [-R [-H | -L | -P]] :group file ...");
+ " chown [-fhvx] [-R [-H | -L | -P]] :group file ...");
else
(void)fprintf(stderr, "%s\n",
- "usage: chgrp [-fhv] [-R [-H | -L | -P]] group file ...");
+ "usage: chgrp [-fhvx] [-R [-H | -L | -P]] group file ...");
exit(1);
}
___
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...@fr
svn commit: r204166 - in head: sbin/devfs share/man/man5
Author: gavin Date: Sun Feb 21 10:29:45 2010 New Revision: 204166 URL: http://svn.freebsd.org/changeset/base/204166 Log: Document the interaction between /etc/devfs.conf and /etc/defaults/devfs.conf PR: docs/117308 Submitted by: Mel (partially) MFC after:1 week Modified: head/sbin/devfs/devfs.8 head/share/man/man5/devfs.rules.5 Modified: head/sbin/devfs/devfs.8 == --- head/sbin/devfs/devfs.8 Sun Feb 21 10:14:06 2010(r204165) +++ head/sbin/devfs/devfs.8 Sun Feb 21 10:29:45 2010(r204166) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 27, 2008 +.Dd February 21, 2010 .Dt DEVFS 8 .Os .Sh NAME @@ -196,6 +196,9 @@ Apply all the rules in ruleset number to the node. This does not necessarily result in any changes to the node (e.g., if none of the rules in the included ruleset match). +Include commands in the referenced +.Ar ruleset +are not resolved. .It Cm mode Ar filemode Set the file mode to .Ar filemode , @@ -243,7 +246,9 @@ configuration file. .It Pa /etc/devfs.rules Local .Nm -configuration file. +configuration file. Rulesets in here override those in +.Pa /etc/defaults/devfs.rules +with the same ruleset number, otherwise the two files are effectively merged. .It Pa /etc/devfs.conf Boot-time .Nm Modified: head/share/man/man5/devfs.rules.5 == --- head/share/man/man5/devfs.rules.5 Sun Feb 21 10:14:06 2010 (r204165) +++ head/share/man/man5/devfs.rules.5 Sun Feb 21 10:29:45 2010 (r204166) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 30, 2006 +.Dd February 21, 2010 .Dt DEVFS.RULES 5 .Os .Sh NAME @@ -83,8 +83,16 @@ devfs_system_ruleset="localrules" .Ed .Sh FILES .Bl -tag -compact -.It Pa /etc/devfs.rules .It Pa /etc/defaults/devfs.rules +Default +.Nm +configuration file. +.It Pa /etc/devfs.rules +Local +.Nm +configuration file. Rulesets in here override those in +.Pa /etc/defaults/devfs.rules +with the same ruleset number, otherwise the two files are effectively merged. .El .Sh EXAMPLES To make all the partitions of ___ 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: r204167 - stable/8/sys/fs/msdosfs
Author: kib Date: Sun Feb 21 11:13:15 2010 New Revision: 204167 URL: http://svn.freebsd.org/changeset/base/204167 Log: MFC r203866: Invalid filesystem might cause the bp to be never read. Modified: stable/8/sys/fs/msdosfs/msdosfs_fat.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/netinet/ (props changed) Modified: stable/8/sys/fs/msdosfs/msdosfs_fat.c == --- stable/8/sys/fs/msdosfs/msdosfs_fat.c Sun Feb 21 10:29:45 2010 (r204166) +++ stable/8/sys/fs/msdosfs/msdosfs_fat.c Sun Feb 21 11:13:15 2010 (r204167) @@ -944,7 +944,8 @@ fillinusemap(pmp) if (readcn == 0) usemap_free(pmp, cn); } - brelse(bp); + if (bp != NULL) + brelse(bp); return (0); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r204168 - stable/8
Author: antoine
Date: Sun Feb 21 11:22:01 2010
New Revision: 204168
URL: http://svn.freebsd.org/changeset/base/204168
Log:
Merge r200413 and r202755 from head to stable/8:
reduces white space diff between head and stable/8
Suggested by: ru@
Modified:
stable/8/Makefile.inc1 (contents, props changed)
Modified: stable/8/Makefile.inc1
==
--- stable/8/Makefile.inc1 Sun Feb 21 11:13:15 2010(r204167)
+++ stable/8/Makefile.inc1 Sun Feb 21 11:22:01 2010(r204168)
@@ -1096,8 +1096,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
- ${_lib_libypclnt} lib/libz lib/msun \
+ lib/libradius lib/libsbuf lib/libtacplus \
+ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl}
___
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: r204165 - head/usr.sbin/chown
On Sun, 21 Feb 2010 10:14:06 + (UTC), Gavin Atkinson wrote: > Author: gavin > Date: Sun Feb 21 10:14:06 2010 > New Revision: 204165 > URL: http://svn.freebsd.org/changeset/base/204165 > > Log: > Add a "-x" option to chown(8)/chgrp(1) similar to the same option in > du(1), cp(1) etc, to prevent the crossing of mountpoints whilst using the > commands recursively. > > PR: bin/130855 > Submitted by: keramida > MFC after: 1 month Thanks. I've only used this a few times, but it's good to see the patch committed :-) ___ 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: r204169 - stable/8/usr.bin/kdump
Author: jh
Date: Sun Feb 21 13:17:35 2010
New Revision: 204169
URL: http://svn.freebsd.org/changeset/base/204169
Log:
MFC r203551:
- Cast intptr_t, pid_t and time_t values to intmax_t and use %jd with
printf.
- Cast the system call return value to long and use %ld in a printf in
ktrsysret().
PR: bin/123774
Modified:
stable/8/usr.bin/kdump/kdump.c
Directory Properties:
stable/8/usr.bin/kdump/ (props changed)
Modified: stable/8/usr.bin/kdump/kdump.c
==
--- stable/8/usr.bin/kdump/kdump.c Sun Feb 21 11:22:01 2010
(r204168)
+++ stable/8/usr.bin/kdump/kdump.c Sun Feb 21 13:17:35 2010
(r204169)
@@ -182,14 +182,16 @@ main(int argc, char *argv[])
if (ktr_header.ktr_type & KTR_DROP) {
ktr_header.ktr_type &= ~KTR_DROP;
if (!drop_logged && threads) {
- (void)printf("%6d %6d %-8.*s Events dropped.\n",
- ktr_header.ktr_pid, ktr_header.ktr_tid >
- 0 ? ktr_header.ktr_tid : 0, MAXCOMLEN,
- ktr_header.ktr_comm);
+ (void)printf(
+ "%6jd %6jd %-8.*s Events dropped.\n",
+ (intmax_t)ktr_header.ktr_pid,
+ ktr_header.ktr_tid > 0 ?
+ (intmax_t)ktr_header.ktr_tid : 0,
+ MAXCOMLEN, ktr_header.ktr_comm);
drop_logged = 1;
} else if (!drop_logged) {
- (void)printf("%6d %-8.*s Events dropped.\n",
- ktr_header.ktr_pid, MAXCOMLEN,
+ (void)printf("%6jd %-8.*s Events dropped.\n",
+ (intmax_t)ktr_header.ktr_pid, MAXCOMLEN,
ktr_header.ktr_comm);
drop_logged = 1;
}
@@ -309,10 +311,11 @@ dumpheader(struct ktr_header *kth)
* negative tid's as 0.
*/
if (threads)
- (void)printf("%6d %6d %-8.*s ", kth->ktr_pid, kth->ktr_tid >
- 0 ? kth->ktr_tid : 0, MAXCOMLEN, kth->ktr_comm);
+ (void)printf("%6jd %6jd %-8.*s ", (intmax_t)kth->ktr_pid,
+ kth->ktr_tid > 0 ? (intmax_t)kth->ktr_tid : 0,
+ MAXCOMLEN, kth->ktr_comm);
else
- (void)printf("%6d %-8.*s ", kth->ktr_pid, MAXCOMLEN,
+ (void)printf("%6jd %-8.*s ", (intmax_t)kth->ktr_pid, MAXCOMLEN,
kth->ktr_comm);
if (timestamp) {
if (timestamp == 3) {
@@ -325,8 +328,8 @@ dumpheader(struct ktr_header *kth)
timevalsub(&kth->ktr_time, &prevtime);
prevtime = temp;
}
- (void)printf("%ld.%06ld ",
- kth->ktr_time.tv_sec, kth->ktr_time.tv_usec);
+ (void)printf("%jd.%06ld ", (intmax_t)kth->ktr_time.tv_sec,
+ kth->ktr_time.tv_usec);
}
(void)printf("%s ", type);
}
@@ -821,7 +824,7 @@ ktrsysret(struct ktr_sysret *ktr)
if (error == 0) {
if (fancy) {
- (void)printf("%d", ret);
+ (void)printf("%ld", (long)ret);
if (ret < 0 || ret > 9)
(void)printf("/%#lx", (long)ret);
} else {
@@ -1270,7 +1273,7 @@ ktrstat(struct stat *statp)
printf("rdev=%ju, ", (uintmax_t)statp->st_rdev);
printf("atime=");
if (resolv == 0)
- printf("%ld", statp->st_atimespec.tv_sec);
+ printf("%jd", (intmax_t)statp->st_atimespec.tv_sec);
else {
tm = localtime(&statp->st_atimespec.tv_sec);
(void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm);
@@ -1282,7 +1285,7 @@ ktrstat(struct stat *statp)
printf(", ");
printf("stime=");
if (resolv == 0)
- printf("%ld", statp->st_mtimespec.tv_sec);
+ printf("%jd", (intmax_t)statp->st_mtimespec.tv_sec);
else {
tm = localtime(&statp->st_mtimespec.tv_sec);
(void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm);
@@ -1294,7 +1297,7 @@ ktrstat(struct stat *statp)
printf(", ");
printf("ctime=");
if (resolv == 0)
- printf("%ld", statp->st_ctimespec.tv_sec);
+ printf("%jd", (intmax_t)statp->st_ctimespec.tv_sec);
else {
tm = localtime(&statp->st_ctimespec.tv_sec);
(void)strftime(timestr, sizeof(timestr), TIME_FORMAT, tm);
@@ -1306,7 +1309,7 @@ ktrstat(struct stat *statp)
svn commit: r204170 - in head: lib/libc/gen sys/sys
Author: ed
Date: Sun Feb 21 13:57:02 2010
New Revision: 204170
URL: http://svn.freebsd.org/changeset/base/204170
Log:
Add proper const keywords to sysctl(3) parameters.
The `name' and `newp' arguments can be marked const, because the buffers
they refer to are never changed. While there, perform some other
cleanups:
- Remove K&R from sysctl.c.
- Implement sysctlbyname() using sysctlnametomib() to prevent
duplication of an undocumented kernel interface.
- Fix some whitespace nits.
It seems the prototypes are now in sync with NetBSD as well.
Modified:
head/lib/libc/gen/sysctl.3
head/lib/libc/gen/sysctl.c
head/lib/libc/gen/sysctlbyname.c
head/lib/libc/gen/sysctlnametomib.c
head/sys/sys/sysctl.h
Modified: head/lib/libc/gen/sysctl.3
==
--- head/lib/libc/gen/sysctl.3 Sun Feb 21 13:17:35 2010(r204169)
+++ head/lib/libc/gen/sysctl.3 Sun Feb 21 13:57:02 2010(r204170)
@@ -28,7 +28,7 @@
.\"@(#)sysctl.38.4 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd January 28, 2009
+.Dd February 21, 2010
.Dt SYSCTL 3
.Os
.Sh NAME
@@ -42,9 +42,9 @@
.In sys/types.h
.In sys/sysctl.h
.Ft int
-.Fn sysctl "int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "void
*newp" "size_t newlen"
+.Fn sysctl "const int *name" "u_int namelen" "void *oldp" "size_t *oldlenp"
"const void *newp" "size_t newlen"
.Ft int
-.Fn sysctlbyname "const char *name" "void *oldp" "size_t *oldlenp" "void
*newp" "size_t newlen"
+.Fn sysctlbyname "const char *name" "void *oldp" "size_t *oldlenp" "const void
*newp" "size_t newlen"
.Ft int
.Fn sysctlnametomib "const char *name" "int *mibp" "size_t *sizep"
.Sh DESCRIPTION
Modified: head/lib/libc/gen/sysctl.c
==
--- head/lib/libc/gen/sysctl.c Sun Feb 21 13:17:35 2010(r204169)
+++ head/lib/libc/gen/sysctl.c Sun Feb 21 13:57:02 2010(r204170)
@@ -43,15 +43,12 @@ __FBSDID("$FreeBSD$");
#include
#include
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-void *newp, size_t newlen);
+extern int __sysctl(const int *name, u_int namelen, void *oldp,
+size_t *oldlenp, const void *newp, size_t newlen);
int
-sysctl(name, namelen, oldp, oldlenp, newp, newlen)
- int *name;
- u_int namelen;
- void *oldp, *newp;
- size_t *oldlenp, newlen;
+sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp,
+const void *newp, size_t newlen)
{
if (name[0] != CTL_USER)
return (__sysctl(name, namelen, oldp, oldlenp, newp, newlen));
Modified: head/lib/libc/gen/sysctlbyname.c
==
--- head/lib/libc/gen/sysctlbyname.cSun Feb 21 13:17:35 2010
(r204169)
+++ head/lib/libc/gen/sysctlbyname.cSun Feb 21 13:57:02 2010
(r204170)
@@ -13,26 +13,19 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
int
-sysctlbyname(const char *name, void *oldp, size_t *oldlenp, void *newp,
-size_t newlen)
+sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
+const void *newp, size_t newlen)
{
- int name2oid_oid[2];
int real_oid[CTL_MAXNAME+2];
int error;
size_t oidlen;
- name2oid_oid[0] = 0;/* This is magic & undocumented! */
- name2oid_oid[1] = 3;
-
- oidlen = sizeof(real_oid);
- error = sysctl(name2oid_oid, 2, real_oid, &oidlen, (void *)name,
- strlen(name));
+ oidlen = sizeof(real_oid) / sizeof(int);
+ error = sysctlnametomib(name, real_oid, &oidlen);
if (error < 0)
- return error;
- oidlen /= sizeof (int);
+ return (error);
error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen);
return (error);
}
Modified: head/lib/libc/gen/sysctlnametomib.c
==
--- head/lib/libc/gen/sysctlnametomib.c Sun Feb 21 13:17:35 2010
(r204169)
+++ head/lib/libc/gen/sysctlnametomib.c Sun Feb 21 13:57:02 2010
(r204170)
@@ -48,8 +48,8 @@ sysctlnametomib(const char *name, int *m
oid[0] = 0;
oid[1] = 3;
- *sizep *= sizeof (int);
- error = sysctl(oid, 2, mibp, sizep, (void *)name, strlen(name));
- *sizep /= sizeof (int);
+ *sizep *= sizeof(int);
+ error = sysctl(oid, 2, mibp, sizep, name, strlen(name));
+ *sizep /= sizeof(int);
return (error);
}
Modified: head/sys/sys/sysctl.h
==
--- head/sys/sys/sysctl.h Sun Feb 21 13:17:35 2010(r204169)
+++ head/sys/sys/sysctl.h Sun Feb 21 13:57:02 2010(r204170)
@@ -714,8 +714,8 @@ int sysctl_wire_old_buffer(struct sysctl
#include
__BEGIN_DECLS
-intsysctl(int *,
svn commit: r204171 - in head: contrib/bc gnu/usr.bin/bc gnu/usr.bin/dc
Author: gabor Date: Sun Feb 21 14:28:03 2010 New Revision: 204171 URL: http://svn.freebsd.org/changeset/base/204171 Log: - Remove GNU bc/dc bits. There has not been any regressions seen after BSD bc/dc import. It has been tested with make universe that this code is not used by anything any more. Approved by: delphij (mentor) Deleted: head/contrib/bc/ head/gnu/usr.bin/bc/ head/gnu/usr.bin/dc/ ___ 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: r204172 - head/lib/libc/gen
Author: ed Date: Sun Feb 21 14:58:01 2010 New Revision: 204172 URL: http://svn.freebsd.org/changeset/base/204172 Log: While there, trim some trailing whitespace. Modified: head/lib/libc/gen/sysctlbyname.c Modified: head/lib/libc/gen/sysctlbyname.c == --- head/lib/libc/gen/sysctlbyname.cSun Feb 21 14:28:03 2010 (r204171) +++ head/lib/libc/gen/sysctlbyname.cSun Feb 21 14:58:01 2010 (r204172) @@ -29,4 +29,3 @@ sysctlbyname(const char *name, void *old error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen); return (error); } - ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r204173 - head/sys/net
Author: rwatson
Date: Sun Feb 21 15:25:47 2010
New Revision: 204173
URL: http://svn.freebsd.org/changeset/base/204173
Log:
ifconfig(8) expects interface fooX to be supported by the module if_foo,
and will try to load it if it's not present. To better meet these
expectations, change the module name for the loopback interface from
'loop' to 'if_lo'. The loopback interface is always compiled into the
base kernel, so there are no resulting changes in kld files, etc.
Discussed with: brooks (ages ago)
MFC after:1 week
Modified:
head/sys/net/if_loop.c
Modified: head/sys/net/if_loop.c
==
--- head/sys/net/if_loop.c Sun Feb 21 14:58:01 2010(r204172)
+++ head/sys/net/if_loop.c Sun Feb 21 15:25:47 2010(r204173)
@@ -200,12 +200,12 @@ loop_modevent(module_t mod, int type, vo
}
static moduledata_t loop_mod = {
- "loop",
+ "if_lo",
loop_modevent,
0
};
-DECLARE_MODULE(loop, loop_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
+DECLARE_MODULE(if_lo, loop_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
int
looutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
___
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: r204174 - in head/contrib/gdb/gdb: . config/mips
Author: rrs
Date: Sun Feb 21 17:25:00 2010
New Revision: 204174
URL: http://svn.freebsd.org/changeset/base/204174
Log:
Adds the missing mips gdb files that I
foobar'd on my last commit.. Sorry about
that JC.. my fault.
Obtained from:JC
Added:
head/contrib/gdb/gdb/config/mips/nm-fbsd.h
head/contrib/gdb/gdb/config/mips/tm-fbsd.h
head/contrib/gdb/gdb/mipsfbsd-nat.c
head/contrib/gdb/gdb/mipsfbsd-tdep.c
head/contrib/gdb/gdb/mipsfbsd-tdep.h
Added: head/contrib/gdb/gdb/config/mips/nm-fbsd.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/gdb/gdb/config/mips/nm-fbsd.h Sun Feb 21 17:25:00 2010
(r204174)
@@ -0,0 +1,48 @@
+/***
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI:
+*#RMI_1#**/
+/* Native-dependent definitions for NetBSD/mips.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef NM_FBSD_H
+#define NM_FBSD_H
+
+/* Override child_pid_to_exec_file in 'inftarg.c'. */
+#define CHILD_PID_TO_EXEC_FILE
+
+/* Type of the third argument to the `ptrace' system call. */
+#define PTRACE_ARG3_TYPE caddr_t
+
+/* Override copies of {fetch,store}_inferior_registers in `infptrace.c'. */
+#define FETCH_INFERIOR_REGISTERS
+
+/* We can attach and detach. */
+#define ATTACH_DETACH
+
+/* Shared library support. */
+
+#include "solib.h"
+
+#endif /* NM_FBSD_H */
Added: head/contrib/gdb/gdb/config/mips/tm-fbsd.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/gdb/gdb/config/mips/tm-fbsd.h Sun Feb 21 17:25:00 2010
(r204174)
@@ -0,0 +1,43 @@
+/***
+Copyright 2003-2006 Raza Microelectronics, Inc.(RMI).
+This is a derived work from software originally provided by the external
+entity identified below. The licensing terms and warranties specified in
+the header of the original work apply to this derived work.
+Contribution by RMI:
+*#RMI_1#**/
+/* Target-dependent definitions for NetBSD/mips.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef TM_FBSD_H
+#define TM_FBSD_H
+
+#include "mips/tm-mips.h"
+#include "solib.h"
+
+/* We don't want to inherit tm-mips.h's shared library trampoline code. */
+#undef IN_SOLIB_CALL_TRAMPOLINE
+#undef IN_SOLIB_RETURN_TRAMPOLINE
+#undef SKIP_TRAMPOLINE_CODE
+#undef IGNORE_HELPER_CALL
+
+/* XXX undef a bunch of stuff we want to use multi-arch */
+#undef IN_SIGTRAMP
+#endif /* TM_FBSD_H */
Added: head/contrib/gdb/gdb/mipsfbsd-nat.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/gdb/gdb/mipsfbsd-nat.c Sun Feb 21 17:25:00 2010
(r204174)
@@ -0,0 +1,108 @@
+/***
svn commit: r204175 - head/sys/mips/rmi
Author: rrs
Date: Sun Feb 21 17:27:20 2010
New Revision: 204175
URL: http://svn.freebsd.org/changeset/base/204175
Log:
Fix another fo-pa of mine... duplicate patches should
not be applied and randy needs coffee in the morning
when working to help keep things sorted out... obviously :-)
Modified:
head/sys/mips/rmi/bus_space_rmi_pci.c
Modified: head/sys/mips/rmi/bus_space_rmi_pci.c
==
--- head/sys/mips/rmi/bus_space_rmi_pci.c Sun Feb 21 17:25:00 2010
(r204174)
+++ head/sys/mips/rmi/bus_space_rmi_pci.c Sun Feb 21 17:27:20 2010
(r204175)
@@ -759,763 +759,3 @@ rmi_pci_bus_space_barrier(void *tag __un
{
}
-/*-
- * Copyright (c) 2009 RMI Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#include
-__FBSDID("$FreeBSD$");
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-static int
-rmi_pci_bus_space_map(void *t, bus_addr_t addr,
-bus_size_t size, int flags,
-bus_space_handle_t * bshp);
-
-static void
-rmi_pci_bus_space_unmap(void *t, bus_space_handle_t bsh,
-bus_size_t size);
-
-static int
-rmi_pci_bus_space_subregion(void *t,
-bus_space_handle_t bsh,
-bus_size_t offset, bus_size_t size,
-bus_space_handle_t * nbshp);
-
-static u_int8_t
-rmi_pci_bus_space_read_1(void *t,
-bus_space_handle_t handle,
-bus_size_t offset);
-
-static u_int16_t
-rmi_pci_bus_space_read_2(void *t,
-bus_space_handle_t handle,
-bus_size_t offset);
-
-static u_int32_t
-rmi_pci_bus_space_read_4(void *t,
-bus_space_handle_t handle,
-bus_size_t offset);
-
-static void
-rmi_pci_bus_space_read_multi_1(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int8_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_read_multi_2(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int16_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_read_multi_4(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int32_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_read_region_1(void *t,
-bus_space_handle_t bsh,
-bus_size_t offset, u_int8_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_read_region_2(void *t,
-bus_space_handle_t bsh,
-bus_size_t offset, u_int16_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_read_region_4(void *t,
-bus_space_handle_t bsh,
-bus_size_t offset, u_int32_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_write_1(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int8_t value);
-
-static void
-rmi_pci_bus_space_write_2(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int16_t value);
-
-static void
-rmi_pci_bus_space_write_4(void *t,
-bus_space_handle_t handle,
-bus_size_t offset, u_int32_t value);
-
-static void
-rmi_pci_bus_space_write_multi_1(void *t,
-bus_space_handle_t handle,
-bus_size_t offset,
-const u_int8_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_write_multi_2(void *t,
-bus_space_handle_t handle,
-bus_size_t offset,
-const u_int16_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_write_multi_4(void *t,
-bus_space_handle_t handle,
-bus_size_t offset,
-const u_int32_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_write_region_2(void *t,
-bus_space_handle_t bsh,
-bus_size_t offset,
-const u_int16_t * addr,
-size_t count);
-
-static void
-rmi_pci_bus_space_write_region_4(void *t
svn commit: r204176 - in head/sys: conf kern
Author: ed
Date: Sun Feb 21 19:53:33 2010
New Revision: 204176
URL: http://svn.freebsd.org/changeset/base/204176
Log:
Decompose the most lousy named file in sys/kern; kern_subr.c.
Although this file has historically been used as a dumping ground for
random functions, nowadays it only contains functions related to copying
bits {from,to} userspace and hash table utility functions.
Behold, subr_uio.c and subr_hash.c.
Added:
head/sys/kern/subr_hash.c
- copied, changed from r204168, head/sys/kern/kern_subr.c
head/sys/kern/subr_uio.c
- copied, changed from r204168, head/sys/kern/kern_subr.c
Deleted:
head/sys/kern/kern_subr.c
Modified:
head/sys/conf/files
Modified: head/sys/conf/files
==
--- head/sys/conf/files Sun Feb 21 17:27:20 2010(r204175)
+++ head/sys/conf/files Sun Feb 21 19:53:33 2010(r204176)
@@ -2084,7 +2084,6 @@ kern/kern_sdt.c optional kdtrace_hooks
kern/kern_sema.c standard
kern/kern_shutdown.c standard
kern/kern_sig.cstandard
-kern/kern_subr.c standard
kern/kern_switch.c standard
kern/kern_sx.c standard
kern/kern_synch.c standard
@@ -2121,6 +2120,7 @@ kern/subr_disk.c standard
kern/subr_eventhandler.c standard
kern/subr_fattime.cstandard
kern/subr_firmware.c optional firmware
+kern/subr_hash.c standard
kern/subr_hints.c standard
kern/subr_kdb.cstandard
kern/subr_kobj.c standard
@@ -2146,6 +2146,7 @@ kern/subr_stack.c optional ddb | stack
kern/subr_taskqueue.c standard
kern/subr_trap.c standard
kern/subr_turnstile.c standard
+kern/subr_uio.cstandard
kern/subr_unit.c standard
kern/subr_witness.coptional witness
kern/sys_generic.c standard
Copied and modified: head/sys/kern/subr_hash.c (from r204168,
head/sys/kern/kern_subr.c)
==
--- head/sys/kern/kern_subr.c Sun Feb 21 11:22:01 2010(r204168, copy
source)
+++ head/sys/kern/subr_hash.c Sun Feb 21 19:53:33 2010(r204176)
@@ -37,328 +37,9 @@
#include
__FBSDID("$FreeBSD$");
-#include "opt_zero.h"
-
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#ifdef ZERO_COPY_SOCKETS
-#include
-#include
-#endif
-
-SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV,
- "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)");
-
-#ifdef ZERO_COPY_SOCKETS
-/* Declared in uipc_socket.c */
-extern int so_zero_copy_receive;
-
-/*
- * Identify the physical page mapped at the given kernel virtual
- * address. Insert this physical page into the given address space at
- * the given virtual address, replacing the physical page, if any,
- * that already exists there.
- */
-static int
-vm_pgmoveco(vm_map_t mapa, vm_offset_t kaddr, vm_offset_t uaddr)
-{
- vm_map_t map = mapa;
- vm_page_t kern_pg, user_pg;
- vm_object_t uobject;
- vm_map_entry_t entry;
- vm_pindex_t upindex;
- vm_prot_t prot;
- boolean_t wired;
-
- KASSERT((uaddr & PAGE_MASK) == 0,
- ("vm_pgmoveco: uaddr is not page aligned"));
-
- /*
-* Herein the physical page is validated and dirtied. It is
-* unwired in sf_buf_mext().
-*/
- kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr));
- kern_pg->valid = VM_PAGE_BITS_ALL;
- KASSERT(kern_pg->queue == PQ_NONE && kern_pg->wire_count == 1,
- ("vm_pgmoveco: kern_pg is not correctly wired"));
-
- if ((vm_map_lookup(&map, uaddr,
- VM_PROT_WRITE, &entry, &uobject,
- &upindex, &prot, &wired)) != KERN_SUCCESS) {
- return(EFAULT);
- }
- VM_OBJECT_LOCK(uobject);
-retry:
- if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) {
- if (vm_page_sleep_if_busy(user_pg, TRUE, "vm_pgmoveco"))
- goto retry;
- vm_page_lock_queues();
- pmap_remove_all(user_pg);
- vm_page_free(user_pg);
- } else {
- /*
-* Even if a physical page does not exist in the
-* object chain's first object, a physical page from a
-* backing object may be mapped read only.
-*/
- if (uobject->backing_object != NULL)
- pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE);
- vm_page_lock_queues();
- }
- vm_page_insert(kern_pg, uobject, upindex);
- vm_page_dirty(kern_pg);
-
svn commit: r204177 - head/sbin/hastd
Author: pjd
Date: Sun Feb 21 19:56:47 2010
New Revision: 204177
URL: http://svn.freebsd.org/changeset/base/204177
Log:
Changing proto_socketpair.c compilation and linking order revealed
a problem - we should simply ignore proto_server() if address
doesn't start with socketpair://, and not abort.
Modified:
head/sbin/hastd/proto_socketpair.c
Modified: head/sbin/hastd/proto_socketpair.c
==
--- head/sbin/hastd/proto_socketpair.c Sun Feb 21 19:53:33 2010
(r204176)
+++ head/sbin/hastd/proto_socketpair.c Sun Feb 21 19:56:47 2010
(r204177)
@@ -91,9 +91,12 @@ sp_connect(void *ctx __unused)
}
static int
-sp_server(const char *addr __unused, void **ctxp __unused)
+sp_server(const char *addr, void **ctxp __unused)
{
+ if (strcmp(addr, "socketpair://") != 0)
+ return (-1);
+
assert(!"proto_server() not supported on socketpairs");
abort();
}
___
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: r204178 - head/games/fortune/fortune
Author: uqs Date: Sun Feb 21 21:03:15 2010 New Revision: 204178 URL: http://svn.freebsd.org/changeset/base/204178 Log: Prefer exit(0) from main over return(0). Although not explicitly mentioned in style(9), it allows for easier grepping of exit points. This reverts part of r203926. Requested by: des Approved by: philip (mentor) Modified: head/games/fortune/fortune/fortune.c Modified: head/games/fortune/fortune/fortune.c == --- head/games/fortune/fortune/fortune.cSun Feb 21 19:56:47 2010 (r204177) +++ head/games/fortune/fortune/fortune.cSun Feb 21 21:03:15 2010 (r204178) @@ -216,7 +216,7 @@ main(int argc, char *argv[]) sleep((unsigned int) max(Fort_len / CPERS, MINW)); } - return (0); + exit(0); } void ___ 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: r204179 - head/sys/powerpc/powermac
Author: nwhitehorn
Date: Sun Feb 21 21:03:37 2010
New Revision: 204179
URL: http://svn.freebsd.org/changeset/base/204179
Log:
Fix several mistakes in this file, in order to allow individual fan speeds
to be read and set correctly.
Modified:
head/sys/powerpc/powermac/smu.c
Modified: head/sys/powerpc/powermac/smu.c
==
--- head/sys/powerpc/powermac/smu.c Sun Feb 21 21:03:15 2010
(r204178)
+++ head/sys/powerpc/powermac/smu.c Sun Feb 21 21:03:37 2010
(r204179)
@@ -58,6 +58,7 @@ struct smu_fan {
cell_t max_rpm;
cell_t unmanaged_rpm;
charlocation[32];
+ int old_style;
};
struct smu_sensor {
@@ -115,6 +116,7 @@ static void smu_cpufreq_pre_change(devic
static voidsmu_cpufreq_post_change(device_t, const struct cf_level *level);
/* utility functions */
+static int smu_run_cmd(device_t dev, struct smu_cmd *cmd);
static int smu_get_datablock(device_t dev, int8_t id, uint8_t *buf,
size_t len);
static voidsmu_attach_fans(device_t dev, phandle_t fanroot);
@@ -148,11 +150,12 @@ MALLOC_DEFINE(M_SMU, "smu", "SMU Sensor
#define SMU_ADC0xd8
#define SMU_FAN0x4a
#define SMU_I2C0x9a
-#define SMU_I2C_SIMPLE 0x00
-#define SMU_I2C_NORMAL 0x01
-#define SMU_I2C_COMBINED 0x02
+#define SMU_I2C_SIMPLE0x00
+#define SMU_I2C_NORMAL0x01
+#define SMU_I2C_COMBINED 0x02
#define SMU_MISC 0xee
-#define SMU_MISC_GET_DATA 0x02
+#define SMU_MISC_GET_DATA 0x02
+#define SMU_MISC_LED_CTRL 0x04
#define SMU_POWER 0xaa
/* Data blocks */
@@ -306,6 +309,7 @@ smu_run_cmd(device_t dev, struct smu_cmd
powerpc_pow_enabled = oldpow;
memcpy(cmd->data, sc->sc_cmd->data, sizeof(cmd->data));
+ cmd->len = sc->sc_cmd->len;
mtx_unlock(&sc->sc_mtx);
@@ -430,21 +434,43 @@ static int
smu_fan_set_rpm(device_t smu, struct smu_fan *fan, int rpm)
{
struct smu_cmd cmd;
+ int error;
cmd.cmd = SMU_FAN;
- cmd.len = 14;
- cmd.data[0] = 0;
- cmd.data[1] = 1 << fan->reg;
+ error = EIO;
+
+ /* Clamp to allowed range */
+ rpm = max(fan->min_rpm, rpm);
+ rpm = min(fan->max_rpm, rpm);
/*
-* There are two locations used for the fan speed.
-* Store it in both.
+* Apple has two fan control mechanisms. We can't distinguish
+* them except by seeing if the new one fails. If the new one
+* fails, use the old one.
*/
+
+ if (!fan->old_style) {
+ cmd.len = 4;
+ cmd.data[0] = 0x30;
+ cmd.data[1] = fan->reg;
+ cmd.data[2] = (rpm >> 8) & 0xff;
+ cmd.data[3] = rpm & 0xff;
+
+ error = smu_run_cmd(smu, &cmd);
+ if (error)
+ fan->old_style = 1;
+ }
- cmd.data[2] = cmd.data[2 + 2*fan->reg] = (rpm >> 8) & 0xff;
- cmd.data[3] = cmd.data[3 + 2*fan->reg] = rpm & 0xff;
+ if (fan->old_style) {
+ cmd.len = 14;
+ cmd.data[0] = 0;
+ cmd.data[1] = 1 << fan->reg;
+ cmd.data[2 + 2*fan->reg] = (rpm >> 8) & 0xff;
+ cmd.data[3 + 2*fan->reg] = rpm & 0xff;
+ error = smu_run_cmd(smu, &cmd);
+ }
- return (smu_run_cmd(smu, &cmd));
+ return (error);
}
static int
@@ -453,13 +479,12 @@ smu_fan_read_rpm(device_t smu, struct sm
struct smu_cmd cmd;
cmd.cmd = SMU_FAN;
- cmd.len = 2;
+ cmd.len = 1;
cmd.data[0] = 1;
- cmd.data[1] = 1 << fan->reg;
smu_run_cmd(smu, &cmd);
- return ((cmd.data[1] << 8) | cmd.data[2]);
+ return ((cmd.data[fan->reg*2+1] << 8) | cmd.data[fan->reg*2+2]);
}
static int
@@ -522,11 +547,15 @@ smu_attach_fans(device_t dev, phandle_t
if (strcmp(type, "fan-rpm-control") != 0)
continue;
+ fan->old_style = 0;
OF_getprop(child, "reg", &fan->reg, sizeof(cell_t));
OF_getprop(child, "min-value", &fan->min_rpm, sizeof(cell_t));
OF_getprop(child, "max-value", &fan->max_rpm, sizeof(cell_t));
- OF_getprop(child, "unmanaged-value", &fan->unmanaged_rpm,
- sizeof(cell_t));
+
+ if (OF_getprop(child, "unmanaged-value", &fan->unmanaged_rpm,
+ sizeof(cell_t)) != sizeof(cell_t))
+ fan->unmanaged_rpm = fan->max_rpm;
+
OF_getprop(child, "location", fan->location,
sizeof(fan->location));
@@ -661,8 +690,8 @@ smu_attach_sensors(device_t dev, phandle
return;
}
- sc->sc_fans = malloc(sc->sc_nsensors * sizeof(s
svn commit: r204180 - head/sys/powerpc/powermac
Author: nwhitehorn
Date: Sun Feb 21 22:13:57 2010
New Revision: 204180
URL: http://svn.freebsd.org/changeset/base/204180
Log:
Add a simple fan management callout to the SMU driver. This is designed
such that a fancier thermal management algorithm can be run from user
space, but the kernel will at least ensure your machine does not either
sound like a wind tunnel or catch fire.
Modified:
head/sys/powerpc/powermac/smu.c
Modified: head/sys/powerpc/powermac/smu.c
==
--- head/sys/powerpc/powermac/smu.c Sun Feb 21 21:03:37 2010
(r204179)
+++ head/sys/powerpc/powermac/smu.c Sun Feb 21 22:13:57 2010
(r204180)
@@ -32,10 +32,12 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
@@ -58,7 +60,9 @@ struct smu_fan {
cell_t max_rpm;
cell_t unmanaged_rpm;
charlocation[32];
+
int old_style;
+ int setpoint;
};
struct smu_sensor {
@@ -92,6 +96,9 @@ struct smu_softc {
struct smu_sensor *sc_sensors;
int sc_nsensors;
+ struct callout sc_fanmgt_callout;
+ time_t sc_lastuserchange;
+
/* Calibration data */
uint16_tsc_cpu_diode_scale;
int16_t sc_cpu_diode_offset;
@@ -103,6 +110,10 @@ struct smu_softc {
uint16_tsc_slots_pow_scale;
int16_t sc_slots_pow_offset;
+
+ /* Thermal management parameters */
+ int sc_target_temp; /* Default 55 C */
+ int sc_critical_temp; /* Default 90 C */
};
/* regular bus attachment functions */
@@ -121,6 +132,7 @@ static int smu_get_datablock(device_t de
size_t len);
static voidsmu_attach_fans(device_t dev, phandle_t fanroot);
static voidsmu_attach_sensors(device_t dev, phandle_t sensroot);
+static voidsmu_fanmgt_callout(void *xdev);
/* where to find the doorbell GPIO */
@@ -145,6 +157,7 @@ DRIVER_MODULE(smu, nexus, smu_driver, sm
MALLOC_DEFINE(M_SMU, "smu", "SMU Sensor Information");
#define SMU_MAILBOX0x8000860c
+#define SMU_FANMGT_INTERVAL500 /* ms */
/* Command types */
#define SMU_ADC0xd8
@@ -261,6 +274,24 @@ smu_attach(device_t dev)
sc->sc_slots_pow_scale = (data[4] << 8) + data[5];
sc->sc_slots_pow_offset = (data[6] << 8) + data[7];
+ /*
+* Set up simple-minded thermal management.
+*/
+ sc->sc_target_temp = 55;
+ sc->sc_critical_temp = 90;
+
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+ "target_temp", CTLTYPE_INT | CTLFLAG_RW, &sc->sc_target_temp,
+ sizeof(int), "Target temperature (C)");
+ SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+ "critical_temp", CTLTYPE_INT | CTLFLAG_RW,
+ &sc->sc_critical_temp, sizeof(int), "Critical temperature (C)");
+
+ callout_init(&sc->sc_fanmgt_callout, 1);
+ smu_fanmgt_callout(dev);
+
return (0);
}
@@ -470,6 +501,9 @@ smu_fan_set_rpm(device_t smu, struct smu
error = smu_run_cmd(smu, &cmd);
}
+ if (error == 0)
+ fan->setpoint = rpm;
+
return (error);
}
@@ -505,6 +539,7 @@ smu_fanrpm_sysctl(SYSCTL_HANDLER_ARGS)
if (error || !req->newptr)
return (error);
+ sc->sc_lastuserchange = time_uptime;
return (smu_fan_set_rpm(smu, fan, rpm));
}
@@ -556,12 +591,11 @@ smu_attach_fans(device_t dev, phandle_t
sizeof(cell_t)) != sizeof(cell_t))
fan->unmanaged_rpm = fan->max_rpm;
+ fan->setpoint = smu_fan_read_rpm(dev, fan);
+
OF_getprop(child, "location", fan->location,
sizeof(fan->location));
-
- /* Make sure it is at a safe value initially */
- //smu_fan_set_rpm(dev, fan, fan->unmanaged_rpm);
-
+
/* Add sysctls */
for (i = 0; i < strlen(fan->location); i++) {
sysctl_name[i] = tolower(fan->location[i]);
@@ -745,3 +779,77 @@ smu_attach_sensors(device_t dev, phandle
}
}
+static int
+ms_to_ticks(int ms)
+{
+ if (hz > 1000)
+ return ms*(hz/1000);
+
+ return ms/(1000/hz);
+}
+
+static void
+smu_fanmgt_callout(void *xdev) {
+ device_t smu = xdev;
+ struct smu_softc *sc;
+ int i, maxtemp, temp, factor;
+
+ sc = device_get_softc(smu);
+
+ if (time_uptime - sc->sc_lastuserchange < 3) {
+ /*
+* If we have heard from a user process in the last 3 seconds,
+* go away.
+*/
+
+ callout
svn commit: r204181 - head/sys/vm
Author: alc
Date: Sun Feb 21 22:23:13 2010
New Revision: 204181
URL: http://svn.freebsd.org/changeset/base/204181
Log:
Align the start of the clean submap to a superpage boundary. Although
no superpage mappings are created within the clean submap, aligning the
start of the clean submap helps to prevent interference with kmem_alloc()'s
use of superpages.
Modified:
head/sys/vm/vm_init.c
Modified: head/sys/vm/vm_init.c
==
--- head/sys/vm/vm_init.c Sun Feb 21 22:13:57 2010(r204180)
+++ head/sys/vm/vm_init.c Sun Feb 21 22:23:13 2010(r204181)
@@ -186,7 +186,7 @@ again:
panic("startup: table size inconsistency");
clean_map = kmem_suballoc(kernel_map, &kmi->clean_sva, &kmi->clean_eva,
- (long)nbuf * BKVASIZE + (long)nswbuf * MAXPHYS, FALSE);
+ (long)nbuf * BKVASIZE + (long)nswbuf * MAXPHYS, TRUE);
buffer_map = kmem_suballoc(clean_map, &kmi->buffer_sva,
&kmi->buffer_eva, (long)nbuf * BKVASIZE, FALSE);
buffer_map->system_map = 1;
___
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: r204076 - in head: etc/defaults etc/rc.d sbin sbin/ggate/ggatec sbin/ggate/ggatel sbin/hastctl sbin/hastd share/examples share/examples/hast share/man/man5 sys/geom/gate
On Thu, 18 Feb 2010, Pawel Jakub Dawidek wrote: PJD> as well as http://wiki.FreeBSD.org/HAST. Does not exist yet? Anyway, thanks a lot! -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ 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: r204076 - in head: etc/defaults etc/rc.d sbin sbin/ggate/ggatec sbin/ggate/ggatel sbin/hastctl sbin/hastd share/examples share/examples/hast share/man/man5 sys/geom/gate
On Mon, 22 Feb 2010, Dmitry Morozovsky wrote: DM> PJD> as well as http://wiki.FreeBSD.org/HAST. DM> DM> Does not exist yet? oops, seems wrong page was cached. sorry for the noise. -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ 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: r204182 - in head/sys/ia64: ia64 include
Author: marcel
Date: Sun Feb 21 23:10:13 2010
New Revision: 204182
URL: http://svn.freebsd.org/changeset/base/204182
Log:
Remove pm_active from struct pmap as it serves no purpose.
MFC after:1 week
Modified:
head/sys/ia64/ia64/pmap.c
head/sys/ia64/include/pmap.h
Modified: head/sys/ia64/ia64/pmap.c
==
--- head/sys/ia64/ia64/pmap.c Sun Feb 21 22:23:13 2010(r204181)
+++ head/sys/ia64/ia64/pmap.c Sun Feb 21 23:10:13 2010(r204182)
@@ -453,7 +453,6 @@ pmap_bootstrap()
PMAP_LOCK_INIT(kernel_pmap);
for (i = 0; i < 5; i++)
kernel_pmap->pm_rid[i] = 0;
- kernel_pmap->pm_active = 1;
TAILQ_INIT(&kernel_pmap->pm_pvlist);
PCPU_SET(md.current_pmap, kernel_pmap);
@@ -662,7 +661,6 @@ pmap_pinit(struct pmap *pmap)
PMAP_LOCK_INIT(pmap);
for (i = 0; i < 5; i++)
pmap->pm_rid[i] = pmap_allocate_rid();
- pmap->pm_active = 0;
TAILQ_INIT(&pmap->pm_pvlist);
bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
return (1);
@@ -2246,8 +2244,6 @@ pmap_switch(pmap_t pm)
prevpm = PCPU_GET(md.current_pmap);
if (prevpm == pm)
goto out;
- if (prevpm != NULL)
- atomic_clear_32(&prevpm->pm_active, PCPU_GET(cpumask));
if (pm == NULL) {
for (i = 0; i < 5; i++) {
ia64_set_rr(IA64_RR_BASE(i),
@@ -2258,7 +2254,6 @@ pmap_switch(pmap_t pm)
ia64_set_rr(IA64_RR_BASE(i),
(pm->pm_rid[i] << 8)|(PAGE_SHIFT << 2)|1);
}
- atomic_set_32(&pm->pm_active, PCPU_GET(cpumask));
}
PCPU_SET(md.current_pmap, pm);
ia64_srlz_d();
Modified: head/sys/ia64/include/pmap.h
==
--- head/sys/ia64/include/pmap.hSun Feb 21 22:23:13 2010
(r204181)
+++ head/sys/ia64/include/pmap.hSun Feb 21 23:10:13 2010
(r204182)
@@ -76,7 +76,6 @@ struct pmap {
struct mtx pm_mtx;
TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */
u_int32_t pm_rid[5]; /* base RID for pmap */
- int pm_active; /* active flag */
struct pmap_statistics pm_stats; /* pmap statistics */
};
___
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: r203889 - in stable/8/sys: cam cam/ata cam/scsi dev/ahci dev/asr dev/ata dev/ciss dev/hptiop dev/hptrr dev/mly dev/mpt dev/ppbus dev/siis dev/trm dev/twa dev/usb/storage
On 02/20/10 04:16, Alexander Motin wrote: Lawrence Stewart wrote: A couple of times it has gotten even more upset reporting things like this: mpt0: mpt_cam_event: 0x16 mpt0: mpt_cam_event: 0x16 mpt0: request 0xff80002f1400:54058 timed out for ccb 0xff0001c65000 (req->ccb 0xff0001c65000) mpt0: attempting to abort req 0xff80002f1400:54058 function 0 mpt0: request 0xff80002fd100:54059 timed out for ccb 0xff009f3ec800 (req->ccb 0xff009f3ec800) mpt0: request 0xff80002efcf0:54060 timed out for ccb 0xff0001bd2000 (req->ccb 0xff0001bd2000) mpt0: mpt_recover_commands: IOC Status 0x4a. Resetting controller. mpt0: mpt_cam_event: 0x0 mpt0: mpt_cam_event: 0x0 mpt0: completing timedout/aborted req 0xff80002f1400:54058 mpt0: completing timedout/aborted req 0xff80002fd100:54059 mpt0: completing timedout/aborted req 0xff80002efcf0:54060 mpt0: mpt_cam_event: 0x16 mpt0: mpt_cam_event: 0x12 mpt0: mpt_cam_event: 0x12 mpt0: mpt_cam_event: 0x16 mpt0: Volume(0:2): Volume Status Changed mpt0: request 0xff80002f8990:0 timed out for ccb 0xff009f3cb800 (req->ccb 0) No ill effects are observed after such an episode and the array remains in healthy as-normal state. The only observable problem is the stall of all disk IO while these events occur. I have no idea how mpt driver works, neither I have hardware to play, but quick look shows that 0x12 event is MPI_EVENT_SAS_PHY_LINK_STATUS, and 0x16 is MPI_EVENT_SAS_DISCOVERY. Both are not handled by mpt driver and so logged. I would say something is going on at physical level of your SAN. Timeouts are also could be the result of physical issues. Ok, I'll try and figure out what's possibly going on. As best I can tell, the hardware is ok, both disks report as fine without SMART errors and are only 2 months old, so wanted to rule out software issues. On upgrading to recent 8-STABLE, I got a page fault kernel panic on boot in the mpt driver mpt_raid0 kproc. After some trial and error, r203888 is the most recent revision that boots fine, whilst r203889 exhibits the page fault. I should also note that r203888 still sees the "mpt0: mpt_cam_event: 0x16" messages and associated disk IO stalls. I compiled DDB into my r203889 kernel. Unfortunately my ILO emulates a USB keyboard so I can't do anything in DDB which is a huge pain, but here's the info I did get (hand transcribed): Fatal trap 12: page fault while in kernel mode current process: mpt_raid0 Stopped at xpt_rescan+0x1d: movq 0x10(%rsi),%rdx 1. Any thoughts on how to resolve the regression in the mpt driver with the r203889 commit? Any thoughts where to find a good telepath? :) For the beginning, show at least verbose boot messages up to the crash. Full panic message could also be useful, it may show address of the fault instruction, which may be resolved to source line with addr2line tool. If you could find a good old PS/2 keyboard, backtrace would be interesting to see. 2 issues: - The server is in colocated rack space and not easy to get to - I'm not even sure that this server has PS2 ports on it Perhaps this commit should be backed out of 8-STABLE until we get a chance to diagnose a bit more? Cheers, Lawrence ___ 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: r204183 - head/sys/ia64/ia64
Author: marcel
Date: Sun Feb 21 23:41:59 2010
New Revision: 204183
URL: http://svn.freebsd.org/changeset/base/204183
Log:
Normalize nop instructions: Only use 0 for the immediate operand.
Modified:
head/sys/ia64/ia64/context.S
Modified: head/sys/ia64/ia64/context.S
==
--- head/sys/ia64/ia64/context.SSun Feb 21 23:10:13 2010
(r204182)
+++ head/sys/ia64/ia64/context.SSun Feb 21 23:41:59 2010
(r204183)
@@ -86,18 +86,18 @@ ENTRY(restorectx, 1)
{ .mmi
ld8.fillr6=[r14],16 // r6
ld8.fillr7=[r15],16 // r7
- nop 1
+ nop 0
;;
}
{ .mmi
mov ar.unat=r16
mov ar.rsc=3
- nop 2
+ nop 0
}
{ .mmi
ld8 r17=[r14],16// b1
ld8 r18=[r15],16// b2
- nop 3
+ nop 0
;;
}
{ .mmi
___
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: r204103 - in head/usr.bin: . seq
On Feb 20, 2010, at 3:58 AM, Alexey Dokuchaev wrote: > On Fri, Feb 19, 2010 at 11:54:12PM +, Xin LI wrote: >> Author: delphij >> Date: Fri Feb 19 23:54:12 2010 >> New Revision: 204103 >> URL: http://svn.freebsd.org/changeset/base/204103 >> >> Log: >> Add seq(1), a small utility to generate sequence number. > > Why do we need this when we have jot(1)? > > ./danfe Agreed. FreeBSD isn't Linux (seq is a non-standard GNU tool). -Garrett ___ 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: r204184 - head/sys/ia64/ia64
Author: marcel
Date: Mon Feb 22 01:23:41 2010
New Revision: 204184
URL: http://svn.freebsd.org/changeset/base/204184
Log:
Prefer I-units and M-units for nop instructions. This works around
McKinley flaws. It also avoids using the F-unit in the kernel for
no reason.
Modified:
head/sys/ia64/ia64/context.S
head/sys/ia64/ia64/exception.S
head/sys/ia64/ia64/locore.S
head/sys/ia64/ia64/support.S
head/sys/ia64/ia64/syscall.S
Modified: head/sys/ia64/ia64/context.S
==
--- head/sys/ia64/ia64/context.SSun Feb 21 23:41:59 2010
(r204183)
+++ head/sys/ia64/ia64/context.SMon Feb 22 01:23:41 2010
(r204184)
@@ -286,7 +286,7 @@ ENTRY(swapctx, 2)
(p15) br.ret.sptk rp
;;
}
-{ .mfb
+{ .mib
mov r32=r33
nop 0
br.sptk restorectx
@@ -338,10 +338,10 @@ ENTRY(save_callee_saved, 1)
mov r17=b5
;;
}
-{ .mfi
+{ .mii
st8 [r14]=r17,16// b5
- nop 0
mov r16=ar.lc
+ nop 0
;;
}
{ .mmb
@@ -363,13 +363,13 @@ ENTRY(restore_callee_saved, 1)
add r31=-8,r32
;;
}
-{ .mmb
+{ .mmi
ld8.fillr4=[r31],16 // r4
ld8.fillr5=[r32],16 // r5
nop 0
;;
}
-{ .mmb
+{ .mmi
ld8.fillr6=[r31],16 // r6
ld8.fillr7=[r32],16 // r7
nop 0
Modified: head/sys/ia64/ia64/exception.S
==
--- head/sys/ia64/ia64/exception.S Sun Feb 21 23:41:59 2010
(r204183)
+++ head/sys/ia64/ia64/exception.S Mon Feb 22 01:23:41 2010
(r204184)
@@ -89,10 +89,10 @@ xhead: data8 xtrace
addlr29=1024*5*8,r0 ;; \
(p15) sub r27=r28,r29 ;; \
} ;\
-{ .mib ; \
+{ .mmi ; \
st8 [r28]=r27 ; \
- mov pr=r25,0x1 ;\
- nop 0 ;;\
+ nop 0 ; \
+ mov pr=r25,0x1 ;; \
}
#else
@@ -148,10 +148,10 @@ ENTRY_NOPROFILE(exception_save, 0)
add r31=8,r30
;;
}
-{ .mib
+{ .mmi
mov r22=cr.iip
- addlr29=NTLBRT_SAVE,r0 // 22-bit restart token.
nop 0
+ addlr29=NTLBRT_SAVE,r0 // 22-bit restart token.
;;
}
@@ -235,7 +235,7 @@ exception_save_restart:
nop 0
;;
}
-{ .mmb
+{ .mmi
(p13) mov ar.rnat=r19
mov r18=ar.bsp
nop 0
@@ -248,7 +248,7 @@ exception_save_restart:
;;
}
// r19=ifs, r22=iip
-{ .mmb
+{ .mmi
st8 [r31]=r18,16// ndirty
st8 [r30]=r19,16// cfm
nop 0
@@ -260,7 +260,7 @@ exception_save_restart:
add r29=16,r30
;;
}
-{ .mmb
+{ .mmi
st8 [r30]=r17,24// ifa
st8 [r31]=r18,24// isr
nop 0
@@ -407,7 +407,7 @@ exception_save_restart:
movlgp=__gp
;;
}
-{ .mfb
+{ .mib
srlz.d
nop 0
br.sptk b7
@@ -567,7 +567,7 @@ ENTRY_NOPROFILE(exception_restore, 0)
cmp.le p14,p15=5,r28
;;
}
-{ .mmb
+{ .mmi
ld8 r25=[r30] // cfm
ld8 r19=[r31] // ip
nop 0
@@ -606,13 +606,13 @@ exception_restore_restart:
dep r31=0,r31,0,13 // 8KB aligned
;;
}
-{ .mmb
+{ .mmi
mov ar.k6=r31
mov ar.rnat=r21
nop 0
;;
}
-{ .mmb
+{ .mmi
mov ar.unat=r17
mov cr.iip=r19
nop 0
@@ -656,7 +656,7 @@ END(exception_restore)
add out1=16,sp ;\
br.call.sptkrp=_func_ ;;\
} ;\
-{ .mfb ; \
+{ .mib ; \
nop 0 ; \
nop 0 ; \
br.sptk exception_restore ;;\
@@ -1021,10 +1021,10 @@ IVT_ENTRY(Data_Nested_TLB, 0x1400)
movlr27=kstack
;;
}
-{ .mib
+{ .mmi
mov
svn commit: r204185 - head/sys/cddl/contrib/opensolaris/common/atomic/ia64
Author: marcel Date: Mon Feb 22 01:24:34 2010 New Revision: 204185 URL: http://svn.freebsd.org/changeset/base/204185 Log: Use mf and not mf.a. The latter doesn't force memory ordering and applies to sequential memory. Modified: head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S Modified: head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S == --- head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S Mon Feb 22 01:23:41 2010(r204184) +++ head/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S Mon Feb 22 01:24:34 2010(r204185) @@ -76,7 +76,7 @@ ENTRY(atomic_or_8_nv, 2) END(atomic_or_8_nv) ENTRY(membar_producer, 0) - mf.a + mf ;; br.ret.sptk rp END(membar_producer) ___ 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: r204186 - head/sys/conf
Author: neel
Date: Mon Feb 22 01:48:38 2010
New Revision: 204186
URL: http://svn.freebsd.org/changeset/base/204186
Log:
Use KERNLOADADDR instead of hardcoded address. This is required to be able to
build the trampoline kernel that has symbol/string tables embedded within it.
Modified:
head/sys/conf/ldscript.mips.cfe
Modified: head/sys/conf/ldscript.mips.cfe
==
--- head/sys/conf/ldscript.mips.cfe Mon Feb 22 01:24:34 2010
(r204185)
+++ head/sys/conf/ldscript.mips.cfe Mon Feb 22 01:48:38 2010
(r204186)
@@ -61,7 +61,7 @@ PHDRS
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = 0x8010 ;
+ . = KERNLOADADDR ;
.interp : { *(.interp) } :interp
.hash : { *(.hash) } :text
.dynsym: { *(.dynsym)}
___
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: r203889 - in stable/8/sys: cam cam/ata cam/scsi dev/ahci dev/asr dev/ata dev/ciss dev/hptiop dev/hptrr dev/mly dev/mpt dev/ppbus dev/siis dev/trm dev/twa dev/usb/storage
Lawrence Stewart wrote: > On 02/20/10 04:16, Alexander Motin wrote: >> Lawrence Stewart wrote: >>> I compiled DDB into my r203889 kernel. Unfortunately my ILO emulates a >>> USB keyboard so I can't do anything in DDB which is a huge pain, but >>> here's the info I did get (hand transcribed): >>> >>> Fatal trap 12: page fault while in kernel mode >>> current process: mpt_raid0 >>> Stopped at xpt_rescan+0x1d: movq 0x10(%rsi),%rdx >>> >>> 1. Any thoughts on how to resolve the regression in the mpt driver with >>> the r203889 commit? >> > Perhaps this commit should be backed out of 8-STABLE until we get a > chance to diagnose a bit more? I also have successful reports with this driver, so problem is not common. So I don't think it is reasonable to back-out it now. As soon as you are the only complaining now, it is only you who can debug the issue. So could you be so kind to provide more info? Even without keyboard you should be able to get verbose boot messages and full panic message. -- Alexander Motin ___ 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: r203889 - in stable/8/sys: cam cam/ata cam/scsi dev/ahci dev/asr dev/ata dev/ciss dev/hptiop dev/hptrr dev/mly dev/mpt dev/ppbus dev/siis dev/trm dev/twa dev/usb/storage
On 02/22/10 18:05, Alexander Motin wrote: Lawrence Stewart wrote: On 02/20/10 04:16, Alexander Motin wrote: Lawrence Stewart wrote: I compiled DDB into my r203889 kernel. Unfortunately my ILO emulates a USB keyboard so I can't do anything in DDB which is a huge pain, but here's the info I did get (hand transcribed): Fatal trap 12: page fault while in kernel mode current process: mpt_raid0 Stopped at xpt_rescan+0x1d: movq 0x10(%rsi),%rdx 1. Any thoughts on how to resolve the regression in the mpt driver with the r203889 commit? Perhaps this commit should be backed out of 8-STABLE until we get a chance to diagnose a bit more? I also have successful reports with this driver, so problem is not common. So I don't think it is reasonable to back-out it now. As soon as you are the only complaining now, it is only you who can debug the issue. So could you be so kind to provide more info? Even without keyboard you should be able to get verbose boot messages and full panic message. Fair enough, if I'm the only person complaining and you've had other success reports, then that's cool. I will get some more info and report back but will have to wait until later in the week before the machine can be scheduled for some out-of-hours downtime. Cheers, Lawrence ___ 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"
