Date: Sat, 4 Nov 2006 06:23:51 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109218 for review Message-ID: <200611040623.kA46Np4s013302@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109218 Change 109218 by jb@jb_freebsd8 on 2006/11/04 06:23:40 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/user/jb/sun4v/src/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/user/jb/sun4v/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 integrate .. //depot/user/jb/sun4v/src/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/user/jb/sun4v/src/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/user/jb/sun4v/src/share/man/man4/aac.4#2 integrate .. //depot/user/jb/sun4v/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/user/jb/sun4v/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/user/jb/sun4v/src/sys/conf/files#6 integrate .. //depot/user/jb/sun4v/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/user/jb/sun4v/src/sys/modules/bge/Makefile#2 integrate .. //depot/user/jb/sun4v/src/sys/modules/nfe/Makefile#2 integrate .. //depot/user/jb/sun4v/src/sys/netinet/sctp_input.c#2 integrate .. //depot/user/jb/sun4v/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/user/jb/sun4v/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/user/jb/sun4v/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/user/jb/sun4v/src/sys/netinet/sctputil.c#2 integrate .. //depot/user/jb/sun4v/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/user/jb/sun4v/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/include/elf.h#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/include/trap.h#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/user/jb/sun4v/src/sys/sun4v/sun4v/wbuf.S#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.304 2006/11/01 18:38:59 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.306 2006/11/04 05:59:58 trhodes Exp $ --> <chapter id="security"> @@ -1773,45 +1773,45 @@ <command>ext_srvtab</command> command. This will create a file which must be copied or moved <emphasis>by secure means</emphasis> to each Kerberos client's - <filename>/etc/kerberosIV</filename> directory. This file must + <filename>/etc</filename> directory. This file must be present on each server and client, and is crucial to the operation of Kerberos.</para> - - + + <screen>&prompt.root; <userinput>ext_srvtab grunt</userinput> <prompt>Enter Kerberos master key:</prompt> - + Current Kerberos master key version is 1. Master key entered. BEWARE! Generating 'grunt-new-srvtab'....</screen> - + <para>Now, this command only generates a temporary file which must be renamed to <filename>srvtab</filename> so that all the servers can pick it up. Use the &man.mv.1; command to move it into place on the original system:</para> - + <screen>&prompt.root; <userinput>mv grunt-new-srvtab srvtab</userinput></screen> - + <para>If the file is for a client system, and the network is not deemed safe, then copy the <filename><replaceable>client</replaceable>-new-srvtab</filename> to removable media and transport it by secure physical means. Be sure to rename it to <filename>srvtab</filename> in the client's - <filename>/etc/kerberosIV</filename> directory, and make sure it is + <filename>/etc</filename> directory, and make sure it is mode 600:</para> - + <screen>&prompt.root; <userinput>mv grumble-new-srvtab srvtab</userinput> &prompt.root; <userinput>chmod 600 srvtab</userinput></screen> </sect2> <sect2> <title>Populating the Database</title> - + <para>We now have to add some user entries into the database. First let us create an entry for the user <username>jane</username>. Use the <command>kdb_edit</command> command to do this:</para> - + <screen>&prompt.root; <userinput>kdb_edit</userinput> Opening database... @@ -1888,11 +1888,11 @@ Issued Expires Principal Apr 30 11:23:22 Apr 30 19:23:22 krbtgt.EXAMPLE.COM@EXAMPLE.COM</screen> - + <para>Now try changing the password using &man.passwd.1; to check if the <application>kpasswd</application> daemon can get authorization to the Kerberos database:</para> - + <screen>&prompt.user; <userinput>passwd</userinput> realm EXAMPLE.COM <prompt>Old password for jane:</prompt> @@ -2286,10 +2286,10 @@ ticket for the principal (user) that you just created from the command-line of the <acronym>KDC</acronym> itself:</para> - <screen>&prompt.user; <userinput>k5init <replaceable>tillman</replaceable></userinput> + <screen>&prompt.user; <userinput>kinit <replaceable>tillman</replaceable></userinput> tillman@EXAMPLE.ORG's Password: -&prompt.user; <userinput>k5list</userinput> +&prompt.user; <userinput>klist</userinput> Credentials cache: FILE:<filename>/tmp/krb5cc_500</filename> Principal: tillman@EXAMPLE.ORG @@ -2439,16 +2439,6 @@ option, which encrypts the entire data stream (similar to <command>ssh</command>).</para> - <para>The core <application>Kerberos</application> client applications - (traditionally named <command>kinit</command>, - <command>klist</command>, <command>kdestroy</command>, and - <command>kpasswd</command>) are installed in - the base &os; install. Note that &os; versions prior to 5.0 - renamed them to <command>k5init</command>, - <command>k5list</command>, <command>k5destroy</command>, - <command>k5passwd</command>, and <command>k5stash</command> - (though it is typically only used once).</para> - <para>Various non-core <application>Kerberos</application> client applications are also installed by default. This is where the <quote>minimal</quote> nature of the base Heimdal installation is ==== //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.2 2006/11/03 23:04:34 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.3 2006/11/04 05:39:39 jb Exp $"); #include "opt_ipsec.h" #include "opt_compat.h" @@ -2206,8 +2206,8 @@ sp = TAILQ_LAST(&((asoc->asoc.locked_on_sending)->outqueue), sctp_streamhead); if (sp == NULL) { - printf("Error, sp is NULL, locked on sending is %ps strm:%d\n", - (u_int)asoc->asoc.locked_on_sending, + printf("Error, sp is NULL, locked on sending is %p strm:%d\n", + asoc->asoc.locked_on_sending, asoc->asoc.locked_on_sending->stream_no); } else { if ((sp->length == 0) && (sp->msg_is_complete == 0)) ==== //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.131 2006/11/04 04:58:10 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.132 2006/11/04 05:27:21 jb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -330,12 +330,6 @@ tick_init(clock); /* - * Initialize global registers. - */ - pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1; - cpu_setregs(pc); - - /* * Initialize the console before printing anything. */ cninit(); @@ -415,6 +409,7 @@ * stack, so don't pass the real size (PAGE_SIZE) to pcpu_init or * it'll zero it out from under us. */ + pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; @@ -426,6 +421,11 @@ pc->pc_tlb_ctx_max = TLB_CTX_USER_MAX; /* + * Initialize global registers. + */ + cpu_setregs(pc); + + /* * Initialize the message buffer (after setting trap table). */ msgbufinit(msgbufp, MSGBUF_SIZE); ==== //depot/user/jb/sun4v/src/lib/libc/sparc64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.10 2006/11/03 23:43:18 kmacy Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -11,6 +11,9 @@ sigcode.S CFLAGS+= -I${.CURDIR}/sparc64/fpu +.if ${MACHINE} == "sun4v" +CFLAGS+= -DSUN4V +.endif MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S ==== //depot/user/jb/sun4v/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.4 2002/06/30 05:36:49 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.5 2006/11/03 23:43:18 kmacy Exp $"); .register %g2, #ignore .register %g3, #ignore @@ -38,6 +38,10 @@ #include "assym.s" ENTRY(__sparc_utrap_gen) +#ifdef SUN4V + save + ta %xcc, ST_FPEMU_CONTEXT +#endif sub %sp, UF_SIZEOF, %sp stx %o0, [%sp + SPOFF + CCFSZ + UF_TYPE] ==== //depot/user/jb/sun4v/src/sbin/mdmfs/mdmfs.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.26 2006/11/03 12:02:24 ru Exp $ .\" -.Dd October 1, 2006 +.Dd November 3, 2006 .Dt MDMFS 8 .Os .Sh NAME @@ -56,26 +56,6 @@ .Op Fl w Ar user : Ns Ar group .Ar md-device .Ar mount-point -.Nm -.Fl C -.Op Fl lNU -.Op Fl a Ar maxcontig -.Op Fl b Ar block-size -.Op Fl c Ar cylinders -.Op Fl d Ar rotdelay -.Op Fl E Ar path-mdconfig -.Op Fl e Ar maxbpg -.Op Fl F Ar file -.Op Fl f Ar frag-size -.Op Fl i Ar bytes -.Op Fl m Ar percent-free -.Op Fl n Ar rotational-positions -.Op Fl O Ar optimization -.Op Fl o Ar mount-options -.Op Fl s Ar size -.Op Fl v Ar version -.Ar md-device -.Ar mount-point .Sh DESCRIPTION The .Nm @@ -134,12 +114,6 @@ option). .It Fl b Ar block-size The block size of the file system, in bytes. -.It Fl C -Enable full compatibility mode with -.Xr mount_mfs 8 . -See the -.Sx COMPATIBILITY -section for more information. .It Fl c Ar cylinders The number of cylinders per cylinder group in the file system. .It Fl D @@ -250,7 +224,7 @@ .Pq Dv MD_MALLOC . .It Fl U Enable soft-updates on the file system. -This is the default, even in compatibility mode, and is accepted only +This is the default, and is accepted only for compatibility. It is only really useful to negate the .Fl S @@ -337,19 +311,16 @@ .Sh COMPATIBILITY The .Nm -utility, while designed to be fully compatible with +utility, while designed to be compatible with .Xr mount_mfs 8 , can be useful by itself. Since .Xr mount_mfs 8 had some silly defaults, a -.Dq full compatibility +.Dq compatibility mode is provided for the case where bug-to-bug compatibility is desired. .Pp -Full compatibility is enabled with the -.Fl C -flag, -or by starting +Compatibility is enabled by starting .Nm with the name .Li mount_mfs @@ -357,17 +328,14 @@ .Li mfs (as returned by .Xr getprogname 3 ) . -In this mode, only the options which would be accepted by -.Xr mount_mfs 8 -are valid. -Furthermore, the following behavior, as done by +In this mode, the following behavior, as done by .Xr mount_mfs 8 , is duplicated: .Bl -bullet -offset indent .It The file mode of .Ar mount-point -is set to +is set by default to .Li 01777 as if .Fl p Ar 1777 ==== //depot/user/jb/sun4v/src/sbin/mdmfs/mdmfs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.27 2006/02/16 21:28:54 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.28 2006/11/03 12:02:24 ru Exp $"); #include <sys/param.h> #include <sys/mdioctl.h> @@ -61,7 +61,6 @@ bool mi_have_mode; }; -static bool compat; /* Full compatibility with mount_mfs? */ static bool debug; /* Emit debugging information? */ static bool loudsubs; /* Suppress output from helper programs? */ static bool norun; /* Actually run the helper programs? */ @@ -119,8 +118,11 @@ /* If we were started as mount_mfs or mfs, imply -C. */ if (strcmp(getprogname(), "mount_mfs") == 0 || - strcmp(getprogname(), "mfs") == 0) - compat = true; + strcmp(getprogname(), "mfs") == 0) { + /* Make compatibility assumptions. */ + mi.mi_mode = 01777; + mi.mi_have_mode = true; + } while ((ch = getopt(argc, argv, "a:b:Cc:Dd:E:e:F:f:hi:LlMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1) @@ -132,16 +134,12 @@ argappend(&newfs_arg, "-b %s", optarg); break; case 'C': - if (compat) - usage(); - compat = true; + /* Ignored for compatibility. */ break; case 'c': argappend(&newfs_arg, "-c %s", optarg); break; case 'D': - if (compat) - usage(); detach = false; break; case 'd': @@ -170,8 +168,6 @@ argappend(&newfs_arg, "-i %s", optarg); break; case 'L': - if (compat) - usage(); loudsubs = true; break; case 'l': @@ -187,8 +183,6 @@ argappend(&newfs_arg, "-m %s", optarg); break; case 'N': - if (compat) - usage(); norun = true; break; case 'n': @@ -201,13 +195,9 @@ argappend(&mount_arg, "-o %s", optarg); break; case 'P': - if (compat) - usage(); newfs = false; break; case 'p': - if (compat) - usage(); if ((set = setmode(optarg)) == NULL) usage(); mi.mi_mode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO); @@ -215,8 +205,6 @@ free(set); break; case 'S': - if (compat) - usage(); softdep = false; break; case 's': @@ -229,13 +217,9 @@ argappend(&newfs_arg, "-O %s", optarg); break; case 'w': - if (compat) - usage(); extract_ugid(optarg, &mi); break; case 'X': - if (compat) - usage(); debug = true; break; default: @@ -246,12 +230,6 @@ if (argc < 2) usage(); - /* Make compatibility assumptions. */ - if (compat) { - mi.mi_mode = 01777; - mi.mi_have_mode = true; - } - /* Derive 'unit' (global). */ unitstr = argv[0]; if (strncmp(unitstr, "/dev/", 5) == 0) @@ -671,23 +649,12 @@ static void usage(void) { - const char *name; - if (compat) - name = getprogname(); - else - name = "mdmfs"; - if (!compat) - fprintf(stderr, + fprintf(stderr, "usage: %s [-DLlMNPSUX] [-a maxcontig] [-b block-size] [-c cylinders]\n" "\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n" "\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n" "\t[-o mount-options] [-p permissions] [-s size] [-v version]\n" -"\t[-w user:group] md-device mount-point\n", name); - fprintf(stderr, -"usage: %s -C [-lNU] [-a maxcontig] [-b block-size] [-c cylinders]\n" -"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n" -"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n" -"\t[-o mount-options] [-s size] [-v version] md-device mount-point\n", name); +"\t[-w user:group] md-device mount-point\n", getprogname()); exit(1); } ==== //depot/user/jb/sun4v/src/share/man/man4/aac.4#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.33 2006/06/18 07:33:51 brueffer Exp $ -.Dd June 17, 2006 +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.34 2006/11/03 06:50:03 brueffer Exp $ +.Dd November 3, 2006 .Dt AAC 4 .Os .Sh NAME @@ -181,6 +181,8 @@ .It IBM ServeRAID 8i .It +IBM ServeRAID 8k +.It ICP ICP5085BR SAS RAID .It ICP ICP9085LI SAS RAID ==== //depot/user/jb/sun4v/src/sys/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine amd64 @@ -17,3 +17,6 @@ # KSE support went from being default to a kernel option options KSE + +# Kernel support for loading DTrace modules +options KDTRACE ==== //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_proto.h#3 (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.73 2006/11/03 18:57:48 rrs Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.86 2006/11/03 15:23:12 rrs Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.74 2006/11/03 21:23:33 ru Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.87 2006/11/03 21:21:28 ru Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -309,37 +309,6 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; -struct sctp_peeloff_args { - char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; - char name_l_[PADL_(uint32_t)]; uint32_t name; char name_r_[PADR_(uint32_t)]; -}; -struct sctp_generic_sendmsg_args { - char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; - char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)]; - char mlen_l_[PADL_(int)]; int mlen; char mlen_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; - char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)]; - char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct sctp_generic_sendmsg_iov_args { - char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; - char iov_l_[PADL_(struct iovec *)]; struct iovec * iov; char iov_r_[PADR_(struct iovec *)]; - char iovlen_l_[PADL_(int)]; int iovlen; char iovlen_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; - char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)]; - char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct sctp_generic_recvmsg_args { - char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; - char iov_l_[PADL_(struct iovec *)]; struct iovec * iov; char iov_r_[PADR_(struct iovec *)]; - char iovlen_l_[PADL_(int)]; int iovlen; char iovlen_r_[PADR_(int)]; - char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)]; - char fromlenaddr_l_[PADL_(__socklen_t *)]; __socklen_t * fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *)]; - char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; - char msg_flags_l_[PADL_(int *)]; int * msg_flags; char msg_flags_r_[PADR_(int *)]; -}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -393,10 +362,6 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); -int sctp_peeloff(struct thread *, struct sctp_peeloff_args *); -int sctp_generic_sendmsg(struct thread *, struct sctp_generic_sendmsg_args *); -int sctp_generic_sendmsg_iov(struct thread *, struct sctp_generic_sendmsg_iov_args *); -int sctp_generic_recvmsg(struct thread *, struct sctp_generic_recvmsg_args *); #ifdef COMPAT_43 @@ -539,10 +504,6 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL -#define FREEBSD32_SYS_AUE_sctp_peeloff AUE_NULL -#define FREEBSD32_SYS_AUE_sctp_generic_sendmsg AUE_NULL -#define FREEBSD32_SYS_AUE_sctp_generic_sendmsg_iov AUE_NULL -#define FREEBSD32_SYS_AUE_sctp_generic_recvmsg AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (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.71 2006/11/03 18:57:48 rrs Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.86 2006/11/03 15:23:12 rrs Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.72 2006/11/03 21:23:33 ru Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.87 2006/11/03 21:21:28 ru Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (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.62 2006/11/03 18:57:48 rrs Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.86 2006/11/03 15:23:12 rrs Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.63 2006/11/03 21:23:33 ru Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.87 2006/11/03 21:21:28 ru Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/user/jb/sun4v/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (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.72 2006/11/03 18:57:48 rrs Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.86 2006/11/03 15:23:12 rrs Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.73 2006/11/03 21:23:33 ru Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.87 2006/11/03 21:21:28 ru Exp */ #include "opt_compat.h" ==== //depot/user/jb/sun4v/src/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.86 2006/11/03 15:23:12 rrs Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.87 2006/11/03 21:21:28 ru Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -771,13 +771,13 @@ 468 AUE_NULL UNIMPL nosys 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr -471 AUE_NULL STD { int sctp_peeloff(int sd, uint32_t name); } -472 AUE_NULL STD { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \ - caddr_t to, __socklen_t tolen, \ +471 AUE_NULL NOPROTO { int sctp_peeloff(int sd, uint32_t name); } +472 AUE_NULL NOPROTO { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \ + caddr_t to, __socklen_t tolen, \ struct sctp_sndrcvinfo *sinfo, int flags); } -473 AUE_NULL STD { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \ - caddr_t to, __socklen_t tolen, \ +473 AUE_NULL NOPROTO { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \ + caddr_t to, __socklen_t tolen, \ struct sctp_sndrcvinfo *sinfo, int flags); } -474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ +474 AUE_NULL NOPROTO { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } ==== //depot/user/jb/sun4v/src/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1158 2006/11/03 15:23:13 rrs Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1159 2006/11/03 21:09:03 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -351,7 +351,7 @@ crypto/sha1.c optional carp | crypto | ipsec | \ netgraph_mppc_encryption | sctp crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random | \ - sctp + sctp ddb/db_access.c optional ddb ddb/db_break.c optional ddb ddb/db_command.c optional ddb @@ -1815,7 +1815,7 @@ netinet6/raw_ip6.c optional inet6 netinet6/route6.c optional inet6 netinet6/scope6.c optional inet6 -netinet6/sctp6_usrreq.c optional inet6 inet6 sctp +netinet6/sctp6_usrreq.c optional inet6 sctp netinet6/udp6_output.c optional inet6 netinet6/udp6_usrreq.c optional inet6 netipsec/ipsec.c optional fast_ipsec ==== //depot/user/jb/sun4v/src/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine i386 @@ -21,3 +21,6 @@ # KSE support went from being default to a kernel option options KSE + +# Kernel support for loading DTrace modules +options KDTRACE ==== //depot/user/jb/sun4v/src/sys/ia64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/ia64 # -# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine ia64 @@ -20,3 +20,6 @@ # KSE support went from being default to a kernel option options KSE + +# Kernel support for loading DTrace modules +options KDTRACE ==== //depot/user/jb/sun4v/src/sys/modules/ath_rate_amrr/Makefile#2 (text+ko) ==== @@ -33,14 +33,14 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath_rate_amrr/Makefile,v 1.3 2006/09/18 16:50:59 sam Exp $ +# $FreeBSD: src/sys/modules/ath_rate_amrr/Makefile,v 1.4 2006/11/03 21:41:19 ru Exp $ # .PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr KMOD= ath_rate SRCS= amrr.c -SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h HAL= ${.CURDIR}/../../contrib/dev/ath CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} ==== //depot/user/jb/sun4v/src/sys/modules/bge/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/modules/bge/Makefile,v 1.4 2005/09/27 18:10:33 mlaier Exp $ +# $FreeBSD: src/sys/modules/bge/Makefile,v 1.5 2006/11/03 21:41:19 ru Exp $ .PATH: ${.CURDIR}/../../dev/bge KMOD= if_bge -SRCS= opt_bge.h if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h +SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h .include <bsd.kmod.mk> ==== //depot/user/jb/sun4v/src/sys/modules/nfe/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/modules/nfe/Makefile,v 1.1 2006/06/26 23:41:07 obrien Exp $ +# $FreeBSD: src/sys/modules/nfe/Makefile,v 1.2 2006/11/03 21:41:19 ru Exp $ .PATH: ${.CURDIR}/../../dev/nfe KMOD= if_nfe -SRCS= if_nfe.c opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h +SRCS= if_nfe.c device_if.h bus_if.h pci_if.h miibus_if.h .include <bsd.kmod.mk> ==== //depot/user/jb/sun4v/src/sys/netinet/sctp_input.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.2 2006/11/03 23:04:34 rrs Exp $"); #include "opt_ipsec.h" #include "opt_compat.h" @@ -250,7 +250,7 @@ sctp_free_remote_addr(sp->net); sp->net = NULL; /* Free the chunk */ - printf("sp:%x tcb:%x weird free case\n", + printf("sp:%p tcb:%p weird free case\n", (u_int)sp, (u_int)stcb); sctp_free_a_strmoq(stcb, sp); ==== //depot/user/jb/sun4v/src/sys/netinet/sctp_pcb.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.3 2006/11/04 05:39:39 jb Exp $"); #include "opt_ipsec.h" #include "opt_compat.h" @@ -2206,8 +2206,8 @@ sp = TAILQ_LAST(&((asoc->asoc.locked_on_sending)->outqueue), sctp_streamhead); if (sp == NULL) { - printf("Error, sp is NULL, locked on sending is %x strm:%d\n", - (u_int)asoc->asoc.locked_on_sending, + printf("Error, sp is NULL, locked on sending is %p strm:%d\n", + asoc->asoc.locked_on_sending, asoc->asoc.locked_on_sending->stream_no); } else { if ((sp->length == 0) && (sp->msg_is_complete == 0)) ==== //depot/user/jb/sun4v/src/sys/netinet/sctp_timer.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_timer.c,v 1.29 2005/03/06 16:04:18 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_timer.c,v 1.2 2006/11/03 23:04:34 rrs Exp $"); #include "opt_ipsec.h" #include "opt_compat.h" @@ -862,7 +862,7 @@ int win_probe, num_mk; #ifdef SCTP_FR_LOGGING - sctp_log_fr(sctps_datadropchklmt.sctps_senddata, 0, 0, SCTP_FR_T3_TIMEOUT); + sctp_log_fr(0, 0, 0, SCTP_FR_T3_TIMEOUT); #ifdef SCTP_CWND_LOGGING { struct sctp_nets *lnet; @@ -1662,7 +1662,7 @@ } if ((it->inp->inp_starting_point_for_iterator != NULL) && (it->inp->inp_starting_point_for_iterator != it)) { - printf("Iterator collision, waiting for one at 0x%x\n", + printf("Iterator collision, waiting for one at %p\n", (uint32_t) it->inp); SCTP_INP_WUNLOCK(it->inp); goto start_timer_return; ==== //depot/user/jb/sun4v/src/sys/netinet/sctp_usrreq.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.3 2006/11/03 23:04:34 rrs Exp $"); #include "opt_ipsec.h" @@ -1134,8 +1134,7 @@ sp = TAILQ_LAST(&asoc->locked_on_sending->outqueue, sctp_streamhead); if (sp == NULL) { - printf("Error, sp is NULL, locked on sending is %x strm:%d\n", - (u_int)asoc->locked_on_sending, + printf("Error, sp is NULL, locked on sending is non-null strm:%d\n", asoc->locked_on_sending->stream_no); } else { if ((sp->length == 0) && (sp->msg_is_complete == 0)) @@ -1275,8 +1274,7 @@ sp = TAILQ_LAST(&asoc->locked_on_sending->outqueue, sctp_streamhead); if (sp == NULL) { - printf("Error, sp is NULL, locked on sending is %x strm:%d\n", - (u_int)asoc->locked_on_sending, + printf("Error, sp is NULL, locked on sending is non-null strm:%d\n", asoc->locked_on_sending->stream_no); } else { if ((sp->length == 0) && (sp->msg_is_complete == 0)) { @@ -3133,7 +3131,7 @@ error = EINVAL; break; } - on_off = (mtod(m, int)); + on_off = *(mtod(m, int *)); if (on_off) { sctp_feature_on(inp, SCTP_PCB_FLAGS_FRAG_INTERLEAVE); } else { ==== //depot/user/jb/sun4v/src/sys/netinet/sctputil.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.1 2006/11/03 15:23:15 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.2 2006/11/03 23:04:34 rrs Exp $"); #include "opt_ipsec.h" @@ -3271,12 +3271,12 @@ break; case SCTP_NOTIFY_AUTH_NEW_KEY: sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error, - (uint32_t) data); + (uint16_t) (uintptr_t) data); break; #if 0 case SCTP_NOTIFY_AUTH_KEY_CONFLICT: sctp_notify_authentication(stcb, SCTP_AUTH_KEY_CONFLICT, - error, (uint32_t) data); + error, (uint16_t) (uintptr_t) data); break; #endif /* not yet? remove? */ ==== //depot/user/jb/sun4v/src/sys/pc98/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/pc98 # -# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.8 2006/11/04 04:58:10 jb Exp $ machine pc98 i386 options PC98 @@ -23,3 +23,6 @@ # KSE support went from being default to a kernel option options KSE + +# Kernel support for loading DTrace modules +options KDTRACE ==== //depot/user/jb/sun4v/src/sys/powerpc/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/powerpc # -# $FreeBSD: src/sys/powerpc/conf/DEFAULTS,v 1.5 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/powerpc/conf/DEFAULTS,v 1.6 2006/11/04 04:58:10 jb Exp $ machine powerpc @@ -14,3 +14,6 @@ # KSE support went from being default to a kernel option options KSE + +# Kernel support for loading DTrace modules >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611040623.kA46Np4s013302>