PERFORCE change 151817 for review
Ed Schouten
ed at FreeBSD.org
Thu Oct 23 18:46:22 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=151817
Change 151817 by ed at ed_dull on 2008/10/23 18:45:35
IFC.
Affected files ...
.. //depot/projects/mpsafetty/lib/libc/gen/__xuname.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/gen/posix_spawn.c#2 integrate
.. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate
.. //depot/projects/mpsafetty/share/man/man4/umodem.4#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/AVILA#5 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/BWCT#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/CRB#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/mpsafetty/sys/arm/conf/EP80219#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/GUMSTIX#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/HL200#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/IQ31244#4 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#6 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#9 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/mpsafetty/sys/conf/NOTES#13 integrate
.. //depot/projects/mpsafetty/sys/conf/files.arm#2 integrate
.. //depot/projects/mpsafetty/sys/conf/files.mips#4 integrate
.. //depot/projects/mpsafetty/sys/dev/mii/ciphy.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#7 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/mpsafetty/sys/i386/include/pcpu.h#4 integrate
.. //depot/projects/mpsafetty/sys/i386/include/smp.h#5 integrate
.. //depot/projects/mpsafetty/sys/i386/include/xen/xen-os.h#4 integrate
.. //depot/projects/mpsafetty/sys/i386/include/xen/xen_intr.h#3 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/clock.c#4 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/exception.s#4 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thread.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/sys_process.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/ADM5120#3 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/mpsafetty/sys/mips/conf/IDT#4 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/MALTA#3 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/SENTRY5#4 integrate
.. //depot/projects/mpsafetty/sys/sys/proc.h#9 integrate
.. //depot/projects/mpsafetty/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/cachelib.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/nscd.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/nscd/nscdcli.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/package.c#4 integrate
Differences ...
==== //depot/projects/mpsafetty/lib/libc/gen/__xuname.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
/*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.13 2007/01/09 00:27:52 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.15 2008/10/22 21:56:57 kib Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -45,94 +45,102 @@
{
int mib[2], rval;
size_t len;
- char *p;
+ char *p, *q;
int oerrno;
- struct xutsname {
- char sysname[namesize]; /* Name of this OS. */
- char nodename[namesize]; /* Name of this network node. */
- char release[namesize]; /* Release level. */
- char version[namesize]; /* Version level. */
- char machine[namesize]; /* Hardware type. */
- } *name;
- name = (struct xutsname *)namebuf;
rval = 0;
+ q = (char *)namebuf;
mib[0] = CTL_KERN;
- mib[1] = KERN_OSTYPE;
- len = sizeof(name->sysname);
- oerrno = errno;
- if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) {
- if(errno == ENOMEM)
- errno = oerrno;
- else
- rval = -1;
+
+ if ((p = getenv("UNAME_s")))
+ strlcpy(q, p, namesize);
+ else {
+ mib[1] = KERN_OSTYPE;
+ len = namesize;
+ oerrno = errno;
+ if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
+ if (errno == ENOMEM)
+ errno = oerrno;
+ else
+ rval = -1;
+ }
+ q[namesize - 1] = '\0';
}
- name->sysname[sizeof(name->sysname) - 1] = '\0';
- if ((p = getenv("UNAME_s")))
- strlcpy(name->sysname, p, sizeof(name->sysname));
+ q += namesize;
- mib[0] = CTL_KERN;
mib[1] = KERN_HOSTNAME;
- len = sizeof(name->nodename);
+ len = namesize;
oerrno = errno;
- if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) {
- if(errno == ENOMEM)
+ if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
+ if (errno == ENOMEM)
errno = oerrno;
else
rval = -1;
}
- name->nodename[sizeof(name->nodename) - 1] = '\0';
+ q[namesize - 1] = '\0';
+ q += namesize;
- mib[0] = CTL_KERN;
- mib[1] = KERN_OSRELEASE;
- len = sizeof(name->release);
- oerrno = errno;
- if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) {
- if(errno == ENOMEM)
- errno = oerrno;
- else
- rval = -1;
- }
- name->release[sizeof(name->release) - 1] = '\0';
if ((p = getenv("UNAME_r")))
- strlcpy(name->release, p, sizeof(name->release));
-
- /* The version may have newlines in it, turn them into spaces. */
- mib[0] = CTL_KERN;
- mib[1] = KERN_VERSION;
- len = sizeof(name->version);
- oerrno = errno;
- if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
- if (errno == ENOMEM)
- errno = oerrno;
- else
- rval = -1;
- }
- name->version[sizeof(name->version) - 1] = '\0';
- for (p = name->version; len--; ++p) {
- if (*p == '\n' || *p == '\t') {
- if (len > 1)
- *p = ' ';
+ strlcpy(q, p, namesize);
+ else {
+ mib[1] = KERN_OSRELEASE;
+ len = namesize;
+ oerrno = errno;
+ if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
+ if (errno == ENOMEM)
+ errno = oerrno;
else
- *p = '\0';
+ rval = -1;
}
+ q[namesize - 1] = '\0';
}
+ q += namesize;
+
if ((p = getenv("UNAME_v")))
- strlcpy(name->version, p, sizeof(name->version));
+ strlcpy(q, p, namesize);
+ else {
- mib[0] = CTL_HW;
- mib[1] = HW_MACHINE;
- len = sizeof(name->machine);
- oerrno = errno;
- if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) {
- if (errno == ENOMEM)
- errno = oerrno;
- else
- rval = -1;
+ /*
+ * The version may have newlines in it, turn them into
+ * spaces.
+ */
+ mib[1] = KERN_VERSION;
+ len = namesize;
+ oerrno = errno;
+ if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
+ if (errno == ENOMEM)
+ errno = oerrno;
+ else
+ rval = -1;
+ }
+ q[namesize - 1] = '\0';
+ for (p = q; len--; ++p) {
+ if (*p == '\n' || *p == '\t') {
+ if (len > 1)
+ *p = ' ';
+ else
+ *p = '\0';
+ }
+ }
}
- name->machine[sizeof(name->machine) - 1] = '\0';
+ q += namesize;
+
if ((p = getenv("UNAME_m")))
- strlcpy(name->machine, p, sizeof(name->machine));
+ strlcpy(q, p, namesize);
+ else {
+ mib[0] = CTL_HW;
+ mib[1] = HW_MACHINE;
+ len = namesize;
+ oerrno = errno;
+ if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
+ if (errno == ENOMEM)
+ errno = oerrno;
+ else
+ rval = -1;
+ }
+ q[namesize - 1] = '\0';
+ }
+
return (rval);
}
==== //depot/projects/mpsafetty/lib/libc/gen/posix_spawn.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.5 2008/06/23 05:22:06 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.6 2008/10/23 15:32:06 rdivacky Exp $");
#include "namespace.h"
#include <sys/queue.h>
@@ -444,7 +444,7 @@
}
int
-posix_spawnattr_setschedparam(posix_spawnattr_t *sa __restrict,
+posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa,
const struct sched_param * __restrict schedparam)
{
(*sa)->sa_schedparam = *schedparam;
==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 (text+ko) ====
@@ -17,7 +17,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.341 2008/10/23 10:38:04 marck Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -90,7 +90,7 @@
</listitem>
<listitem>
- <para>&intel; 64-bit &xeon; (<quote>Nacona</quote>). This
+ <para>&intel; 64-bit &xeon; (<quote>Nocona</quote>). This
processor is fabricated on 90nm process technology, and
operates with 2.80 to 3.60 GHz (FSB 800MHz) and &intel;
E7520/E7525/E7320 chipsets.</para>
==== //depot/projects/mpsafetty/share/man/man4/umodem.4#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.10 2007/08/21 13:20:13 sanpei Exp $
+.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.11 2008/10/22 21:46:59 n_hibma Exp $
.\"
.Dd November 22, 2006
.Dt UMODEM 4
@@ -96,6 +96,8 @@
Yamaha Broadband Wireless Router RTW65b
.It
ELSA MicroLink 56k USB modem
+.It
+Sony Ericsson W810i phone
.El
.Sh SEE ALSO
.Xr tty 4 ,
==== //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.163 2008/10/22 00:01:53 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $");
#include "opt_cpu.h"
@@ -347,12 +347,17 @@
"AuthenticAMD") == 0)
cpu_feature &= ~CPUID_HTT;
+ /*
+ * If this CPU supports P-state invariant TSC then
+ * mention the capability.
+ */
if (!tsc_is_invariant &&
(strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
- AMD64_CPU_FAMILY(cpu_id) >= 0x10))) {
+ AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+ cpu_id == 0x60fb2))) {
tsc_is_invariant = 1;
- printf("\n P-state invariant TSC");
+ printf("\n TSC: P-state invariant");
}
/*
==== //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.48 2008/10/22 00:01:53 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -162,12 +162,10 @@
#define CPUID_EXT_FAMILY 0x0ff00000
#define AMD64_CPU_MODEL(id) \
((((id) & CPUID_MODEL) >> 4) | \
- ((((id) & CPUID_FAMILY) >= 0x600) ? \
- (((id) & CPUID_EXT_MODEL) >> 12) : 0))
+ (((id) & CPUID_EXT_MODEL) >> 12))
#define AMD64_CPU_FAMILY(id) \
((((id) & CPUID_FAMILY) >> 8) + \
- ((((id) & CPUID_FAMILY) == 0xf00) ? \
- (((id) & CPUID_EXT_FAMILY) >> 20) : 0))
+ (((id) & CPUID_EXT_FAMILY) >> 20))
/*
* CPUID instruction 1 ebx info
==== //depot/projects/mpsafetty/sys/arm/conf/AVILA#5 (text+ko) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.16 2008/08/02 22:53:43 imp Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.17 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident AVILA
options PHYSADDR=0x10000000
@@ -80,7 +79,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device mem # Memory and kernel memory devices
#device saarm
device pci
==== //depot/projects/mpsafetty/sys/arm/conf/BWCT#4 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.6 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident BWCT
options VERBOSE_INIT_ARM
@@ -85,7 +84,6 @@
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
#options DIAGNOSTIC
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
==== //depot/projects/mpsafetty/sys/arm/conf/CRB#4 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.6 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident CRB
options PHYSADDR=0x00000000
@@ -67,7 +66,6 @@
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device rl
==== //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#2 (text+ko) ====
@@ -1,10 +1,9 @@
#
# Custom kernel for Marvell DB-78xx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
#
-machine arm
ident DB-88F78XX
include "../mv/discovery/std.db78xxx"
@@ -49,7 +48,6 @@
# Pseudo devices
device loop
-device mem
device md
device pty
device random
==== //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#2 (text+ko) ====
@@ -1,10 +1,9 @@
#
# Custom kernel for Marvell DB-88F5xxx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
#
-machine arm
ident DB-88F5XXX
include "../mv/orion/std.db88f5xxx"
@@ -48,7 +47,6 @@
#options WITNESS_KDB
# Pseudo devices
-device mem
device md
device loop
device pty
==== //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#2 (text+ko) ====
@@ -1,10 +1,9 @@
#
# Custom kernel for Marvell DB-88F6xxx boards.
#
-# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
#
-machine arm
ident DB-88F6XXX
include "../mv/kirkwood/std.db88f6xxx"
@@ -49,7 +48,6 @@
# Pseudo devices
device loop
-device mem
device md
device pty
device random
==== //depot/projects/mpsafetty/sys/arm/conf/EP80219#4 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.9 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident EP80219
options PHYSADDR=0xa0000000
@@ -69,7 +68,6 @@
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device fxp
==== //depot/projects/mpsafetty/sys/arm/conf/GUMSTIX#4 (text+ko) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.1 2008/06/06 05:08:09 benno Exp $
+# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.2 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident GUMSTIX
cpu CPU_XSCALE_PXA2X0
@@ -71,7 +70,6 @@
options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
device mii
device smc
device smcphy
==== //depot/projects/mpsafetty/sys/arm/conf/HL200#4 (text+ko) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.6 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident HL200
include "../at91/std.at91"
@@ -89,7 +88,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
==== //depot/projects/mpsafetty/sys/arm/conf/IQ31244#4 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.23 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident IQ31244
options PHYSADDR=0xa0000000
@@ -66,7 +65,6 @@
#options PREEMPTION
device loop
device ether
-device mem # Memory and kernel memory devices
#device saarm
device miibus
device rl
==== //depot/projects/mpsafetty/sys/arm/conf/KB920X#6 (text) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.19 2008/09/07 18:55:55 imp Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.20 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident KB920X
include "../at91/std.kb920x"
@@ -80,7 +79,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
device at91_twi # TWI: Two Wire Interface
device at91_spi # SPI:
==== //depot/projects/mpsafetty/sys/arm/conf/NSLU#3 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/NSLU,v 1.2 2008/09/08 00:41:32 imp Exp $
+# $FreeBSD: src/sys/arm/conf/NSLU,v 1.3 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident NSLU
options PHYSADDR=0x10000000
@@ -76,7 +75,6 @@
options BOOTP_WIRED_TO=npe0
options BOOTP_COMPAT
-device mem # Memory and kernel memory devices
device pci
device uart
==== //depot/projects/mpsafetty/sys/arm/conf/SIMICS#2 (text+ko) ====
@@ -15,9 +15,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.17 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident SIMICS
options KERNPHYSADDR=0xc0000000
@@ -68,5 +67,4 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device mem # Memory and kernel memory devices
device md
==== //depot/projects/mpsafetty/sys/arm/conf/SKYEYE#2 (text) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.11 2008/10/23 01:51:55 marcel Exp $
-machine arm
ident KB920X
options KERNPHYSADDR=0xc0000000
@@ -79,7 +78,6 @@
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O
-device mem # Memory and kernel memory devices
device md
options SKYEYE_WORKAROUNDS
# Floppy drives
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.81 2008/10/22 21:55:48 jhb Exp $");
#include "opt_compat.h"
@@ -1762,6 +1762,24 @@
return (ftruncate(td, &ap));
}
+int
+freebsd32_getdirentries(struct thread *td,
+ struct freebsd32_getdirentries_args *uap)
+{
+ long base;
+ int32_t base32;
+ int error;
+
+ error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base);
+ if (error)
+ return (error);
+ if (uap->basep != NULL) {
+ base32 = base;
+ error = copyout(&base32, uap->basep, sizeof(int32_t));
+ }
+ return (error);
+}
+
#ifdef COMPAT_FREEBSD6
/* versions with the 'int pad' argument */
int
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.94 2008/10/22 21:56:44 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -152,6 +152,12 @@
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
};
+struct freebsd32_getdirentries_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
+ char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
+ char basep_l_[PADL_(int32_t *)]; int32_t * basep; char basep_r_[PADR_(int32_t *)];
+};
struct freebsd32_sysctl_args {
char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
@@ -406,6 +412,7 @@
int freebsd32_stat(struct thread *, struct freebsd32_stat_args *);
int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *);
int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *);
+int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *);
int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
@@ -618,6 +625,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT
#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT
#define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT
+#define FREEBSD32_SYS_AUE_freebsd32_getdirentries AUE_GETDIRENTRIES
#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.93 2008/10/22 21:56:44 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb
*/
#define FREEBSD32_SYS_syscall 0
@@ -177,7 +177,7 @@
#define FREEBSD32_SYS_fpathconf 192
#define FREEBSD32_SYS_getrlimit 194
#define FREEBSD32_SYS_setrlimit 195
-#define FREEBSD32_SYS_getdirentries 196
+#define FREEBSD32_SYS_freebsd32_getdirentries 196
#define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197
#define FREEBSD32_SYS___syscall 198
#define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.84 2008/10/22 21:56:44 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb
*/
const char *freebsd32_syscallnames[] = {
@@ -203,7 +203,7 @@
"#193", /* 193 = nosys */
"getrlimit", /* 194 = getrlimit */
"setrlimit", /* 195 = setrlimit */
- "getdirentries", /* 196 = getdirentries */
+ "freebsd32_getdirentries", /* 196 = freebsd32_getdirentries */
"compat6.freebsd32_mmap", /* 197 = old freebsd32_mmap */
"__syscall", /* 198 = __syscall */
"compat6.freebsd32_lseek", /* 199 = old freebsd32_lseek */
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#9 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.94 2008/10/22 21:56:44 jhb Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb
*/
#include "opt_compat.h"
@@ -234,7 +234,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 193 = nosys */
{ AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */
{ AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */
- { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */
+ { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = freebsd32_getdirentries */
{ compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0 }, /* 197 = old freebsd32_mmap */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */
{ compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0 }, /* 199 = old freebsd32_lseek */
==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#10 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.109 2008/10/22 21:55:48 jhb Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -350,8 +350,8 @@
195 AUE_SETRLIMIT NOPROTO { int setrlimit(u_int which, \
struct rlimit *rlp); } setrlimit \
__setrlimit_args int
-196 AUE_GETDIRENTRIES NOPROTO { int getdirentries(int fd, char *buf, \
- u_int count, long *basep); }
+196 AUE_GETDIRENTRIES STD { int freebsd32_getdirentries(int fd, \
+ char *buf, u_int count, int32_t *basep); }
197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(caddr_t addr, \
size_t len, int prot, int flags, int fd, \
int pad, u_int32_t poslo, \
==== //depot/projects/mpsafetty/sys/conf/NOTES#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1509 2008/10/21 20:33:40 mav Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -242,9 +242,9 @@
# SMP Debugging Options:
#
-# PREEMPTION allows the threads that are in the kernel to be preempted
-# by higher priority threads. It helps with interactivity and
-# allows interrupt threads to run sooner rather than waiting.
+# PREEMPTION allows the threads that are in the kernel to be preempted by
+# higher priority [interrupt] threads. It helps with interactivity
+# and allows interrupt threads to run sooner rather than waiting.
# WARNING! Only tested on amd64 and i386.
# FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel
# threads. Its sole use is to expose race conditions and other
==== //depot/projects/mpsafetty/sys/conf/files.arm#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files.arm,v 1.19 2007/12/02 20:40:31 rwatson Exp $
+# $FreeBSD: src/sys/conf/files.arm,v 1.20 2008/10/23 01:51:55 marcel Exp $
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
arm/arm/autoconf.c standard
@@ -46,10 +46,10 @@
arm/fpe-arm/armfpe_glue.S optional armfpe
arm/fpe-arm/armfpe_init.c optional armfpe
arm/fpe-arm/armfpe.S optional armfpe
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
+geom/geom_bsd.c optional geom_bsd
+geom/geom_bsd_enc.c optional geom_bsd
+geom/geom_mbr.c optional geom_mbr
+geom/geom_mbr_enc.c optional geom_mbr
hal.o optional ath_hal \
compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
no-implicit-rule
==== //depot/projects/mpsafetty/sys/conf/files.mips#4 (text+ko) ====
@@ -18,7 +18,7 @@
# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc.
# All rights reserved.
# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
-# $FreeBSD: src/sys/conf/files.mips,v 1.4 2008/09/19 19:46:11 imp Exp $
+# $FreeBSD: src/sys/conf/files.mips,v 1.5 2008/10/23 02:16:38 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -71,10 +71,10 @@
mips/mips/support.S standard
mips/mips/swtch.S standard
mips/mips/uio_machdep.c standard
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
+geom/geom_bsd.c optional geom_bsd
+geom/geom_bsd_enc.c optional geom_bsd
+geom/geom_mbr.c optional geom_mbr
+geom/geom_mbr_enc.c optional geom_mbr
hal.o optional ath_hal \
compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
no-implicit-rule
==== //depot/projects/mpsafetty/sys/dev/mii/ciphy.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.16 2008/09/30 07:30:05 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.17 2008/10/23 01:27:15 yongari Exp $");
/*
* Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY.
@@ -92,9 +92,9 @@
MII_PHY_DESC(CICADA, CS8201A),
MII_PHY_DESC(CICADA, CS8201B),
MII_PHY_DESC(CICADA, CS8204),
+ MII_PHY_DESC(CICADA, VSC8211),
MII_PHY_DESC(CICADA, CS8244),
MII_PHY_DESC(VITESSE, VSC8601),
- MII_PHY_DESC(VITESSE, VSC8211),
MII_PHY_END
};
@@ -423,9 +423,9 @@
}
break;
+ case MII_MODEL_CICADA_VSC8211:
case MII_MODEL_CICADA_CS8244:
case MII_MODEL_VITESSE_VSC8601:
- case MII_MODEL_VITESSE_VSC8211:
break;
default:
device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n",
==== //depot/projects/mpsafetty/sys/dev/mii/miidevs#5 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/mii/miidevs,v 1.61 2008/10/03 10:31:31 stas Exp $
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.62 2008/10/23 01:27:15 yongari Exp $
/*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
/*-
@@ -155,11 +155,11 @@
/* Cicada Semiconductor PHYs (now owned by Vitesse?) */
model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY
model CICADA CS8204 0x0004 Cicada CS8204 10/100/1000TX PHY
+model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY
model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY
model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY
model CICADA CS8244 0x002c Cicada CS8244 10/100/1000TX PHY
model VITESSE VSC8601 0x0002 Vitesse VSC8601 10/100/1000TX PHY
-model VITESSE VSC8211 0x000b Vitesse VSC8211 10/100/1000TX PHY
/* Davicom Semiconductor PHYs */
model DAVICOM DM9102 0x0004 DM9102 10/100 media interface
==== //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.60 2008/10/21 18:30:10 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.61 2008/10/22 19:39:16 jhb Exp $");
#include "opt_ppc.h"
@@ -751,7 +751,8 @@
if (bootverbose) {
outb(csr, 0x1);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list