PERFORCE change 150188 for review
Warner Losh
imp at FreeBSD.org
Sun Sep 21 04:34:15 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150188
Change 150188 by imp at imp_paco-paco on 2008/09/21 04:33:24
IFC @150187
Affected files ...
.. //depot/projects/mips2/src/Makefile.inc1#24 integrate
.. //depot/projects/mips2/src/lib/libc/gen/getosreldate.3#2 integrate
.. //depot/projects/mips2/src/lib/libc/uuid/Symbol.map#4 integrate
.. //depot/projects/mips2/src/lib/libpmc/pmc.3#8 integrate
.. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#11 integrate
.. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#6 integrate
.. //depot/projects/mips2/src/share/man/man5/rc.conf.5#15 integrate
.. //depot/projects/mips2/src/sys/boot/ofw/libofw/Makefile#4 integrate
.. //depot/projects/mips2/src/sys/boot/ofw/libofw/ofw_console.c#4 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate
.. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/mips2/src/sys/conf/files.mips#25 integrate
.. //depot/projects/mips2/src/sys/conf/files.sparc64#9 integrate
.. //depot/projects/mips2/src/sys/conf/options.sparc64#4 integrate
.. //depot/projects/mips2/src/sys/dev/acpica/acpi_quirk.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#7 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#10 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/pci/vga_pci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/snp/snp.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#13 integrate
.. //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#9 integrate
.. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate
.. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate
.. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_node.c#8 integrate
.. //depot/projects/mips2/src/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate
.. //depot/projects/mips2/src/sys/fs/udf/udf_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#22 integrate
.. //depot/projects/mips2/src/sys/kern/uipc_mqueue.c#9 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/mips/adm5120/obio.c#5 integrate
.. //depot/projects/mips2/src/sys/mips/idt/obio.c#5 integrate
.. //depot/projects/mips2/src/sys/mips/malta/gt_pci.c#5 integrate
.. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#9 integrate
.. //depot/projects/mips2/src/sys/net/if_clone.c#3 integrate
.. //depot/projects/mips2/src/sys/net/if_clone.h#3 integrate
.. //depot/projects/mips2/src/sys/net/route.c#12 integrate
.. //depot/projects/mips2/src/sys/net/route.h#7 integrate
.. //depot/projects/mips2/src/sys/net80211/ieee80211_freebsd.c#9 integrate
.. //depot/projects/mips2/src/sys/nfsclient/nfs_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/tick.h#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/tick.c#5 integrate
.. //depot/projects/mips2/src/sys/sys/mount.h#11 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/mips2/src/sys/vm/vm_mmap.c#11 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/scripts/config#2 integrate
.. //depot/projects/mips2/src/usr.bin/ar/Makefile#3 integrate
.. //depot/projects/mips2/src/usr.bin/ar/acplex.l#1 branch
.. //depot/projects/mips2/src/usr.bin/ar/acpyacc.y#1 branch
.. //depot/projects/mips2/src/usr.bin/ar/ar.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/ar/ar.h#3 integrate
.. //depot/projects/mips2/src/usr.bin/ar/write.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/Makefile#15 integrate
.. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.8#6 integrate
.. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.c#8 integrate
Differences ...
==== //depot/projects/mips2/src/Makefile.inc1#24 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -27,6 +27,10 @@
.include <bsd.own.mk>
+.if ${MACHINE_ARCH} == "mips"
+MK_RESCUE=no # not yet
+.endif
+
# We must do share/info early so that installation of info `dir'
# entries works correctly. Do it first since it is less likely to
# grow dependencies on include and lib than vice versa.
==== //depot/projects/mips2/src/lib/libc/gen/getosreldate.3#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.3 2005/12/03 05:11:07 ambrisko Exp $
+.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.4 2008/09/20 21:12:54 rodrigc Exp $
.\"
.Dd December 2, 2005
.Dt GETOSRELDATE 3
@@ -34,7 +34,6 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In osreldate.h
.Ft int
.Fn getosreldate void
.Sh DESCRIPTION
==== //depot/projects/mips2/src/lib/libc/uuid/Symbol.map#4 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.3 2008/09/15 23:54:55 emax Exp $
+ * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.4 2008/09/19 15:52:56 emax Exp $
*/
FBSD_1.0 {
@@ -11,6 +11,9 @@
uuid_create_nil;
uuid_create;
uuid_compare;
+};
+
+FBSD_1.1 {
uuid_enc_le;
uuid_dec_le;
uuid_enc_be;
==== //depot/projects/mips2/src/lib/libpmc/pmc.3#8 (text+ko) ====
@@ -21,7 +21,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.20 2008/09/18 10:20:35 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.21 2008/09/19 13:21:23 jkoshy Exp $
.\"
.Dd September 16, 2008
.Os
@@ -242,13 +242,13 @@
.It Li PMC_CAP_INVERT
The ability to invert the sense of the hardware conditions being
measured.
-.It Li PMC_CAP_READ
-The ability to read from performance counters.
+.It Li PMC_CAP_PRECISE
+The ability to perform precise sampling.
.It Li PMC_CAP_QUALIFIER
The hardware allows monitored to be further qualified in some
system dependent way.
-.It Li PMC_CAP_PRECISE
-The ability to perform precise sampling.
+.It Li PMC_CAP_READ
+The ability to read from performance counters.
.It Li PMC_CAP_SYSTEM
The ability to restrict counting of hardware events to when the CPU is
running privileged code.
==== //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#11 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.121 2008/09/06 17:23:37 rik Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.125 2008/09/20 19:25:02 rik Exp $
*/
#include <sys/param.h>
@@ -3569,7 +3569,7 @@
char **av, *sep; /* Token separator. */
/* Temporary buffer used to hold server pool ip's. */
char tmp_spool_buf[NAT_BUF_LEN];
- int ac, i, space, lsnat;
+ int ac, space, lsnat;
struct cfg_redir *r;
struct cfg_spool *tmp;
@@ -3788,7 +3788,7 @@
int *_ac, char ***_av)
{
char **av;
- int ac, i, space;
+ int ac, space;
struct protoent *protoent;
struct cfg_redir *r;
@@ -3975,7 +3975,6 @@
config_nat(int ac, char **av)
{
struct cfg_nat *n; /* Nat instance configuration. */
- struct in_addr ip;
int i, len, off, tok;
char *id, buf[NAT_BUF_LEN]; /* Buffer for serialized data. */
@@ -5937,6 +5936,11 @@
l = sizeof(a);
if (do_cmd(IP_FW_TABLE_GETSIZE, &a, (uintptr_t)&l) < 0)
err(EX_OSERR, "getsockopt(IP_FW_TABLE_GETSIZE)");
+
+ /* If a is zero we have nothing to do, the table is empty. */
+ if (a == 0)
+ return;
+
l = sizeof(*tbl) + a * sizeof(ipfw_table_entry);
tbl = malloc(l);
if (tbl == NULL)
@@ -5961,18 +5965,20 @@
tbl->ent[a].masklen, tval);
}
}
+ free(tbl);
} else
errx(EX_USAGE, "invalid table command %s", *av);
}
static void
-show_nat(int ac, char **av) {
+show_nat(int ac, char **av)
+{
struct cfg_nat *n;
struct cfg_redir *e;
int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size;
int nat_cnt, redir_cnt, r;
uint8_t *data, *p;
- char **lav, *endptr;
+ char *endptr;
do_rule = 0;
nalloc = 1024;
==== //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#6 (text+ko) ====
@@ -66,7 +66,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.79 2008/09/13 20:22:46 rodrigc Exp $");
+__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.80 2008/09/19 11:59:10 rodrigc Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -164,19 +164,19 @@
enum tryret nfs4_tryproto(struct addrinfo *ai, char *hostp, char *spec,
char **errstr);
enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
+extern int getosreldate(void);
int
main(int argc, char *argv[])
{
int c;
struct iovec *iov;
- int mntflags, altflags, num;
- int iovlen;
+ int mntflags, num, iovlen;
+ int osversion;
char *name, *p, *spec, *fstype;
char mntpath[MAXPATHLEN], errmsg[255];
mntflags = 0;
- altflags = 0;
iov = NULL;
iovlen = 0;
memset(errmsg, 0, sizeof(errmsg));
@@ -403,9 +403,19 @@
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
- if (nmount(iov, iovlen, mntflags)) {
- if (errno != ENOENT
- || fallback_mount(iov, iovlen, mntflags))
+ /*
+ * XXX:
+ * Backwards compatibility routines for older kernels.
+ * Remove this and fallback_mount() code when we do not need to support
+ * NFS mounts against older kernels which still need
+ * struct nfs_args to be passed in via nmount().
+ */
+ osversion = getosreldate();
+ if (osversion >= 800048) {
+ if (nmount(iov, iovlen, mntflags))
+ err(1, "%s, %s", mntpath, errmsg);
+ } else {
+ if (fallback_mount(iov, iovlen, mntflags))
err(1, "%s, %s", mntpath, errmsg);
}
==== //depot/projects/mips2/src/share/man/man5/rc.conf.5#15 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.346 2008/09/16 20:18:25 thompsa Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.347 2008/09/19 15:27:37 thompsa Exp $
.\"
.Dd September 16, 2008
.Dt RC.CONF 5
@@ -3453,7 +3453,8 @@
.It Va jail_ Ns Ao Ar jname Ac Ns Va _fib
.Pq Vt str
Unset by default.
-When set, the jail is started with the specified routing table via
+When set, the jail is started with the specified forwarding table (sometimes
+referred to as a routing table) via
.Xr setfib 1 .
.It Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
.Pq Vt str
==== //depot/projects/mips2/src/sys/boot/ofw/libofw/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $
+# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.13 2008/09/19 19:49:58 sobomax Exp $
LIB= ofw
INTERNALLIB=
==== //depot/projects/mips2/src/sys/boot/ofw/libofw/ofw_console.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.13 2008/02/06 22:04:28 grehan Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.15 2008/09/19 19:49:58 sobomax Exp $");
#include <sys/types.h>
==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_misc.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.78 2008/09/15 17:39:40 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $");
#include "opt_compat.h"
@@ -85,6 +85,8 @@
#include <machine/cpu.h>
+#include <security/audit/audit.h>
+
#include <compat/freebsd32/freebsd32_util.h>
#include <compat/freebsd32/freebsd32.h>
#include <compat/freebsd32/freebsd32_ipc.h>
@@ -2552,8 +2554,51 @@
return (cpuset_setaffinity(td, &ap));
}
+int
+freebsd32_nmount(struct thread *td,
+ struct freebsd32_nmount_args /* {
+ struct iovec *iovp;
+ unsigned int iovcnt;
+ int flags;
+ } */ *uap)
+{
+ struct uio *auio;
+ struct iovec *iov;
+ int error, k;
+
+ AUDIT_ARG(fflags, uap->flags);
+
+ /*
+ * Filter out MNT_ROOTFS. We do not want clients of nmount() in
+ * userspace to set this flag, but we must filter it out if we want
+ * MNT_UPDATE on the root file system to work.
+ * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try().
+ */
+ uap->flags &= ~MNT_ROOTFS;
+
+ /*
+ * check that we have an even number of iovec's
+ * and that we have at least two options.
+ */
+ if ((uap->iovcnt & 1) || (uap->iovcnt < 4))
+ return (EINVAL);
+
+ error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio);
+ if (error)
+ return (error);
+ for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) {
+ if (iov->iov_len > MMAXOPTIONLEN) {
+ free(auio, M_IOV);
+ return (EINVAL);
+ }
+ }
+
+ error = vfs_donmount(td, uap->flags, auio);
+ free(auio, M_IOV);
+ return error;
+}
+
#if 0
-
int
freebsd32_xxx(struct thread *td, struct freebsd32_xxx_args *uap)
{
@@ -2578,5 +2623,4 @@
}
return (error);
}
-
#endif
==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#13 (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.90 2008/09/15 17:39:01 obrien Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.91 2008/09/19 15:21:40 obrien Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -241,6 +241,11 @@
char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)];
char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)];
};
+struct freebsd32_nmount_args {
+ char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
+ char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
struct freebsd32_sendfile_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
@@ -413,6 +418,7 @@
int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
+int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *);
int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *);
int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *);
int freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *);
@@ -623,6 +629,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT
#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT
#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION
#define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN
==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#13 (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.89 2008/09/15 17:39:01 obrien Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.90 2008/09/19 15:21:40 obrien Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien
*/
#define FREEBSD32_SYS_syscall 0
@@ -283,7 +283,7 @@
#define FREEBSD32_SYS_extattr_delete_fd 373
#define FREEBSD32_SYS___setugid 374
#define FREEBSD32_SYS_eaccess 376
-#define FREEBSD32_SYS_nmount 378
+#define FREEBSD32_SYS_freebsd32_nmount 378
#define FREEBSD32_SYS_kenv 390
#define FREEBSD32_SYS_lchflags 391
#define FREEBSD32_SYS_uuidgen 392
==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 (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.80 2008/09/15 17:39:01 obrien Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.81 2008/09/19 15:21:40 obrien Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien
*/
const char *freebsd32_syscallnames[] = {
@@ -385,7 +385,7 @@
"#375", /* 375 = nfsclnt */
"eaccess", /* 376 = eaccess */
"#377", /* 377 = afs_syscall */
- "nmount", /* 378 = nmount */
+ "freebsd32_nmount", /* 378 = freebsd32_nmount */
"#379", /* 379 = kse_exit */
"#380", /* 380 = kse_wakeup */
"#381", /* 381 = kse_create */
==== //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#13 (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.90 2008/09/15 17:39:01 obrien Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183042 2008-09-15 17:37:41Z obrien
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.91 2008/09/19 15:21:40 obrien Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183188 2008-09-19 15:17:32Z obrien
*/
#include "opt_compat.h"
@@ -416,7 +416,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */
{ AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */
- { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */
+ { AS(freebsd32_nmount_args), (sy_call_t *)freebsd32_nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = freebsd32_nmount */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */
==== //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.105 2008/09/15 17:37:41 obrien Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.106 2008/09/19 15:17:32 obrien Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -651,7 +651,7 @@
375 AUE_NULL UNIMPL nfsclnt
376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); }
377 AUE_NULL UNIMPL afs_syscall
-378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \
+378 AUE_NMOUNT STD { int freebsd32_nmount(struct iovec32 *iovp, \
unsigned int iovcnt, int flags); }
379 AUE_NULL UNIMPL kse_exit
380 AUE_NULL UNIMPL kse_wakeup
==== //depot/projects/mips2/src/sys/conf/files.mips#25 (text+ko) ====
@@ -44,7 +44,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.2 2008/08/27 01:41:32 imp Exp $
+# $FreeBSD: src/sys/conf/files.mips,v 1.4 2008/09/19 19:46:11 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/mips2/src/sys/conf/files.sparc64#9 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.97 2008/09/10 20:22:27 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.99 2008/09/20 11:34:18 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -100,20 +100,23 @@
sparc64/sparc64/db_hwwatch.c optional ddb
sparc64/sparc64/dump_machdep.c standard
sparc64/sparc64/elf_machdep.c standard
-sparc64/sparc64/exception.S standard no-obj
+sparc64/sparc64/exception.S standard no-obj \
+ compile-with "${NORMAL_S} -mcpu=ultrasparc"
sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \
eeprom sbus
sparc64/sparc64/gdb_machdep.c optional gdb
sparc64/sparc64/identcpu.c standard
sparc64/sparc64/in_cksum.c optional inet
-sparc64/sparc64/interrupt.S standard no-obj
+sparc64/sparc64/interrupt.S standard no-obj \
+ compile-with "${NORMAL_S} -mcpu=ultrasparc"
sparc64/sparc64/intr_machdep.c standard
sparc64/sparc64/iommu.c standard
sparc64/sparc64/jbusppm.c standard
sparc64/sparc64/locore.S standard no-obj
sparc64/sparc64/machdep.c standard
sparc64/sparc64/mem.c optional mem
-sparc64/sparc64/mp_exception.S optional smp
+sparc64/sparc64/mp_exception.S optional smp \
+ compile-with "${NORMAL_S} -mcpu=ultrasparc"
sparc64/sparc64/mp_locore.S optional smp
sparc64/sparc64/mp_machdep.c optional smp
sparc64/sparc64/nexus.c standard
@@ -127,7 +130,8 @@
sparc64/sparc64/schppm.c standard
sparc64/sparc64/spitfire.c standard
sparc64/sparc64/stack_machdep.c optional ddb | stack
-sparc64/sparc64/support.S standard
+sparc64/sparc64/support.S standard \
+ compile-with "${NORMAL_S} -mcpu=ultrasparc"
sparc64/sparc64/sys_machdep.c standard
sparc64/sparc64/swtch.S standard
sparc64/sparc64/tick.c standard
==== //depot/projects/mips2/src/sys/conf/options.sparc64#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.15 2008/08/22 20:28:19 marius Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.17 2008/09/20 11:46:07 marius Exp $
GFB_DEBUG opt_gfb.h
GFB_NO_FONT_LOADING opt_gfb.h
==== //depot/projects/mips2/src/sys/dev/acpica/acpi_quirk.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.4 2007/03/22 18:16:40 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_quirk.c,v 1.5 2008/09/19 15:25:13 jkim Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -149,9 +149,9 @@
if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_FADT, 0, &fadt)))
bzero(&fadt, sizeof(fadt));
if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_DSDT, 0, &dsdt)))
- bzero(&fadt, sizeof(dsdt));
+ bzero(&dsdt, sizeof(dsdt));
if (ACPI_FAILURE(AcpiGetTableHeader(ACPI_SIG_XSDT, 0, &xsdt)))
- bzero(&fadt, sizeof(xsdt));
+ bzero(&xsdt, sizeof(xsdt));
/* Then, override the quirks with any matched from table signatures. */
for (entry = acpi_quirks_table; entry->match; entry++) {
==== //depot/projects/mips2/src/sys/dev/ath/if_ath.c#12 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.191 2008/06/07 18:38:02 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.192 2008/09/21 00:30:33 sam Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -2852,7 +2852,8 @@
DPRINTF(sc, ATH_DEBUG_BEACON,
"%s: %s beacons bslot %d intval %u tsfadjust %llu\n",
__func__, sc->sc_stagbeacons ? "stagger" : "burst",
- avp->av_bslot, ni->ni_intval, le64toh(tsfadjust));
+ avp->av_bslot, ni->ni_intval,
+ (long long unsigned) le64toh(tsfadjust));
wh = mtod(m, struct ieee80211_frame *);
memcpy(&wh[1], &tsfadjust, sizeof(tsfadjust));
==== //depot/projects/mips2/src/sys/dev/ath/if_athvar.h#7 (text+ko) ====
@@ -26,7 +26,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.66 2008/09/09 16:21:25 rpaulo Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.67 2008/09/21 00:28:54 sam Exp $
*/
/*
@@ -505,8 +505,13 @@
(ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK)
#define ath_hal_getregdomain(_ah, _prd) \
(ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK)
+#if defined(__LP64__)
#define ath_hal_setregdomain(_ah, _rd) \
+ (*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 176) = (_rd))
+#else
+#define ath_hal_setregdomain(_ah, _rd) \
(*(uint16_t *)(((uint8_t *)&(_ah)[1]) + 128) = (_rd))
+#endif
#define ath_hal_getcountrycode(_ah, _pcc) \
(*(_pcc) = (_ah)->ah_countryCode)
#define ath_hal_gettkipmic(_ah) \
==== //depot/projects/mips2/src/sys/dev/cxgb/cxgb_osdep.h#10 (text+ko) ====
@@ -26,7 +26,7 @@
POSSIBILITY OF SUCH DAMAGE.
-$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.24 2008/09/16 02:28:08 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.25 2008/09/19 21:12:19 kmacy Exp $
***************************************************************************/
@@ -92,7 +92,6 @@
#define m_get_socket(m) ((m)->m_pkthdr.header)
#define KTR_CXGB KTR_SPARE2
-void cxgb_log_tcb(struct adapter *sc, unsigned int tid);
#define MT_DONTFREE 128
==== //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 (text+ko) ====
@@ -27,7 +27,7 @@
POSSIBILITY OF SUCH DAMAGE.
-$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_defs.h,v 1.4 2008/04/19 03:22:42 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_defs.h,v 1.5 2008/09/19 21:12:19 kmacy Exp $
***************************************************************************/
#ifndef CXGB_DEFS_H_
@@ -49,6 +49,7 @@
struct toepcb;
struct listen_ctx;
+void cxgb_log_tcb(struct adapter *sc, unsigned int tid);
typedef void (*defer_handler_t)(struct toedev *dev, struct mbuf *m);
void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h);
==== //depot/projects/mips2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tom.c,v 1.8 2008/09/16 01:02:17 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_tom.c,v 1.9 2008/09/19 21:12:19 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,6 +145,35 @@
.redirect = NULL
};
+void
+cxgb_log_tcb(struct adapter *sc, unsigned int tid)
+{
+
+ char buf[TCB_SIZE];
+ uint64_t *tcb = (uint64_t *)buf;
+ int i, error;
+ struct mc7 *mem = &sc->cm;
+
+ error = t3_mc7_bd_read(mem, tid*TCB_SIZE/8, TCB_SIZE/8, tcb);
+ if (error)
+ printf("cxgb_tcb_log failed\n");
+
+
+ CTR1(KTR_CXGB, "TCB tid=%u", tid);
+ for (i = 0; i < TCB_SIZE / 32; i++) {
+
+ CTR5(KTR_CXGB, "%1d: %08x %08x %08x %08x",
+ i, (uint32_t)tcb[1], (uint32_t)(tcb[1] >> 32),
+ (uint32_t)tcb[0], (uint32_t)(tcb[0] >> 32));
+
+ tcb += 2;
+ CTR4(KTR_CXGB, " %08x %08x %08x %08x",
+ (uint32_t)tcb[1], (uint32_t)(tcb[1] >> 32),
+ (uint32_t)tcb[0], (uint32_t)(tcb[0] >> 32));
+ tcb += 2;
+ }
+}
+
/*
* Add an skb to the deferred skb queue for processing from process context.
*/
==== //depot/projects/mips2/src/sys/dev/pci/vga_pci.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.6 2008/09/16 19:52:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.7 2008/09/19 19:11:35 rnoland Exp $");
/*
* Simple driver for PCI VGA display devices. Drivers such as agp(4) and
@@ -110,6 +110,22 @@
return (EINVAL);
}
+static int
+vga_pci_setup_intr(device_t dev, device_t child, struct resource *irq,
+ int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg,
+ void **cookiep)
+{
+ return (BUS_SETUP_INTR(device_get_parent(dev), dev, irq, flags,
+ filter, intr, arg, cookiep));
+}
+
+static int
+vga_pci_teardown_intr(device_t dev, device_t child, struct resource *irq,
+ void *cookie)
+{
+ return (BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie));
+}
+
static struct resource *
vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
@@ -311,8 +327,8 @@
/* Bus interface */
DEVMETHOD(bus_read_ivar, vga_pci_read_ivar),
DEVMETHOD(bus_write_ivar, vga_pci_write_ivar),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
+ DEVMETHOD(bus_setup_intr, vga_pci_setup_intr),
+ DEVMETHOD(bus_teardown_intr, vga_pci_teardown_intr),
DEVMETHOD(bus_alloc_resource, vga_pci_alloc_resource),
DEVMETHOD(bus_release_resource, vga_pci_release_resource),
==== //depot/projects/mips2/src/sys/dev/snp/snp.c#8 (text+ko) ====
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.109 2008/08/15 13:07:07 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.110 2008/09/19 10:21:30 ed Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@
static struct cdevsw snp_cdevsw = {
.d_version = D_VERSION,
- .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR,
+ .d_flags = D_PSEUDO | D_NEEDGIANT,
.d_open = snpopen,
.d_read = snpread,
.d_write = snpwrite,
==== //depot/projects/mips2/src/sys/dev/usb/if_zyd.c#10 (text+ko) ====
@@ -1,6 +1,6 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
/* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */
-/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.20 2008/09/10 03:40:51 weongyo Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.22 2008/09/19 07:40:30 weongyo Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini at free.fr>
@@ -234,6 +234,7 @@
static void zyd_scan_start(struct ieee80211com *);
static void zyd_scan_end(struct ieee80211com *);
static void zyd_set_channel(struct ieee80211com *);
+static void zyd_wakeup(struct zyd_softc *);
static int
zyd_match(device_t dev)
@@ -451,9 +452,6 @@
if (!device_is_attached(dev))
return 0;
- /* set a flag to indicate we're detaching. */
- sc->sc_flags |= ZYD_FLAG_DETACHING;
-
/* protect a race when we have listeners related with the driver. */
ifp->if_flags &= ~IFF_UP;
@@ -461,10 +459,14 @@
bpfdetach(ifp);
ieee80211_ifdetach(ic);
+ /* set a flag to indicate we're detaching. */
+ sc->sc_flags |= ZYD_FLAG_DETACHING;
+
usb_rem_task(sc->sc_udev, &sc->sc_scantask);
usb_rem_task(sc->sc_udev, &sc->sc_task);
callout_stop(&sc->sc_watchdog_ch);
+ zyd_wakeup(sc);
zyd_close_pipes(sc);
if_free(ifp);
@@ -763,7 +765,9 @@
struct ieee80211com *ic = vap->iv_ic;
struct zyd_softc *sc = ic->ic_ifp->if_softc;
+ usb_rem_task(sc->sc_udev, &sc->sc_scantask);
usb_rem_task(sc->sc_udev, &sc->sc_task);
+ callout_stop(&sc->sc_watchdog_ch);
/* do it in a process context */
sc->sc_state = nstate;
@@ -788,6 +792,9 @@
uint16_t xferflags;
usbd_status error;
+ if (sc->sc_flags & ZYD_FLAG_DETACHING)
+ return ENXIO;
+
if ((xfer = usbd_alloc_xfer(sc->sc_udev)) == NULL)
return ENOMEM;
@@ -2746,9 +2753,6 @@
struct ifnet *ifp = sc->sc_ifp;
struct ieee80211com *ic = ifp->if_l2com;
- if (sc->sc_flags & ZYD_FLAG_DETACHING)
- return;
-
ZYD_LOCK(sc);
switch (sc->sc_scan_action) {
@@ -2777,6 +2781,16 @@
ZYD_UNLOCK(sc);
}
+static void
+zyd_wakeup(struct zyd_softc *sc)
+{
+ struct rq *rqp;
+
+ STAILQ_FOREACH(rqp, &sc->sc_rqh, rq) {
+ wakeup(rqp->odata); /* wakeup sleeping caller */
+ }
+}
+
static device_method_t zyd_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, zyd_match),
==== //depot/projects/mips2/src/sys/dev/usb/usbdevs#24 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.371 2008/09/14 15:21:22 thompsa Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -282,6 +282,7 @@
vendor APPLE 0x05ac Apple Computer
vendor YCCABLE 0x05ad Y.C. Cable
vendor DIGITALPERSONA 0x05ba DigitalPersona
+vendor 3G 0x05bc 3G Green Green Globe
vendor RAFI 0x05bd RAFI
vendor TYCO 0x05be Tyco
vendor KAWASAKI 0x05c1 Kawasaki
==== //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#13 (text+ko) ====
@@ -31,7 +31,7 @@
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
* From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
*
- * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.166 2008/08/28 15:23:18 attilio Exp $
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.167 2008/09/20 19:50:52 kib Exp $
*/
/*
@@ -499,8 +499,6 @@
KASSERT(de != NULL,
("Null dir dirent in devfs_getattr vp=%p", vp));
}
- bzero((caddr_t) vap, sizeof(*vap));
- vattr_null(vap);
vap->va_uid = de->de_uid;
vap->va_gid = de->de_gid;
vap->va_mode = de->de_mode;
@@ -543,6 +541,7 @@
}
vap->va_gen = 0;
vap->va_flags = 0;
+ vap->va_filerev = 0;
vap->va_nlink = de->de_links;
vap->va_fileid = de->de_inode;
==== //depot/projects/mips2/src/sys/fs/fdescfs/fdesc_vnops.c#9 (text+ko) ====
@@ -31,7 +31,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.110 2008/08/28 15:23:18 attilio Exp $
+ * $FreeBSD: src/sys/fs/fdescfs/fdesc_vnops.c,v 1.112 2008/09/20 19:50:52 kib Exp $
*/
/*
@@ -391,8 +391,6 @@
switch (VTOFDESC(vp)->fd_type) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list