From owner-p4-projects@FreeBSD.ORG Sun Jan 6 01:02:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 198EF16A420; Sun, 6 Jan 2008 01:02:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD74016A419 for ; Sun, 6 Jan 2008 01:02:58 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C351B13C447 for ; Sun, 6 Jan 2008 01:02:58 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0612wMV006837 for ; Sun, 6 Jan 2008 01:02:58 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0612AFj099919 for perforce@freebsd.org; Sun, 6 Jan 2008 01:02:10 GMT (envelope-from delphij@freebsd.org) Date: Sun, 6 Jan 2008 01:02:10 GMT Message-Id: <200801060102.m0612AFj099919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 132602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 01:02:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=132602 Change 132602 by delphij@charlie on 2008/01/06 01:02:01 IFC Affected files ... .. //depot/projects/delphij_fork/COPYRIGHT#2 integrate .. //depot/projects/delphij_fork/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/NEWS#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/config.guess#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/config.sub#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/configure#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/configure.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/headers#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/form/modules#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/headers#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/install-sh#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/delphij_fork/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/README#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/modules#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/delphij_fork/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/Makefile#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/delphij_fork/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/cpio.5#1 branch .. //depot/projects/delphij_fork/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/README#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/main.c#6 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test.h#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse.c#7 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/delphij_fork/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/delphij_fork/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/delphij_fork/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/delphij_fork/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#17 integrate .. //depot/projects/delphij_fork/share/man/man4/Makefile#10 integrate .. //depot/projects/delphij_fork/share/man/man4/ed.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/edsc.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ipmi.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/mxge.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/pci.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/pcib.4#1 branch .. //depot/projects/delphij_fork/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/boot.config.5#2 integrate .. //depot/projects/delphij_fork/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/delphij_fork/share/man/man9/style.9#2 integrate .. //depot/projects/delphij_fork/share/misc/committers-src.dot#4 integrate .. //depot/projects/delphij_fork/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/tr_TR.ISO8859-9.src#3 integrate .. //depot/projects/delphij_fork/share/timedef/tr_TR.UTF-8.src#3 integrate .. //depot/projects/delphij_fork/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/backward#2 integrate .. //depot/projects/delphij_fork/share/zoneinfo/europe#3 integrate .. //depot/projects/delphij_fork/share/zoneinfo/southamerica#4 integrate .. //depot/projects/delphij_fork/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/delphij_fork/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/delphij_fork/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/delphij_fork/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/files#15 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/creator.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/fb.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/fb/vga.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/le/am7990.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/le/am79900.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/streams/streams.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/conf/NOTES#7 integrate .. //depot/projects/delphij_fork/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/delphij_fork/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/delphij_fork/sys/isa/vga_isa.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_event.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_exec.c#8 integrate .. //depot/projects/delphij_fork/sys/kern/kern_mib.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_tc.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/sched_ule.c#11 integrate .. //depot/projects/delphij_fork/sys/kern/subr_lock.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/subr_smp.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/sys_generic.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/delphij_fork/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/delphij_fork/sys/net/if_lagg.c#9 integrate .. //depot/projects/delphij_fork/sys/net/netisr.h#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/if_ether.c#6 integrate .. //depot/projects/delphij_fork/sys/netinet/if_ether.h#3 integrate .. //depot/projects/delphij_fork/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/delphij_fork/sys/sys/file.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/sysctl.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/unpcb.h#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/delphij_fork/sys/vm/pmap.h#4 integrate .. //depot/projects/delphij_fork/sys/vm/vm_fault.c#7 integrate .. //depot/projects/delphij_fork/sys/vm/vm_kern.c#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_map.c#6 integrate .. //depot/projects/delphij_fork/sys/vm/vm_object.c#5 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.c#12 integrate .. //depot/projects/delphij_fork/sys/vm/vm_reserv.c#1 branch .. //depot/projects/delphij_fork/sys/vm/vm_reserv.h#1 branch .. //depot/projects/delphij_fork/tools/regression/sockets/unix_gc/Makefile#1 branch .. //depot/projects/delphij_fork/tools/regression/sockets/unix_gc/unix_gc.c#1 branch .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/io.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/colldef/parse.y#2 integrate .. //depot/projects/delphij_fork/usr.bin/colldef/scan.l#2 integrate .. //depot/projects/delphij_fork/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/atalk.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/bpf.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/if.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/ipsec.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/ipx.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/main.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/mbuf.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/mcast.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/mroute.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/netgraph.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/pfkey.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/route.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/sctp.c#6 integrate .. //depot/projects/delphij_fork/usr.bin/netstat/unix.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/tar/COPYING#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/Makefile#3 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/config_freebsd.h#2 integrate .. //depot/projects/delphij_fork/usr.bin/tar/read.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/tar/test/config.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-acl.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-basic.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-deep-dir.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-flags.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-nodump.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-overwrite.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/test/test-utf8.sh#2 delete .. //depot/projects/delphij_fork/usr.bin/tar/util.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/mtree/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.sbin/mtree/mtree.5#1 branch .. //depot/projects/delphij_fork/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/sysinstall.h#2 integrate .. //depot/user/howardsu/truss/COPYRIGHT#3 integrate .. //depot/user/howardsu/truss/Makefile#6 integrate .. //depot/user/howardsu/truss/bin/cp/cp.c#3 integrate .. //depot/user/howardsu/truss/bin/mv/mv.c#2 integrate .. //depot/user/howardsu/truss/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/user/howardsu/truss/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/user/howardsu/truss/contrib/cvs/src/filesubr.c#2 integrate .. //depot/user/howardsu/truss/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/user/howardsu/truss/contrib/gcc/fold-const.c#4 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/hexnan.c#3 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/strtod.c#3 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/strtof.c#3 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/user/howardsu/truss/contrib/gdtoa/strtorx.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/INSTALL#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/MANIFEST#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/NEWS#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/TO-DO#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/aclocal.m4#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/config.guess#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/config.sub#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/configure#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/configure.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/dist.mk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/headers#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/form/modules#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/curses.tail#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/curses.wide#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/headers#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/include/tic.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/install-sh#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/clear.1#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/panel.3x#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/term.5#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/term.7#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/tic.1m#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/toe.1m#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/tput.1#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/man/tset.1#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/menu/headers#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/menu/menu.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/menu/modules#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/misc/shlib#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/mkdirs.sh#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/mkinstalldirs#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/modules#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/panel/headers#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/panel/modules#2 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/clear.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/modules#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/tic.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/toe.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/tput.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/progs/tset.c#3 integrate .. //depot/user/howardsu/truss/contrib/ncurses/tack/COPYING#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/HISTORY#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/Makefile.in#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/README#2 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/ansi.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/charset.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/color.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/control.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/crum.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/edit.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/fun.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/init.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/menu.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/modes.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/modules#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/output.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/pad.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/scan.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/sync.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/sysdep.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/tack.1#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/tack.c#3 delete .. //depot/user/howardsu/truss/contrib/ncurses/tack/tack.h#3 delete .. //depot/user/howardsu/truss/contrib/openpam/CREDITS#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/HISTORY#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/INSTALL#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/LICENSE#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/MANIFEST#2 delete .. //depot/user/howardsu/truss/contrib/openpam/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/README#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/RELNOTES#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/aclocal.m4#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/autogen.sh#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/bin/su/su.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/compile#1 branch .. //depot/user/howardsu/truss/contrib/openpam/config.h.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/configure#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/configure.ac#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/configure.in#2 delete .. //depot/user/howardsu/truss/contrib/openpam/depcomp#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/user/howardsu/truss/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/install-sh#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/ltconfig#2 delete .. //depot/user/howardsu/truss/contrib/openpam/ltmain.sh#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/missing#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/mkinstalldirs#2 delete .. //depot/user/howardsu/truss/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/user/howardsu/truss/contrib/openpam/stamp-h.in#2 delete .. //depot/user/howardsu/truss/etc/defaults/periodic.conf#6 integrate .. //depot/user/howardsu/truss/etc/rc.d/ldconfig#4 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes#11 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes-o.real#7 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/user/howardsu/truss/include/complex.h#2 integrate .. //depot/user/howardsu/truss/include/nsswitch.h#2 integrate .. //depot/user/howardsu/truss/include/pthread_np.h#3 integrate .. //depot/user/howardsu/truss/lib/Makefile#8 integrate .. //depot/user/howardsu/truss/lib/libarchive/Makefile#10 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 6 01:22:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15EF416A419; Sun, 6 Jan 2008 01:22:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF40916A417 for ; Sun, 6 Jan 2008 01:22:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5D1613C448 for ; Sun, 6 Jan 2008 01:22:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m061MNpK074818 for ; Sun, 6 Jan 2008 01:22:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m061MN2O074814 for perforce@freebsd.org; Sun, 6 Jan 2008 01:22:23 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 6 Jan 2008 01:22:23 GMT Message-Id: <200801060122.m061MN2O074814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 01:22:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132604 Change 132604 by kmacy@pandemonium:kmacy:xen31 on 2008/01/06 01:21:40 get ping working - bring the rx control flow more in line with what exists in current linux - switch to tracking pfn in ext_args to allow for larger than 4GB VMs - move page management structures in to netfront_tinfo (softc) so that multiple devices can operate in parallel Affected files ... .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#4 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#4 (text+ko) ==== @@ -88,7 +88,11 @@ #define RX_COPY_THRESHOLD 256 +#define net_ratelimit() 0 + struct netfront_info; +struct netfront_rx_info; + static void xn_txeof(struct netfront_info *); static void xn_rxeof(struct netfront_info *); static void network_alloc_rx_buffers(struct netfront_info *); @@ -127,10 +131,12 @@ static void xn_free_tx_ring(struct netfront_info *); +static int xennet_get_responses(struct netfront_info *np, + struct netfront_rx_info *rinfo, RING_IDX rp, struct mbuf_head *list, + int *pages_flipped_p); + #define virt_to_mfn(x) (vtomach(x) >> PAGE_SHIFT) -/* XXX: This isn't supported in FreeBSD, so ignore it for now. */ -#define TASK_UNINTERRUPTIBLE 0 #define INVALID_P2M_ENTRY (~0UL) /* @@ -144,10 +150,6 @@ }; -static unsigned long rx_pfn_array[NET_RX_RING_SIZE]; -static multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; -static mmu_update_t rx_mmu[NET_RX_RING_SIZE]; - struct net_device_stats { unsigned long rx_packets; /* total packets received */ @@ -225,6 +227,11 @@ int xn_if_flags; struct callout xn_stat_ch; + + + unsigned long rx_pfn_array[NET_RX_RING_SIZE]; + multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; + mmu_update_t rx_mmu[NET_RX_RING_SIZE]; }; #define rx_mbufs xn_cdata.xn_rx_chain @@ -251,6 +258,11 @@ mtx_destroy(&(_sc)->tx_lock); \ sx_destroy(&(_sc)->sc_lock); +struct netfront_rx_info { + struct netif_rx_response rx; + struct netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1]; +}; + #define netfront_carrier_on(netif) ((netif)->carrier = 1) #define netfront_carrier_off(netif) ((netif)->carrier = 0) #define netfront_carrier_ok(netif) ((netif)->carrier) @@ -315,6 +327,7 @@ #define DPRINTK(fmt, args...) \ printf("[XEN] " fmt, ##args) + static __inline struct mbuf* makembuf (struct mbuf *buf) { @@ -331,11 +344,8 @@ m->m_pkthdr.len = buf->m_pkthdr.len; m->m_len = buf->m_len; m_copydata(buf, 0, buf->m_pkthdr.len, mtod(m,caddr_t) ); - /* - * XXX this will break on > 4GB - * - */ - m->m_ext.ext_args = (caddr_t *)(uintptr_t)vtophys(mtod(m,caddr_t)); + + m->m_ext.ext_args = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT); return m; } @@ -737,7 +747,8 @@ if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) break; - m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)vtophys(m_new->m_ext.ext_buf); + m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)(vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); + id = xennet_rxidx(req_prod + i); PANIC_IF(sc->xn_cdata.xn_rx_chain[id] != NULL); @@ -755,13 +766,13 @@ gnttab_grant_foreign_transfer_ref(ref, sc->xbdev->otherend_id, pfn); - rx_pfn_array[nr_flips] = PFNTOMFN(pfn); + sc->rx_pfn_array[nr_flips] = PFNTOMFN(pfn); if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Remove this page before passing * back to Xen. */ set_phys_to_machine(pfn, INVALID_P2M_ENTRY); - MULTI_update_va_mapping(&rx_mcl[i], + MULTI_update_va_mapping(&sc->rx_mcl[i], vaddr, 0, 0); } nr_flips++; @@ -774,7 +785,7 @@ req->id = id; req->gref = ref; - rx_pfn_array[i] = vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; + sc->rx_pfn_array[i] = vtomach(mtod(m_new,vm_offset_t)) >> PAGE_SHIFT; } KASSERT(i, ("no mbufs processed")); /* should have returned earlier */ @@ -789,7 +800,7 @@ /* Tell the ballon driver what is going on. */ balloon_update_driver_allowance(i); #endif - set_xen_guest_handle(reservation.extent_start, rx_pfn_array); + set_xen_guest_handle(reservation.extent_start, sc->rx_pfn_array); reservation.nr_extents = i; reservation.extent_order = 0; reservation.address_bits = 0; @@ -798,18 +809,18 @@ if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* After all PTEs have been zapped, flush the TLB. */ - rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = + sc->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] = UVMF_TLB_FLUSH|UVMF_ALL; /* Give away a batch of pages. */ - rx_mcl[i].op = __HYPERVISOR_memory_op; - rx_mcl[i].args[0] = XENMEM_decrease_reservation; - rx_mcl[i].args[1] = (unsigned long)&reservation; + sc->rx_mcl[i].op = __HYPERVISOR_memory_op; + sc->rx_mcl[i].args[0] = XENMEM_decrease_reservation; + sc->rx_mcl[i].args[1] = (unsigned long)&reservation; /* Zap PTEs and give away pages in one big multicall. */ - (void)HYPERVISOR_multicall(rx_mcl, i+1); + (void)HYPERVISOR_multicall(sc->rx_mcl, i+1); /* Check return status of HYPERVISOR_dom_mem_op(). */ - if (unlikely(rx_mcl[i].result != i)) + if (unlikely(sc->rx_mcl[i].result != i)) panic("Unable to reduce memory reservation\n"); } else { @@ -832,144 +843,119 @@ static void xn_rxeof(struct netfront_info *np) { - struct ifnet *ifp; - netif_rx_response_t *rx; - RING_IDX i, rp; - mmu_update_t *mmu = rx_mmu; - multicall_entry_t *mcl = rx_mcl; - struct mbuf *tail_mbuf = NULL, *head_mbuf = NULL, *m, *next; - unsigned long mfn; - grant_ref_t ref; + struct ifnet *ifp; + struct netfront_rx_info rinfo; + struct netif_rx_response *rx = &rinfo.rx; + struct netif_extra_info *extras = rinfo.extras; + RING_IDX i, rp; + multicall_entry_t *mcl; + struct mbuf *m; + struct mbuf_head rxq, errq, tmpq; + int err, pages_flipped = 0; + + XN_RX_LOCK_ASSERT(np); + if (!netfront_carrier_ok(np)) + return; - XN_RX_LOCK_ASSERT(np); - if (!netfront_carrier_ok(np)) - return; + mbufq_init(&tmpq); + mbufq_init(&errq); + mbufq_init(&rxq); + + ifp = np->xn_ifp; - ifp = np->xn_ifp; - - rp = np->rx.sring->rsp_prod; - rmb(); /* Ensure we see queued responses up to 'rp'. */ - - for (i = np->rx.rsp_cons; i != rp; i++) { - - rx = RING_GET_RESPONSE(&np->rx, i); - KASSERT(rx->id != 0, ("xn_rxeof: found free receive index of 0\n")); - /* - * This definitely indicates a bug, either in this driver or - * in the backend driver. In future this should flag the bad - * situation to the system controller to reboot the backed. - */ - if ((ref = np->grant_rx_ref[rx->id]) == GRANT_INVALID_REF) { - WPRINTK("Bad rx response id %d.\n", rx->id); - continue; - } + rp = np->rx.sring->rsp_prod; + rmb(); /* Ensure we see queued responses up to 'rp'. */ + + i = np->rx.rsp_cons; + while ((i != rp)) { + memcpy(rx, RING_GET_RESPONSE(&np->rx, i), sizeof(*rx)); + memset(extras, 0, sizeof(rinfo.extras)); + + err = xennet_get_responses(np, &rinfo, rp, &tmpq, + &pages_flipped); + + if (unlikely(err)) { + while ((m = mbufq_dequeue(&tmpq))) + mbufq_tail(&errq, m); + np->stats.rx_errors++; + i = np->rx.rsp_cons; + continue; + } - - /* Memory pressure, insufficient buffer headroom, ... */ - if ((mfn = gnttab_end_foreign_transfer_ref(ref)) == 0) { -#if 0 - if (net_ratelimit()) - WPRINTK("Unfulfilled rx req (id=%d, st=%d).\n", - rx->id, rx->status); -#endif - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = - rx->id; - RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = - ref; - np->rx.req_prod_pvt++; - RING_PUSH_REQUESTS(&np->rx); - continue; - } + m = mbufq_dequeue(&tmpq); - gnttab_release_grant_reference(&np->gref_rx_head, ref); - np->grant_rx_ref[rx->id] = GRANT_INVALID_REF; + m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ + m->m_pkthdr.len = m->m_len = rx->status; + m->m_pkthdr.rcvif = ifp; - m = (struct mbuf *)np->xn_cdata.xn_rx_chain[rx->id]; - if (m->m_next) - panic("mbuf is already part of a valid mbuf chain"); - add_id_to_freelist(np->xn_cdata.xn_rx_chain, rx->id); - - m->m_data += rx->offset;/* (rx->addr & PAGE_MASK); */ - m->m_pkthdr.len = m->m_len = rx->status; - m->m_pkthdr.rcvif = ifp; - - if ( rx->flags & NETRXF_data_validated ) { - /* Tell the stack the checksums are okay */ - m->m_pkthdr.csum_flags |= - (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR); - m->m_pkthdr.csum_data = 0xffff; - } + if ( rx->flags & NETRXF_data_validated ) { + /* Tell the stack the checksums are okay */ + /* + * XXX this isn't necessarily the case - need to add check + * + */ + + m->m_pkthdr.csum_flags |= + (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_data = 0xffff; + } - np->stats.rx_packets++; - np->stats.rx_bytes += rx->status; - - - /* Remap the page. */ - mmu->ptr = ((vm_offset_t)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; - mmu->val = (unsigned long)m->m_ext.ext_args >> PAGE_SHIFT; - mmu++; - /* XXX validate me */ - mcl->op = __HYPERVISOR_update_va_mapping; - mcl->args[0] = (unsigned long)m->m_data; - mcl->args[1] = (mfn << PAGE_SHIFT) | PG_V | PG_RW | PG_M | PG_A; - mcl->args[2] = 0; - mcl->args[3] = 0; - mcl++; + np->stats.rx_packets++; + np->stats.rx_bytes += rx->status; - xen_phys_machine[((unsigned long)m->m_ext.ext_args >> PAGE_SHIFT)] = - mfn; + mbufq_tail(&rxq, m); + np->rx.rsp_cons = ++i; + } - if (unlikely(!head_mbuf)) - head_mbuf = m; - - if (tail_mbuf) - tail_mbuf->m_next = m; - tail_mbuf = m; - - np->xn_cdata.xn_rx_chain[rx->id] = NULL; - } + if (pages_flipped) { + /* Some pages are no longer absent... */ +#ifdef notyet + balloon_update_driver_allowance(-pages_flipped); +#endif + /* Do all the remapping work, and M->P updates, in one big hypercall. */ + if (!!xen_feature(XENFEAT_auto_translated_physmap)) { + mcl = np->rx_mcl + pages_flipped; + mcl->op = __HYPERVISOR_mmu_update; + mcl->args[0] = (unsigned long)np->rx_mmu; + mcl->args[1] = pages_flipped; + mcl->args[2] = 0; + mcl->args[3] = DOMID_SELF; + (void)HYPERVISOR_multicall(np->rx_mcl, pages_flipped + 1); + } + } - /* Do all the remapping work, and M->P updates, in one big hypercall. */ - if (likely((mcl - rx_mcl) != 0)) { - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)rx_mmu; - mcl->args[1] = mmu - rx_mmu; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; - mcl++; - (void)HYPERVISOR_multicall(rx_mcl, mcl - rx_mcl); - } + while ((m = mbufq_dequeue(&errq))) + m_freem(m); + + + /* + * Process all the mbufs after the remapping is complete. + * Break the mbuf chain first though. + */ + while ((m = mbufq_dequeue(&rxq)) != NULL) { + ifp->if_ipackets++; + + /* + * Do we really need to drop the rx lock? + */ + XN_RX_UNLOCK(np); + /* Pass it up. */ + (*ifp->if_input)(ifp, m); + XN_RX_LOCK(np); + } + np->rx.rsp_cons = i; - /* - * Process all the mbufs after the remapping is complete. - * Break the mbuf chain first though. - */ - for (m = head_mbuf; m; m = next) { - next = m->m_next; - m->m_next = NULL; - - ifp->if_ipackets++; - - XN_RX_UNLOCK(np); - - /* Pass it up. */ - (*ifp->if_input)(ifp, m); - XN_RX_LOCK(np); - } + /* If we get a callback with very few responses, reduce fill target. */ + /* NB. Note exponential increase, linear decrease. */ + if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > + ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) + np->rx_target = np->rx_min_target; - np->rx.rsp_cons = i; - - /* If we get a callback with very few responses, reduce fill target. */ - /* NB. Note exponential increase, linear decrease. */ - if (((np->rx.req_prod_pvt - np->rx.sring->rsp_prod) > - ((3*np->rx_target) / 4)) && (--np->rx_target < np->rx_min_target)) - np->rx_target = np->rx_min_target; - - network_alloc_rx_buffers(np); + network_alloc_rx_buffers(np); - np->rx.sring->rsp_event = i + 1; + np->rx.sring->rsp_event = i + 1; } @@ -1054,23 +1040,212 @@ struct ifnet *ifp = np->xn_ifp; - while (np->rx.rsp_cons != np->rx.sring->rsp_prod && + if (!(np->rx.rsp_cons != np->rx.sring->rsp_prod && likely(netfront_carrier_ok(np)) && - ifp->if_drv_flags & IFF_DRV_RUNNING) { - - XN_RX_LOCK(np); - xn_rxeof(np); - XN_RX_UNLOCK(np); - if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { + ifp->if_drv_flags & IFF_DRV_RUNNING)) + return; + if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { XN_TX_LOCK(np); xn_txeof(np); XN_TX_UNLOCK(np); + } + + XN_RX_LOCK(np); + xn_rxeof(np); + XN_RX_UNLOCK(np); + + if (ifp->if_drv_flags & IFF_DRV_RUNNING && + !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + xn_start(ifp); +} + + +static void +xennet_move_rx_slot(struct netfront_info *np, struct mbuf *m, + grant_ref_t ref) +{ + int new = xennet_rxidx(np->rx.req_prod_pvt); + + PANIC_IF(np->rx_mbufs[new] != NULL); + np->rx_mbufs[new] = m; + np->grant_rx_ref[new] = ref; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->id = new; + RING_GET_REQUEST(&np->rx, np->rx.req_prod_pvt)->gref = ref; + np->rx.req_prod_pvt++; +} + +static int +xennet_get_extras(struct netfront_info *np, + struct netif_extra_info *extras, RING_IDX rp) + +{ + struct netif_extra_info *extra; + RING_IDX cons = np->rx.rsp_cons; + + int err = 0; + + do { + struct mbuf *m; + grant_ref_t ref; + + if (unlikely(cons + 1 == rp)) { +#if 0 + if (net_ratelimit()) + WPRINTK("Missing extra info\n"); +#endif + err = -EINVAL; + break; + } + + extra = (struct netif_extra_info *) + RING_GET_RESPONSE(&np->rx, ++cons); + + if (unlikely(!extra->type || + extra->type >= XEN_NETIF_EXTRA_TYPE_MAX)) { +#if 0 + if (net_ratelimit()) + WPRINTK("Invalid extra type: %d\n", + extra->type); +#endif + err = -EINVAL; + } else { + memcpy(&extras[extra->type - 1], extra, + sizeof(*extra)); + } + + m = xennet_get_rx_mbuf(np, cons); + ref = xennet_get_rx_ref(np, cons); + xennet_move_rx_slot(np, m, ref); + } while (extra->flags & XEN_NETIF_EXTRA_FLAG_MORE); + + np->rx.rsp_cons = cons; + return err; +} + +static int +xennet_get_responses(struct netfront_info *np, + struct netfront_rx_info *rinfo, RING_IDX rp, + struct mbuf_head *list, + int *pages_flipped_p) +{ + int pages_flipped = *pages_flipped_p; + struct mmu_update *mmu; + struct multicall_entry *mcl; + struct netif_rx_response *rx = &rinfo->rx; + struct netif_extra_info *extras = rinfo->extras; + RING_IDX cons = np->rx.rsp_cons; + struct mbuf *m = xennet_get_rx_mbuf(np, cons); + grant_ref_t ref = xennet_get_rx_ref(np, cons); + int max = 24 /* MAX_SKB_FRAGS + (rx->status <= RX_COPY_THRESHOLD) */; + int frags = 1; + int err = 0; + unsigned long ret; + + if (rx->flags & NETRXF_extra_info) { + err = xennet_get_extras(np, extras, rp); + cons = np->rx.rsp_cons; } - if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - xn_start(ifp); - } - return; + + for (;;) { + unsigned long mfn; + + if (unlikely(rx->status < 0 || + rx->offset + rx->status > PAGE_SIZE)) { +#if 0 + if (net_ratelimit()) + WPRINTK("rx->offset: %x, size: %u\n", + rx->offset, rx->status); +#endif + xennet_move_rx_slot(np, m, ref); + err = -EINVAL; + goto next; + } + + /* + * This definitely indicates a bug, either in this driver or in + * the backend driver. In future this should flag the bad + * situation to the system controller to reboot the backed. + */ + if (ref == GRANT_INVALID_REF) { +#if 0 + if (net_ratelimit()) + WPRINTK("Bad rx response id %d.\n", rx->id); +#endif + err = -EINVAL; + goto next; + } + + if (!np->copying_receiver) { + /* Memory pressure, insufficient buffer + * headroom, ... + */ + if (!(mfn = gnttab_end_foreign_transfer_ref(ref))) { + if (net_ratelimit()) + WPRINTK("Unfulfilled rx req " + "(id=%d, st=%d).\n", + rx->id, rx->status); + xennet_move_rx_slot(np, m, ref); + err = -ENOMEM; + goto next; + } + + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + /* Remap the page. */ + void *vaddr = mtod(m, void *); + uint32_t pfn; + + mcl = np->rx_mcl + pages_flipped; + mmu = np->rx_mmu + pages_flipped; + + MULTI_update_va_mapping(mcl, + (unsigned long)vaddr, + (mfn << PAGE_SHIFT) | PG_RW | PG_V | PG_M | PG_A, + 0); + pfn = (uint32_t)m->m_ext.ext_args; + mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) + | MMU_MACHPHYS_UPDATE; + mmu->val = pfn; + + set_phys_to_machine(pfn, mfn); + } + pages_flipped++; + } else { + ret = gnttab_end_foreign_access_ref(ref, 0); + PANIC_IF(!ret); + } + + gnttab_release_grant_reference(&np->gref_rx_head, ref); + mbufq_tail(list, m); + + next: + if (!(rx->flags & NETRXF_more_data)) + break; + + if (cons + frags == rp) { + if (net_ratelimit()) + WPRINTK("Need more frags\n"); + err = -ENOENT; + break; + } + + rx = RING_GET_RESPONSE(&np->rx, cons + frags); + m = xennet_get_rx_mbuf(np, cons + frags); + ref = xennet_get_rx_ref(np, cons + frags); + frags++; + } + + if (unlikely(frags > max)) { + if (net_ratelimit()) + WPRINTK("Too many frags\n"); + err = -E2BIG; + } + + if (unlikely(err)) + np->rx.rsp_cons = cons + frags; + + *pages_flipped_p = pages_flipped; + + return err; } static void @@ -1164,9 +1339,7 @@ if (notify) notify_remote_via_irq(sc->irq); - XN_TX_LOCK(sc); xn_txeof(sc); - XN_TX_UNLOCK(sc); if (RING_FULL(&sc->tx)) { sc->tx_full = 1; @@ -1190,8 +1363,6 @@ XN_TX_UNLOCK(sc); } - - /* equivalent of network_open() in Linux */ static void xn_ifinit_locked(struct netfront_info *sc) From owner-p4-projects@FreeBSD.ORG Sun Jan 6 02:08:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ABE816A41A; Sun, 6 Jan 2008 02:08:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD9CE16A417 for ; Sun, 6 Jan 2008 02:08:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BB0F13C45A for ; Sun, 6 Jan 2008 02:08:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0628AsF082347 for ; Sun, 6 Jan 2008 02:08:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0628Aof082344 for perforce@freebsd.org; Sun, 6 Jan 2008 02:08:10 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 6 Jan 2008 02:08:10 GMT Message-Id: <200801060208.m0628Aof082344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 02:08:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=132605 Change 132605 by kmacy@pandemonium:kmacy:xen31 on 2008/01/06 02:07:27 missed add Affected files ... .. //depot/projects/xen31/sys/xen/features.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 6 02:08:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E3EE16A420; Sun, 6 Jan 2008 02:08:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D55D216A418 for ; Sun, 6 Jan 2008 02:08:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B375513C45D for ; Sun, 6 Jan 2008 02:08:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0628AJ5082353 for ; Sun, 6 Jan 2008 02:08:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0628Ag9082350 for perforce@freebsd.org; Sun, 6 Jan 2008 02:08:10 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 6 Jan 2008 02:08:10 GMT Message-Id: <200801060208.m0628Ag9082350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 02:08:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=132606 Change 132606 by kmacy@pandemonium:kmacy:xen31 on 2008/01/06 02:07:41 missed add Affected files ... .. //depot/projects/xen31/sys/xen/xenbus/xenbus_probe_backend.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 6 02:10:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DE116A469; Sun, 6 Jan 2008 02:10:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EA0B16A421 for ; Sun, 6 Jan 2008 02:10:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 032E213C448 for ; Sun, 6 Jan 2008 02:10:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m062ARCS082647 for ; Sun, 6 Jan 2008 02:10:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m062ADC6082513 for perforce@freebsd.org; Sun, 6 Jan 2008 02:10:13 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 6 Jan 2008 02:10:13 GMT Message-Id: <200801060210.m062ADC6082513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 02:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132607 Change 132607 by kmacy@pandemonium:kmacy:xen31 on 2008/01/06 02:10:10 IFC 132601 Affected files ... .. //depot/projects/xen31/COPYRIGHT#2 integrate .. //depot/projects/xen31/bin/cp/cp.c#2 integrate .. //depot/projects/xen31/bin/mv/mv.c#3 integrate .. //depot/projects/xen31/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/xen31/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/xen31/contrib/ncurses/NEWS#2 integrate .. //depot/projects/xen31/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/xen31/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/xen31/contrib/ncurses/config.guess#2 integrate .. //depot/projects/xen31/contrib/ncurses/config.sub#2 integrate .. //depot/projects/xen31/contrib/ncurses/configure#2 integrate .. //depot/projects/xen31/contrib/ncurses/configure.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/xen31/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/xen31/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/xen31/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/headers#2 integrate .. //depot/projects/xen31/contrib/ncurses/form/modules#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/headers#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/install-sh#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/xen31/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/xen31/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/xen31/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/xen31/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/xen31/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/xen31/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/xen31/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/xen31/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/xen31/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/xen31/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/xen31/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/xen31/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/xen31/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/xen31/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/README#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/modules#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/xen31/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/xen31/contrib/openpam/CREDITS#2 integrate .. //depot/projects/xen31/contrib/openpam/HISTORY#2 integrate .. //depot/projects/xen31/contrib/openpam/INSTALL#2 integrate .. //depot/projects/xen31/contrib/openpam/LICENSE#2 integrate .. //depot/projects/xen31/contrib/openpam/MANIFEST#2 delete .. //depot/projects/xen31/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/README#2 integrate .. //depot/projects/xen31/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/xen31/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/xen31/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/xen31/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/xen31/contrib/openpam/compile#1 branch .. //depot/projects/xen31/contrib/openpam/config.h.in#2 integrate .. //depot/projects/xen31/contrib/openpam/configure#2 integrate .. //depot/projects/xen31/contrib/openpam/configure.ac#2 integrate .. //depot/projects/xen31/contrib/openpam/configure.in#2 delete .. //depot/projects/xen31/contrib/openpam/depcomp#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/xen31/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/xen31/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/xen31/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/xen31/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/xen31/contrib/openpam/install-sh#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/xen31/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/xen31/contrib/openpam/ltconfig#2 delete .. //depot/projects/xen31/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/xen31/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/xen31/contrib/openpam/missing#2 integrate .. //depot/projects/xen31/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/xen31/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/xen31/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/xen31/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/xen31/etc/defaults/periodic.conf#3 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/xen31/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/xen31/lib/libarchive/Makefile#2 integrate .. //depot/projects/xen31/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/xen31/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/xen31/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/xen31/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/cpio.5#1 branch .. //depot/projects/xen31/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/xen31/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/xen31/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/xen31/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/xen31/lib/libarchive/test/README#2 integrate .. //depot/projects/xen31/lib/libarchive/test/main.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test.h#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/xen31/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/xen31/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/xen31/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/xen31/lib/libfetch/Makefile#3 integrate .. //depot/projects/xen31/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/xen31/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/xen31/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/xen31/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/xen31/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/xen31/lib/libthr/pthread.map#4 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/xen31/lib/libutil/pty.c#3 integrate .. //depot/projects/xen31/lib/msun/src/math.h#3 integrate .. //depot/projects/xen31/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/xen31/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/xen31/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/xen31/sbin/Makefile#2 integrate .. //depot/projects/xen31/sbin/ddb/Makefile#1 branch .. //depot/projects/xen31/sbin/ddb/ddb.8#1 branch .. //depot/projects/xen31/sbin/ddb/ddb.c#1 branch .. //depot/projects/xen31/sbin/ddb/ddb.h#1 branch .. //depot/projects/xen31/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/xen31/sbin/devd/devd.hh#2 integrate .. //depot/projects/xen31/sbin/savecore/savecore.8#2 integrate .. //depot/projects/xen31/sbin/savecore/savecore.c#2 integrate .. //depot/projects/xen31/share/colldef/Makefile#2 integrate .. //depot/projects/xen31/share/colldef/README#2 integrate .. //depot/projects/xen31/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/xen31/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/xen31/share/man/man3/tree.3#2 integrate .. //depot/projects/xen31/share/man/man4/Makefile#5 integrate .. //depot/projects/xen31/share/man/man4/bge.4#2 integrate .. //depot/projects/xen31/share/man/man4/ddb.4#2 integrate .. //depot/projects/xen31/share/man/man4/ed.4#2 integrate .. //depot/projects/xen31/share/man/man4/edsc.4#2 integrate .. //depot/projects/xen31/share/man/man4/ipmi.4#2 integrate .. //depot/projects/xen31/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/xen31/share/man/man4/mxge.4#2 integrate .. //depot/projects/xen31/share/man/man4/ng_car.4#3 integrate .. //depot/projects/xen31/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/xen31/share/man/man4/pci.4#2 integrate .. //depot/projects/xen31/share/man/man4/pcib.4#1 branch .. //depot/projects/xen31/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/xen31/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/xen31/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/xen31/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/xen31/share/man/man4/syncache.4#2 integrate .. //depot/projects/xen31/share/man/man4/textdump.4#1 branch .. //depot/projects/xen31/share/man/man5/boot.config.5#2 integrate .. //depot/projects/xen31/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/xen31/share/man/man7/ports.7#2 integrate .. //depot/projects/xen31/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/xen31/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/xen31/share/man/man9/lock.9#2 integrate .. //depot/projects/xen31/share/man/man9/sf_buf.9#2 integrate .. //depot/projects/xen31/share/man/man9/style.9#2 integrate .. //depot/projects/xen31/share/misc/bsd-family-tree#3 integrate .. //depot/projects/xen31/share/misc/committers-src.dot#3 integrate .. //depot/projects/xen31/share/mklocale/Makefile#2 integrate .. //depot/projects/xen31/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/xen31/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/xen31/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/xen31/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/xen31/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/xen31/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/xen31/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/xen31/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/xen31/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/xen31/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/xen31/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/xen31/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/xen31/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/xen31/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/xen31/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/xen31/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/xen31/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/xen31/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/xen31/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/xen31/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/xen31/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/xen31/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/xen31/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/xen31/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/xen31/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/xen31/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/xen31/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/xen31/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/xen31/share/zoneinfo/backward#2 integrate .. //depot/projects/xen31/share/zoneinfo/europe#2 integrate .. //depot/projects/xen31/share/zoneinfo/southamerica#3 integrate .. //depot/projects/xen31/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/xen31/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/xen31/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/xen31/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/xen31/sys/arm/at91/at91.c#3 integrate .. //depot/projects/xen31/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/xen31/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/xen31/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/xen31/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/xen31/sys/boot/forth/support.4th#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/xen31/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/xen31/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/xen31/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/xen31/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/xen31/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/xen31/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#8 integrate .. //depot/projects/xen31/sys/conf/files#14 integrate .. //depot/projects/xen31/sys/conf/files.i386#12 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#5 integrate .. //depot/projects/xen31/sys/conf/options#6 integrate .. //depot/projects/xen31/sys/ddb/db_capture.c#1 branch .. //depot/projects/xen31/sys/ddb/db_command.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_command.h#2 integrate .. //depot/projects/xen31/sys/ddb/db_input.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_lex.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_lex.h#2 integrate .. //depot/projects/xen31/sys/ddb/db_main.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_output.c#2 integrate .. //depot/projects/xen31/sys/ddb/db_script.c#1 branch .. //depot/projects/xen31/sys/ddb/db_textdump.c#1 branch .. //depot/projects/xen31/sys/ddb/ddb.h#2 integrate .. //depot/projects/xen31/sys/dev/aac/aac.c#5 integrate .. //depot/projects/xen31/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/xen31/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/xen31/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/xen31/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/xen31/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/xen31/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/xen31/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/xen31/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/creator.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/fb.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/xen31/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/xen31/sys/dev/fb/vga.c#2 integrate .. //depot/projects/xen31/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/xen31/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/xen31/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/xen31/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/xen31/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/xen31/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/xen31/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/xen31/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/xen31/sys/dev/le/am7990.c#2 integrate .. //depot/projects/xen31/sys/dev/le/am79900.c#2 integrate .. //depot/projects/xen31/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/xen31/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/xen31/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/xen31/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/xen31/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/xen31/sys/dev/re/if_re.c#6 integrate .. //depot/projects/xen31/sys/dev/sio/sio.c#3 integrate .. //depot/projects/xen31/sys/dev/snp/snp.c#3 integrate .. //depot/projects/xen31/sys/dev/streams/streams.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/xen31/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/xen31/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/ums.c#2 integrate .. //depot/projects/xen31/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/xen31/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/xen31/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/xen31/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/xen31/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/xen31/sys/i386/conf/NOTES#5 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#10 edit .. //depot/projects/xen31/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/xen31/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/xen31/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/xen31/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/xen31/sys/i386/xen/pmap.c#12 edit .. //depot/projects/xen31/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/xen31/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/xen31/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/isa/vga_isa.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/xen31/sys/kern/init_main.c#7 integrate .. //depot/projects/xen31/sys/kern/kern_clock.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_event.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_exec.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_lock.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_mib.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_proc.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_tc.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#6 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_bus.c#3 integrate .. //depot/projects/xen31/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/xen31/sys/kern/subr_lock.c#4 integrate .. //depot/projects/xen31/sys/kern/subr_smp.c#3 integrate .. //depot/projects/xen31/sys/kern/subr_witness.c#3 integrate .. //depot/projects/xen31/sys/kern/sys_generic.c#4 integrate .. //depot/projects/xen31/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/xen31/sys/kern/tty_cons.c#2 integrate .. //depot/projects/xen31/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/xen31/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/xen31/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/xen31/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/xen31/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/xen31/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/xen31/sys/net/bpf.c#3 integrate .. //depot/projects/xen31/sys/net/bpf.h#2 integrate .. //depot/projects/xen31/sys/net/bpf_filter.c#2 integrate .. //depot/projects/xen31/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/xen31/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/xen31/sys/net/if_enc.c#3 integrate .. //depot/projects/xen31/sys/net/if_lagg.c#6 integrate .. //depot/projects/xen31/sys/net/netisr.h#2 integrate .. //depot/projects/xen31/sys/net/route.c#5 integrate .. //depot/projects/xen31/sys/net/route.h#3 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/xen31/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/xen31/sys/netinet/if_ether.c#5 integrate .. //depot/projects/xen31/sys/netinet/if_ether.h#3 integrate .. //depot/projects/xen31/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/xen31/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/xen31/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/xen31/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/xen31/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/xen31/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/xen31/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/xen31/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/xen31/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/xen31/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/xen31/sys/powerpc/include/_bus.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/bus_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/xen31/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/xen31/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/xen31/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/xen31/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/xen31/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/xen31/sys/sys/copyright.h#2 integrate .. //depot/projects/xen31/sys/sys/file.h#2 integrate .. //depot/projects/xen31/sys/sys/kdb.h#2 integrate .. //depot/projects/xen31/sys/sys/kernel.h#3 integrate .. //depot/projects/xen31/sys/sys/kerneldump.h#3 integrate .. //depot/projects/xen31/sys/sys/lockmgr.h#3 integrate .. //depot/projects/xen31/sys/sys/mbuf.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#10 integrate .. //depot/projects/xen31/sys/sys/priv.h#2 integrate .. //depot/projects/xen31/sys/sys/sysctl.h#3 integrate .. //depot/projects/xen31/sys/sys/tree.h#2 integrate .. //depot/projects/xen31/sys/sys/unpcb.h#2 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/xen31/sys/vm/pmap.h#4 integrate .. //depot/projects/xen31/sys/vm/vm.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_fault.c#2 integrate .. //depot/projects/xen31/sys/vm/vm_kern.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_map.c#4 integrate .. //depot/projects/xen31/sys/vm/vm_object.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_object.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_page.c#7 integrate .. //depot/projects/xen31/sys/vm/vm_phys.c#2 integrate .. //depot/projects/xen31/sys/vm/vm_phys.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_reserv.c#1 branch .. //depot/projects/xen31/sys/vm/vm_reserv.h#1 branch .. //depot/projects/xen31/tools/regression/bin/mv/regress.sh#3 integrate .. //depot/projects/xen31/tools/regression/sockets/unix_gc/Makefile#1 branch .. //depot/projects/xen31/tools/regression/sockets/unix_gc/unix_gc.c#1 branch .. //depot/projects/xen31/tools/tools/ministat/Makefile#2 delete .. //depot/projects/xen31/tools/tools/ministat/README#2 delete .. //depot/projects/xen31/tools/tools/ministat/chameleon#2 delete .. //depot/projects/xen31/tools/tools/ministat/iguana#2 delete .. //depot/projects/xen31/tools/tools/ministat/ministat.c#2 delete .. //depot/projects/xen31/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/xen31/usr.bin/Makefile#3 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/xen31/usr.bin/calendar/io.c#3 integrate .. //depot/projects/xen31/usr.bin/colldef/parse.y#2 integrate .. //depot/projects/xen31/usr.bin/colldef/scan.l#2 integrate .. //depot/projects/xen31/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/xen31/usr.bin/ipcrm/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/xen31/usr.bin/ipcrm/ipcrm.c#3 integrate .. //depot/projects/xen31/usr.bin/ipcs/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/ipcs/ipc.c#1 branch .. //depot/projects/xen31/usr.bin/ipcs/ipc.h#1 branch .. //depot/projects/xen31/usr.bin/ipcs/ipcs.c#3 integrate .. //depot/projects/xen31/usr.bin/ministat/Makefile#1 branch .. //depot/projects/xen31/usr.bin/ministat/README#1 branch .. //depot/projects/xen31/usr.bin/ministat/chameleon#1 branch .. //depot/projects/xen31/usr.bin/ministat/iguana#1 branch .. //depot/projects/xen31/usr.bin/ministat/ministat.1#1 branch .. //depot/projects/xen31/usr.bin/ministat/ministat.c#1 branch .. //depot/projects/xen31/usr.bin/netstat/atalk.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/bpf.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/if.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/xen31/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/ipx.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/main.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/mbuf.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/netgraph.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/xen31/usr.bin/netstat/pfkey.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/route.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/xen31/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/xen31/usr.bin/tar/COPYING#2 integrate .. //depot/projects/xen31/usr.bin/tar/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/xen31/usr.bin/tar/config_freebsd.h#2 integrate .. //depot/projects/xen31/usr.bin/tar/read.c#2 integrate .. //depot/projects/xen31/usr.bin/tar/test/config.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-acl.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-basic.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-deep-dir.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-flags.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-nodump.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-overwrite.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/test/test-utf8.sh#2 delete .. //depot/projects/xen31/usr.bin/tar/util.c#2 integrate .. //depot/projects/xen31/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/xen31/usr.bin/usbhidctl/usbhid.c#2 integrate .. //depot/projects/xen31/usr.sbin/config/config.y#2 integrate .. //depot/projects/xen31/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/xen31/usr.sbin/mtree/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/mtree/mtree.5#1 branch .. //depot/projects/xen31/usr.sbin/pkg_install/version/pkg_version.1#3 integrate .. //depot/projects/xen31/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/auth.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/sysinstall.h#2 integrate .. //depot/projects/xen31/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate Differences ... ==== //depot/projects/xen31/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.8 2006/12/31 16:34:16 delphij Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.9 2007/12/31 22:09:19 delphij Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2007 The FreeBSD Project. All rights reserved. +Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/xen31/bin/cp/cp.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); /* * Cp copies source files to target files. @@ -210,10 +210,9 @@ /* * Case (1). Target is not a directory. */ - if (argc > 1) { - usage(); - exit(1); - } + if (argc > 1) + errx(1, "%s is not a directory", to.p_path); + /* * Need to detect the case: * cp -R dir foo ==== //depot/projects/xen31/bin/mv/mv.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.49 2007/12/17 09:02:42 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.50 2007/12/27 11:33:42 dds Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +/* Exit code for a failed exec. */ +#define EXEC_FAILED 127 + int fflg, iflg, nflg, vflg; int copy(char *, char *); @@ -198,6 +201,11 @@ } } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 6 02:34:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F96716A419; Sun, 6 Jan 2008 02:34:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1483E16A417 for ; Sun, 6 Jan 2008 02:34:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0932513C45B for ; Sun, 6 Jan 2008 02:34:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m062YsqL093865 for ; Sun, 6 Jan 2008 02:34:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m062Yrfh093862 for perforce@freebsd.org; Sun, 6 Jan 2008 02:34:53 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 6 Jan 2008 02:34:53 GMT Message-Id: <200801060234.m062Yrfh093862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 02:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132608 Change 132608 by kmacy@pandemonium:kmacy:xen31 on 2008/01/06 02:34:00 Move files in sys/i386/include/xen/xen-public to sys/xen/interface as they are intended to be shared across architectures. Remove hypervisor-ifs.h Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#8 edit .. //depot/projects/xen31/sys/dev/xen/blkfront/block.h#4 edit .. //depot/projects/xen31/sys/dev/xen/console/console.c#6 edit .. //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#6 edit .. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#5 edit .. //depot/projects/xen31/sys/i386/i386/genassym.c#5 edit .. //depot/projects/xen31/sys/i386/i386/machdep.c#11 edit .. //depot/projects/xen31/sys/i386/include/xen/features.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/hypercall.h#6 edit .. //depot/projects/xen31/sys/i386/include/xen/hypervisor-ifs.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/hypervisor.h#5 edit .. //depot/projects/xen31/sys/i386/include/xen/xen-os.h#5 edit .. //depot/projects/xen31/sys/i386/include/xen/xen-public/COPYING#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm_ops.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-ia64.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-powerpc.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen-x86_32.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen-x86_64.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_32.h#5 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_64.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/callback.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/dom0_ops.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/domctl.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/elfnote.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/elfstructs.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/event_channel.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/features.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/Makefile#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/mkchecker.py#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/mkheader.py#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/reference.size#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/structs.py#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/grant_table.h#5 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/e820.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/hvm_info_table.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/hvm_op.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/ioreq.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/params.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/save.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/vmx_assist.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/blkif.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/console.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/fbif.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/kbdif.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/netif.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/pciif.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/protocols.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/ring.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/tpmif.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xenbus.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xs_wire.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/kexec.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/libelf.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/memory.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/nmi.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/physdev.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/platform.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/sched.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/sysctl.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/trace.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/vcpu.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/version.h#3 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen-compat.h#4 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen.h#6 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xencomm.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xen-public/xenoprof.h#2 delete .. //depot/projects/xen31/sys/i386/include/xen/xenbus.h#3 edit .. //depot/projects/xen31/sys/i386/xen/clock.c#3 edit .. //depot/projects/xen31/sys/i386/xen/locore.s#7 edit .. //depot/projects/xen31/sys/i386/xen/pmap.c#13 edit .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#13 edit .. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#6 edit .. //depot/projects/xen31/sys/xen/gnttab.h#3 edit .. //depot/projects/xen31/sys/xen/interface/COPYING#1 branch .. //depot/projects/xen31/sys/xen/interface/acm.h#1 branch .. //depot/projects/xen31/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/xen31/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/xen31/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/xen31/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/xen31/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/xen31/sys/xen/interface/arch-x86/xen.h#1 add .. //depot/projects/xen31/sys/xen/interface/arch-x86_32.h#1 add .. //depot/projects/xen31/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/xen31/sys/xen/interface/callback.h#1 branch .. //depot/projects/xen31/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/xen31/sys/xen/interface/domctl.h#1 branch .. //depot/projects/xen31/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/xen31/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/xen31/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/xen31/sys/xen/interface/features.h#1 branch .. //depot/projects/xen31/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/xen31/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/xen31/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/xen31/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/xen31/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/xen31/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/xen31/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/blkif.h#1 add .. //depot/projects/xen31/sys/xen/interface/io/console.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/xen31/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/xen31/sys/xen/interface/kexec.h#1 branch .. //depot/projects/xen31/sys/xen/interface/libelf.h#1 branch .. //depot/projects/xen31/sys/xen/interface/memory.h#1 branch .. //depot/projects/xen31/sys/xen/interface/nmi.h#1 branch .. //depot/projects/xen31/sys/xen/interface/physdev.h#1 branch .. //depot/projects/xen31/sys/xen/interface/platform.h#1 branch .. //depot/projects/xen31/sys/xen/interface/sched.h#1 branch .. //depot/projects/xen31/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/xen31/sys/xen/interface/trace.h#1 branch .. //depot/projects/xen31/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/xen31/sys/xen/interface/version.h#1 branch .. //depot/projects/xen31/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/xen31/sys/xen/interface/xen.h#1 add .. //depot/projects/xen31/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/xen31/sys/xen/interface/xenoprof.h#1 branch Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#8 (text+ko) ==== @@ -38,12 +38,11 @@ #include #include -#include #include #include #include #include -#include +#include #include #include ==== //depot/projects/xen31/sys/dev/xen/blkfront/block.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ #ifndef __XEN_DRIVERS_BLOCK_H__ #define __XEN_DRIVERS_BLOCK_H__ -#include +#include struct xlbd_type_info { ==== //depot/projects/xen31/sys/dev/xen/console/console.c#6 (text+ko) ==== @@ -21,7 +21,7 @@ #include #include -#include +#include #include "opt_ddb.h" ==== //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#6 (text+ko) ==== @@ -22,7 +22,7 @@ #include #include -#include +#include #define console_evtchn console.domU.evtchn ==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#5 (text+ko) ==== @@ -58,15 +58,14 @@ #include #include -#include #include #include #include #include -#include +#include #include #include -#include +#include #define GRANT_INVALID_REF 0 ==== //depot/projects/xen31/sys/i386/i386/genassym.c#5 (text+ko) ==== @@ -233,7 +233,7 @@ #endif #ifdef XEN -#include +#include ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); #endif ==== //depot/projects/xen31/sys/i386/i386/machdep.c#11 (text+ko) ==== @@ -144,9 +144,8 @@ #ifdef XEN /* XEN includes */ -#include +#include #include -#include #include #include #include ==== //depot/projects/xen31/sys/i386/include/xen/features.h#2 (text+ko) ==== @@ -9,7 +9,7 @@ #ifndef __ASM_XEN_FEATURES_H__ #define __ASM_XEN_FEATURES_H__ -#include +#include extern void setup_xen_features(void); ==== //depot/projects/xen31/sys/i386/include/xen/hypercall.h#6 (text+ko) ==== @@ -30,8 +30,8 @@ #ifndef __HYPERCALL_H__ #define __HYPERCALL_H__ -#include -#include +#include +#include #define _hypercall0(type, name) \ ({ \ ==== //depot/projects/xen31/sys/i386/include/xen/hypervisor.h#5 (text+ko) ==== @@ -16,11 +16,11 @@ #endif #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #if defined(__amd64__) ==== //depot/projects/xen31/sys/i386/include/xen/xen-os.h#5 (text+ko) ==== @@ -70,7 +70,7 @@ /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__ #include -#include +#include void printk(const char *fmt, ...); ==== //depot/projects/xen31/sys/i386/include/xen/xenbus.h#3 (text+ko) ==== @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include LIST_HEAD(xendev_list_head, xenbus_device); ==== //depot/projects/xen31/sys/i386/xen/clock.c#3 (text+ko) ==== @@ -82,10 +82,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include /* ==== //depot/projects/xen31/sys/i386/xen/locore.s#7 (text+ko) ==== @@ -55,7 +55,7 @@ #include #define __ASSEMBLY__ -#include +#include /* The defines below have been lifted out of */ #define FLAT_RING1_CS 0xe019 /* GDT index 259 */ ==== //depot/projects/xen31/sys/i386/xen/pmap.c#13 (text+ko) ==== @@ -150,7 +150,7 @@ #include #endif -#include +#include #include #include #include ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#13 (text+ko) ==== @@ -56,13 +56,13 @@ -#include +#include #include #include #include #include #include -#include +#include #include #ifdef SMP #include ==== //depot/projects/xen31/sys/xen/evtchn/evtchn.c#6 (text+ko) ==== @@ -22,8 +22,6 @@ #include #include #include -#include - /* linux helper functions that got sucked in ==== //depot/projects/xen31/sys/xen/gnttab.h#3 (text+ko) ==== @@ -36,8 +36,8 @@ #ifndef __ASM_GNTTAB_H__ -#include -#include +#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jan 6 06:55:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD45C16A41B; Sun, 6 Jan 2008 06:55:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2CA216A418 for ; Sun, 6 Jan 2008 06:55:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90C6F13C459 for ; Sun, 6 Jan 2008 06:55:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m066tU9H055427 for ; Sun, 6 Jan 2008 06:55:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m066tUDA055424 for perforce@freebsd.org; Sun, 6 Jan 2008 06:55:30 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 06:55:30 GMT Message-Id: <200801060655.m066tUDA055424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 06:55:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132611 Change 132611 by jb@jb_freebsd1 on 2008/01/06 06:55:13 Add the Function Boundary Trace provider to the list of modules we load by default with "DTrace" Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 (text+ko) ==== @@ -64,5 +64,8 @@ MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1); MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1); MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1); +#if defined(__amd64__) || defined(__i386__) +MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); +#endif MODULE_DEPEND(dtraceall, systrace, 1, 1, 1); MODULE_DEPEND(dtraceall, profile, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Sun Jan 6 06:56:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FDF716A420; Sun, 6 Jan 2008 06:56:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E966416A417 for ; Sun, 6 Jan 2008 06:56:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D725B13C43E for ; Sun, 6 Jan 2008 06:56:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m066uVnx055493 for ; Sun, 6 Jan 2008 06:56:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m066uVsu055490 for perforce@freebsd.org; Sun, 6 Jan 2008 06:56:31 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 06:56:31 GMT Message-Id: <200801060656.m066uVsu055490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 06:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=132612 Change 132612 by jb@jb_freebsd1 on 2008/01/06 06:56:14 Add functions back again after they got walloped ages ago during an integration from a tree with different parentage. Affected files ... .. //depot/projects/dtrace/src/sys/kern/link_elf.c#13 edit .. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/link_elf.c#13 (text+ko) ==== @@ -121,6 +121,9 @@ static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); +static int link_elf_each_function_nameval(linker_file_t, + int (*)(linker_file_t, linker_symval_t*, void *), + void *); static void link_elf_reloc_local(linker_file_t); static Elf_Addr elf_lookup(linker_file_t lf, Elf_Size symidx, int deps); @@ -134,6 +137,7 @@ KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), + KOBJMETHOD(linker_each_function_nameval, link_elf_each_function_nameval), { 0, 0 } }; @@ -1222,6 +1226,30 @@ return (0); } +static int +link_elf_each_function_nameval(linker_file_t file, + int (*callback)(linker_file_t, linker_symval_t *, void *), void *opaque) +{ + linker_symval_t symval; + elf_file_t ef = (elf_file_t)file; + const Elf_Sym* symp; + int i, error; + + /* Exhaustive search */ + for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { + if (symp->st_value != 0 && + ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); + if (error) + return (error); + error = callback(file, &symval, opaque); + if (error) + return (error); + } + } + return (0); +} + #ifdef __ia64__ /* * Each KLD has its own GP. The GP value for each load module is given by ==== //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#10 (text+ko) ==== @@ -124,6 +124,9 @@ void ***, void ***, int *); static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); +static int link_elf_each_function_nameval(linker_file_t, + int (*)(linker_file_t, linker_symval_t*, void *), + void *); static void link_elf_reloc_local(linker_file_t); static Elf_Addr elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps); @@ -138,6 +141,7 @@ KOBJMETHOD(linker_link_preload_finish, link_elf_link_preload_finish), KOBJMETHOD(linker_lookup_set, link_elf_lookup_set), KOBJMETHOD(linker_each_function_name, link_elf_each_function_name), + KOBJMETHOD(linker_each_function_nameval, link_elf_each_function_nameval), { 0, 0 } }; @@ -1064,6 +1068,30 @@ return (0); } +static int +link_elf_each_function_nameval(linker_file_t file, + int (*callback)(linker_file_t, linker_symval_t *, void *), void *opaque) +{ + linker_symval_t symval; + elf_file_t ef = (elf_file_t)file; + const Elf_Sym* symp; + int i, error; + + /* Exhaustive search */ + for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { + if (symp->st_value != 0 && + ELF_ST_TYPE(symp->st_info) == STT_FUNC) { + error = link_elf_symbol_values(file, (c_linker_sym_t) symp, &symval); + if (error) + return (error); + error = callback(file, &symval, opaque); + if (error) + return (error); + } + } + return (0); +} + /* * Symbol lookup function that can be used when the symbol index is known (ie * in relocations). It uses the symbol index instead of doing a fully fledged From owner-p4-projects@FreeBSD.ORG Sun Jan 6 06:57:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BEE416A468; Sun, 6 Jan 2008 06:57:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5153B16A419 for ; Sun, 6 Jan 2008 06:57:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F63313C4CE for ; Sun, 6 Jan 2008 06:57:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m066vXE6055518 for ; Sun, 6 Jan 2008 06:57:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m066vXrf055515 for perforce@freebsd.org; Sun, 6 Jan 2008 06:57:33 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 06:57:33 GMT Message-Id: <200801060657.m066vXrf055515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 06:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132613 Change 132613 by jb@jb_freebsd1 on 2008/01/06 06:56:52 Fussy i386 compiler. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#5 (text+ko) ==== @@ -152,7 +152,7 @@ nanotime(&ts); timespecsub(&ts,&test_003_start); - printf("%s: called after %lu.%09lu on curcpu %d id %ju\n",__func__,(u_long) ts.tv_sec,(u_long) ts.tv_nsec, curcpu, (uintmax_t) arg); + printf("%s: called after %lu.%09lu on curcpu %d id %ju\n",__func__,(u_long) ts.tv_sec,(u_long) ts.tv_nsec, curcpu, (uintmax_t)(uintptr_t) arg); } static void From owner-p4-projects@FreeBSD.ORG Sun Jan 6 06:58:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEC4416A420; Sun, 6 Jan 2008 06:58:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81D6016A41A for ; Sun, 6 Jan 2008 06:58:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FADE13C461 for ; Sun, 6 Jan 2008 06:58:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m066wYaF055567 for ; Sun, 6 Jan 2008 06:58:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m066wYW4055564 for perforce@freebsd.org; Sun, 6 Jan 2008 06:58:34 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 06:58:34 GMT Message-Id: <200801060658.m066wYW4055564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 06:58:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=132614 Change 132614 by jb@jb_freebsd1 on 2008/01/06 06:58:21 Add the global variables and it might be helpful to actually include the option header to check if the option is enabled. A bit sub-optimal otherwise. Heh. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#30 edit .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#23 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#30 (text+ko) ==== @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.112 2007/12/15 23:13:31 jeff Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include #include @@ -61,6 +62,8 @@ #ifdef KDTRACE_HOOKS #include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; #endif /* ==== //depot/projects/dtrace/src/sys/kern/sched_ule.c#23 (text+ko) ==== @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.220 2007/12/21 23:30:18 wkoszek Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_sched.h" #include @@ -70,6 +71,8 @@ #ifdef KDTRACE_HOOKS #include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; #endif #include From owner-p4-projects@FreeBSD.ORG Sun Jan 6 06:59:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E88B116A41A; Sun, 6 Jan 2008 06:59:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE26616A419 for ; Sun, 6 Jan 2008 06:59:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BE6E13C465 for ; Sun, 6 Jan 2008 06:59:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m066xZh9055595 for ; Sun, 6 Jan 2008 06:59:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m066xZMl055592 for perforce@freebsd.org; Sun, 6 Jan 2008 06:59:35 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 06:59:35 GMT Message-Id: <200801060659.m066xZMl055592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 06:59:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132615 Change 132615 by jb@jb_freebsd1 on 2008/01/06 06:59:13 Need the assym.s definitions for use in dtrace_asm.S. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#13 (text+ko) ==== @@ -20,6 +20,12 @@ SRCS+= bus_if.h device_if.h vnode_if.h +# Needed for dtrace_asm.S +SRCS+= assym.s + +# These are needed for assym.s +SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h + CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris \ -I${.CURDIR}/../../../cddl/dev/dtrace \ -I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \ From owner-p4-projects@FreeBSD.ORG Sun Jan 6 07:01:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46C3016A421; Sun, 6 Jan 2008 07:01:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C48E16A417 for ; Sun, 6 Jan 2008 07:01:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE2A013C447 for ; Sun, 6 Jan 2008 07:01:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0671bvM056260 for ; Sun, 6 Jan 2008 07:01:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0671b9S056254 for perforce@freebsd.org; Sun, 6 Jan 2008 07:01:37 GMT (envelope-from jb@freebsd.org) Date: Sun, 6 Jan 2008 07:01:37 GMT Message-Id: <200801060701.m0671b9S056254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 07:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=132616 Change 132616 by jb@jb_freebsd1 on 2008/01/06 07:00:54 Define and call the invalid opcode init and uninit functions which add/remove the hook to/from the exception handler code. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#25 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#21 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#25 (text+ko) ==== @@ -53,6 +53,9 @@ /* Hang our hook for thread switches. */ dtrace_vtime_switch_func = dtrace_vtime_switch; + /* Hang our hook for invalid opcodes. */ + dtrace_invop_init(); + /* * XXX This is a short term hack to avoid having to comment * out lots and lots of lock/unlock calls. ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#21 (text+ko) ==== @@ -159,6 +159,9 @@ /* XXX Hack */ mutex_destroy(&mod_lock); + /* Reset out hook for invalid opcodes. */ + dtrace_invop_uninit(); + /* * Reset our hook for thread switches, but ensure that vtime isn't * active first. ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#13 (text) ==== @@ -15965,6 +15965,9 @@ static struct clonedevs *dtrace_clones; /* Ptr to the array of cloned devices. */ static eventhandler_tag eh_tag; /* Event handler tag. */ +void dtrace_invop_init(void); +void dtrace_invop_uninit(void); + static struct cdevsw dtrace_cdevsw = { .d_version = D_VERSION, .d_close = dtrace_close, From owner-p4-projects@FreeBSD.ORG Sun Jan 6 14:14:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D16A16A421; Sun, 6 Jan 2008 14:14:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02B0016A419 for ; Sun, 6 Jan 2008 14:14:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8C2F13C468 for ; Sun, 6 Jan 2008 14:14:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06EEDGx072075 for ; Sun, 6 Jan 2008 14:14:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06EEDtk072072 for perforce@freebsd.org; Sun, 6 Jan 2008 14:14:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 14:14:13 GMT Message-Id: <200801061414.m06EEDtk072072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 14:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=132622 Change 132622 by hselasky@hselasky_laptop001 on 2008/01/06 14:13:16 Add generic support for handling alternate setting requests in device side mode. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#98 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#98 (text+ko) ==== @@ -3362,7 +3362,26 @@ case UT_WRITE_INTERFACE: switch (req.bRequest) { case UR_SET_INTERFACE: - if (iface->alt_index != req.wValue[0]) { + if (state == ST_POST_STATUS) { + /* we are complete */ + break; + } + if (iface->alt_index == req.wValue[0]) { + /* no change - nothing to do */ + break; + } + error = device_detach(iface->subdev); + if (error) { + goto tr_stalled; + } + error = usbd_set_alt_interface_index(udev, + req.wIndex[0], req.wValue[0]); + if (error) { + goto tr_stalled; + } + error = usbd_probe_and_attach(udev, + req.wIndex[0]); + if (error) { goto tr_stalled; } break; From owner-p4-projects@FreeBSD.ORG Sun Jan 6 14:39:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56EDA16A41B; Sun, 6 Jan 2008 14:39:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0617516A419 for ; Sun, 6 Jan 2008 14:39:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5E7313C46B for ; Sun, 6 Jan 2008 14:39:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06EdfB4075182 for ; Sun, 6 Jan 2008 14:39:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06Edf8S075179 for perforce@freebsd.org; Sun, 6 Jan 2008 14:39:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 14:39:41 GMT Message-Id: <200801061439.m06Edf8S075179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 14:39:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=132624 Change 132624 by hselasky@hselasky_laptop001 on 2008/01/06 14:39:16 Add "uss820_dci" kernel module Makefile. Affected files ... .. //depot/projects/usb/src/sys/modules/uss820_dci/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 6 14:45:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACEF16A41B; Sun, 6 Jan 2008 14:45:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70AAA16A419 for ; Sun, 6 Jan 2008 14:45:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64E5113C465 for ; Sun, 6 Jan 2008 14:45:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06EjmbW076544 for ; Sun, 6 Jan 2008 14:45:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06Ejm0n076541 for perforce@freebsd.org; Sun, 6 Jan 2008 14:45:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 14:45:48 GMT Message-Id: <200801061445.m06Ejm0n076541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 14:45:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132625 Change 132625 by hselasky@hselasky_laptop001 on 2008/01/06 14:44:54 Build the "uss820_dci" module by default. Add "uss820_dci" build option. Affected files ... .. //depot/projects/usb/src/sys/conf/files#23 edit .. //depot/projects/usb/src/sys/modules/Makefile#10 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#23 (text+ko) ==== @@ -1151,6 +1151,8 @@ dev/usb/usb_transfer.c optional usb dev/usb/usb_compat_linux.c optional usb dev/usb/uscanner.c optional uscanner +dev/usb/uss820_dci.c optional uss820_dci +dev/usb/uss820_dci_pccard.c optional uss820_dci pccard dev/usb/uvisor.c optional uvisor dev/usb/uvscom.c optional uvscom # End of USB support ==== //depot/projects/usb/src/sys/modules/Makefile#10 (text+ko) ==== @@ -292,6 +292,7 @@ urio \ usb \ uscanner \ + uss820_dci \ utopia \ uvisor \ uvscom \ From owner-p4-projects@FreeBSD.ORG Sun Jan 6 15:43:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87AF516A41B; Sun, 6 Jan 2008 15:43:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3452116A41A for ; Sun, 6 Jan 2008 15:43:49 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A6C113C46A for ; Sun, 6 Jan 2008 15:43:49 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06FhnRM087654 for ; Sun, 6 Jan 2008 15:43:49 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06FhmW3087647 for perforce@freebsd.org; Sun, 6 Jan 2008 15:43:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 6 Jan 2008 15:43:48 GMT Message-Id: <200801061543.m06FhmW3087647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 15:43:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132626 Change 132626 by gonzo@gonzo_jeeves on 2008/01/06 15:43:20 o Bring in assembler bits from juniper-mips branch Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#2 edit .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $ */ - /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -15,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,14 +33,22 @@ #include #include -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $") -#endif /* LIBC_SCCS and not lint */ +#if defined(LIBC_SCCS) + .text + //.asciz "$OpenBSD: _setjmp.S,v 1.5 1996/08/19 08:15:51 tholo Exp $" + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ + +/* These defs must be consistent with ucontext_t. We really ought to employ + * something like genassym here, but... + */ -#ifdef __ABICALLS__ - .abicalls -#endif +#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ +#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ +#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ +#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ +#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ +#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ /* * C library -- _setjmp, _longjmp @@ -55,55 +61,81 @@ * The previous signal state is NOT restored. */ - LEAF(_setjmp) -#ifdef __ABICALLS__ .set noreorder - .cpload t9 - .cprestore 16 -#endif - li v0, _JB_MAGIC__SETJMP - sw v0, (_JB_MAGIC * SZREG)(a0) - sw ra, (_JB_REG_RA * SZREG)(a0) - sw s0, (_JB_REG_S0 * SZREG)(a0) - sw s1, (_JB_REG_S1 * SZREG)(a0) - sw s2, (_JB_REG_S2 * SZREG)(a0) - sw s3, (_JB_REG_S3 * SZREG)(a0) - sw s4, (_JB_REG_S4 * SZREG)(a0) - sw s5, (_JB_REG_S5 * SZREG)(a0) - sw s6, (_JB_REG_S6 * SZREG)(a0) - sw s7, (_JB_REG_S7 * SZREG)(a0) - sw sp, (_JB_REG_SP * SZREG)(a0) - sw s8, (_JB_REG_S8 * SZREG)(a0) - + li v0, 0xACEDBADE # sigcontext magic number + sw ra, UC_PC(a0) # sc_pc = return address + sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] + sw s0, (S0 * 4) + UC_REGS (a0) + sw s1, (S1 * 4) + UC_REGS (a0) + sw s2, (S2 * 4) + UC_REGS (a0) + sw s3, (S3 * 4) + UC_REGS (a0) + sw s4, (S4 * 4) + UC_REGS (a0) + sw s5, (S5 * 4) + UC_REGS (a0) + sw s6, (S6 * 4) + UC_REGS (a0) + sw s7, (S7 * 4) + UC_REGS (a0) + sw s8, (S8 * 4) + UC_REGS (a0) + sw sp, (SP * 4) + UC_REGS (a0) +#ifndef SOFTFLOAT + cfc1 v0, $31 # too bad cant check if FP used + swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) + swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) + swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) + swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) + swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) + swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) + swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) + swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) + swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) + swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) + swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) + swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) + sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) +#endif /*SOFTFLOAT */ j ra move v0, zero END(_setjmp) LEAF(_longjmp) -#ifdef __ABICALLS__ - .set noreorder - .cpload t9 +#ifdef ABICALLS + subu sp, sp, 32 .cprestore 16 -#endif - lw v0, (_JB_MAGIC * SZREG)(a0) - lw ra, (_JB_REG_RA * SZREG)(a0) - li t0, _JB_MAGIC__SETJMP - bne v0, t0, botch # jump if error - lw s0, (_JB_REG_S0 * SZREG)(a0) - lw s1, (_JB_REG_S1 * SZREG)(a0) - lw s2, (_JB_REG_S2 * SZREG)(a0) - lw s3, (_JB_REG_S3 * SZREG)(a0) - lw s4, (_JB_REG_S4 * SZREG)(a0) - lw s5, (_JB_REG_S5 * SZREG)(a0) - lw s6, (_JB_REG_S6 * SZREG)(a0) - lw s7, (_JB_REG_S7 * SZREG)(a0) - lw sp, (_JB_REG_SP * SZREG)(a0) - lw s8, (_JB_REG_S8 * SZREG)(a0) +#endif + .set noreorder + lw v0, (ZERO * 4) + UC_REGS (a0) # get magic number + lw ra, UC_PC (a0) + bne v0, 0xACEDBADE, botch # jump if error + + addu sp, sp, 32 # does not matter, sanity + lw s0, (S0 * 4) + UC_REGS (a0) + lw s1, (S1 * 4) + UC_REGS (a0) + lw s2, (S2 * 4) + UC_REGS (a0) + lw s3, (S3 * 4) + UC_REGS (a0) + lw s4, (S4 * 4) + UC_REGS (a0) + lw s5, (S5 * 4) + UC_REGS (a0) + lw s6, (S6 * 4) + UC_REGS (a0) + lw s7, (S7 * 4) + UC_REGS (a0) + lw v0, (FSR_NUM * 4) + UC_FPREGS (a0) # get fpu status + lw sp, (SP * 4) + UC_REGS (a0) + lw s8, (S8 * 4) + UC_REGS (a0) +#ifndef SOFTFLOAT + ctc1 v0, $31 + lwc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) + lwc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) + lwc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) + lwc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) + lwc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) + lwc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) + lwc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) + lwc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) + lwc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) + lwc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) + lwc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) + lwc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) +#endif /* SOFTFLOAT */ j ra move v0, a1 - botch: jal _C_LABEL(longjmperror) nop ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $ */ - /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. @@ -15,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,17 +32,11 @@ #include -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)fabs.s 8.1 (Berkeley) 2/16/94") - ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $") -#endif /* LIBC_SCCS and not lint */ - +#if defined(LIBC_SCCS) + .text + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ -#ifdef __ABICALLS__ - .abicalls -#endif - .set noreorder - /* * fabs(x) * double x; @@ -52,6 +44,7 @@ * Return absolute value of x. */ LEAF(fabs) + .set noreorder j ra abs.d $f0, $f12 # compute absolute value of x END(fabs) ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $ */ - /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -15,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,22 +32,18 @@ #include -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $") -#endif /* LIBC_SCCS and not lint */ +#if defined(LIBC_SCCS) + .text + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ -#ifdef __ABICALLS__ - .abicalls -#endif - #define DEXP_INF 0x7ff #define DEXP_BIAS 1023 #define DEXP_MIN -1022 #define DEXP_MAX 1023 #define DFRAC_BITS 52 #define DIMPL_ONE 0x00100000 -#define DLEAD_ZEROS 31 - 20 +#define DLEAD_ZEROS (31 - 20) #define STICKYBIT 1 #define GUARDBIT 0x80000000 #define DSIGNAL_NAN 0x00040000 @@ -63,6 +57,7 @@ * Return x * (2**N), for integer values N. */ LEAF(ldexp) + .set reorder mfc1 v1, $f13 # get MSW of x mfc1 t3, $f12 # get LSW of x sll t1, v1, 1 # get x exponent @@ -93,28 +88,28 @@ move v0, t3 addu t9, 32 1: - srl ta0, v0, 16 - bne ta0, zero, 1f + srl t4, v0, 16 + bne t4, zero, 1f addu t9, 16 sll v0, 16 1: - srl ta0, v0, 24 - bne ta0, zero, 1f + srl t4, v0, 24 + bne t4, zero, 1f addu t9, 8 sll v0, 8 1: - srl ta0, v0, 28 - bne ta0, zero, 1f + srl t4, v0, 28 + bne t4, zero, 1f addu t9, 4 sll v0, 4 1: - srl ta0, v0, 30 - bne ta0, zero, 1f + srl t4, v0, 30 + bne t4, zero, 1f addu t9, 2 sll v0, 2 1: - srl ta0, v0, 31 - bne ta0, zero, 1f + srl t4, v0, 31 + bne t4, zero, 1f addu t9, 1 /* * Now shift t2,t3 the correct number of bits. @@ -133,8 +128,8 @@ 1: subu v0, v0, t9 # shift fraction left < 32 bits sll t2, t2, t9 - srl ta0, t3, v0 - or t2, t2, ta0 + srl t4, t3, v0 + or t2, t2, t4 sll t3, t3, t9 2: bge t1, DEXP_INF, 8f # overflow? @@ -157,17 +152,17 @@ blt t1, -30, 2f # will all bits in t3 be shifted out? srl t2, t2, 31 - 20 # shift fraction back to normal position subu t1, t1, 1 - sll ta0, t2, t1 # shift right t2,t3 based on exponent + sll t4, t2, t1 # shift right t2,t3 based on exponent srl t8, t3, t1 # save bits shifted out negu t1 srl t3, t3, t1 - or t3, t3, ta0 + or t3, t3, t4 srl t2, t2, t1 bge t8, zero, 1f # does result need to be rounded? addu t3, t3, 1 # round result - sltu ta0, t3, 1 + sltu t4, t3, 1 sll t8, t8, 1 - addu t2, t2, ta0 + addu t2, t2, t4 bne t8, zero, 1f # round result to nearest and t3, t3, ~1 1: @@ -185,9 +180,9 @@ srl t3, t2, t1 bge t8, zero, 1f # does result need to be rounded? addu t3, t3, 1 # round result - sltu ta0, t3, 1 + sltu t4, t3, 1 sll t8, t8, 1 - mtc1 ta0, $f1 # exponent and upper fraction + mtc1 t4, $f1 # exponent and upper fraction bne t8, zero, 1f # round result to nearest and t3, t3, ~1 1: @@ -205,7 +200,7 @@ j ra 8: li t1, 0x7ff00000 # result is infinity (MSW) - mtc1 t1, $f1 + mtc1 t1, $f1 mtc1 zero, $f0 # result is infinity (LSW) bge v1, zero, 1f # should result be negative infinity? neg.d $f0, $f0 # result is negative infinity ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#2 (text+ko) ==== @@ -41,10 +41,8 @@ __RCSID("$NetBSD: makecontext.c,v 1.3 2003/01/19 08:53:36 matt Exp $"); #endif -#include -#include +#include #include - #include void ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $ */ - /*- * Copyright (c) 1991, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -15,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,14 +32,10 @@ #include -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)modf.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $") -#endif /* LIBC_SCCS and not lint */ - -#ifdef __ABICALLS__ - .abicalls -#endif +#if defined(LIBC_SCCS) + .text + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ /* * double modf(val, iptr) @@ -49,11 +43,7 @@ * returns: xxx and n (in *iptr) where val == n.xxx */ LEAF(modf) -#ifdef __ABICALLS__ - .set noreorder - .cpload t9 .set reorder -#endif cfc1 t0, $31 # get the control register li.d $f2, 4503599627370496e0 # f2 <- 2^52 @@ -63,17 +53,17 @@ mov.d $f0, $f12 # f0 <- f12 abs.d $f4, $f12 # f4 <- |f12| - c.olt.d $f4, $f2 # f4 ? < f2 - bc1f 1f # leave f0 alone if Nan, infinity + c.olt.d $f4, $f2 # f4 ? < f2 + bc1f 1f # leave f0 alone if Nan, infinity # or >=2^52 c.eq.d $f12,$f4 # was f12 positive ? add.d $f4,$f2,$f4 # round off to integer bc1f 2f # No -> will have to negate result sub.d $f0,$f4,$f2 # Remove fudge factor j 1f # integer fraction got -2: +2: sub.d $f0,$f2,$f4 # Remove fudge factor and negate -1: +1: ctc1 t0, $31 # restore old rounding mode s.d $f0, 0(a2) # save the integer part sub.d $f0, $f12, $f0 # subtract val - integer part ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $ */ - /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -15,7 +13,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,17 +34,26 @@ * SUCH DAMAGE. */ +#include +#include #include -#include + +#if defined(LIBC_SCCS) + .text + //.asciz "$OpenBSD: setjmp.S,v 1.6 1997/07/23 20:55:25 kstailey Exp $" + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $") -#endif /* LIBC_SCCS and not lint */ +/* These defs must be consistent with ucontext_t. We really ought to employ + * something like genassym here, but... + */ -#ifdef __ABICALLS__ - .abicalls -#endif +#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ +#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ +#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ +#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ +#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ +#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ /* * C library -- setjmp, longjmp @@ -55,105 +66,82 @@ * and a struct sigcontext, see */ -#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + SZREG) +#define SETJMP_FRAME_SIZE (STAND_FRAME_SIZE + 12) - -NESTED(setjmp, SETJMP_FRAME_SIZE, ra) - .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) - .set noreorder -#ifdef __ABICALLS__ - .cpload t9 -#endif +NON_LEAF(setjmp, SETJMP_FRAME_SIZE, ra) + .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) subu sp, sp, SETJMP_FRAME_SIZE # allocate stack frame -#ifdef __ABICALLS__ +#ifdef ABICALLS .cprestore 16 #endif - sw ra, CALLFRAME_RA(sp) # save RA - sw a0, CALLFRAME_SIZ(sp) # store env + .set reorder + sw ra, STAND_RA_OFFSET(sp) # save state + sw a0, SETJMP_FRAME_SIZE(sp) + + move a1, zero # Make new sigset_t NULL + la a2, UC_SIGMASK(a0) # Get address of ucontext_t->uc_sigmask + jal _C_LABEL(sigprocmask) # Save the old signal mask + + move a0, zero + addu a1, sp, STAND_FRAME_SIZE # pointer to struct sigaltstack + jal _C_LABEL(sigaltstack) - /* Get the signal mask. */ - addu a2, a0, _JB_SIGMASK * SZREG # &oenv - li a0, 1 # SIG_SETBLOCK - move a1, zero # &env == 0 - la t9, _C_LABEL(sigprocmask) # get current signal mask - jal t9 - nop + lw a0, SETJMP_FRAME_SIZE(sp) # restore jmpbuf + lw v1, STAND_FRAME_SIZE+8(sp) # struct sigaltstack->ss_flags + and v1, v1, 1 # extract SS_ONSTACK + sw v1, UC_ONSTACK(a0) # save it in ucontext_t->uc_mcontext.mc_onstack - lw a0, CALLFRAME_SIZ(sp) # restore env pointer - lw ra, CALLFRAME_RA(sp) # restore RA - addu sp, sp, SETJMP_FRAME_SIZE # pop stack frame + lw ra, STAND_RA_OFFSET(sp) # Restore return address + addu sp, sp, SETJMP_FRAME_SIZE # Restore old stack pointer (eeeew...) - li v0, _JB_MAGIC_SETJMP - sw v0, (_JB_MAGIC * SZREG)(a0) - sw ra, (_JB_REG_RA * SZREG)(a0) - sw s0, (_JB_REG_S0 * SZREG)(a0) - sw s1, (_JB_REG_S1 * SZREG)(a0) - sw s2, (_JB_REG_S2 * SZREG)(a0) - sw s3, (_JB_REG_S3 * SZREG)(a0) - sw s4, (_JB_REG_S4 * SZREG)(a0) - sw s5, (_JB_REG_S5 * SZREG)(a0) - sw s6, (_JB_REG_S6 * SZREG)(a0) - sw s7, (_JB_REG_S7 * SZREG)(a0) - sw sp, (_JB_REG_SP * SZREG)(a0) - sw s8, (_JB_REG_S8 * SZREG)(a0) + blt v0, zero, botch # check for sigstack() error + sw ra, UC_PC(a0) # sc_pc = return address + li v0, 0xACEDBADE # sigcontext magic number + sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] + sw s0, (S0 * 4) + UC_REGS (a0) + sw s1, (S1 * 4) + UC_REGS (a0) + sw s2, (S2 * 4) + UC_REGS (a0) + sw s3, (S3 * 4) + UC_REGS (a0) + sw s4, (S4 * 4) + UC_REGS (a0) + sw s5, (S5 * 4) + UC_REGS (a0) + sw s6, (S6 * 4) + UC_REGS (a0) + sw s7, (S7 * 4) + UC_REGS (a0) + sw gp, (GP * 4) + UC_REGS (a0) + sw sp, (SP * 4) + UC_REGS (a0) + sw s8, (S8 * 4) + UC_REGS (a0) + li v0, 1 # be nice if we could tell + sw v0, UC_FPUSED (a0) # sc_fpused = 1 +#ifndef SOFTFLOAT + cfc1 v0, $31 + swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) + swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) + swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) + swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) + swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) + swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) + swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) + swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) + swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) + swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) + swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) + swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) + sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) +#endif /* SOFTFLOAT */ move v0, zero j ra END(setjmp) -#define LONGJMP_FRAME_SIZE CALLFRAME_RA + SZREG * 2 - -NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) - .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) - .set noreorder -#ifdef __ABICALLS__ - .cpload t9 -#endif - subu sp, sp, LONGJMP_FRAME_SIZE # allocate stack frame -#ifdef __ABICALLS__ +LEAF(longjmp) +#ifdef ABICALLS + subu sp, sp, 32 .cprestore 16 #endif - sw ra, CALLFRAME_RA(sp) # save RA - lw v0, (_JB_MAGIC * SZREG)(a0) - li t0, _JB_MAGIC_SETJMP - bne v0, t0, botch # jump if error - nop - - sw a0, CALLFRAME_SIZ(sp) # save env - sw a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value - - # set sigmask - addu a1, a0, _JB_SIGMASK * SZREG # &set - move a2, zero # &oset == NULL - li a0, 3 # SIG_SETMASK - la t9,_C_LABEL(sigprocmask) # set current signal mask - jal t9 - nop - - lw a0, CALLFRAME_SIZ(sp) # restore env - lw a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value - - lw ra, (_JB_REG_RA * SZREG)(a0) - lw s0, (_JB_REG_S0 * SZREG)(a0) - lw s1, (_JB_REG_S1 * SZREG)(a0) - lw s2, (_JB_REG_S2 * SZREG)(a0) - lw s3, (_JB_REG_S3 * SZREG)(a0) - lw s4, (_JB_REG_S4 * SZREG)(a0) - lw s5, (_JB_REG_S5 * SZREG)(a0) - lw s6, (_JB_REG_S6 * SZREG)(a0) - lw s7, (_JB_REG_S7 * SZREG)(a0) - lw sp, (_JB_REG_SP * SZREG)(a0) - lw s8, (_JB_REG_S8 * SZREG)(a0) - move v0, a1 - j ra - nop - + .set reorder + sw a1, (V0 * 4) + UC_REGS (a0) # save return value in sc_regs[V0] + li v0, SYS_sigreturn + syscall botch: - la t9, _C_LABEL(longjmperror) - jal t9 - nop - - la t9, _C_LABEL(abort) - jal t9 - nop + jal _C_LABEL(longjmperror) + jal _C_LABEL(abort) END(longjmp) ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $ */ - /*- * Copyright (c) 1991, 1993, 1995, * The Regents of the University of California. All rights reserved. @@ -15,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,17 +30,15 @@ * SUCH DAMAGE. */ +#include #include #include +#include -#if defined(LIBC_SCCS) && !defined(lint) - ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") - ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $") -#endif /* LIBC_SCCS and not lint */ - -#ifdef __ABICALLS__ - .abicalls -#endif +#if defined(LIBC_SCCS) + .text + .asciz "$FreeBSD$" +#endif /* LIBC_SCCS */ /* * C library -- sigsetjmp, siglongjmp @@ -57,28 +53,20 @@ */ LEAF(sigsetjmp) -#ifdef __ABICALLS__ - .set noreorder - .cpload t9 .set reorder -#endif + sw a1, (_JBLEN*4)(a0) # save "savemask" bne a1, 0x0, 1f # do saving of signal mask? la t9, _setjmp - jr t9 + jr t9 1: la t9, setjmp - jr t9 + jr t9 END(sigsetjmp) LEAF(siglongjmp) -#ifdef __ABICALLS__ - .set noreorder - .cpload t9 .set reorder -#endif - lw t0, (_JB_MAGIC * SZREG)(a0) - li t1, _JB_MAGIC__SETJMP - bne t0, t1, 1f # setjmp or _setjmp magic? + lw t0, (_JBLEN * 4)(a0) # get "savemask" + bne t0, 0x0, 1f # restore signal mask? la t9, _longjmp jr t9 1: la t9, longjmp From owner-p4-projects@FreeBSD.ORG Sun Jan 6 20:33:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A16AE16A41B; Sun, 6 Jan 2008 20:33:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60FB816A418; Sun, 6 Jan 2008 20:33:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 33D1313C461; Sun, 6 Jan 2008 20:33:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id m06KVZ3r070598; Sun, 6 Jan 2008 13:31:35 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 06 Jan 2008 13:32:37 -0700 (MST) Message-Id: <20080106.133237.1784683699.imp@bsdimp.com> To: jhb@freebsd.org From: "M. Warner Losh" In-Reply-To: <200801041343.19320.jhb@freebsd.org> References: <200801041711.m04HBGPG029002@repoman.freebsd.org> <20080104.111926.-108774279.imp@bsdimp.com> <200801041343.19320.jhb@freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: gonzo@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 132497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 20:33:22 -0000 In message: <200801041343.19320.jhb@freebsd.org> John Baldwin writes: : On Friday 04 January 2008 01:19:26 pm M. Warner Losh wrote: : > In message: <200801041711.m04HBGPG029002@repoman.freebsd.org> : > Oleksandr Tymoshenko writes: : > : http://perforce.freebsd.org/chv.cgi?CH=132497 : > : : > : Change 132497 by gonzo@gonzo_jeeves on 2008/01/04 17:11:07 : > : : > : o I believe MK_ZFS is more appropriate variable to be checked : > : in this case. : > : > I thought this was more a case of 'exclude all CDDL code' rather than : > being tied to ZFS. : > : > Warner : : I dunno, I think gonzo@ might be right. It's ZFS support for fstat and I : think disabling CDDL would disable ZFS as a side effect? In any event, these changes should be made in head, not here. Warner : > : Affected files ... : > : : > : .. //depot/projects/mips2-jnpr/src/usr.bin/fstat/Makefile#2 edit : > : : > : Differences ... : > : : > : ==== //depot/projects/mips2-jnpr/src/usr.bin/fstat/Makefile#2 (text+ko) : ==== : > : : > : @@ -13,7 +13,7 @@ : > : : > : CFLAGS+=-D_KVM_VNODE : > : : > : -.if ${MK_CDDL} != "no" : > : +.if ${MK_ZFS} != "no" : > : CFLAGS+= -DZFS : > : OBJS+= zfs/zfs.o : > : SUBDIR= zfs : > : : > : : : : -- : John Baldwin : From owner-p4-projects@FreeBSD.ORG Sun Jan 6 20:39:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E913E16A418; Sun, 6 Jan 2008 20:39:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD10016A41B; Sun, 6 Jan 2008 20:39:42 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 0DBE313C447; Sun, 6 Jan 2008 20:39:41 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id m06Kb0Ib070660; Sun, 6 Jan 2008 13:37:00 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 06 Jan 2008 13:38:03 -0700 (MST) Message-Id: <20080106.133803.35183967.imp@bsdimp.com> To: gonzo@freebsd.org From: "M. Warner Losh" In-Reply-To: <200801061543.m06FhmW3087647@repoman.freebsd.org> References: <200801061543.m06FhmW3087647@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 132626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 20:39:43 -0000 In message: <200801061543.m06FhmW3087647@repoman.freebsd.org> Oleksandr Tymoshenko writes: : http://perforce.freebsd.org/chv.cgi?CH=132626 : : Change 132626 by gonzo@gonzo_jeeves on 2008/01/06 15:43:20 : : o Bring in assembler bits from juniper-mips branch What I've tried to do when I've done this stuff is to break it down into an integrate phase and then edit after that. These look like they are pure edits.... Warner : Affected files ... : : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#2 edit : .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#2 edit : : Differences ... : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $ */ : - : /*- : * Copyright (c) 1991, 1993 : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,7 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -35,14 +33,22 @@ : #include : #include : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93") : - ASMSTR("$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $") : -#endif /* LIBC_SCCS and not lint */ : +#if defined(LIBC_SCCS) : + .text : + //.asciz "$OpenBSD: _setjmp.S,v 1.5 1996/08/19 08:15:51 tholo Exp $" : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : + : +/* These defs must be consistent with ucontext_t. We really ought to employ : + * something like genassym here, but... : + */ : : -#ifdef __ABICALLS__ : - .abicalls : -#endif : +#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ : +#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ : +#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ : +#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ : +#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ : +#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ : : /* : * C library -- _setjmp, _longjmp : @@ -55,55 +61,81 @@ : * The previous signal state is NOT restored. : */ : : - : LEAF(_setjmp) : -#ifdef __ABICALLS__ : .set noreorder : - .cpload t9 : - .cprestore 16 : -#endif : - li v0, _JB_MAGIC__SETJMP : - sw v0, (_JB_MAGIC * SZREG)(a0) : - sw ra, (_JB_REG_RA * SZREG)(a0) : - sw s0, (_JB_REG_S0 * SZREG)(a0) : - sw s1, (_JB_REG_S1 * SZREG)(a0) : - sw s2, (_JB_REG_S2 * SZREG)(a0) : - sw s3, (_JB_REG_S3 * SZREG)(a0) : - sw s4, (_JB_REG_S4 * SZREG)(a0) : - sw s5, (_JB_REG_S5 * SZREG)(a0) : - sw s6, (_JB_REG_S6 * SZREG)(a0) : - sw s7, (_JB_REG_S7 * SZREG)(a0) : - sw sp, (_JB_REG_SP * SZREG)(a0) : - sw s8, (_JB_REG_S8 * SZREG)(a0) : - : + li v0, 0xACEDBADE # sigcontext magic number : + sw ra, UC_PC(a0) # sc_pc = return address : + sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] : + sw s0, (S0 * 4) + UC_REGS (a0) : + sw s1, (S1 * 4) + UC_REGS (a0) : + sw s2, (S2 * 4) + UC_REGS (a0) : + sw s3, (S3 * 4) + UC_REGS (a0) : + sw s4, (S4 * 4) + UC_REGS (a0) : + sw s5, (S5 * 4) + UC_REGS (a0) : + sw s6, (S6 * 4) + UC_REGS (a0) : + sw s7, (S7 * 4) + UC_REGS (a0) : + sw s8, (S8 * 4) + UC_REGS (a0) : + sw sp, (SP * 4) + UC_REGS (a0) : +#ifndef SOFTFLOAT : + cfc1 v0, $31 # too bad cant check if FP used : + swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) : + swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) : + swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) : + swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) : + swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) : + swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) : + swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) : + swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) : + swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) : + swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) : + swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) : + swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) : + sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) : +#endif /*SOFTFLOAT */ : j ra : move v0, zero : END(_setjmp) : : LEAF(_longjmp) : -#ifdef __ABICALLS__ : - .set noreorder : - .cpload t9 : +#ifdef ABICALLS : + subu sp, sp, 32 : .cprestore 16 : -#endif : - lw v0, (_JB_MAGIC * SZREG)(a0) : - lw ra, (_JB_REG_RA * SZREG)(a0) : - li t0, _JB_MAGIC__SETJMP : - bne v0, t0, botch # jump if error : - lw s0, (_JB_REG_S0 * SZREG)(a0) : - lw s1, (_JB_REG_S1 * SZREG)(a0) : - lw s2, (_JB_REG_S2 * SZREG)(a0) : - lw s3, (_JB_REG_S3 * SZREG)(a0) : - lw s4, (_JB_REG_S4 * SZREG)(a0) : - lw s5, (_JB_REG_S5 * SZREG)(a0) : - lw s6, (_JB_REG_S6 * SZREG)(a0) : - lw s7, (_JB_REG_S7 * SZREG)(a0) : - lw sp, (_JB_REG_SP * SZREG)(a0) : - lw s8, (_JB_REG_S8 * SZREG)(a0) : +#endif : + .set noreorder : + lw v0, (ZERO * 4) + UC_REGS (a0) # get magic number : + lw ra, UC_PC (a0) : + bne v0, 0xACEDBADE, botch # jump if error : + : + addu sp, sp, 32 # does not matter, sanity : + lw s0, (S0 * 4) + UC_REGS (a0) : + lw s1, (S1 * 4) + UC_REGS (a0) : + lw s2, (S2 * 4) + UC_REGS (a0) : + lw s3, (S3 * 4) + UC_REGS (a0) : + lw s4, (S4 * 4) + UC_REGS (a0) : + lw s5, (S5 * 4) + UC_REGS (a0) : + lw s6, (S6 * 4) + UC_REGS (a0) : + lw s7, (S7 * 4) + UC_REGS (a0) : + lw v0, (FSR_NUM * 4) + UC_FPREGS (a0) # get fpu status : + lw sp, (SP * 4) + UC_REGS (a0) : + lw s8, (S8 * 4) + UC_REGS (a0) : +#ifndef SOFTFLOAT : + ctc1 v0, $31 : + lwc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) : + lwc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) : +#endif /* SOFTFLOAT */ : : j ra : move v0, a1 : - : botch: : jal _C_LABEL(longjmperror) : nop : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $ */ : - : /*- : * Copyright (c) 1993 : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,7 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -34,17 +32,11 @@ : : #include : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)fabs.s 8.1 (Berkeley) 2/16/94") : - ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $") : -#endif /* LIBC_SCCS and not lint */ : - : +#if defined(LIBC_SCCS) : + .text : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : : -#ifdef __ABICALLS__ : - .abicalls : -#endif : - .set noreorder : - : /* : * fabs(x) : * double x; : @@ -52,6 +44,7 @@ : * Return absolute value of x. : */ : LEAF(fabs) : + .set noreorder : j ra : abs.d $f0, $f12 # compute absolute value of x : END(fabs) : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $ */ : - : /*- : * Copyright (c) 1991, 1993 : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,7 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -34,22 +32,18 @@ : : #include : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93") : - ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $") : -#endif /* LIBC_SCCS and not lint */ : +#if defined(LIBC_SCCS) : + .text : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : : -#ifdef __ABICALLS__ : - .abicalls : -#endif : - : #define DEXP_INF 0x7ff : #define DEXP_BIAS 1023 : #define DEXP_MIN -1022 : #define DEXP_MAX 1023 : #define DFRAC_BITS 52 : #define DIMPL_ONE 0x00100000 : -#define DLEAD_ZEROS 31 - 20 : +#define DLEAD_ZEROS (31 - 20) : #define STICKYBIT 1 : #define GUARDBIT 0x80000000 : #define DSIGNAL_NAN 0x00040000 : @@ -63,6 +57,7 @@ : * Return x * (2**N), for integer values N. : */ : LEAF(ldexp) : + .set reorder : mfc1 v1, $f13 # get MSW of x : mfc1 t3, $f12 # get LSW of x : sll t1, v1, 1 # get x exponent : @@ -93,28 +88,28 @@ : move v0, t3 : addu t9, 32 : 1: : - srl ta0, v0, 16 : - bne ta0, zero, 1f : + srl t4, v0, 16 : + bne t4, zero, 1f : addu t9, 16 : sll v0, 16 : 1: : - srl ta0, v0, 24 : - bne ta0, zero, 1f : + srl t4, v0, 24 : + bne t4, zero, 1f : addu t9, 8 : sll v0, 8 : 1: : - srl ta0, v0, 28 : - bne ta0, zero, 1f : + srl t4, v0, 28 : + bne t4, zero, 1f : addu t9, 4 : sll v0, 4 : 1: : - srl ta0, v0, 30 : - bne ta0, zero, 1f : + srl t4, v0, 30 : + bne t4, zero, 1f : addu t9, 2 : sll v0, 2 : 1: : - srl ta0, v0, 31 : - bne ta0, zero, 1f : + srl t4, v0, 31 : + bne t4, zero, 1f : addu t9, 1 : /* : * Now shift t2,t3 the correct number of bits. : @@ -133,8 +128,8 @@ : 1: : subu v0, v0, t9 # shift fraction left < 32 bits : sll t2, t2, t9 : - srl ta0, t3, v0 : - or t2, t2, ta0 : + srl t4, t3, v0 : + or t2, t2, t4 : sll t3, t3, t9 : 2: : bge t1, DEXP_INF, 8f # overflow? : @@ -157,17 +152,17 @@ : blt t1, -30, 2f # will all bits in t3 be shifted out? : srl t2, t2, 31 - 20 # shift fraction back to normal position : subu t1, t1, 1 : - sll ta0, t2, t1 # shift right t2,t3 based on exponent : + sll t4, t2, t1 # shift right t2,t3 based on exponent : srl t8, t3, t1 # save bits shifted out : negu t1 : srl t3, t3, t1 : - or t3, t3, ta0 : + or t3, t3, t4 : srl t2, t2, t1 : bge t8, zero, 1f # does result need to be rounded? : addu t3, t3, 1 # round result : - sltu ta0, t3, 1 : + sltu t4, t3, 1 : sll t8, t8, 1 : - addu t2, t2, ta0 : + addu t2, t2, t4 : bne t8, zero, 1f # round result to nearest : and t3, t3, ~1 : 1: : @@ -185,9 +180,9 @@ : srl t3, t2, t1 : bge t8, zero, 1f # does result need to be rounded? : addu t3, t3, 1 # round result : - sltu ta0, t3, 1 : + sltu t4, t3, 1 : sll t8, t8, 1 : - mtc1 ta0, $f1 # exponent and upper fraction : + mtc1 t4, $f1 # exponent and upper fraction : bne t8, zero, 1f # round result to nearest : and t3, t3, ~1 : 1: : @@ -205,7 +200,7 @@ : j ra : 8: : li t1, 0x7ff00000 # result is infinity (MSW) : - mtc1 t1, $f1 : + mtc1 t1, $f1 : mtc1 zero, $f0 # result is infinity (LSW) : bge v1, zero, 1f # should result be negative infinity? : neg.d $f0, $f0 # result is negative infinity : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/makecontext.c#2 (text+ko) ==== : : @@ -41,10 +41,8 @@ : __RCSID("$NetBSD: makecontext.c,v 1.3 2003/01/19 08:53:36 matt Exp $"); : #endif : : -#include : -#include : +#include : #include : - : #include : : void : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $ */ : - : /*- : * Copyright (c) 1991, 1993, 1995 : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,7 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -34,14 +32,10 @@ : : #include : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)modf.s 8.1 (Berkeley) 6/4/93") : - ASMSTR("$NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $") : -#endif /* LIBC_SCCS and not lint */ : - : -#ifdef __ABICALLS__ : - .abicalls : -#endif : +#if defined(LIBC_SCCS) : + .text : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : : /* : * double modf(val, iptr) : @@ -49,11 +43,7 @@ : * returns: xxx and n (in *iptr) where val == n.xxx : */ : LEAF(modf) : -#ifdef __ABICALLS__ : - .set noreorder : - .cpload t9 : .set reorder : -#endif : cfc1 t0, $31 # get the control register : li.d $f2, 4503599627370496e0 # f2 <- 2^52 : : @@ -63,17 +53,17 @@ : : mov.d $f0, $f12 # f0 <- f12 : abs.d $f4, $f12 # f4 <- |f12| : - c.olt.d $f4, $f2 # f4 ? < f2 : - bc1f 1f # leave f0 alone if Nan, infinity : + c.olt.d $f4, $f2 # f4 ? < f2 : + bc1f 1f # leave f0 alone if Nan, infinity : # or >=2^52 : c.eq.d $f12,$f4 # was f12 positive ? : add.d $f4,$f2,$f4 # round off to integer : bc1f 2f # No -> will have to negate result : sub.d $f0,$f4,$f2 # Remove fudge factor : j 1f # integer fraction got : -2: : +2: : sub.d $f0,$f2,$f4 # Remove fudge factor and negate : -1: : +1: : ctc1 t0, $31 # restore old rounding mode : s.d $f0, 0(a2) # save the integer part : sub.d $f0, $f12, $f0 # subtract val - integer part : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $ */ : - : /*- : * Copyright (c) 1991, 1993 : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,11 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 3. All advertising materials mentioning features or use of this software : + * must display the following acknowledgement: : + * This product includes software developed by the University of : + * California, Berkeley and its contributors. : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -32,17 +34,26 @@ : * SUCH DAMAGE. : */ : : +#include : +#include : #include : -#include : + : +#if defined(LIBC_SCCS) : + .text : + //.asciz "$OpenBSD: setjmp.S,v 1.6 1997/07/23 20:55:25 kstailey Exp $" : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") : - ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $") : -#endif /* LIBC_SCCS and not lint */ : +/* These defs must be consistent with ucontext_t. We really ought to employ : + * something like genassym here, but... : + */ : : -#ifdef __ABICALLS__ : - .abicalls : -#endif : +#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ : +#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ : +#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ : +#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ : +#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ : +#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ : : /* : * C library -- setjmp, longjmp : @@ -55,105 +66,82 @@ : * and a struct sigcontext, see : */ : : -#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + SZREG) : +#define SETJMP_FRAME_SIZE (STAND_FRAME_SIZE + 12) : : - : -NESTED(setjmp, SETJMP_FRAME_SIZE, ra) : - .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) : - .set noreorder : -#ifdef __ABICALLS__ : - .cpload t9 : -#endif : +NON_LEAF(setjmp, SETJMP_FRAME_SIZE, ra) : + .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) : subu sp, sp, SETJMP_FRAME_SIZE # allocate stack frame : -#ifdef __ABICALLS__ : +#ifdef ABICALLS : .cprestore 16 : #endif : - sw ra, CALLFRAME_RA(sp) # save RA : - sw a0, CALLFRAME_SIZ(sp) # store env : + .set reorder : + sw ra, STAND_RA_OFFSET(sp) # save state : + sw a0, SETJMP_FRAME_SIZE(sp) : + : + move a1, zero # Make new sigset_t NULL : + la a2, UC_SIGMASK(a0) # Get address of ucontext_t->uc_sigmask : + jal _C_LABEL(sigprocmask) # Save the old signal mask : + : + move a0, zero : + addu a1, sp, STAND_FRAME_SIZE # pointer to struct sigaltstack : + jal _C_LABEL(sigaltstack) : : - /* Get the signal mask. */ : - addu a2, a0, _JB_SIGMASK * SZREG # &oenv : - li a0, 1 # SIG_SETBLOCK : - move a1, zero # &env == 0 : - la t9, _C_LABEL(sigprocmask) # get current signal mask : - jal t9 : - nop : + lw a0, SETJMP_FRAME_SIZE(sp) # restore jmpbuf : + lw v1, STAND_FRAME_SIZE+8(sp) # struct sigaltstack->ss_flags : + and v1, v1, 1 # extract SS_ONSTACK : + sw v1, UC_ONSTACK(a0) # save it in ucontext_t->uc_mcontext.mc_onstack : : - lw a0, CALLFRAME_SIZ(sp) # restore env pointer : - lw ra, CALLFRAME_RA(sp) # restore RA : - addu sp, sp, SETJMP_FRAME_SIZE # pop stack frame : + lw ra, STAND_RA_OFFSET(sp) # Restore return address : + addu sp, sp, SETJMP_FRAME_SIZE # Restore old stack pointer (eeeew...) : : - li v0, _JB_MAGIC_SETJMP : - sw v0, (_JB_MAGIC * SZREG)(a0) : - sw ra, (_JB_REG_RA * SZREG)(a0) : - sw s0, (_JB_REG_S0 * SZREG)(a0) : - sw s1, (_JB_REG_S1 * SZREG)(a0) : - sw s2, (_JB_REG_S2 * SZREG)(a0) : - sw s3, (_JB_REG_S3 * SZREG)(a0) : - sw s4, (_JB_REG_S4 * SZREG)(a0) : - sw s5, (_JB_REG_S5 * SZREG)(a0) : - sw s6, (_JB_REG_S6 * SZREG)(a0) : - sw s7, (_JB_REG_S7 * SZREG)(a0) : - sw sp, (_JB_REG_SP * SZREG)(a0) : - sw s8, (_JB_REG_S8 * SZREG)(a0) : + blt v0, zero, botch # check for sigstack() error : : + sw ra, UC_PC(a0) # sc_pc = return address : + li v0, 0xACEDBADE # sigcontext magic number : + sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] : + sw s0, (S0 * 4) + UC_REGS (a0) : + sw s1, (S1 * 4) + UC_REGS (a0) : + sw s2, (S2 * 4) + UC_REGS (a0) : + sw s3, (S3 * 4) + UC_REGS (a0) : + sw s4, (S4 * 4) + UC_REGS (a0) : + sw s5, (S5 * 4) + UC_REGS (a0) : + sw s6, (S6 * 4) + UC_REGS (a0) : + sw s7, (S7 * 4) + UC_REGS (a0) : + sw gp, (GP * 4) + UC_REGS (a0) : + sw sp, (SP * 4) + UC_REGS (a0) : + sw s8, (S8 * 4) + UC_REGS (a0) : + li v0, 1 # be nice if we could tell : + sw v0, UC_FPUSED (a0) # sc_fpused = 1 : +#ifndef SOFTFLOAT : + cfc1 v0, $31 : + swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) : + swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) : + swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) : + swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) : + swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) : + swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) : + swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) : + swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) : + swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) : + swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) : + swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) : + swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) : + sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) : +#endif /* SOFTFLOAT */ : move v0, zero : j ra : END(setjmp) : : -#define LONGJMP_FRAME_SIZE CALLFRAME_RA + SZREG * 2 : - : -NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) : - .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) : - .set noreorder : -#ifdef __ABICALLS__ : - .cpload t9 : -#endif : - subu sp, sp, LONGJMP_FRAME_SIZE # allocate stack frame : -#ifdef __ABICALLS__ : +LEAF(longjmp) : +#ifdef ABICALLS : + subu sp, sp, 32 : .cprestore 16 : #endif : - sw ra, CALLFRAME_RA(sp) # save RA : - lw v0, (_JB_MAGIC * SZREG)(a0) : - li t0, _JB_MAGIC_SETJMP : - bne v0, t0, botch # jump if error : - nop : - : - sw a0, CALLFRAME_SIZ(sp) # save env : - sw a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value : - : - # set sigmask : - addu a1, a0, _JB_SIGMASK * SZREG # &set : - move a2, zero # &oset == NULL : - li a0, 3 # SIG_SETMASK : - la t9,_C_LABEL(sigprocmask) # set current signal mask : - jal t9 : - nop : - : - lw a0, CALLFRAME_SIZ(sp) # restore env : - lw a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value : - : - lw ra, (_JB_REG_RA * SZREG)(a0) : - lw s0, (_JB_REG_S0 * SZREG)(a0) : - lw s1, (_JB_REG_S1 * SZREG)(a0) : - lw s2, (_JB_REG_S2 * SZREG)(a0) : - lw s3, (_JB_REG_S3 * SZREG)(a0) : - lw s4, (_JB_REG_S4 * SZREG)(a0) : - lw s5, (_JB_REG_S5 * SZREG)(a0) : - lw s6, (_JB_REG_S6 * SZREG)(a0) : - lw s7, (_JB_REG_S7 * SZREG)(a0) : - lw sp, (_JB_REG_SP * SZREG)(a0) : - lw s8, (_JB_REG_S8 * SZREG)(a0) : - move v0, a1 : - j ra : - nop : - : + .set reorder : + sw a1, (V0 * 4) + UC_REGS (a0) # save return value in sc_regs[V0] : + li v0, SYS_sigreturn : + syscall : botch: : - la t9, _C_LABEL(longjmperror) : - jal t9 : - nop : - : - la t9, _C_LABEL(abort) : - jal t9 : - nop : + jal _C_LABEL(longjmperror) : + jal _C_LABEL(abort) : END(longjmp) : : ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#2 (text+ko) ==== : : @@ -1,5 +1,3 @@ : -/* $NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $ */ : - : /*- : * Copyright (c) 1991, 1993, 1995, : * The Regents of the University of California. All rights reserved. : @@ -15,7 +13,7 @@ : * 2. Redistributions in binary form must reproduce the above copyright : * notice, this list of conditions and the following disclaimer in the : * documentation and/or other materials provided with the distribution. : - * 3. Neither the name of the University nor the names of its contributors : + * 4. Neither the name of the University nor the names of its contributors : * may be used to endorse or promote products derived from this software : * without specific prior written permission. : * : @@ -32,17 +30,15 @@ : * SUCH DAMAGE. : */ : : +#include : #include : #include : +#include : : -#if defined(LIBC_SCCS) && !defined(lint) : - ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") : - ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $") : -#endif /* LIBC_SCCS and not lint */ : - : -#ifdef __ABICALLS__ : - .abicalls : -#endif : +#if defined(LIBC_SCCS) : + .text : + .asciz "$FreeBSD$" : +#endif /* LIBC_SCCS */ : : /* : * C library -- sigsetjmp, siglongjmp : @@ -57,28 +53,20 @@ : */ : : LEAF(sigsetjmp) : -#ifdef __ABICALLS__ : - .set noreorder : - .cpload t9 : .set reorder : -#endif : + sw a1, (_JBLEN*4)(a0) # save "savemask" : bne a1, 0x0, 1f # do saving of signal mask? : la t9, _setjmp : - jr t9 : + jr t9 : : 1: la t9, setjmp : - jr t9 : + jr t9 : END(sigsetjmp) : : LEAF(siglongjmp) : -#ifdef __ABICALLS__ : - .set noreorder : - .cpload t9 : .set reorder : -#endif : - lw t0, (_JB_MAGIC * SZREG)(a0) : - li t1, _JB_MAGIC__SETJMP : - bne t0, t1, 1f # setjmp or _setjmp magic? : + lw t0, (_JBLEN * 4)(a0) # get "savemask" : + bne t0, 0x0, 1f # restore signal mask? : la t9, _longjmp : jr t9 : 1: la t9, longjmp : From owner-p4-projects@FreeBSD.ORG Sun Jan 6 21:06:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94EC216A420; Sun, 6 Jan 2008 21:06:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A0C216A417 for ; Sun, 6 Jan 2008 21:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B64C13C442 for ; Sun, 6 Jan 2008 21:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06L6XOI069628 for ; Sun, 6 Jan 2008 21:06:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06L6X8Q069625 for perforce@freebsd.org; Sun, 6 Jan 2008 21:06:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 21:06:33 GMT Message-Id: <200801062106.m06L6X8Q069625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 21:06:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=132639 Change 132639 by hselasky@hselasky_laptop001 on 2008/01/06 21:06:03 AT91 UDP related: Disable clocks after uninit is called. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/at91_udp.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/at91_udp.c#5 (text+ko) ==== @@ -276,12 +276,6 @@ AT91_UDP_WRITE_4(&(sc->sc_dci), AT91_UDP_IDR, 0xFFFFFFFF); AT91_UDP_WRITE_4(&(sc->sc_dci), AT91_UDP_ICR, 0xFFFFFFFF); - /* disable clocks */ - at91_pmc_clock_disable(sc->sc_iclk); - at91_pmc_clock_disable(sc->sc_fclk); - at91_pmc_clock_deref(sc->sc_fclk); - at91_pmc_clock_deref(sc->sc_iclk); - /* disable VBUS interrupt */ at91_pio_gpio_set_interrupt(VBUS_BASE, VBUS_MASK, 0); @@ -319,6 +313,12 @@ usbd_bus_mem_free_all(&(sc->sc_dci.sc_bus), NULL); + /* disable clocks */ + at91_pmc_clock_disable(sc->sc_iclk); + at91_pmc_clock_disable(sc->sc_fclk); + at91_pmc_clock_deref(sc->sc_fclk); + at91_pmc_clock_deref(sc->sc_iclk); + return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jan 6 21:44:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC73616A46B; Sun, 6 Jan 2008 21:44:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F1A616A420 for ; Sun, 6 Jan 2008 21:44:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A03D713C447 for ; Sun, 6 Jan 2008 21:44:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06LiCxY074385 for ; Sun, 6 Jan 2008 21:44:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06LiC0E074382 for perforce@freebsd.org; Sun, 6 Jan 2008 21:44:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 21:44:12 GMT Message-Id: <200801062144.m06LiC0E074382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 21:44:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=132640 Change 132640 by hselasky@hselasky_laptop001 on 2008/01/06 21:43:50 AT91 UDP bugfixes: o Remove "did_multi_buffer" flag. Multi bufring works regardless of this. o Create new routine, at9100_dci_reset_ep, that handles all endpoint reset. The reason for this is that the FIFO reset command does not release all the FIFO banks, so if we do not clear these ourselves we end up receiving ZLP's which can confuse the USB device drivers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#12 (text+ko) ==== @@ -561,23 +561,13 @@ temp &= AT91_UDP_CSR_STALLSENT; if (csr & AT91_UDP_CSR_TXPKTRDY) { - /* check for double buffering */ - if (td->support_multi_buffer && - (!td->did_multi_buffer)) { - td->did_multi_buffer = 1; - - /* only set TXPKTRDY next time */ - temp |= AT91_UDP_CSR_TXPKTRDY; - - } else if (temp) { + if (temp) { /* write command */ AT91_CSR_ACK(csr, temp); bus_space_write_4(td->io_tag, td->io_hdl, td->status_reg, csr); - return (1); /* not complete */ - } else { - return (1); /* not complete */ } + return (1); /* not complete */ } else { /* clear TXCOMP and set TXPKTRDY */ temp |= (AT91_UDP_CSR_TXCOMP | @@ -673,19 +663,6 @@ bus_space_write_4(td->io_tag, td->io_hdl, td->status_reg, csr); -#if 0 - /* - * XXX The AT91 USB chip does not generate a second interrupt - * when we do double bufring, so there is no way of telling - * when the peer has actually received the data. Usually this - * is not a big problem. XXX - */ - if (td->did_multi_buffer) { - /* wait for the second and final interrupt */ - td->did_multi_buffer = 0; - goto repeat; - } -#endif return (0); /* complete */ not_complete: @@ -734,14 +711,10 @@ temp = 0; if (td->fifo_bank) temp |= 1; - if (td->did_multi_buffer) - temp |= 2; td = td->obj_next; xfer->td_transfer_cache = td; if (temp & 1) td->fifo_bank = 1; - if (temp & 2) - td->did_multi_buffer = 1; } return (1); /* not complete */ @@ -756,13 +729,6 @@ sc->sc_ep_flags[temp].fifo_bank = 0; } - /* update multi buffer flag */ - if (td->did_multi_buffer) { - sc->sc_ep_flags[temp].did_multi_buffer = 1; - } else { - sc->sc_ep_flags[temp].did_multi_buffer = 0; - } - /* compute all actual lengths */ at9100_dci_standard_done(xfer); @@ -927,7 +893,6 @@ td->remainder = temp->len; td->fifo_bank = 0; td->error = 0; - td->did_multi_buffer = 0; td->did_stall = 0; td->short_pkt = temp->short_pkt; td->alt_next = temp->setup_alt_next; @@ -1081,11 +1046,6 @@ td = xfer->td_transfer_first; td->fifo_bank = 1; } - /* setup the correct multi buffer flag */ - if (sc->sc_ep_flags[ep_no].did_multi_buffer) { - td = xfer->td_transfer_first; - td->did_multi_buffer = 1; - } return; } @@ -1342,28 +1302,77 @@ } static void -at9100_dci_clear_stall(struct usbd_device *udev, struct usbd_pipe *pipe) +at9100_dci_reset_ep(struct usbd_device *udev, uint8_t ep_no) { struct at9100_dci_softc *sc; - uint32_t rst_val; + const struct usbd_hw_ep_profile *pf; + uint32_t csr_val; + uint32_t temp; + uint8_t csr_reg; + uint8_t to; + + /* get softc */ + sc = AT9100_DCI_BUS2SC(udev->bus); + + /* get endpoint profile */ + at9100_dci_get_hw_ep_profile(udev, &pf, ep_no); + + /* reset FIFO */ + AT91_UDP_WRITE_4(sc, AT91_UDP_RST, AT91_UDP_RST_EP(ep_no)); + AT91_UDP_WRITE_4(sc, AT91_UDP_RST, 0); + + /* + * NOTE: One would assume that a FIFO reset would release the + * FIFO banks aswell, but it doesn't! We have to do this + * manually! + */ + csr_reg = AT91_UDP_CSR(ep_no); + + /* release FIFO banks, if any */ + for (to = 0; to != 2; to++) { + + /* get csr value */ + csr_val = AT91_UDP_READ_4(sc, csr_reg); + + if (csr_val & (AT91_UDP_CSR_RX_DATA_BK0 | + AT91_UDP_CSR_RX_DATA_BK1)) { + /* clear status bits */ + if (pf->support_multi_buffer) { + if (sc->sc_ep_flags[ep_no].fifo_bank) { + sc->sc_ep_flags[ep_no].fifo_bank = 0; + temp = AT91_UDP_CSR_RX_DATA_BK1; + } else { + sc->sc_ep_flags[ep_no].fifo_bank = 1; + temp = AT91_UDP_CSR_RX_DATA_BK0; + } + } else { + temp = (AT91_UDP_CSR_RX_DATA_BK0 | + AT91_UDP_CSR_RX_DATA_BK1); + } + } else { + temp = 0; + } + + /* clear FORCESTALL */ + temp |= AT91_UDP_CSR_STALLSENT; - mtx_assert(&(udev->bus->mtx), MA_OWNED); + AT91_CSR_ACK(csr_val, temp); + AT91_UDP_WRITE_4(sc, csr_reg, csr_val); + } + return; +} +static void +at9100_dci_clear_stall(struct usbd_device *udev, struct usbd_pipe *pipe) +{ DPRINTFN(4, "pipe=%p\n", pipe); - /* reset pipe state */ + mtx_assert(&(udev->bus->mtx), MA_OWNED); - sc = AT9100_DCI_BUS2SC(udev->bus); - rst_val = (pipe->edesc->bEndpointAddress & UE_ADDR); - sc->sc_ep_flags[rst_val].did_multi_buffer = 0; - rst_val = AT91_UDP_RST_EP(rst_val); + /* reset endpoint */ + at9100_dci_reset_ep(udev, + (pipe->edesc->bEndpointAddress & UE_ADDR)); - /* - * XXX Do we need some delay between setting and clearing - * reset ? - */ - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, rst_val); - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, 0); return; } @@ -1401,11 +1410,7 @@ AT91_UDP_WRITE_4(sc, AT91_UDP_CSR(n), csr_val); /* reset endpoint */ - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, AT91_UDP_RST_EP(n)); - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, 0); - - /* reset "did_multi_buffer" */ - sc->sc_ep_flags[n].did_multi_buffer = 0; + at9100_dci_reset_ep(udev, n); } if (cd == NULL) { @@ -1486,10 +1491,6 @@ /* disable endpoint */ AT91_UDP_WRITE_4(sc, AT91_UDP_CSR(n), csr_val); - - /* reset endpoint */ - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, AT91_UDP_RST_EP(n)); - AT91_UDP_WRITE_4(sc, AT91_UDP_RST, 0); } /* enable the interrupts we want */ @@ -1860,13 +1861,13 @@ .DeviceRemovable = {0}, /* port is removable */ }; -#define STRING_LANG \ +#define STRING_LANG \ 0x09, 0x04, /* American English */ -#define STRING_VENDOR \ +#define STRING_VENDOR \ 'A', 0, 'T', 0, 'M', 0, 'E', 0, 'L', 0 -#define STRING_PRODUCT \ +#define STRING_PRODUCT \ 'D', 0, 'C', 0, 'I', 0, ' ', 0, 'R', 0, \ 'o', 0, 'o', 0, 't', 0, ' ', 0, 'H', 0, \ 'U', 0, 'B', 0, ==== //depot/projects/usb/src/sys/dev/usb/at9100_dci.h#4 (text+ko) ==== @@ -149,7 +149,6 @@ uint8_t alt_next:1; uint8_t short_pkt:1; uint8_t support_multi_buffer:1; - uint8_t did_multi_buffer:1; uint8_t did_stall:1; }; @@ -182,7 +181,6 @@ struct at9100_ep_flags { uint8_t fifo_bank:1; /* hardware specific */ - uint8_t did_multi_buffer:1; /* hardware specific */ }; struct at9100_flags { From owner-p4-projects@FreeBSD.ORG Sun Jan 6 21:55:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AB1716A47F; Sun, 6 Jan 2008 21:55:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C00F516A47D for ; Sun, 6 Jan 2008 21:55:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C02C413C4CC for ; Sun, 6 Jan 2008 21:55:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06LtPLW075929 for ; Sun, 6 Jan 2008 21:55:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06LtPBu075926 for perforce@freebsd.org; Sun, 6 Jan 2008 21:55:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 21:55:25 GMT Message-Id: <200801062155.m06LtPBu075926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 21:55:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132642 Change 132642 by hselasky@hselasky_laptop001 on 2008/01/06 21:55:09 We need to probe the USB bus a little bit later, because if a USB network device dissappears early the boot process will hang, because the network stack is not able to detach the device, hence the network stack has not been started at this point. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.c#31 (text+ko) ==== @@ -448,7 +448,7 @@ return; } -SYSINIT(usb_post_init, SI_SUB_PSEUDO, SI_ORDER_ANY, usb_post_init, NULL); +SYSINIT(usb_post_init, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, usb_post_init, NULL); static int usb_detach(device_t dev) From owner-p4-projects@FreeBSD.ORG Sun Jan 6 21:58:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 295B916A4B3; Sun, 6 Jan 2008 21:58:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E234316A49A for ; Sun, 6 Jan 2008 21:58:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CC0613C4E5 for ; Sun, 6 Jan 2008 21:58:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06LwTQo076035 for ; Sun, 6 Jan 2008 21:58:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06LwT0P076032 for perforce@freebsd.org; Sun, 6 Jan 2008 21:58:29 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Jan 2008 21:58:29 GMT Message-Id: <200801062158.m06LwT0P076032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 132643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 21:58:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132643 Change 132643 by pgj@disznohal on 2008/01/06 21:58:27 Add localized mirrors XML and XSL files (for Appendices A & C). Approved by: gabor (mentor) Affected files ... .. //depot/projects/docproj_hu/share/sgml/mirrors-local.xsl#1 add .. //depot/projects/docproj_hu/share/sgml/mirrors.xml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:03:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D555016A469; Sun, 6 Jan 2008 22:03:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AEF516A418 for ; Sun, 6 Jan 2008 22:03:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CECD13C458 for ; Sun, 6 Jan 2008 22:03:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06M3Yip078478 for ; Sun, 6 Jan 2008 22:03:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06M3YRj078475 for perforce@freebsd.org; Sun, 6 Jan 2008 22:03:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:03:34 GMT Message-Id: <200801062203.m06M3YRj078475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:03:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=132644 Change 132644 by hselasky@hselasky_laptop001 on 2008/01/06 22:02:58 Improve alternate setting. Add some more debug prints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#99 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#99 (text+ko) ==== @@ -3368,20 +3368,22 @@ } if (iface->alt_index == req.wValue[0]) { /* no change - nothing to do */ + PRINTFN(0, ("alt setting no change\n")); break; } - error = device_detach(iface->subdev); - if (error) { - goto tr_stalled; - } + usbd_detach_device(udev, req.wIndex[0], 1); + error = usbd_set_alt_interface_index(udev, req.wIndex[0], req.wValue[0]); if (error) { + PRINTFN(0, ("alt setting failed %s\n", + usbd_errstr(error))); goto tr_stalled; } error = usbd_probe_and_attach(udev, req.wIndex[0]); if (error) { + PRINTFN(0, ("alt setting probe failed\n")); goto tr_stalled; } break; From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:05:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AC2116A46D; Sun, 6 Jan 2008 22:05:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FD1C16A417 for ; Sun, 6 Jan 2008 22:05:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A0D013C469 for ; Sun, 6 Jan 2008 22:05:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06M5atY078641 for ; Sun, 6 Jan 2008 22:05:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06M5aHd078638 for perforce@freebsd.org; Sun, 6 Jan 2008 22:05:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:05:36 GMT Message-Id: <200801062205.m06M5aHd078638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:05:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=132645 Change 132645 by hselasky@hselasky_laptop001 on 2008/01/06 22:05:34 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#28 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#28 (text+ko) ==== @@ -274,7 +274,7 @@ #define UE_ISO_SYNC 0x0c #define UE_GET_ISO_TYPE(a) ((a) & UE_ISO_TYPE) uWord wMaxPacketSize; -#define UE_ZERO_MPS 0xFFFF /* for internal use only */ +#define UE_ZERO_MPS 0xFFFF /* for internal use only */ uByte bInterval; } __packed usb_endpoint_descriptor_t; From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:15:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED9E816A46D; Sun, 6 Jan 2008 22:15:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B32E416A46C for ; Sun, 6 Jan 2008 22:15:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B592A13C447 for ; Sun, 6 Jan 2008 22:15:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MFlcR082833 for ; Sun, 6 Jan 2008 22:15:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MFl2A082830 for perforce@freebsd.org; Sun, 6 Jan 2008 22:15:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:15:47 GMT Message-Id: <200801062215.m06MFl2A082830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:15:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=132646 Change 132646 by hselasky@hselasky_laptop001 on 2008/01/06 22:15:06 Add new CDC subclass protocol: o UIPROTO_CDC_ETH_512X4 This is the new Accelerated Zero Copy USB Ethernet protocol, which I have created. I would like to have some BSD Network experts to review the protocol before I freeze it. Basically the new USB ethernet protocol works like this: 1. Send fragment length list to peer. 2. Send all fragments accross like separate USB transfers. 3. The peer receives the frament list. 4. The peer builds up an USB chain to receive all the USB packets having one interrupt in the end. In other words: All fragmented IP packets gets defragmented at this point. The protocol supports a maximum of 511 ethernet frames that are split into a maximum of 4 fragments per interrupt. Question: Do we need to support more than 4 fragments per ethernet frame ? Please see coming commits to "if_cdce". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#29 (text+ko) ==== @@ -454,6 +454,7 @@ #define UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL 6 #define UISUBCLASS_ATM_NETWORKING_CONTROL_MODEL 7 #define UIPROTO_CDC_AT 1 +#define UIPROTO_CDC_ETH_512X4 0x76 /* FreeBSD specific */ #define UICLASS_HID 0x03 #define UISUBCLASS_BOOT 1 From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:17:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D58C16A420; Sun, 6 Jan 2008 22:17:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0305F16A419 for ; Sun, 6 Jan 2008 22:17:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 056D813C46A for ; Sun, 6 Jan 2008 22:17:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MHnxw082954 for ; Sun, 6 Jan 2008 22:17:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MHnuN082951 for perforce@freebsd.org; Sun, 6 Jan 2008 22:17:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:17:49 GMT Message-Id: <200801062217.m06MHnuN082951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=132647 Change 132647 by hselasky@hselasky_laptop001 on 2008/01/06 22:17:48 Revise the "Multi Frame Ethernet Header" to support fragments. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#8 (text+ko) ==== @@ -188,13 +188,18 @@ #define UCDC_MDM_PARITY_ERR 0x20 #define UCDC_MDM_OVERRUN_ERR 0x40 -/* Multi Frame Ethernet Header */ +/* 512x4 Multi Frame Ethernet Header */ typedef struct { - uByte bSig0[2]; /* "MF" */ - uDWord dwFramesAhead; - uDWord dwFramesAheadInverse; -} __packed usb_cdc_mf_eth_header_t; - -#define CDC_MF_ETH_HEADER_SIZE 10 /* bytes */ + uByte bSig[2]; /* "FL" - Frag List */ + uByte bReserved[4]; + uWord wFragLength[511 * 4]; +#define CDCE_512X4_FRAG_LENGTH_OFFSET 6 /* bytes */ +#define CDCE_512X4_FRAG_LAST_MASK 0x8000 +#define CDCE_512X4_FRAG_LENGTH_MASK 0x1FFF /* bytes */ +#define CDCE_512X4_FRAME_FRAG_MAX 4 /* fragments */ +#define CDCE_512X4_FRAMES_MAX 511 /* frames */ +#define CDCE_512X4_FRAGS_MAX (511 * 4) /* fragments */ + uWord wPadding; /* used to make transfer short */ +} __packed usb_cdc_mf_eth_512x4_header_t; #endif /* _USB_CDC_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:20:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C823C16A4A6; Sun, 6 Jan 2008 22:20:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D23C16A4A1 for ; Sun, 6 Jan 2008 22:20:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76B7E13C46A for ; Sun, 6 Jan 2008 22:20:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MKrYj083373 for ; Sun, 6 Jan 2008 22:20:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MKrvf083370 for perforce@freebsd.org; Sun, 6 Jan 2008 22:20:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:20:53 GMT Message-Id: <200801062220.m06MKrvf083370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:20:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132648 Change 132648 by hselasky@hselasky_laptop001 on 2008/01/06 22:20:26 Add support for the 512x4 ethernet over USB protocol to the default CDCE USB template. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_template_cdce.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_template_cdce.c#6 (text+ko) ==== @@ -40,6 +40,7 @@ STRING_LANG_INDEX, STRING_MAC_INDEX, STRING_ETH_CONTROL_INDEX, + STRING_ETH_CONTROL_512X4_INDEX, STRING_ETH_DATA_INDEX, STRING_ETH_CONFIG_INDEX, STRING_ETH_VENDOR_INDEX, @@ -65,6 +66,24 @@ 't', 0, 'e', 0, 'r', 0, 'f', 0, \ 'a', 0, 'c', 0, 'e', 0, +/* + * Hardware Accelerated Zero Copy CDC ethernet. Buffer capacity: 512 + * frames by 4 fragments per USB transfer. + */ +#define STRING_ETH_512X4_CONTROL \ + 'U', 0, 'S', 0, 'B', 0, ' ', 0, \ + 'E', 0, 't', 0, 'h', 0, 'e', 0, \ + 'r', 0, 'n', 0, 'e', 0, 't', 0, \ + ' ', 0, 'C', 0, 'o', 0, 'm', 0, \ + 'm', 0, ' ', 0, 'i', 0, 'n', 0, \ + 't', 0, 'e', 0, 'r', 0, 'f', 0, \ + 'a', 0, 'c', 0, 'e', 0, ' ', 0, \ + '5', 0, '1', 0, '2', 0, 'x', 0, \ + '4', 0, ' ', 0, 'H', 0, 'W', 0, \ + ' ', 0, 'A', 0, 'c', 0, 'c', 0, \ + 'e', 0, 'l', 0, 'e', 0, 'r', 0, \ + 'a', 0, 't', 0, 'e', 0, 'd', 0, + #define STRING_ETH_DATA \ 'U', 0, 'S', 0, 'B', 0, ' ', 0, \ 'E', 0, 't', 0, 'h', 0, 'e', 0, \ @@ -105,6 +124,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, string_lang); USB_MAKE_STRING_DESC(STRING_MAC, string_mac); USB_MAKE_STRING_DESC(STRING_ETH_CONTROL, string_eth_control); +USB_MAKE_STRING_DESC(STRING_ETH_512X4_CONTROL, string_eth_512x4_control); USB_MAKE_STRING_DESC(STRING_ETH_DATA, string_eth_data); USB_MAKE_STRING_DESC(STRING_ETH_CONFIG, string_eth_config); USB_MAKE_STRING_DESC(STRING_ETH_VENDOR, string_eth_vendor); @@ -191,6 +211,17 @@ .iInterface = STRING_ETH_CONTROL_INDEX, }; +static const struct usb_temp_interface_desc eth_control_if_512x4 = { + .ppEndpoints = eth_intr_endpoints, + .ppRawDesc = eth_control_if_desc, + .bInterfaceClass = UICLASS_CDC, + .bInterfaceSubClass = UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL, + .bInterfaceProtocol = UIPROTO_CDC_ETH_512X4, + .iInterface = STRING_ETH_CONTROL_512X4_INDEX, + .isAltInterface = 1, /* this is an alternate setting */ +}; + + static const struct usb_temp_endpoint_desc *eth_data_endpoints[] = { &bulk_in_ep, &bulk_out_ep, @@ -207,6 +238,7 @@ static const struct usb_temp_interface_desc *eth_interfaces[] = { ð_control_interface, + ð_control_if_512x4, ð_data_interface, NULL, }; @@ -244,6 +276,7 @@ [STRING_LANG_INDEX] = &string_lang, [STRING_MAC_INDEX] = &string_mac, [STRING_ETH_CONTROL_INDEX] = &string_eth_control, + [STRING_ETH_CONTROL_512X4_INDEX] = &string_eth_512x4_control, [STRING_ETH_DATA_INDEX] = &string_eth_data, [STRING_ETH_CONFIG_INDEX] = &string_eth_config, [STRING_ETH_VENDOR_INDEX] = &string_eth_vendor, From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:29:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FFC316A41B; Sun, 6 Jan 2008 22:29:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6087A16A417 for ; Sun, 6 Jan 2008 22:29:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60CB313C447 for ; Sun, 6 Jan 2008 22:29:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MT4Ih084586 for ; Sun, 6 Jan 2008 22:29:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MT3ah084583 for perforce@freebsd.org; Sun, 6 Jan 2008 22:29:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:29:03 GMT Message-Id: <200801062229.m06MT3ah084583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:29:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=132649 Change 132649 by hselasky@hselasky_laptop001 on 2008/01/06 22:28:36 Upgrade "if_cdce" to support the new 512x4 protocol. o I should have started by reverting CDCE to get rid of the initial MF protocol, instead of working forward. Basically there are two new callbacks "cdce_bulk_write_512x4_callback" and "cdce_bulk_read_512x4_callback". The other callbacks do the same like before. o Added some code to set the correct alternate setting. o The protocol has been tested on a AT91 KB9202B board and there was a noticable increase in the number of frames transmitted per second when doing a ping flood ! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#45 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#45 (text+ko) ==== @@ -115,15 +115,15 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .frames = CDCE_ETH_FRAMES_MAX, - .bufsize = (MCLBYTES * CDCE_ETH_FRAMES_MAX), + .frames = CDCE_512X4_FRAGS_MAX + 1, + .bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .if_index = 0, /* Host Mode */ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,}, .mh.callback = &cdce_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ /* Device Mode */ - .md.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,.short_frames_ok = 1,}, + .md.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,}, .md.callback = &cdce_bulk_read_callback, .md.timeout = 0, /* no timeout */ }, @@ -132,11 +132,11 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .frames = CDCE_ETH_FRAMES_MAX, - .bufsize = (MCLBYTES * CDCE_ETH_FRAMES_MAX), + .frames = CDCE_512X4_FRAGS_MAX + 1, + .bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .if_index = 0, /* Host Mode */ - .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,.short_frames_ok = 1,}, + .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,}, .mh.callback = &cdce_bulk_read_callback, .mh.timeout = 0, /* no timeout */ /* Device Mode */ @@ -280,9 +280,11 @@ const usb_cdc_union_descriptor_t *ud; const usb_cdc_ethernet_descriptor_t *ue; const usb_interface_descriptor_t *id; + usb_descriptor_t *desc = NULL; const struct cdce_type *t; struct ifnet *ifp; int error; + uint8_t alt_index; uint8_t i; uint8_t eaddr[ETHER_ADDR_LEN]; uint8_t eaddr_str[USB_STRING_DESC_LEN(ETHER_ADDR_LEN * 2) + 1]; @@ -298,6 +300,51 @@ if (t) { sc->sc_flags = t->cdce_flags; } + /* search for alternate settings */ + if (uaa->usb_mode == USB_MODE_HOST) { + + id = uaa->iface->idesc; + i = id->bInterfaceNumber; + alt_index = 0; + while ((desc = usbd_desc_foreach( + usbd_get_config_descriptor(uaa->device), desc))) { + id = (void *)desc; + if ((id->bDescriptorType == UDESC_INTERFACE) && + (id->bLength >= sizeof(*id))) { + if (id->bInterfaceNumber != i) { + alt_index = 0; + break; + } + if ((id->bInterfaceClass == UICLASS_CDC) && + (id->bInterfaceSubClass == + UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL) && + (id->bInterfaceProtocol == UIPROTO_CDC_ETH_512X4)) { + + alt_index = id->bAlternateSetting; + /* + * We want this alt setting hence + * the protocol supports multi + * sub-framing ! + */ + break; + } + } + } + + if (alt_index > 0) { + + error = usbd_set_alt_interface_index(uaa->device, + uaa->iface_index, alt_index); + if (error) { + device_printf(dev, "Could not set alternate " + "setting, error = %s\n", usbd_errstr(error)); + return (EINVAL); + } + } + } + /* get the interface subclass we are using */ + sc->sc_iface_protocol = uaa->iface->idesc->bInterfaceProtocol; + usbd_set_device_desc(dev); snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", @@ -459,8 +506,13 @@ ifp->if_start = cdce_start_cb; ifp->if_init = cdce_init_cb; ifp->if_baudrate = 11000000; - IFQ_SET_MAXLEN(&ifp->if_snd, CDCE_IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = CDCE_IFQ_MAXLEN; + if (sc->sc_iface_protocol == UIPROTO_CDC_ETH_512X4) { + IFQ_SET_MAXLEN(&ifp->if_snd, CDCE_512X4_IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = CDCE_512X4_IFQ_MAXLEN; + } else { + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + } IFQ_SET_READY(&ifp->if_snd); /* no IFM type for 11Mbps USB, so go with 10baseT */ @@ -547,7 +599,62 @@ return; } +static uint32_t +cdce_m_frags(struct mbuf *m) +{ + uint32_t temp = 1; + while ((m = m->m_next)) { + temp ++; + } + return (temp); +} + +static void +cdce_fwd_mq(struct cdce_softc *sc, struct cdce_mq *mq) +{ + struct mbuf *m; + struct ifnet *ifp = sc->sc_ifp; + + if (mq->ifq_head) { + + mtx_unlock(&(sc->sc_mtx)); + + while (1) { + + _IF_DEQUEUE(mq, m); + + if (m == NULL) + break; + + (ifp->if_input) (ifp, m); + } + + mtx_lock(&(sc->sc_mtx)); + } + return; +} + static void +cdce_free_mq(struct cdce_mq *mq) +{ + struct mbuf *m; + + if (mq->ifq_head) { + + while (1) { + + _IF_DEQUEUE(mq, m); + + if (m == NULL) + break; + + m_freem(m); + } + } + return; +} + +static void cdce_bulk_write_clear_stall_callback(struct usbd_xfer *xfer) { struct cdce_softc *sc = xfer->priv_sc; @@ -561,38 +668,140 @@ } static void -cdce_free_mbufs(struct mbuf **ppm) +cdce_bulk_write_512x4_callback(struct usbd_xfer *xfer) { + struct cdce_softc *sc = xfer->priv_sc; + struct ifnet *ifp = sc->sc_ifp; struct mbuf *m; + struct mbuf *mt; uint16_t x; + uint16_t y; + uint16_t flen; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: + DPRINTF(sc, 10, "transfer complete: " + "%u bytes in %u fragments and %u frames\n", + xfer->actlen, xfer->nframes, sc->sc_tx_mq.ifq_len); + + /* update packet counter */ + ifp->if_opackets += sc->sc_tx_mq.ifq_len; + + /* free all previous mbufs */ + cdce_free_mq(&(sc->sc_tx_mq)); + + case USBD_ST_SETUP: +tr_setup: + if (xfer->flags.stall_pipe && + (xfer->flags_int.usb_mode == USB_MODE_HOST)) { + /* try to clear stall */ + usbd_transfer_start(sc->sc_xfer[2]); + break; + } + + x = 0; /* number of frames */ + y = 1; /* number of fragments */ + + while (x != CDCE_512X4_FRAMES_MAX) { - /* free all previous mbufs */ - for (x = 0; x != CDCE_ETH_FRAMES_MAX; x++) { - m = ppm[x]; - if (m) { - m_freem(m); - ppm[x] = NULL; - } else { - if (x != 0) { + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); + + if (m == NULL) { break; } + if (m->m_pkthdr.len > MCLBYTES) { + m_freem(m); + ifp->if_oerrors++; + continue; + } + if (cdce_m_frags(m) > CDCE_512X4_FRAME_FRAG_MAX) { + mt = m_defrag(m, M_DONTWAIT); + if (mt == NULL) { + m_freem(m); + ifp->if_oerrors++; + continue; + } + m = mt; + } + + _IF_ENQUEUE(&(sc->sc_tx_mq), m); + + /* + * if there's a BPF listener, bounce a copy + * of this frame to him: + */ + BPF_MTAP(ifp, m); + +#if (CDCE_512X4_FRAG_LENGTH_MASK < MCLBYTES) +#error "(CDCE_512X4_FRAG_LENGTH_MASK < MCLBYTES)" +#endif + do { + + flen = m->m_len & CDCE_512X4_FRAG_LENGTH_MASK; + xfer->frlengths[y] = m->m_len; + usbd_set_frame_data(xfer, m->m_data, y); + + if (m->m_next == NULL) { + flen |= CDCE_512X4_FRAG_LAST_MASK; + } + + USETW(sc->sc_tx.hdr.wFragLength[y-1], flen); + + y++; + + } while ((m = m->m_next)); + + x++; + } + + if (y == 1) { + /* no data to transmit */ + break; + } + + /* fill in Signature */ + sc->sc_tx.hdr.bSig[0] = 'F'; + sc->sc_tx.hdr.bSig[1] = 'L'; + + /* + * We ensure that the header results in a short packet + * by making the length odd ! + */ + USETW(sc->sc_tx.hdr.wFragLength[y-1], 0); + xfer->frlengths[0] = CDCE_512X4_FRAG_LENGTH_OFFSET + ((y-1) * 2) + 1; + usbd_set_frame_data(xfer, &(sc->sc_tx.hdr), 0); + xfer->nframes = y; + usbd_start_hardware(xfer); + break; + + default: /* Error */ + DPRINTF(sc, 10, "transfer error, %s\n", + usbd_errstr(xfer->error)); + + /* update error counter */ + ifp->if_oerrors += sc->sc_tx_mq.ifq_len; + + /* free all previous mbufs */ + cdce_free_mq(&(sc->sc_tx_mq)); + + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; } + break; } return; } static void -cdce_bulk_write_callback(struct usbd_xfer *xfer) +cdce_bulk_write_std_callback(struct usbd_xfer *xfer) { struct cdce_softc *sc = xfer->priv_sc; struct ifnet *ifp = sc->sc_ifp; struct mbuf *m; struct mbuf *mt; uint32_t crc; - uint32_t x; - - /* free all previous mbufs */ - cdce_free_mbufs(sc->sc_tx_mbufs); switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: @@ -602,44 +811,22 @@ ifp->if_opackets++; + /* free all previous mbufs */ + cdce_free_mq(&(sc->sc_tx_mq)); + case USBD_ST_SETUP: tr_setup: if (xfer->flags.stall_pipe && (xfer->flags_int.usb_mode == USB_MODE_HOST)) { usbd_transfer_start(sc->sc_xfer[2]); - goto done; + break; } -#ifdef CDCE_MF_ENABLE - x = 1; -#else - x = 0; -#endif - while (x != CDCE_ETH_FRAMES_MAX) { IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { -#ifdef CDCE_DO_BENCHMARK - /* send dummy ethernet frames */ - usbd_set_frame_data(xfer, - &(sc->sc_rx_dump), x); - xfer->frlengths[x] = - (sizeof(sc->sc_rx_dump) / 2) + (x & 63) - 1; - x++; - continue; -#else break; -#endif } - if (m->m_pkthdr.len < sizeof(struct ether_header)) { - /* - * frames of this size have special meaning - * - filter away - */ - m_freem(m); - ifp->if_oerrors++; - continue; - } if (sc->sc_flags & CDCE_FLAG_ZAURUS) { /* * Zaurus wants a 32-bit CRC appended to @@ -652,27 +839,27 @@ if (!m_append(m, 4, (void *)&crc)) { m_freem(m); ifp->if_oerrors++; - continue; + goto tr_setup; } - m->m_pkthdr.len += 4; } if (m->m_len != m->m_pkthdr.len) { mt = m_defrag(m, M_DONTWAIT); if (mt == NULL) { m_freem(m); ifp->if_oerrors++; - continue; + goto tr_setup; } m = mt; } if (m->m_pkthdr.len > MCLBYTES) { m->m_pkthdr.len = MCLBYTES; } - sc->sc_tx_mbufs[x] = m; - xfer->frlengths[x] = m->m_len; + _IF_ENQUEUE(&(sc->sc_tx_mq), m); - usbd_set_frame_data(xfer, m->m_data, x); + xfer->frlengths[0] = m->m_len; + usbd_set_frame_data(xfer, m->m_data, 0); + xfer->nframes = 1; /* * if there's a BPF listener, bounce a copy @@ -680,51 +867,41 @@ */ BPF_MTAP(ifp, m); - x++; - } - - xfer->nframes = x; - -#ifdef CDCE_MF_ENABLE - if (x == 1) { - /* nothing to do */ - goto done; - } - /* fill out the Multi Frame header */ - usbd_set_frame_data(xfer, &(sc->sc_tx_eth.hdr), 0); - xfer->frlengths[0] = sizeof(sc->sc_tx_eth.hdr); - sc->sc_tx_eth.hdr.bSig0[0] = 'M'; - sc->sc_tx_eth.hdr.bSig0[1] = 'F'; - x--; - /* tell the peer how many frames are coming */ - x += ifp->if_snd.ifq_drv_len; - USETDW(sc->sc_tx_eth.hdr.dwFramesAhead, x); - x = ~x; - USETDW(sc->sc_tx_eth.hdr.dwFramesAheadInverse, x); -#else - if (x == 0) { - /* nothing to do */ - goto done; - } -#endif usbd_start_hardware(xfer); + break; -done: - return; - default: /* Error */ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); + /* free all previous mbufs */ + cdce_free_mq(&(sc->sc_tx_mq)); + ifp->if_oerrors++; + if (xfer->error != USBD_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; } - ifp->if_oerrors++; - return; + break; + } + return; +} + +static void +cdce_bulk_write_callback(struct usbd_xfer *xfer) +{ + struct cdce_softc *sc = xfer->priv_sc; + /* first call - set the correct callback */ + if (sc->sc_iface_protocol == UIPROTO_CDC_ETH_512X4) { + xfer->flags.force_short_xfer = 0; + xfer->callback = &cdce_bulk_write_512x4_callback; + } else { + xfer->callback = &cdce_bulk_write_std_callback; } + (xfer->callback) (xfer); + return; } static int32_t @@ -883,16 +1060,24 @@ } static void -cdce_bulk_read_callback(struct usbd_xfer *xfer) +cdce_bulk_read_512x4_callback(struct usbd_xfer *xfer) { - struct cdce_mq mq = {NULL, NULL, 0}; struct cdce_softc *sc = xfer->priv_sc; struct ifnet *ifp = sc->sc_ifp; struct mbuf *m; - usb_cdc_mf_eth_header_t *mf_hdr; - uint32_t x; - uint32_t ta; - uint32_t tb; + void *data_ptr; + uint32_t offset; + uint16_t x; + uint16_t y; + uint16_t z; + uint16_t rx_frags; + uint16_t flen; + uint8_t fwd_mq; + uint8_t free_mq; + + fwd_mq = 0; + free_mq = 0; + rx_frags = 0; switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: @@ -900,172 +1085,312 @@ DPRINTF(sc, 0, "received %u bytes in %u frames\n", xfer->actlen, xfer->aframes); - for (x = 0; x != xfer->nframes; x++) { + /* check state */ + if (!(sc->sc_flags & CDCE_FLAG_RX_DATA)) { - if (sc->sc_flags & CDCE_FLAG_ZAURUS) { - - /* Strip off CRC added by Zaurus */ - if (xfer->frlengths[x] >= MAX(4, 14)) { - xfer->frlengths[x] -= 4; - } + /* verify the header */ + if ((xfer->actlen < CDCE_512X4_FRAG_LENGTH_OFFSET) || + (sc->sc_rx.hdr.bSig[0] != 'F') || + (sc->sc_rx.hdr.bSig[1] != 'L')) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; } - m = sc->sc_rx_mbufs[x]; - sc->sc_rx_mbufs[x] = NULL; - if (m == NULL) { - continue; + rx_frags = (xfer->actlen - + CDCE_512X4_FRAG_LENGTH_OFFSET) / 2; + if (rx_frags != 0) { + /* start receiving data */ + sc->sc_flags |= CDCE_FLAG_RX_DATA; } - if (xfer->frlengths[x] < sizeof(struct ether_header)) { -#ifdef CDCE_MF_ENABLE - if (xfer->frlengths[x] >= - CDC_MF_ETH_HEADER_SIZE) { + DPRINTF(sc, 0, "doing %u fragments\n", rx_frags); - mf_hdr = (void *)(m->m_data); + } else { + /* we are done receiving data */ + sc->sc_flags &= ~CDCE_FLAG_RX_DATA; + fwd_mq = 1; + } - /* - * decode and verify the multi - * frame header - */ + case USBD_ST_SETUP: +tr_setup: + if (xfer->flags.stall_pipe) { - ta = UGETDW(mf_hdr->dwFramesAhead); - tb = UGETDW(mf_hdr->dwFramesAheadInverse); - tb ^= ta; + /* we are done */ + sc->sc_flags &= ~CDCE_FLAG_RX_DATA; - DPRINTF(sc, 0, "ta = 0x%08x, " - "tb = 0x%08x\n", ta, tb); + if (xfer->flags_int.usb_mode == USB_MODE_HOST) { + usbd_transfer_start(sc->sc_xfer[3]); + free_mq = 1; + break; + } + } + /* we expect a Multi Frame Ethernet Header */ + if (!(sc->sc_flags & CDCE_FLAG_RX_DATA)) { + DPRINTF(sc, 0, "expecting length header\n"); + usbd_set_frame_data(xfer, &(sc->sc_rx.hdr), 0); + xfer->frlengths[0] = sizeof(sc->sc_rx.hdr); + xfer->nframes = 1; + xfer->flags.short_xfer_ok = 1; + usbd_start_hardware(xfer); + free_mq = 1; + break; + } + /* verify number of fragments */ + if (rx_frags > CDCE_512X4_FRAGS_MAX) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; + } - /* - * check if we have a multi frame - * header - */ - if ((tb == 0xFFFFFFFF) && - (mf_hdr->bSig0[0] == 'M') && - (mf_hdr->bSig0[1] == 'F')) { + /* check if the last fragment does not complete a frame */ + x = rx_frags - 1; + flen = UGETW(sc->sc_rx.hdr.wFragLength[x]); + if (!(flen & CDCE_512X4_FRAG_LAST_MASK)) { + DPRINTF(sc, 0, "no last frag mask\n"); + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; + } + /* + * Setup a new USB transfer chain to receive all the + * IP-frame fragments, automagically defragged : + */ + x = 0; + y = 0; + while (1) { - DPRINTF(sc, 0, "frames ahead " - "= %u\n", ta); + z = x; + offset = 0; - sc->sc_rx_frames_ahead = ta; - } + /* precompute the frame length */ + while (1) { + flen = UGETW(sc->sc_rx.hdr.wFragLength[z]); + offset += (flen & CDCE_512X4_FRAG_LENGTH_MASK); + if (flen & CDCE_512X4_FRAG_LAST_MASK) { + break; } -#endif + z++; + } - m_freem(m); - continue; - } else { + if (offset >= sizeof(struct ether_header)) { /* - * we received a frame - decrement frames - * ahead + * allocate a suitable memory buffer, if + * possible */ - if (sc->sc_rx_frames_ahead) { - sc->sc_rx_frames_ahead--; + if (offset > (MCLBYTES - ETHER_ALIGN)) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; + } if (offset > (MHLEN - ETHER_ALIGN)) { + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + } else { + m = m_gethdr(M_DONTWAIT, MT_DATA); } + } else { + m = NULL; /* dump it */ } - ifp->if_ipackets++; - m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = xfer->frlengths[x]; + DPRINTF(sc, 16, "frame %u, length = %u \n", y, offset); + + /* check if we have a buffer */ + if (m) { + m->m_data = USBD_ADD_BYTES(m->m_data, ETHER_ALIGN); + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = m->m_len = offset; + + /* enqueue */ + _IF_ENQUEUE(&(sc->sc_rx_mq), m); + + data_ptr = m->m_data; + ifp->if_ipackets++; + } else { + data_ptr = sc->sc_rx.data; + ifp->if_ierrors++; + } + + /* setup the RX chain */ + offset = 0; + while (1) { + + flen = UGETW(sc->sc_rx.hdr.wFragLength[x]); + + usbd_set_frame_data(xfer, + USBD_ADD_BYTES(data_ptr, offset), x); + + xfer->frlengths[x] = + (flen & CDCE_512X4_FRAG_LENGTH_MASK); - /* enqueue */ - _IF_ENQUEUE(&(mq), m); - } + DPRINTF(sc, 16, "length[%u] = %u\n", + x, xfer->frlengths[x]); - case USBD_ST_SETUP: -tr_setup: - if (xfer->flags.stall_pipe) { + offset += xfer->frlengths[x]; - /* reset number of frames ahead */ - sc->sc_rx_frames_ahead = 0; + x++; - if (xfer->flags_int.usb_mode == USB_MODE_HOST) { - usbd_transfer_start(sc->sc_xfer[3]); - /* - * In case the "stall_pipe" flag was set - * while transferring data, we need to go to - * the "tr_if_input" afterwards! - */ - goto tr_if_input; + if (flen & CDCE_512X4_FRAG_LAST_MASK) { + break; + } } - } - /* setup a new USB transfer chain */ - ta = sc->sc_rx_frames_ahead; + y++; - if (ta == 0) { - /* always receive at least one frame */ - ta = 1; - } - if (ta > CDCE_ETH_FRAMES_MAX) { - ta = CDCE_ETH_FRAMES_MAX; - } - for (x = 0; x != ta; x++) { - m = usbd_ether_get_mbuf(); - if (m == NULL) { + if (x == rx_frags) { break; } - usbd_set_frame_data(xfer, m->m_data, x); + if (y == CDCE_512X4_FRAMES_MAX) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; + } + } + + DPRINTF(sc, 0, "nframes = %u\n", x); + + xfer->nframes = x; + xfer->flags.short_xfer_ok = 0; + usbd_start_hardware(xfer); + break; + + default: /* Error */ + DPRINTF(sc, 0, "error = %s\n", + usbd_errstr(xfer->error)); - xfer->frlengths[x] = m->m_len; - sc->sc_rx_mbufs[x] = m; + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto tr_setup; } + free_mq = 1; + break; + } + + /* + * At the end of a USB callback it is always safe to unlock + * the private mutex of a device! + * + * + * By safe we mean that if "usbd_transfer_stop()" is called, + * we will get a callback having the error code + * USBD_CANCELLED. + */ + if (fwd_mq) { + cdce_fwd_mq(sc, &(sc->sc_rx_mq)); + } + + if (free_mq) { + cdce_free_mq(&(sc->sc_rx_mq)); + } + return; +} + +static void +cdce_bulk_read_std_callback(struct usbd_xfer *xfer) +{ + struct cdce_softc *sc = xfer->priv_sc; + struct ifnet *ifp = sc->sc_ifp; + struct mbuf *m; + struct mbuf *m_rx = NULL; - for (; x != ta; x++) { + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: - /* - * We are out of mbufs and need to dump all the - * received data ! - */ - usbd_set_frame_data(xfer, &(sc->sc_rx_dump), x); - xfer->frlengths[x] = sizeof(sc->sc_rx_dump); - } - xfer->nframes = ta; - usbd_start_hardware(xfer); + DPRINTF(sc, 0, "received %u bytes in %u frames\n", + xfer->actlen, xfer->aframes); - /* - * At the end of a USB callback it is always safe to - * unlock the private mutex of a device! That is why - * we do the "if_input" here, and not some lines up! - * - * By safe we mean that if "usbd_transfer_stop()" is - * called, we will get a callback having the error - * code USBD_CANCELLED. - */ -tr_if_input: - if (mq.ifq_head) { + if (sc->sc_flags & CDCE_FLAG_ZAURUS) { - mtx_unlock(&(sc->sc_mtx)); + /* Strip off CRC added by Zaurus */ + if (xfer->frlengths[0] >= MAX(4, 14)) { + xfer->frlengths[0] -= 4; + } + } - while (1) { + _IF_DEQUEUE(&(sc->sc_rx_mq), m); - _IF_DEQUEUE(&(mq), m); + if (m) { - if (m == NULL) - break; + if (xfer->frlengths[0] < sizeof(struct ether_header)) { + m_freem(m); + goto tr_setup; + } + ifp->if_ipackets++; + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = m->m_len = xfer->frlengths[0]; + m_rx = m; + } + case USBD_ST_SETUP: +tr_setup: + if (xfer->flags.stall_pipe) { - (ifp->if_input) (ifp, m); + if (xfer->flags_int.usb_mode == USB_MODE_HOST) { + usbd_transfer_start(sc->sc_xfer[3]); + break; } + } + m = usbd_ether_get_mbuf(); + if (m == NULL) { + + /* + * We are out of mbufs and need to dump all the + * received data ! + */ + usbd_set_frame_data(xfer, &(sc->sc_rx.data), 0); + xfer->frlengths[0] = sizeof(sc->sc_rx.data); - mtx_lock(&(sc->sc_mtx)); + } else { + usbd_set_frame_data(xfer, m->m_data, 0); + xfer->frlengths[0] = m->m_len; + _IF_ENQUEUE(&(sc->sc_rx_mq), m); } - return; + xfer->nframes = 1; + usbd_start_hardware(xfer); + break; default: /* Error */ - /* free all received data, if any */ - cdce_free_mbufs(sc->sc_rx_mbufs); + DPRINTF(sc, 0, "error = %s\n", + usbd_errstr(xfer->error)); - /* reset number of frames ahead */ - sc->sc_rx_frames_ahead = 0; + /* free all mbufs */ + cdce_free_mq(&(sc->sc_rx_mq)); if (xfer->error != USBD_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; } - DPRINTF(sc, 0, "bulk read error, %s\n", - usbd_errstr(xfer->error)); return; + } + + /* + * At the end of a USB callback it is always safe to unlock + * the private mutex of a device! That is why we do the + * "if_input" here, and not some lines up! + * + * By safe we mean that if "usbd_transfer_stop()" is called, + * we will get a callback having the error code + * USBD_CANCELLED. + */ + if (m_rx) { + mtx_unlock(&(sc->sc_mtx)); + (ifp->if_input) (ifp, m_rx); + mtx_lock(&(sc->sc_mtx)); + } + return; +} + +static void +cdce_bulk_read_callback(struct usbd_xfer *xfer) +{ + struct cdce_softc *sc = xfer->priv_sc; + /* first call - set the correct callback */ + if (sc->sc_iface_protocol == UIPROTO_CDC_ETH_512X4) { + xfer->callback = &cdce_bulk_read_512x4_callback; + } else { + xfer->callback = &cdce_bulk_read_std_callback; } + (xfer->callback) (xfer); + return; } static int @@ -1166,13 +1491,9 @@ } static int -cdce_handle_request(device_t dev, const void *req, void **pptr, - uint16_t *plen, uint16_t offset, uint8_t is_complete) +cdce_handle_request(device_t dev, + const void *req, void **pptr, uint16_t *plen, + uint16_t offset, uint8_t is_complete) { -#ifdef USB_DEBUG - struct cdce_softc *sc = device_get_softc(dev); - - DPRINTF(sc, 0, "\n"); -#endif - return (ENXIO); /* use builtin handling */ + return (ENXIO); /* use builtin handler */ } ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#16 (text+ko) ==== @@ -37,21 +37,20 @@ #define CDCE_N_TRANSFER 6 /* units */ #define CDCE_IND_SIZE_MAX 32 /* bytes */ -#define CDCE_ETH_FRAMES_MAX 64 /* USB ethernet acceleration factor */ -#define CDCE_IFQ_MAXLEN MAX((2*CDCE_ETH_FRAMES_MAX), IFQ_MAXLEN) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:30:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DCAE16A41A; Sun, 6 Jan 2008 22:30:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C772B16A419 for ; Sun, 6 Jan 2008 22:30:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C868E13C459 for ; Sun, 6 Jan 2008 22:30:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MU5K6084689 for ; Sun, 6 Jan 2008 22:30:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MU5jo084685 for perforce@freebsd.org; Sun, 6 Jan 2008 22:30:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jan 2008 22:30:05 GMT Message-Id: <200801062230.m06MU5jo084685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:30:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=132651 Change 132651 by hselasky@hselasky_laptop001 on 2008/01/06 22:29:10 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#46 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#46 (text+ko) ==== @@ -307,7 +307,7 @@ i = id->bInterfaceNumber; alt_index = 0; while ((desc = usbd_desc_foreach( - usbd_get_config_descriptor(uaa->device), desc))) { + usbd_get_config_descriptor(uaa->device), desc))) { id = (void *)desc; if ((id->bDescriptorType == UDESC_INTERFACE) && (id->bLength >= sizeof(*id))) { @@ -316,8 +316,8 @@ break; } if ((id->bInterfaceClass == UICLASS_CDC) && - (id->bInterfaceSubClass == - UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL) && + (id->bInterfaceSubClass == + UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL) && (id->bInterfaceProtocol == UIPROTO_CDC_ETH_512X4)) { alt_index = id->bAlternateSetting; @@ -507,11 +507,11 @@ ifp->if_init = cdce_init_cb; ifp->if_baudrate = 11000000; if (sc->sc_iface_protocol == UIPROTO_CDC_ETH_512X4) { - IFQ_SET_MAXLEN(&ifp->if_snd, CDCE_512X4_IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = CDCE_512X4_IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, CDCE_512X4_IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = CDCE_512X4_IFQ_MAXLEN; } else { - IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; } IFQ_SET_READY(&ifp->if_snd); @@ -602,11 +602,12 @@ static uint32_t cdce_m_frags(struct mbuf *m) { - uint32_t temp = 1; - while ((m = m->m_next)) { - temp ++; - } - return (temp); + uint32_t temp = 1; + + while ((m = m->m_next)) { + temp++; + } + return (temp); } static void @@ -682,7 +683,7 @@ case USBD_ST_TRANSFERRED: DPRINTF(sc, 10, "transfer complete: " "%u bytes in %u fragments and %u frames\n", - xfer->actlen, xfer->nframes, sc->sc_tx_mq.ifq_len); + xfer->actlen, xfer->nframes, sc->sc_tx_mq.ifq_len); /* update packet counter */ ifp->if_opackets += sc->sc_tx_mq.ifq_len; @@ -698,10 +699,9 @@ usbd_transfer_start(sc->sc_xfer[2]); break; } + x = 0; /* number of frames */ + y = 1; /* number of fragments */ - x = 0; /* number of frames */ - y = 1; /* number of fragments */ - while (x != CDCE_512X4_FRAMES_MAX) { IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); @@ -723,7 +723,6 @@ } m = mt; } - _IF_ENQUEUE(&(sc->sc_tx_mq), m); /* @@ -737,38 +736,36 @@ #endif do { - flen = m->m_len & CDCE_512X4_FRAG_LENGTH_MASK; - xfer->frlengths[y] = m->m_len; - usbd_set_frame_data(xfer, m->m_data, y); + flen = m->m_len & CDCE_512X4_FRAG_LENGTH_MASK; + xfer->frlengths[y] = m->m_len; + usbd_set_frame_data(xfer, m->m_data, y); - if (m->m_next == NULL) { - flen |= CDCE_512X4_FRAG_LAST_MASK; - } + if (m->m_next == NULL) { + flen |= CDCE_512X4_FRAG_LAST_MASK; + } + USETW(sc->sc_tx.hdr.wFragLength[y - 1], flen); - USETW(sc->sc_tx.hdr.wFragLength[y-1], flen); + y++; - y++; - } while ((m = m->m_next)); x++; } if (y == 1) { - /* no data to transmit */ - break; + /* no data to transmit */ + break; } - /* fill in Signature */ sc->sc_tx.hdr.bSig[0] = 'F'; sc->sc_tx.hdr.bSig[1] = 'L'; - /* - * We ensure that the header results in a short packet - * by making the length odd ! + /* + * We ensure that the header results in a short packet by + * making the length odd ! */ - USETW(sc->sc_tx.hdr.wFragLength[y-1], 0); - xfer->frlengths[0] = CDCE_512X4_FRAG_LENGTH_OFFSET + ((y-1) * 2) + 1; + USETW(sc->sc_tx.hdr.wFragLength[y - 1], 0); + xfer->frlengths[0] = CDCE_512X4_FRAG_LENGTH_OFFSET + ((y - 1) * 2) + 1; usbd_set_frame_data(xfer, &(sc->sc_tx.hdr), 0); xfer->nframes = y; usbd_start_hardware(xfer); @@ -821,51 +818,49 @@ usbd_transfer_start(sc->sc_xfer[2]); break; } + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); - IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); + if (m == NULL) { + break; + } + if (sc->sc_flags & CDCE_FLAG_ZAURUS) { + /* + * Zaurus wants a 32-bit CRC appended to + * every frame + */ - if (m == NULL) { - break; - } - if (sc->sc_flags & CDCE_FLAG_ZAURUS) { - /* - * Zaurus wants a 32-bit CRC appended to - * every frame - */ + crc = cdce_m_crc32(m, 0, m->m_pkthdr.len); + crc = htole32(crc); - crc = cdce_m_crc32(m, 0, m->m_pkthdr.len); - crc = htole32(crc); - - if (!m_append(m, 4, (void *)&crc)) { - m_freem(m); - ifp->if_oerrors++; - goto tr_setup; - } + if (!m_append(m, 4, (void *)&crc)) { + m_freem(m); + ifp->if_oerrors++; + goto tr_setup; } - if (m->m_len != m->m_pkthdr.len) { - mt = m_defrag(m, M_DONTWAIT); - if (mt == NULL) { - m_freem(m); - ifp->if_oerrors++; - goto tr_setup; - } - m = mt; + } + if (m->m_len != m->m_pkthdr.len) { + mt = m_defrag(m, M_DONTWAIT); + if (mt == NULL) { + m_freem(m); + ifp->if_oerrors++; + goto tr_setup; } - if (m->m_pkthdr.len > MCLBYTES) { - m->m_pkthdr.len = MCLBYTES; - } + m = mt; + } + if (m->m_pkthdr.len > MCLBYTES) { + m->m_pkthdr.len = MCLBYTES; + } + _IF_ENQUEUE(&(sc->sc_tx_mq), m); - _IF_ENQUEUE(&(sc->sc_tx_mq), m); + xfer->frlengths[0] = m->m_len; + usbd_set_frame_data(xfer, m->m_data, 0); + xfer->nframes = 1; - xfer->frlengths[0] = m->m_len; - usbd_set_frame_data(xfer, m->m_data, 0); - xfer->nframes = 1; - - /* - * if there's a BPF listener, bounce a copy - * of this frame to him: - */ - BPF_MTAP(ifp, m); + /* + * if there's a BPF listener, bounce a copy + * of this frame to him: + */ + BPF_MTAP(ifp, m); usbd_start_hardware(xfer); break; @@ -1096,13 +1091,12 @@ xfer->flags.stall_pipe = 1; goto tr_setup; } - rx_frags = (xfer->actlen - + rx_frags = (xfer->actlen - CDCE_512X4_FRAG_LENGTH_OFFSET) / 2; if (rx_frags != 0) { /* start receiving data */ sc->sc_flags |= CDCE_FLAG_RX_DATA; } - DPRINTF(sc, 0, "doing %u fragments\n", rx_frags); } else { @@ -1141,7 +1135,6 @@ xfer->flags.stall_pipe = 1; goto tr_setup; } - /* check if the last fragment does not complete a frame */ x = rx_frags - 1; flen = UGETW(sc->sc_rx.hdr.wFragLength[x]); @@ -1220,8 +1213,8 @@ xfer->frlengths[x] = (flen & CDCE_512X4_FRAG_LENGTH_MASK); - DPRINTF(sc, 16, "length[%u] = %u\n", - x, xfer->frlengths[x]); + DPRINTF(sc, 16, "length[%u] = %u\n", + x, xfer->frlengths[x]); offset += xfer->frlengths[x]; @@ -1266,7 +1259,7 @@ /* * At the end of a USB callback it is always safe to unlock - * the private mutex of a device! + * the private mutex of a device! * * * By safe we mean that if "usbd_transfer_stop()" is called, @@ -1276,7 +1269,6 @@ if (fwd_mq) { cdce_fwd_mq(sc, &(sc->sc_rx_mq)); } - if (free_mq) { cdce_free_mq(&(sc->sc_rx_mq)); } @@ -1304,7 +1296,6 @@ xfer->frlengths[0] -= 4; } } - _IF_DEQUEUE(&(sc->sc_rx_mq), m); if (m) { @@ -1495,5 +1486,5 @@ const void *req, void **pptr, uint16_t *plen, uint16_t offset, uint8_t is_complete) { - return (ENXIO); /* use builtin handler */ + return (ENXIO); /* use builtin handler */ } ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#17 (text+ko) ==== @@ -44,12 +44,12 @@ uint16_t cdce_flags; }; -union cdce_eth_rx { /* multiframe header */ +union cdce_eth_rx { /* multiframe header */ usb_cdc_mf_eth_512x4_header_t hdr; - uint8_t data[MCLBYTES]; + uint8_t data[MCLBYTES]; } __aligned(USB_HOST_ALIGN); -union cdce_eth_tx { /* multiframe header */ +union cdce_eth_tx { /* multiframe header */ usb_cdc_mf_eth_512x4_header_t hdr; } __aligned(USB_HOST_ALIGN); @@ -86,7 +86,7 @@ uint8_t sc_name[16]; uint8_t sc_data_iface_no; uint8_t sc_ifaces_index[2]; - uint8_t sc_iface_protocol; + uint8_t sc_iface_protocol; }; #endif /* _USB_IF_CDCEREG_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:30:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B634C16A420; Sun, 6 Jan 2008 22:30:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6738A16A418; Sun, 6 Jan 2008 22:30:56 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from dommail.onthenet.com.au (dommail.OntheNet.com.au [203.13.70.57]) by mx1.freebsd.org (Postfix) with ESMTP id C6DC013C45D; Sun, 6 Jan 2008 22:30:55 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from excfreebsd.hq.netapp.com (nat-198-95-226-228.netapp.com [198.95.226.228]) by dommail.onthenet.com.au (MOS 3.7.5a-GA) with ESMTP id DLJ49758 (AUTH peterg@ptree32.com.au); Mon, 7 Jan 2008 08:17:54 +1000 (EST) Message-ID: <47815371.9020501@freebsd.org> Date: Sun, 06 Jan 2008 14:17:21 -0800 From: Peter Grehan User-Agent: Thunderbird 2.0.0.0 (X11/20070525) MIME-Version: 1.0 To: Rafal Jaworowski References: <200801041525.m04FPIrt011288@repoman.freebsd.org> In-Reply-To: <200801041525.m04FPIrt011288@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: grehan@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:30:57 -0000 Hi Rafal, > Temporary fix to avoid confusion of 'kstack0' symbol and make e500 > kernel operational again. kstack0 area requires further > improvements (space for kstack0 is now statically defined within > kernel body, does not have guard pages etc., which should be fixed) On AIM it is allocated correctly but never switched over. The (not-yet-implemented) plan was to mimic amd64 and return the value from powerpc_init() to locore, switching r1 to this value before calling mi_startup(). later, Peter. From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:39:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 577DC16A477; Sun, 6 Jan 2008 22:39:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02DB816A4E9 for ; Sun, 6 Jan 2008 22:39:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00EBF13C44B for ; Sun, 6 Jan 2008 22:39:18 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MdHos087058 for ; Sun, 6 Jan 2008 22:39:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MdFw1087055 for perforce@freebsd.org; Sun, 6 Jan 2008 22:39:15 GMT (envelope-from csjp@freebsd.org) Date: Sun, 6 Jan 2008 22:39:15 GMT Message-Id: <200801062239.m06MdFw1087055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 132652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:39:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=132652 Change 132652 by csjp@csjp_xor on 2008/01/06 22:38:48 Integrate the zcopybpf branch Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#14 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#15 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#8 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#11 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/zcopybpf/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_script.c#1 branch .. //depot/projects/zcopybpf/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/zcopybpf/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/creator.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/streams/streams.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ums.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_tc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf.c#36 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if_enc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#8 integrate .. //depot/projects/zcopybpf/src/sys/net/netisr.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/route.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net/route.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/pswitch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/tsb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/copyright.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/file.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/kdb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/kernel.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/kerneldump.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#11 integrate .. //depot/projects/zcopybpf/src/sys/sys/priv.h#8 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/tree.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/unpcb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/pmap.h#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_kern.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#8 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.h#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#11 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_reserv.c#1 branch .. //depot/projects/zcopybpf/src/sys/vm/vm_reserv.h#1 branch .. //depot/projects/zcopybpf/src/usr.sbin/netstat/atalk.c#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#7 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/if.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet.c#7 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet6.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/ipsec.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/ipx.c#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/main.c#5 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/mbuf.c#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/mcast.c#5 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/mroute.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/mroute6.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/netgraph.c#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/netstat.h#5 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/pfkey.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/route.c#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/sctp.c#5 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/unix.c#3 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.679 2007/12/12 20:24:06 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.680 2007/12/25 17:51:55 rwatson Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1277,7 +1277,8 @@ #ifdef KDB if (boothowto & RB_KDB) - kdb_enter("Boot flags requested debugger"); + kdb_enter(KDB_WHY_BOOTFLAGS, + "Boot flags requested debugger"); #endif identify_cpu(); /* Final stage of CPU initialization */ ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_watchdog.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.6 2007/12/25 17:51:55 rwatson Exp $ */ #include "opt_mp_watchdog.h" @@ -203,7 +203,7 @@ if (watchdog_nmi) watchdog_ipi_nmi(); else - kdb_enter("mp_watchdog"); + kdb_enter(KDB_WHY_WATCHDOG, "mp_watchdog"); } } bcopy(old_pcomm, p->p_comm, MAXCOMLEN + 1); ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.599 2007/12/09 21:00:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.602 2008/01/06 18:51:03 alc Exp $"); /* * Manages physical address maps. @@ -614,7 +614,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1554,7 +1553,7 @@ /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, nkpt, VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); @@ -1572,12 +1571,9 @@ continue; } - /* - * This index is bogus, but out of the way - */ - nkpg = vm_page_alloc(NULL, nkpt, + nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); nkpt++; @@ -1702,7 +1698,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1850,7 +1845,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1870,7 +1864,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1887,7 +1880,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2121,7 +2113,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -2253,8 +2244,8 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_paddr_t pa; pd_entry_t *pde; @@ -3048,7 +3039,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); ==== //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#9 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ # # @@ -411,6 +411,7 @@ # vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver +# asmc: Apple System Management Controller # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -436,7 +437,7 @@ hint.pbio.0.port="0x360" device smbios device vpd - +device asmc # # Laptop/Notebook options: # ==== //depot/projects/zcopybpf/src/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.139 2008/01/06 18:51:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -231,7 +231,6 @@ struct pv_chunk; struct md_page { - int pv_list_count; TAILQ_HEAD(,pv_entry) pv_list; }; ==== //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#6 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.50 2007/12/27 16:45:38 alc Exp $ */ @@ -132,6 +132,20 @@ #define VM_NFREEORDER 13 /* + * Enable superpage reservations: 1 level. + */ +#ifndef VM_NRESERVLEVEL +#define VM_NRESERVLEVEL 1 +#endif + +/* + * Level 0 reservations consist of 512 pages. + */ +#ifndef VM_LEVEL_0_ORDER +#define VM_LEVEL_0_ORDER 9 +#endif + +/* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. * Because of the page that is both a PD and PT, it looks a little ==== //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#9 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.93 2007/12/11 20:35:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.96 2008/01/03 07:34:33 alc Exp $"); #include #include #include @@ -3170,11 +3170,10 @@ #if defined(PMAP_DEBUG) /* - * XXX this makes pmap_page_protect(NONE) illegal for non-managed - * pages! + * XXX This makes pmap_remove_all() illegal for non-managed pages! */ if (m->flags & PG_FICTITIOUS) { - panic("pmap_page_protect: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); + panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); } #endif @@ -3325,8 +3324,8 @@ */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_page_lock_queues(); ==== //depot/projects/zcopybpf/src/sys/arm/at91/uart_dev_at91usart.c#3 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.12 2007/04/02 22:00:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.13 2007/12/25 17:51:55 rwatson Exp $"); #include "opt_comconsole.h" @@ -508,7 +508,7 @@ #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { if (kdb_alt_break(key, &sc->sc_altbrk)) - kdb_enter("Break sequence to console"); + kdb_enter(KDB_WHY_BREAK, "Break sequence to console"); } #endif uart_rx_put(sc, key); ==== //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.11 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.12 2007/12/27 16:45:38 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -85,6 +85,13 @@ */ #define VM_NFREEORDER 9 +/* + * Disable superpage reservations. + */ +#ifndef VM_NRESERVLEVEL +#define VM_NRESERVLEVEL 0 +#endif + #define UPT_MAX_ADDRESS VADDR(UPTPTDI + 3, 0) #define UPT_MIN_ADDRESS VADDR(UPTPTDI, 0) ==== //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.20 2007/12/17 22:18:07 marcel Exp $ +# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.21 2007/12/26 19:15:58 marcel Exp $ .include PROG= loader -NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" +NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b ==== //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.192 2007/12/16 07:49:44 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.193 2008/01/02 01:45:31 obrien Exp $"); #include #include @@ -172,12 +172,12 @@ * identify, and removed when a device fails to respond after a number * of retries, or a bus rescan finds the device missing. */ -struct cam_et { +struct cam_et { TAILQ_HEAD(, cam_ed) ed_entries; TAILQ_ENTRY(cam_et) links; - struct cam_eb *bus; + struct cam_eb *bus; target_id_t target_id; - u_int32_t refcount; + u_int32_t refcount; u_int generation; struct timeval last_reset; }; @@ -187,7 +187,7 @@ * are created by calls to xpt_bus_register and deleted by calls to * xpt_bus_deregister. */ -struct cam_eb { +struct cam_eb { TAILQ_HEAD(, cam_et) et_entries; TAILQ_ENTRY(cam_eb) links; path_id_t path_id; @@ -275,7 +275,7 @@ static const char seagate[] = "SEAGATE"; static const char microp[] = "MICROP"; -static struct xpt_quirk_entry xpt_quirk_table[] = +static struct xpt_quirk_entry xpt_quirk_table[] = { { /* Reports QUEUE FULL for temporary resource shortages */ @@ -315,12 +315,12 @@ * * For future reference, the drive with the problem was: * QUANTUM QM39100TD-SW N1B0 - * + * * It's possible that Quantum will fix the problem in later * firmware revisions. If that happens, the quirk entry * will need to be made specific to the firmware revisions * with the problem. - * + * */ /* Reports QUEUE FULL for temporary resource shortages */ { T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM39100*", "*" }, @@ -351,7 +351,7 @@ /* * The Seagate Medalist Pro drives have very poor write * performance with anything more than 2 tags. - * + * * Reported by: Paul van der Zwan * Drive: * @@ -406,7 +406,7 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { - /* Broken tagged queuing drive */ + /* Broken tagged queuing drive */ { T_DIRECT, SIP_MEDIA_FIXED, "CONNER", "CFP2107*", "*" }, /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, @@ -924,7 +924,7 @@ */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, &dev->alloc_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->drvq)->priority); + CAMQ_GET_HEAD(&dev->drvq)->priority); } else { retval = 0; } @@ -1025,7 +1025,7 @@ mtx_lock(&xsoftc.xpt_lock); xsoftc.flags |= XPT_FLAG_OPEN; mtx_unlock(&xsoftc.xpt_lock); - + return(0); } @@ -1225,7 +1225,7 @@ * (or rather should be) impossible for the device peripheral driver * list to change since we look at the whole thing in one pass, and * we do it with lock protection. - * + * */ case CAMGETPASSTHRU: { union ccb *ccb; @@ -1280,7 +1280,7 @@ ccb->cgdl.unit_number = 0; error = ENOENT; break; - } + } /* * Run through every peripheral instance of this driver @@ -1318,7 +1318,7 @@ periph = SLIST_NEXT(periph, periph_links), i++) { /* * Check to see whether we have a - * passthrough device or not. + * passthrough device or not. */ if (strcmp(periph->periph_name, "pass") == 0) { /* @@ -1638,7 +1638,7 @@ struct periph_list *periph_head; periph_head = &device->periphs; - + /* Release the slot for this peripheral */ camq_resize(&device->drvq, device->drvq.array_size - 1); @@ -1867,7 +1867,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this bus. So tell the caller to copy the * data out. */ @@ -1945,7 +1945,7 @@ /* set the copy flag */ retval |= DM_RET_COPY; - + /* * If we've already decided on an action, go ahead * and return. @@ -1980,7 +1980,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this device. So tell the caller to copy * the data out. */ @@ -2103,7 +2103,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this peripheral. So tell the caller to * copy the data out. */ @@ -2167,7 +2167,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS; cdm->pos.cookie.bus = bus; @@ -2298,7 +2298,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS | CAM_DEV_POS_TARGET | CAM_DEV_POS_DEVICE; @@ -2309,7 +2309,7 @@ cdm->pos.generations[CAM_TARGET_GENERATION] = device->target->bus->generation; cdm->pos.cookie.device = device; - cdm->pos.generations[CAM_DEV_GENERATION] = + cdm->pos.generations[CAM_DEV_GENERATION] = device->target->generation; cdm->status = CAM_DEV_MATCH_MORE; return(0); @@ -2407,7 +2407,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS | CAM_DEV_POS_TARGET | CAM_DEV_POS_DEVICE | CAM_DEV_POS_PERIPH; @@ -2419,7 +2419,7 @@ cdm->pos.generations[CAM_TARGET_GENERATION] = periph->path->bus->generation; cdm->pos.cookie.device = periph->path->device; - cdm->pos.generations[CAM_DEV_GENERATION] = + cdm->pos.generations[CAM_DEV_GENERATION] = periph->path->target->generation; cdm->pos.cookie.periph = periph; cdm->pos.generations[CAM_PERIPH_GENERATION] = @@ -2545,7 +2545,7 @@ pdrv = NULL; bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_PDRV | CAM_DEV_POS_PDPTR | CAM_DEV_POS_PERIPH; @@ -3139,7 +3139,7 @@ start_ccb->ccb_h.status = CAM_REQ_CMP; break; } - } + } if (XPT_FC_IS_QUEUED(abort_ccb) && (abort_ccb->ccb_h.pinfo.index == CAM_DONEQ_INDEX)) { /* @@ -3204,7 +3204,7 @@ bcopy(dev->serial_num, cgd->serial_num, dev->serial_num_len); } - break; + break; } case XPT_GDEV_STATS: { @@ -3257,17 +3257,17 @@ /* * Check and see if the list has changed since the user * last requested a list member. If so, tell them that the - * list has changed, and therefore they need to start over + * list has changed, and therefore they need to start over * from the beginning. */ - if ((cgdl->index != 0) && + if ((cgdl->index != 0) && (cgdl->generation != device->generation)) { cgdl->status = CAM_GDEVLIST_LIST_CHANGED; break; } /* - * Traverse the list of peripherals and attempt to find + * Traverse the list of peripherals and attempt to find * the requested peripheral. */ for (nperiph = SLIST_FIRST(periph_head), i = 0; @@ -3496,7 +3496,7 @@ */ start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - + dev->flags |= CAM_DEV_REL_ON_COMPLETE; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3509,7 +3509,7 @@ start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - + dev->flags |= CAM_DEV_REL_ON_QUEUE_EMPTY; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3584,7 +3584,7 @@ xpt_polled_action(union ccb *start_ccb) { u_int32_t timeout; - struct cam_sim *sim; + struct cam_sim *sim; struct cam_devq *devq; struct cam_ed *dev; @@ -3601,18 +3601,18 @@ * can get it before us while we simulate interrupts. */ dev->ccbq.devq_openings--; - dev->ccbq.dev_openings--; - + dev->ccbq.dev_openings--; + while(((devq != NULL && devq->send_openings <= 0) || dev->ccbq.dev_openings < 0) && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); camisr_runqueue(&sim->sim_doneq); } - + dev->ccbq.devq_openings++; dev->ccbq.dev_openings++; - + if (timeout != 0) { xpt_action(start_ccb); while(--timeout > 0) { @@ -3636,7 +3636,7 @@ start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; } } - + /* * Schedule a peripheral driver to receive a ccb when it's * target device has space for more transactions. @@ -3759,7 +3759,7 @@ union ccb *work_ccb; struct cam_periph *drv; struct camq *drvq; - + qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->alloc_queue, CAMQ_HEAD); device = qinfo->device; @@ -3796,7 +3796,7 @@ */ break; } - + if (drvq->entries > 0) { /* We have more work. Attempt to reschedule */ xpt_schedule_dev_allocq(bus, device); @@ -3811,7 +3811,7 @@ struct cam_devq *devq; CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_sendq\n")); - + devq = bus->sim->devq; devq->send_queue.qfrozen_cnt++; @@ -3858,8 +3858,8 @@ * available. */ device->qfrozen_cnt++; - STAILQ_INSERT_TAIL(&xsoftc.highpowerq, - &work_ccb->ccb_h, + STAILQ_INSERT_TAIL(&xsoftc.highpowerq, + &work_ccb->ccb_h, xpt_links.stqe); mtx_unlock(&xsoftc.xpt_lock); @@ -3879,8 +3879,8 @@ cam_ccbq_send_ccb(&device->ccbq, work_ccb); devq->send_openings--; - devq->send_active++; - + devq->send_active++; + if (device->ccbq.queue.entries > 0) xpt_schedule_dev_sendq(bus, device); @@ -4549,7 +4549,7 @@ bus = path->bus; - if (async_code == AC_BUS_RESET) { + if (async_code == AC_BUS_RESET) { /* Update our notion of when the last reset occurred */ microtime(&bus->last_reset); } @@ -4576,7 +4576,7 @@ next_device = TAILQ_NEXT(device, links); - if (path->device != device + if (path->device != device && path->device->lun_id != CAM_LUN_WILDCARD && device->lun_id != CAM_LUN_WILDCARD) continue; @@ -4588,7 +4588,7 @@ path, async_arg); } } - + /* * If this wasn't a fully wildcarded async, tell all * clients that want all async events. @@ -4722,7 +4722,7 @@ sim->devq->send_queue.qfrozen_cnt += count; if (sim->devq->active_dev != NULL) { struct ccb_hdr *ccbh; - + ccbh = TAILQ_LAST(&sim->devq->active_dev->ccbq.active_ccbs, ccb_hdr_tailq); if (ccbh && ccbh->status == CAM_REQ_INPROG) @@ -5278,7 +5278,7 @@ scan_info->counter--; } } - + for (i = 0; i <= max_target; i++) { cam_status status; if (i == initiator_id) @@ -5367,7 +5367,7 @@ } } else { struct cam_ed *device; - + device = request_ccb->ccb_h.path->device; if ((device->quirk->quirks & CAM_QUIRK_NOLUNS) == 0) { @@ -5394,7 +5394,7 @@ done = 0; if (scan_info->cpi->hba_misc & PIM_SEQSCAN) { scan_info->counter++; - if (scan_info->counter == + if (scan_info->counter == scan_info->cpi->initiator_id) { scan_info->counter++; } @@ -5506,7 +5506,7 @@ CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_scan_lun\n")); - + xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -5616,7 +5616,7 @@ if (softc == NULL) { printf("proberegister: Unable to probe new device. " - "Unable to allocate softc\n"); + "Unable to allocate softc\n"); return(CAM_REQ_CMP_ERR); } TAILQ_INIT(&softc->request_ccbs); @@ -5661,7 +5661,7 @@ * condition pending. It will not report the unit attention in * response to an inquiry, which may leave invalid transfer * negotiations in effect. The TUR will reveal the unit attention - * condition. Only send the TUR for lun 0, since some devices >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 6 22:45:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD2A916A420; Sun, 6 Jan 2008 22:45:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A280A16A417 for ; Sun, 6 Jan 2008 22:45:29 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A21B913C457 for ; Sun, 6 Jan 2008 22:45:29 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06MjT4O092962 for ; Sun, 6 Jan 2008 22:45:29 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06MjT2O092959 for perforce@freebsd.org; Sun, 6 Jan 2008 22:45:29 GMT (envelope-from csjp@freebsd.org) Date: Sun, 6 Jan 2008 22:45:29 GMT Message-Id: <200801062245.m06MjT2O092959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 132654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 22:45:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=132654 Change 132654 by csjp@csjp_xor on 2008/01/06 22:42:56 Correct line wrap on comment Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#19 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#19 (text+ko) ==== @@ -226,7 +226,8 @@ /* * Check again for data, which may exist now that we've either been - * woken up as a result of data or timed out. Try the "there's data" * case first since it doesn't require a system call. + * woken up as a result of data or timed out. Try the "there's data" + * case first since it doesn't require a system call. */ data = pcap_next_zbuf_shm(p, cc); if (data) From owner-p4-projects@FreeBSD.ORG Sun Jan 6 23:28:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28BA016A49A; Sun, 6 Jan 2008 23:28:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D878416A468 for ; Sun, 6 Jan 2008 23:28:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D149513C468 for ; Sun, 6 Jan 2008 23:28:14 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m06NSEq5010602 for ; Sun, 6 Jan 2008 23:28:14 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m06NSEGB010598 for perforce@freebsd.org; Sun, 6 Jan 2008 23:28:14 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 6 Jan 2008 23:28:14 GMT Message-Id: <200801062328.m06NSEGB010598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 23:28:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=132658 Change 132658 by gonzo@gonzo_jeeves on 2008/01/06 23:27:59 o Re-integrate src/lib/libc/mips/gen/...@131856 from mips2 to eliminate consequences of changeset 132626 (sorry for jumping the gun) Pointyhat to: me Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#3 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/_setjmp.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $ */ + /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -33,22 +35,14 @@ #include #include -#if defined(LIBC_SCCS) - .text - //.asciz "$OpenBSD: _setjmp.S,v 1.5 1996/08/19 08:15:51 tholo Exp $" - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93") + ASMSTR("$NetBSD: _setjmp.S,v 1.20 2005/10/07 17:16:40 tsutsui Exp $") +#endif /* LIBC_SCCS and not lint */ -/* These defs must be consistent with ucontext_t. We really ought to employ - * something like genassym here, but... - */ - -#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ -#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ -#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ -#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ -#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ -#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ +#ifdef __ABICALLS__ + .abicalls +#endif /* * C library -- _setjmp, _longjmp @@ -61,81 +55,55 @@ * The previous signal state is NOT restored. */ + LEAF(_setjmp) +#ifdef __ABICALLS__ .set noreorder - li v0, 0xACEDBADE # sigcontext magic number - sw ra, UC_PC(a0) # sc_pc = return address - sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] - sw s0, (S0 * 4) + UC_REGS (a0) - sw s1, (S1 * 4) + UC_REGS (a0) - sw s2, (S2 * 4) + UC_REGS (a0) - sw s3, (S3 * 4) + UC_REGS (a0) - sw s4, (S4 * 4) + UC_REGS (a0) - sw s5, (S5 * 4) + UC_REGS (a0) - sw s6, (S6 * 4) + UC_REGS (a0) - sw s7, (S7 * 4) + UC_REGS (a0) - sw s8, (S8 * 4) + UC_REGS (a0) - sw sp, (SP * 4) + UC_REGS (a0) -#ifndef SOFTFLOAT - cfc1 v0, $31 # too bad cant check if FP used - swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) - swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) - swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) - swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) - swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) - swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) - swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) - swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) - swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) - swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) - swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) - swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) - sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) -#endif /*SOFTFLOAT */ + .cpload t9 + .cprestore 16 +#endif + li v0, _JB_MAGIC__SETJMP + sw v0, (_JB_MAGIC * SZREG)(a0) + sw ra, (_JB_REG_RA * SZREG)(a0) + sw s0, (_JB_REG_S0 * SZREG)(a0) + sw s1, (_JB_REG_S1 * SZREG)(a0) + sw s2, (_JB_REG_S2 * SZREG)(a0) + sw s3, (_JB_REG_S3 * SZREG)(a0) + sw s4, (_JB_REG_S4 * SZREG)(a0) + sw s5, (_JB_REG_S5 * SZREG)(a0) + sw s6, (_JB_REG_S6 * SZREG)(a0) + sw s7, (_JB_REG_S7 * SZREG)(a0) + sw sp, (_JB_REG_SP * SZREG)(a0) + sw s8, (_JB_REG_S8 * SZREG)(a0) + j ra move v0, zero END(_setjmp) LEAF(_longjmp) -#ifdef ABICALLS - subu sp, sp, 32 +#ifdef __ABICALLS__ + .set noreorder + .cpload t9 .cprestore 16 -#endif - .set noreorder - lw v0, (ZERO * 4) + UC_REGS (a0) # get magic number - lw ra, UC_PC (a0) - bne v0, 0xACEDBADE, botch # jump if error - - addu sp, sp, 32 # does not matter, sanity - lw s0, (S0 * 4) + UC_REGS (a0) - lw s1, (S1 * 4) + UC_REGS (a0) - lw s2, (S2 * 4) + UC_REGS (a0) - lw s3, (S3 * 4) + UC_REGS (a0) - lw s4, (S4 * 4) + UC_REGS (a0) - lw s5, (S5 * 4) + UC_REGS (a0) - lw s6, (S6 * 4) + UC_REGS (a0) - lw s7, (S7 * 4) + UC_REGS (a0) - lw v0, (FSR_NUM * 4) + UC_FPREGS (a0) # get fpu status - lw sp, (SP * 4) + UC_REGS (a0) - lw s8, (S8 * 4) + UC_REGS (a0) -#ifndef SOFTFLOAT - ctc1 v0, $31 - lwc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) - lwc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) - lwc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) - lwc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) - lwc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) - lwc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) - lwc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) - lwc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) - lwc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) - lwc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) - lwc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) - lwc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) -#endif /* SOFTFLOAT */ +#endif + lw v0, (_JB_MAGIC * SZREG)(a0) + lw ra, (_JB_REG_RA * SZREG)(a0) + li t0, _JB_MAGIC__SETJMP + bne v0, t0, botch # jump if error + lw s0, (_JB_REG_S0 * SZREG)(a0) + lw s1, (_JB_REG_S1 * SZREG)(a0) + lw s2, (_JB_REG_S2 * SZREG)(a0) + lw s3, (_JB_REG_S3 * SZREG)(a0) + lw s4, (_JB_REG_S4 * SZREG)(a0) + lw s5, (_JB_REG_S5 * SZREG)(a0) + lw s6, (_JB_REG_S6 * SZREG)(a0) + lw s7, (_JB_REG_S7 * SZREG)(a0) + lw sp, (_JB_REG_SP * SZREG)(a0) + lw s8, (_JB_REG_S8 * SZREG)(a0) j ra move v0, a1 + botch: jal _C_LABEL(longjmperror) nop ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/fabs.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $ */ + /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,10 +34,16 @@ #include -#if defined(LIBC_SCCS) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)fabs.s 8.1 (Berkeley) 2/16/94") + ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $") +#endif /* LIBC_SCCS and not lint */ + + +#ifdef __ABICALLS__ + .abicalls +#endif + .set noreorder /* * fabs(x) @@ -44,7 +52,6 @@ * Return absolute value of x. */ LEAF(fabs) - .set noreorder j ra abs.d $f0, $f12 # compute absolute value of x END(fabs) ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/ldexp.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $ */ + /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,10 +34,14 @@ #include -#if defined(LIBC_SCCS) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)ldexp.s 8.1 (Berkeley) 6/4/93") + ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $") +#endif /* LIBC_SCCS and not lint */ + +#ifdef __ABICALLS__ + .abicalls +#endif #define DEXP_INF 0x7ff #define DEXP_BIAS 1023 @@ -43,7 +49,7 @@ #define DEXP_MAX 1023 #define DFRAC_BITS 52 #define DIMPL_ONE 0x00100000 -#define DLEAD_ZEROS (31 - 20) +#define DLEAD_ZEROS 31 - 20 #define STICKYBIT 1 #define GUARDBIT 0x80000000 #define DSIGNAL_NAN 0x00040000 @@ -57,7 +63,6 @@ * Return x * (2**N), for integer values N. */ LEAF(ldexp) - .set reorder mfc1 v1, $f13 # get MSW of x mfc1 t3, $f12 # get LSW of x sll t1, v1, 1 # get x exponent @@ -88,28 +93,28 @@ move v0, t3 addu t9, 32 1: - srl t4, v0, 16 - bne t4, zero, 1f + srl ta0, v0, 16 + bne ta0, zero, 1f addu t9, 16 sll v0, 16 1: - srl t4, v0, 24 - bne t4, zero, 1f + srl ta0, v0, 24 + bne ta0, zero, 1f addu t9, 8 sll v0, 8 1: - srl t4, v0, 28 - bne t4, zero, 1f + srl ta0, v0, 28 + bne ta0, zero, 1f addu t9, 4 sll v0, 4 1: - srl t4, v0, 30 - bne t4, zero, 1f + srl ta0, v0, 30 + bne ta0, zero, 1f addu t9, 2 sll v0, 2 1: - srl t4, v0, 31 - bne t4, zero, 1f + srl ta0, v0, 31 + bne ta0, zero, 1f addu t9, 1 /* * Now shift t2,t3 the correct number of bits. @@ -128,8 +133,8 @@ 1: subu v0, v0, t9 # shift fraction left < 32 bits sll t2, t2, t9 - srl t4, t3, v0 - or t2, t2, t4 + srl ta0, t3, v0 + or t2, t2, ta0 sll t3, t3, t9 2: bge t1, DEXP_INF, 8f # overflow? @@ -152,17 +157,17 @@ blt t1, -30, 2f # will all bits in t3 be shifted out? srl t2, t2, 31 - 20 # shift fraction back to normal position subu t1, t1, 1 - sll t4, t2, t1 # shift right t2,t3 based on exponent + sll ta0, t2, t1 # shift right t2,t3 based on exponent srl t8, t3, t1 # save bits shifted out negu t1 srl t3, t3, t1 - or t3, t3, t4 + or t3, t3, ta0 srl t2, t2, t1 bge t8, zero, 1f # does result need to be rounded? addu t3, t3, 1 # round result - sltu t4, t3, 1 + sltu ta0, t3, 1 sll t8, t8, 1 - addu t2, t2, t4 + addu t2, t2, ta0 bne t8, zero, 1f # round result to nearest and t3, t3, ~1 1: @@ -180,9 +185,9 @@ srl t3, t2, t1 bge t8, zero, 1f # does result need to be rounded? addu t3, t3, 1 # round result - sltu t4, t3, 1 + sltu ta0, t3, 1 sll t8, t8, 1 - mtc1 t4, $f1 # exponent and upper fraction + mtc1 ta0, $f1 # exponent and upper fraction bne t8, zero, 1f # round result to nearest and t3, t3, ~1 1: @@ -200,7 +205,7 @@ j ra 8: li t1, 0x7ff00000 # result is infinity (MSW) - mtc1 t1, $f1 + mtc1 t1, $f1 mtc1 zero, $f0 # result is infinity (LSW) bge v1, zero, 1f # should result be negative infinity? neg.d $f0, $f0 # result is negative infinity ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/modf.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $ */ + /*- * Copyright (c) 1991, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -13,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,10 +34,14 @@ #include -#if defined(LIBC_SCCS) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)modf.s 8.1 (Berkeley) 6/4/93") + ASMSTR("$NetBSD: modf.S,v 1.10 2003/08/07 16:42:15 agc Exp $") +#endif /* LIBC_SCCS and not lint */ + +#ifdef __ABICALLS__ + .abicalls +#endif /* * double modf(val, iptr) @@ -43,7 +49,11 @@ * returns: xxx and n (in *iptr) where val == n.xxx */ LEAF(modf) +#ifdef __ABICALLS__ + .set noreorder + .cpload t9 .set reorder +#endif cfc1 t0, $31 # get the control register li.d $f2, 4503599627370496e0 # f2 <- 2^52 @@ -53,17 +63,17 @@ mov.d $f0, $f12 # f0 <- f12 abs.d $f4, $f12 # f4 <- |f12| - c.olt.d $f4, $f2 # f4 ? < f2 - bc1f 1f # leave f0 alone if Nan, infinity + c.olt.d $f4, $f2 # f4 ? < f2 + bc1f 1f # leave f0 alone if Nan, infinity # or >=2^52 c.eq.d $f12,$f4 # was f12 positive ? add.d $f4,$f2,$f4 # round off to integer bc1f 2f # No -> will have to negate result sub.d $f0,$f4,$f2 # Remove fudge factor j 1f # integer fraction got -2: +2: sub.d $f0,$f2,$f4 # Remove fudge factor and negate -1: +1: ctc1 t0, $31 # restore old rounding mode s.d $f0, 0(a2) # save the integer part sub.d $f0, $f12, $f0 # subtract val - integer part ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $ */ + /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -13,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,26 +32,17 @@ * SUCH DAMAGE. */ -#include +#include #include -#include -#if defined(LIBC_SCCS) - .text - //.asciz "$OpenBSD: setjmp.S,v 1.6 1997/07/23 20:55:25 kstailey Exp $" - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") + ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $") +#endif /* LIBC_SCCS and not lint */ -/* These defs must be consistent with ucontext_t. We really ought to employ - * something like genassym here, but... - */ - -#define UC_SIGMASK 0x00 /* offsetof(ucontext_t, uc_sigmask) */ -#define UC_ONSTACK 0x10 /* offsetof(ucontext_t, uc_mcontext.mc_onstack) */ -#define UC_PC 0x14 /* offsetof(ucontext_t, uc_mcontext.mc_pc) */ -#define UC_REGS 0x18 /* offsetof(ucontext_t, uc_mcontext.mc_regs) */ -#define UC_FPUSED 0xa0 /* offsetof(ucontext_t, uc_mcontext.mc_fpused) */ -#define UC_FPREGS 0xa4 /* offsetof(ucontext_t, uc_mcontext.mc_fpregs) */ +#ifdef __ABICALLS__ + .abicalls +#endif /* * C library -- setjmp, longjmp @@ -66,82 +55,105 @@ * and a struct sigcontext, see */ -#define SETJMP_FRAME_SIZE (STAND_FRAME_SIZE + 12) +#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + SZREG) + -NON_LEAF(setjmp, SETJMP_FRAME_SIZE, ra) - .mask 0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE) +NESTED(setjmp, SETJMP_FRAME_SIZE, ra) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + .set noreorder +#ifdef __ABICALLS__ + .cpload t9 +#endif subu sp, sp, SETJMP_FRAME_SIZE # allocate stack frame -#ifdef ABICALLS +#ifdef __ABICALLS__ .cprestore 16 #endif - .set reorder - sw ra, STAND_RA_OFFSET(sp) # save state - sw a0, SETJMP_FRAME_SIZE(sp) + sw ra, CALLFRAME_RA(sp) # save RA + sw a0, CALLFRAME_SIZ(sp) # store env - move a1, zero # Make new sigset_t NULL - la a2, UC_SIGMASK(a0) # Get address of ucontext_t->uc_sigmask - jal _C_LABEL(sigprocmask) # Save the old signal mask + /* Get the signal mask. */ + addu a2, a0, _JB_SIGMASK * SZREG # &oenv + li a0, 1 # SIG_SETBLOCK + move a1, zero # &env == 0 + la t9, _C_LABEL(sigprocmask) # get current signal mask + jal t9 + nop - move a0, zero - addu a1, sp, STAND_FRAME_SIZE # pointer to struct sigaltstack - jal _C_LABEL(sigaltstack) + lw a0, CALLFRAME_SIZ(sp) # restore env pointer + lw ra, CALLFRAME_RA(sp) # restore RA + addu sp, sp, SETJMP_FRAME_SIZE # pop stack frame - lw a0, SETJMP_FRAME_SIZE(sp) # restore jmpbuf - lw v1, STAND_FRAME_SIZE+8(sp) # struct sigaltstack->ss_flags - and v1, v1, 1 # extract SS_ONSTACK - sw v1, UC_ONSTACK(a0) # save it in ucontext_t->uc_mcontext.mc_onstack + li v0, _JB_MAGIC_SETJMP + sw v0, (_JB_MAGIC * SZREG)(a0) + sw ra, (_JB_REG_RA * SZREG)(a0) + sw s0, (_JB_REG_S0 * SZREG)(a0) + sw s1, (_JB_REG_S1 * SZREG)(a0) + sw s2, (_JB_REG_S2 * SZREG)(a0) + sw s3, (_JB_REG_S3 * SZREG)(a0) + sw s4, (_JB_REG_S4 * SZREG)(a0) + sw s5, (_JB_REG_S5 * SZREG)(a0) + sw s6, (_JB_REG_S6 * SZREG)(a0) + sw s7, (_JB_REG_S7 * SZREG)(a0) + sw sp, (_JB_REG_SP * SZREG)(a0) + sw s8, (_JB_REG_S8 * SZREG)(a0) - lw ra, STAND_RA_OFFSET(sp) # Restore return address - addu sp, sp, SETJMP_FRAME_SIZE # Restore old stack pointer (eeeew...) - - blt v0, zero, botch # check for sigstack() error - - sw ra, UC_PC(a0) # sc_pc = return address - li v0, 0xACEDBADE # sigcontext magic number - sw v0, (ZERO * 4) + UC_REGS (a0) # saved in sc_regs[0] - sw s0, (S0 * 4) + UC_REGS (a0) - sw s1, (S1 * 4) + UC_REGS (a0) - sw s2, (S2 * 4) + UC_REGS (a0) - sw s3, (S3 * 4) + UC_REGS (a0) - sw s4, (S4 * 4) + UC_REGS (a0) - sw s5, (S5 * 4) + UC_REGS (a0) - sw s6, (S6 * 4) + UC_REGS (a0) - sw s7, (S7 * 4) + UC_REGS (a0) - sw gp, (GP * 4) + UC_REGS (a0) - sw sp, (SP * 4) + UC_REGS (a0) - sw s8, (S8 * 4) + UC_REGS (a0) - li v0, 1 # be nice if we could tell - sw v0, UC_FPUSED (a0) # sc_fpused = 1 -#ifndef SOFTFLOAT - cfc1 v0, $31 - swc1 $f20, (F20_NUM * 4) + UC_FPREGS (a0) - swc1 $f21, (F21_NUM * 4) + UC_FPREGS (a0) - swc1 $f22, (F22_NUM * 4) + UC_FPREGS (a0) - swc1 $f23, (F23_NUM * 4) + UC_FPREGS (a0) - swc1 $f24, (F24_NUM * 4) + UC_FPREGS (a0) - swc1 $f25, (F25_NUM * 4) + UC_FPREGS (a0) - swc1 $f26, (F26_NUM * 4) + UC_FPREGS (a0) - swc1 $f27, (F27_NUM * 4) + UC_FPREGS (a0) - swc1 $f28, (F28_NUM * 4) + UC_FPREGS (a0) - swc1 $f29, (F29_NUM * 4) + UC_FPREGS (a0) - swc1 $f30, (F30_NUM * 4) + UC_FPREGS (a0) - swc1 $f31, (F31_NUM * 4) + UC_FPREGS (a0) - sw v0, (FSR_NUM * 4) + UC_FPREGS (a0) -#endif /* SOFTFLOAT */ move v0, zero j ra END(setjmp) -LEAF(longjmp) -#ifdef ABICALLS - subu sp, sp, 32 +#define LONGJMP_FRAME_SIZE CALLFRAME_RA + SZREG * 2 + +NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) + .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) + .set noreorder +#ifdef __ABICALLS__ + .cpload t9 +#endif + subu sp, sp, LONGJMP_FRAME_SIZE # allocate stack frame +#ifdef __ABICALLS__ .cprestore 16 #endif - .set reorder - sw a1, (V0 * 4) + UC_REGS (a0) # save return value in sc_regs[V0] - li v0, SYS_sigreturn - syscall + sw ra, CALLFRAME_RA(sp) # save RA + lw v0, (_JB_MAGIC * SZREG)(a0) + li t0, _JB_MAGIC_SETJMP + bne v0, t0, botch # jump if error + nop + + sw a0, CALLFRAME_SIZ(sp) # save env + sw a1, (CALLFRAME_SIZ + SZREG)(sp) # save return value + + # set sigmask + addu a1, a0, _JB_SIGMASK * SZREG # &set + move a2, zero # &oset == NULL + li a0, 3 # SIG_SETMASK + la t9,_C_LABEL(sigprocmask) # set current signal mask + jal t9 + nop + + lw a0, CALLFRAME_SIZ(sp) # restore env + lw a1, (CALLFRAME_SIZ + SZREG)(sp) # restore return value + + lw ra, (_JB_REG_RA * SZREG)(a0) + lw s0, (_JB_REG_S0 * SZREG)(a0) + lw s1, (_JB_REG_S1 * SZREG)(a0) + lw s2, (_JB_REG_S2 * SZREG)(a0) + lw s3, (_JB_REG_S3 * SZREG)(a0) + lw s4, (_JB_REG_S4 * SZREG)(a0) + lw s5, (_JB_REG_S5 * SZREG)(a0) + lw s6, (_JB_REG_S6 * SZREG)(a0) + lw s7, (_JB_REG_S7 * SZREG)(a0) + lw sp, (_JB_REG_SP * SZREG)(a0) + lw s8, (_JB_REG_S8 * SZREG)(a0) + move v0, a1 + j ra + nop + botch: - jal _C_LABEL(longjmperror) - jal _C_LABEL(abort) + la t9, _C_LABEL(longjmperror) + jal t9 + nop + + la t9, _C_LABEL(abort) + jal t9 + nop END(longjmp) ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/sigsetjmp.S#3 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $ */ + /*- * Copyright (c) 1991, 1993, 1995, * The Regents of the University of California. All rights reserved. @@ -13,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -30,15 +32,17 @@ * SUCH DAMAGE. */ -#include #include #include -#include + +#if defined(LIBC_SCCS) && !defined(lint) + ASMSTR("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93") + ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $") +#endif /* LIBC_SCCS and not lint */ -#if defined(LIBC_SCCS) - .text - .asciz "$FreeBSD$" -#endif /* LIBC_SCCS */ +#ifdef __ABICALLS__ + .abicalls +#endif /* * C library -- sigsetjmp, siglongjmp @@ -53,20 +57,28 @@ */ LEAF(sigsetjmp) +#ifdef __ABICALLS__ + .set noreorder + .cpload t9 .set reorder - sw a1, (_JBLEN*4)(a0) # save "savemask" +#endif bne a1, 0x0, 1f # do saving of signal mask? la t9, _setjmp - jr t9 + jr t9 1: la t9, setjmp - jr t9 + jr t9 END(sigsetjmp) LEAF(siglongjmp) +#ifdef __ABICALLS__ + .set noreorder + .cpload t9 .set reorder - lw t0, (_JBLEN * 4)(a0) # get "savemask" - bne t0, 0x0, 1f # restore signal mask? +#endif + lw t0, (_JB_MAGIC * SZREG)(a0) + li t1, _JB_MAGIC__SETJMP + bne t0, t1, 1f # setjmp or _setjmp magic? la t9, _longjmp jr t9 1: la t9, longjmp From owner-p4-projects@FreeBSD.ORG Sun Jan 6 23:36:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 004BA16A421; Sun, 6 Jan 2008 23:36:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9CE516A419; Sun, 6 Jan 2008 23:36:51 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.70]) by mx1.freebsd.org (Postfix) with ESMTP id ACE6513C468; Sun, 6 Jan 2008 23:36:51 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp007-s [10.150.69.70]) by smtpoutm.mac.com (Xserve/smtpout007/MantshX 4.0) with ESMTP id m06NPpvo010066; Sun, 6 Jan 2008 15:25:51 -0800 (PST) Received: from MacBook-Pro (adsl-69-108-230-110.dsl.scrm01.pacbell.net [69.108.230.110]) (authenticated bits=0) by mac.com (Xserve/asmtp007/MantshX 4.0) with ESMTP id m06NPnbc023154 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 6 Jan 2008 15:25:50 -0800 (PST) Message-Id: <4CCF7BFD-9DD3-4D69-8113-D5DC3E8F4B27@mac.com> From: Marcel Moolenaar To: grehan@FreeBSD.org In-Reply-To: <47815371.9020501@freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v915) Date: Sun, 6 Jan 2008 15:25:49 -0800 References: <200801041525.m04FPIrt011288@repoman.freebsd.org> <47815371.9020501@freebsd.org> X-Mailer: Apple Mail (2.915) Cc: Rafal Jaworowski , Perforce Change Reviews Subject: Re: PERFORCE change 132485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 23:36:52 -0000 On Jan 6, 2008, at 2:17 PM, Peter Grehan wrote: > Hi Rafal, > >> Temporary fix to avoid confusion of 'kstack0' symbol and make e500 >> kernel operational again. kstack0 area requires further >> improvements (space for kstack0 is now statically defined within >> kernel body, does not have guard pages etc., which should be fixed) > > On AIM it is allocated correctly but never switched over. The (not- > yet-implemented) plan was to mimic amd64 and return the value from > powerpc_init() to locore, switching r1 to this value before calling > mi_startup(). I'm planning this. I have done the same on ia64. It helps SMP, because after you switched the BSP to its own stack kstack0 becomes available to start APs on (in particular before you have the MMU set up)... FYI, -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Sun Jan 6 23:45:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0457416A41B; Sun, 6 Jan 2008 23:45:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDD5D16A417; Sun, 6 Jan 2008 23:45:47 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from dommail.onthenet.com.au (dommail.OntheNet.com.au [203.13.70.57]) by mx1.freebsd.org (Postfix) with ESMTP id 2F13813C458; Sun, 6 Jan 2008 23:45:46 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from excfreebsd.hq.netapp.com (nat-198-95-226-228.netapp.com [198.95.226.228]) by dommail.onthenet.com.au (MOS 3.7.5a-GA) with ESMTP id DLJ57322 (AUTH peterg@ptree32.com.au); Mon, 7 Jan 2008 09:45:40 +1000 (EST) Message-ID: <47816807.90907@freebsd.org> Date: Sun, 06 Jan 2008 15:45:11 -0800 From: Peter Grehan User-Agent: Thunderbird 2.0.0.0 (X11/20070525) MIME-Version: 1.0 To: Marcel Moolenaar References: <200801041525.m04FPIrt011288@repoman.freebsd.org> <47815371.9020501@freebsd.org> <4CCF7BFD-9DD3-4D69-8113-D5DC3E8F4B27@mac.com> In-Reply-To: <4CCF7BFD-9DD3-4D69-8113-D5DC3E8F4B27@mac.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Rafal Jaworowski , Perforce Change Reviews Subject: Re: PERFORCE change 132485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: grehan@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 23:45:48 -0000 > I'm planning this. I have done the same on ia64. It helps SMP, because > after you switched the BSP to its own stack kstack0 becomes available to start > APs on (in particular before you have the MMU set up)... > > FYI, Great ! I would expect that some OFW calls may blow up with leakage of params on the kernel virtual stack instead of on the 1:1 stack, but that needs to be fixed anyways. later, Peter. From owner-p4-projects@FreeBSD.ORG Sun Jan 6 23:51:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDB3316A468; Sun, 6 Jan 2008 23:51:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2FB616A41A for ; Sun, 6 Jan 2008 23:51:00 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from bugor.portaone.com (bugor.portaone.com [65.61.203.147]) by mx1.freebsd.org (Postfix) with ESMTP id 8E4F313C474 for ; Sun, 6 Jan 2008 23:51:00 +0000 (UTC) (envelope-from gonzo@freebsd.org) Received: from mail.pbxpress.com ([65.61.203.142] helo=leaf.pbxpress.com) by bugor.portaone.com (8.11.3/8.11.3) with ESMTP (TLSv1:AES256-SHA:256)id 1JBfGe-000Jen-1X; Sun, 06 Jan 2008 15:51:00 -0800 Received: from leaf.pbxpress.com (localhost [127.0.0.1]) by leaf.pbxpress.com (8.13.3/8.13.3) with ESMTP id m06NpFOH048428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 6 Jan 2008 15:51:15 -0800 (PST) (envelope-from gonzo@freebsd.org) Received: (from gonzo@localhost) by leaf.pbxpress.com (8.13.3/8.13.3/Submit) id m06NpFkw048427; Sun, 6 Jan 2008 15:51:15 -0800 (PST) (envelope-from gonzo@freebsd.org) X-Authentication-Warning: leaf.pbxpress.com: gonzo set sender to gonzo@freebsd.org using -f Date: Sun, 6 Jan 2008 15:51:15 -0800 From: Oleksandr Tymoshenko To: "M. Warner Losh" Message-ID: <20080106235115.GA48258@portaone.com> References: <200801061543.m06FhmW3087647@repoman.freebsd.org> <20080106.133803.35183967.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080106.133803.35183967.imp@bsdimp.com> User-Agent: Mutt/1.4.2.1i X-Operating-System: FreeBSD/5.4-STABLE (i386) X-Spam-Status: No, recieved from trusted server Cc: perforce@freebsd.org Subject: Re: PERFORCE change 132626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2008 23:51:01 -0000 M. Warner Losh (imp@bsdimp.com) wrote: > In message: <200801061543.m06FhmW3087647@repoman.freebsd.org> > Oleksandr Tymoshenko writes: > : http://perforce.freebsd.org/chv.cgi?CH=132626 > : > : Change 132626 by gonzo@gonzo_jeeves on 2008/01/06 15:43:20 > : > : o Bring in assembler bits from juniper-mips branch > > What I've tried to do when I've done this stuff is to break it down > into an integrate phase and then edit after that. These look like > they are pure edits.... I reverted this changeset back by re-integrating from mips2 branch. Sorry for messing things up :( -- gonzo From owner-p4-projects@FreeBSD.ORG Mon Jan 7 00:31:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C98B716A421; Mon, 7 Jan 2008 00:31:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F1D216A41A for ; Mon, 7 Jan 2008 00:31:07 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B84313C45A for ; Mon, 7 Jan 2008 00:31:07 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m070V7FQ021639 for ; Mon, 7 Jan 2008 00:31:07 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m070V7qB021634 for perforce@freebsd.org; Mon, 7 Jan 2008 00:31:07 GMT (envelope-from csjp@freebsd.org) Date: Mon, 7 Jan 2008 00:31:07 GMT Message-Id: <200801070031.m070V7qB021634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 132663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 00:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=132663 Change 132663 by csjp@csjp_xor on 2008/01/07 00:30:15 Make zerocopy copy enabled by default. This doesn't mean that we will use it by default, but it does mean that we will have support for it by default. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/conf/BPF_ZEROCOPY#2 delete .. //depot/projects/zcopybpf/src/sys/conf/NOTES#15 edit .. //depot/projects/zcopybpf/src/sys/conf/files#16 edit .. //depot/projects/zcopybpf/src/sys/conf/options#12 edit .. //depot/projects/zcopybpf/src/sys/i386/conf/BPF_ZEROCOPY#2 delete .. //depot/projects/zcopybpf/src/sys/net/bpf.c#37 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/conf/NOTES#15 (text+ko) ==== @@ -614,10 +614,6 @@ options ALTQ_NOPCC # Required if the TSC is unusable options ALTQ_DEBUG -# bpf(4). Compile-time options go here, whereas enabling bpf(4) itself goes -# later with the other devices. -options BPF_ZEROCOPY # Enable zero-copy BPF - # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option # listed below; however, this is not strictly necessary as netgraph ==== //depot/projects/zcopybpf/src/sys/conf/files#16 (text+ko) ==== @@ -1607,7 +1607,7 @@ net/bpf_buffer.c optional bpf net/bpf_jitter.c optional bpf_jitter net/bpf_filter.c optional bpf | netgraph_bpf -net/bpf_zerocopy.c optional bpf_zerocopy +net/bpf_zerocopy.c optional bpf net/bridgestp.c optional bridge | if_bridge net/bsd_comp.c optional ppp_bsdcomp net/ieee8023ad_lacp.c optional lagg ==== //depot/projects/zcopybpf/src/sys/conf/options#12 (text+ko) ==== @@ -479,7 +479,6 @@ # DRM options DRM_DEBUG opt_drm.h -BPF_ZEROCOPY opt_bpf.h ZERO_COPY_SOCKETS opt_zero.h TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#37 (text+ko) ==== @@ -70,9 +70,7 @@ #ifdef BPF_JITTER #include #endif -#ifdef BPF_ZEROCOPY #include -#endif #include #include @@ -134,11 +132,9 @@ static int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); -#ifdef BPF_ZEROCOPY static int bpf_zerocopy_enable = 1; SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLAG_RW, &bpf_zerocopy_enable, 0, "Enable new zero-copy BPF buffer sessions"); -#endif SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_RW, bpf_stats_sysctl, "bpf statistics portal"); @@ -181,11 +177,9 @@ case BPF_BUFMODE_BUFFER: return (bpf_buffer_append_bytes(d, buf, offset, src, len)); -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: d->bd_zcopy++; return (bpf_zerocopy_append_bytes(d, buf, offset, src, len)); -#endif default: panic("bpf_buf_append_bytes"); @@ -203,11 +197,9 @@ case BPF_BUFMODE_BUFFER: return (bpf_buffer_append_mbuf(d, buf, offset, src, len)); -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: d->bd_zcopy++; return (bpf_zerocopy_append_mbuf(d, buf, offset, src, len)); -#endif default: panic("bpf_buf_append_mbuf"); @@ -226,10 +218,8 @@ BPFD_LOCK_ASSERT(d); switch (d->bd_bufmode) { -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: return (bpf_zerocopy_canfreebuf(d)); -#endif } return (0); } @@ -241,11 +231,9 @@ BPFD_LOCK_ASSERT(d); switch (d->bd_bufmode) { -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: bpf_zerocopy_bufheld(d); break; -#endif } } @@ -257,10 +245,8 @@ case BPF_BUFMODE_BUFFER: return (bpf_buffer_free(d)); -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: return (bpf_zerocopy_free(d)); -#endif default: panic("bpf_buf_free"); @@ -291,11 +277,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_ackzbuf(td, d, bz)); -#else - panic("bpf_ioctl_ackzbuf"); -#endif } static int @@ -304,11 +286,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_getzbuf(td, d, bz)); -#else - panic("bpf_ioctl_getzbuf"); -#endif } static int @@ -317,11 +295,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_getznext(td, d, bz)); -#else - panic("bpf_ioctl_getznext"); -#endif } static int @@ -330,11 +304,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_getzmax(td, d, i)); -#else - panic("bpf_ioctl_getzmax"); -#endif } static int @@ -343,11 +313,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_rotzbuf(td, d, bz)); -#else - panic("bpf_ioctl_rotzbuf"); -#endif } static int @@ -356,11 +322,7 @@ if (d->bd_bufmode != BPF_BUFMODE_ZBUF) return (EOPNOTSUPP); -#ifdef BPF_ZEROCOPY return (bpf_zerocopy_ioctl_setzbuf(td, d, bz)); -#else - panic("bpf_ioctl_setzbuf"); -#endif } /* @@ -1308,12 +1270,10 @@ case BPF_BUFMODE_BUFFER: break; -#ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: if (bpf_zerocopy_enable) break; /* FALLSTHROUGH */ -#endif default: return (EINVAL); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 06:42:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921B916A420; Mon, 7 Jan 2008 06:42:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 579C516A417 for ; Mon, 7 Jan 2008 06:42:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F0EB13C44B for ; Mon, 7 Jan 2008 06:42:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m076gjOa014907 for ; Mon, 7 Jan 2008 06:42:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m076gixS014904 for perforce@freebsd.org; Mon, 7 Jan 2008 06:42:44 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 7 Jan 2008 06:42:44 GMT Message-Id: <200801070642.m076gixS014904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 06:42:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132676 Change 132676 by kmacy@pandemonium:kmacy:xen31 on 2008/01/07 06:42:20 remove sc and vga drivers - they aren't needed for domU (which is all we'll support for the foreseeable future) and sc was overwriting kernel text because we don't observe KERNLOAD Affected files ... .. //depot/projects/xen31/sys/i386/conf/XEN#4 edit Differences ... ==== //depot/projects/xen31/sys/i386/conf/XEN#4 (text+ko) ==== @@ -124,12 +124,11 @@ device kbdmux # keyboard multiplexer -device vga # VGA video card driver +#device vga # VGA video card driver device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console -device sc device agp # support several AGP chipsets From owner-p4-projects@FreeBSD.ORG Mon Jan 7 06:43:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAD9316A46B; Mon, 7 Jan 2008 06:43:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8008216A417 for ; Mon, 7 Jan 2008 06:43:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 414C513C448 for ; Mon, 7 Jan 2008 06:43:46 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m076hkXj015271 for ; Mon, 7 Jan 2008 06:43:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m076hknC015268 for perforce@freebsd.org; Mon, 7 Jan 2008 06:43:46 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 7 Jan 2008 06:43:46 GMT Message-Id: <200801070643.m076hknC015268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 06:43:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=132677 Change 132677 by kmacy@pandemonium:kmacy:xen31 on 2008/01/07 06:42:48 map kernel text R/O re-map R/W in kdb_enter Affected files ... .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#14 edit .. //depot/projects/xen31/sys/kern/subr_kdb.c#3 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#14 (text+ko) ==== @@ -691,7 +691,7 @@ void initvalues(start_info_t *startinfo) { - int i, l3_pages, l2_pages, l1_pages, offset; + int l3_pages, l2_pages, l1_pages, offset; vm_offset_t cur_space; struct physdev_set_iopl set_iopl; @@ -705,7 +705,8 @@ pd_entry_t *IdlePDPTnew, *IdlePTDnew; #else vm_paddr_t pdir_shadow_ma; -#endif +#endif + unsigned long i; #ifdef WRITABLE_PAGETABLES printk("using writable pagetables\n"); @@ -934,6 +935,14 @@ xen_flush_queue(); } #endif + /* + * re-map kernel text read-only + * + */ + for (i = (((vm_offset_t)&btext) & ~PAGE_MASK); + i < (((vm_offset_t)&etext) & ~PAGE_MASK); i += PAGE_SIZE) + PT_SET_MA(i, xpmap_ptom(VTOP(i)) | PG_V | PG_A); + printk("#7\n"); physfree = VTOP(cur_space); init_first = physfree >> PAGE_SHIFT; ==== //depot/projects/xen31/sys/kern/subr_kdb.c#3 (text+ko) ==== @@ -304,10 +304,22 @@ * string than 'msg', and is relied upon by DDB scripting to identify the * reason for entering the debugger so that the right script can be run. */ +#ifdef XEN +#include /* needed for btext/etext */ +#endif void kdb_enter(const char *why, const char *msg) { - +#ifdef XEN + unsigned long i; + + /* + * re-map kernel text R/W + */ + for (i = (((vm_offset_t)&btext) & ~PAGE_MASK); + i < (((vm_offset_t)&etext) & ~PAGE_MASK); i += PAGE_SIZE) + PT_SET_MA(i, xpmap_ptom(VTOP(i)) | PG_V | PG_A | PG_RW); +#endif if (kdb_dbbe != NULL && kdb_active == 0) { if (msg != NULL) printf("KDB: enter: %s\n", msg); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:22:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A75E316A419; Mon, 7 Jan 2008 07:22:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CDC916A417 for ; Mon, 7 Jan 2008 07:22:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6544813C45A for ; Mon, 7 Jan 2008 07:22:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077MRpK021844 for ; Mon, 7 Jan 2008 07:22:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077MRtB021840 for perforce@freebsd.org; Mon, 7 Jan 2008 07:22:27 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:22:27 GMT Message-Id: <200801070722.m077MRtB021840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:22:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132678 Change 132678 by jb@jb_freebsd1 on 2008/01/07 07:21:49 Add the hook to allow the dtrace module to process breakpoint interrupts if it is loaded. The Function Boundary Trace (fbt) and Statically Defined Trace (sdt) providers trigger probes on amd64 by replacing the "pushl %ebp" and 'ret' opcodes with int3 (#BP, 0xcc) and then checking the trap address against the list of installed probes. If the address has a probe associated with it, the dtrace module calls it's probes and the function that was broken by the breakpoint, then repairs the trap frame and returns via 'doreti'. In the case that the trap address isn't from a DTrace probe, the return path takes execution back to the calltrap code and the trap is handled in the usual way. No doubt there is a simpler way to do this pointer ping pong. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#7 (text+ko) ==== @@ -37,6 +37,7 @@ #include "opt_atpic.h" #include "opt_compat.h" #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include #include @@ -44,6 +45,27 @@ #include "assym.s" +#ifdef KDTRACE_HOOKS + .bss + .globl dtrace_invop_jump_addr + .align 8 + .type dtrace_invop_jump_addr, @object + .size dtrace_invop_jump_addr, 8 +dtrace_invop_jump_addr: + .zero 8 + .globl dtrace_invop_calltrap_addr + .align 8 + .type dtrace_invop_calltrap_addr, @object + .size dtrace_invop_calltrap_addr, 8 +dtrace_invop_calltrap_addr: + .zero 8 + .globl dtrace_invop_return_addr + .align 8 + .type dtrace_invop_return_addr, @object + .size dtrace_invop_return_addr, 8 +dtrace_invop_return_addr: + .zero 8 +#endif .text #ifdef HWPMC_HOOKS ENTRY(start_exceptions) @@ -170,6 +192,28 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) +#ifdef KDTRACE_HOOKS + /* + * DTrace Function Boundary Trace (fbt) and Statically Defined + * Trace (sdt) probes are triggered by int3 (0xcc) which causes + * the #BP (T_BPTFLT) breakpoint interrupt. For all other trap + * types, just handle them in the usual way. + */ + cmpq $T_BPTFLT,TF_TRAPNO(%rsp) + jne calltrap + + /* Check if there is no DTrace hook registered. */ + cmpq $0,dtrace_invop_jump_addr + je calltrap + + /* Set our alternate jump addresses for the jump back. */ + movq $calltrap, dtrace_invop_calltrap_addr(%rip) + movq $doreti, dtrace_invop_return_addr(%rip) + + /* Jump to the code hooked in by DTrace. */ + movq dtrace_invop_jump_addr, %rax + jmpq *dtrace_invop_jump_addr +#endif .globl calltrap .type calltrap,@function calltrap: From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:27:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06DFD16A419; Mon, 7 Jan 2008 07:27:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0A6C16A417 for ; Mon, 7 Jan 2008 07:27:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B94B713C455 for ; Mon, 7 Jan 2008 07:27:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077RWjH028247 for ; Mon, 7 Jan 2008 07:27:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077RWGi028244 for perforce@freebsd.org; Mon, 7 Jan 2008 07:27:32 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:27:32 GMT Message-Id: <200801070727.m077RWGi028244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132680 Change 132680 by jb@jb_freebsd1 on 2008/01/07 07:27:20 Add functions to set and clear the hook in the exception code. Note that the 'invop' reference is a legacy of Sun's implementation. On amd64 it isn't an "invalid opcode" interrupt at all (like on i386), but a breakpoint one instead. The dtrace_invop_start is where the bulk of the OpenSolaris code will go (soon). Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#2 (text+ko) ==== @@ -17,6 +17,11 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * Portions Copyright 2008 John Birrell + * + * $FreeBSD$ + * */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -26,6 +31,34 @@ #include #include +#include "assym.s" + + .globl calltrap + .type calltrap,@function + ENTRY(dtrace_invop_start) + + /* XXX More code to go in here. :-) */ + + /* When all else fails handle the trap in the usual way. */ + jmpq *dtrace_invop_calltrap_addr + END(dtrace_invop_start) + +/* +void dtrace_invop_init(void) +*/ + ENTRY(dtrace_invop_init) + movq $dtrace_invop_start, dtrace_invop_jump_addr(%rip) + ret + END(dtrace_invop_init) + +/* +void dtrace_invop_uninit(void) +*/ + ENTRY(dtrace_invop_uninit) + movq $0, dtrace_invop_jump_addr(%rip) + ret + END(dtrace_invop_uninit) + /* greg_t dtrace_getfp(void) */ From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:27:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFCE816A5FB; Mon, 7 Jan 2008 07:27:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42DF716A5C1 for ; Mon, 7 Jan 2008 07:27:33 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AD8E13C458 for ; Mon, 7 Jan 2008 07:27:33 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077RXgc028254 for ; Mon, 7 Jan 2008 07:27:33 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077RWIh028250 for perforce@freebsd.org; Mon, 7 Jan 2008 07:27:32 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 7 Jan 2008 07:27:32 GMT Message-Id: <200801070727.m077RWIh028250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 132681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132681 Change 132681 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/07 07:27:20 style modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/LICENSE#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#15 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/README#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/fifo_io.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macping.c#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mdconfig.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mmaptest.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/msgtest.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/ptrace.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/semtest.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/shmtest.c#7 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/conf#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#26 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvshm/00.t#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#19 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/LICENSE#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/tools/regression/mactest/LICENSE,v 1.1 2007/01/17 01:42:07 pjd Exp $ +$FreeBSD$ License for all regression tests available with fstest: ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/regression/mactest/Makefile,v 1.1 2007/01/17 01:42:07 zhouzhouyi Exp $ +# $FreeBSD$ CFLAGS+=-DHAS_LCHMOD CFLAGS+=-DHAS_CHFLAGS ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/README#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/tools/regression/mactest/README,v 1.1 2007/01/28 00:10:28 zhouzhouyi Exp $ +$FreeBSD$ Few notes on how to use fstest in short steps: ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/fifo_io.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/mactest/fifo_io.c,v 1.6 2006/11/07 23:28:30 jkim Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macping.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/mactest/macping.c,v 1.6 2006/11/07 23:28:30 jkim Exp $ + * $FreeBSD$ */ #include /* NB: we rely on this for */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/mactest/macproc.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mdconfig.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54 2007/02/20 22:04:23 n_hibma Exp $ + * $FreeBSD$ * */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mmaptest.c#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/tools/regression/mactest/mmaptest.c,v 1.1 2007/09/02 06:34:37 zhouzhouyi Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/msgtest.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * Obtained from: $NetBSD: msgtest.c,v 1.7 2002/07/20 08:36:25 grant Exp $ - * $FreeBSD: src/tools/regression/sysvmsg/msgtest.c,v 1.2 2006/11/16 19:51:10 jkim Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/ptrace.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/mactest/macproc.c,v 1.1 2007/05/17 01:42:07 zhouzhouyi Exp $ + * $FreeBSD$ */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/semtest.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $ - * $FreeBSD: src/tools/regression/mactest/semtest.c,v 1.1 2002/08/15 06:34:37 zhouzhouyi Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/shmtest.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $ - * $FreeBSD: src/tools/regression/mactest/shmtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $ + * $FreeBSD$ */ /* ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/regression/fstest/tests/conf,v 1.1 2007/01/17 01:42:08 pjd Exp $ +# $FreeBSD$ # fstest configuration file # Known operating systems: FreeBSD, SunOS, Linux ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/regression/mactest/tests/misc.sh,v 1.1 2007/06/04 01:42:08 zhouzhouyi Exp $ +# $FreeBSD$ ntest=1 pid=0 ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvshm/00.t#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/sysvshm/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ desc="manipulate sysv share memory" @@ -7,67 +7,76 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..4" +case "${os}" in +FreeBSD) + + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then #turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + echo "1..4" -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && - [ "${mac_test_support}" != "" ] ; then - + sysctl security.mac.mls.enabled=1 > /dev/null + sysctl security.mac.biba.enabled=1 > /dev/null + sysctl security.mac.mls.revocation_enabled=1 > /dev/null + sysctl security.mac.biba.revocation_enabled=1 > /dev/null - - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} - -############################################################# - t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" - t=`sysctl security.mac.biba.enabled=1` - echo "enforcing mac/biba!" - t=`sysctl security.mac.mls.revocation_enabled=1` - t=`sysctl security.mac.biba.revocation_enabled=1` - echo "enabling revoking" #option -c creator's label, option -s sender's label #option -r receiver's label, option -t ipc stat label #options -e ipc set label #case 1: check mls no read high - echo -n "pid = -2 mac_test_check_sysv_shmget:" > ${mactest_conf} - echo "biba/high(low-high),mls/9(low-high) biba/high,mls/5" >> ${mactest_conf} - bizarretestexpect ${shmtest} "" "" -c "mls/5" -s "mls/5" \ - -r "mls/9" -t "mls/5" -e "mls/5" -f ${mactest_conf} + echo -n "pid = -2 sysvshm_check_shmget:" > ${mactest_conf} + echo "biba/high(low-high),mls/9(low-high) biba/high,mls/5" >> ${mactest_conf} + bizarretestexpect ${shmtest} "*Permission.denied*" "" -c "mls/5" -s "mls/5" \ + -r "mls/9" -t "mls/5" -e "mls/5" -f ${mactest_conf} + #case 2: check biba no read low - echo -n "pid = -2 mac_test_check_sysv_shmat#SHM_RDONLY:" > ${mactest_conf} - echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} - bizarretestexpect ${shmtest} "" "" -c "biba/5" -s "biba/5" \ - -r "biba/3" -t "biba/5" -e "biba/5" -f ${mactest_conf} + echo -n "pid = -2 sysvshm_check_shmat#SHM_RDONLY:" > ${mactest_conf} + echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} + bizarretestexpect ${shmtest} "" "" -c "biba/5" -s "biba/5" \ + -r "biba/3" -t "biba/5" -e "biba/5" -f ${mactest_conf} + #case 3: ipc stat biba no stat low - echo -n "pid = -2 mac_test_check_sysv_shmctl#IPC_STAT:" > ${mactest_conf} - echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} - bizarretestexpect ${shmtest} "" "" -c "biba/5" -s "biba/5" \ - -r "biba/5" -t "biba/3" -e "biba/5" -f ${mactest_conf} + echo -n "pid = -2 sysvshm_check_shmctl#IPC_STAT:" > ${mactest_conf} + echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} + bizarretestexpect ${shmtest} "" "" -c "biba/5" -s "biba/5" \ + -r "biba/5" -t "biba/3" -e "biba/5" -f ${mactest_conf} + #case 4: ipc set biba no set high - echo -n "pid = -2 mac_test_check_sysv_shmctl#IPC_SET:" > ${mactest_conf} - echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} - bizarretestexpect ${shmtest} "*shmctl.IPC_SET:.Permission.denied" "" -c "biba/5" -s "biba/5" \ - -r "biba/5" -t "biba/5" -e "biba/3" -f ${mactest_conf} -#cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - t=`sysctl security.mac.biba.enabled=0` - echo "disabling mac/biba!" + echo -n "pid = -2 sysvshm_check_shmctl#IPC_SET:" > ${mactest_conf} + echo "biba/3(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} + echo -n "pid = -2 sysvshm_check_shmctl#IPC_RMID:" >> ${mactest_conf} + echo "biba/5(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} + echo "pid = -2 sysvshm_cleanup:*" >> ${mactest_conf} + bizarretestexpect ${shmtest} "*shmctl.IPC_SET:.Permission.denied" "" \ + -c "biba/5" -s "biba/5" \ + -r "biba/5" -t "biba/5" -e "biba/3" -f ${mactest_conf} - rm ${mactest_conf} -fi +#cleanup: + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm ${mactest_conf} +#mac_mls mac_biba and mac_test support + fi + ;; +*) + quick_exit + ;; +esac ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#19 (text+ko) ==== @@ -2281,6 +2281,7 @@ LOG_DECL LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); + APPEND_FLAG((shmflg & SHM_RDONLY)? "SHM_RDONLY" : "SHM_RND"); COUNTER_INC(sysvshm_check_shmat); return (0); @@ -2295,6 +2296,24 @@ LOG_DECL LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); + + switch(cmd) { + case IPC_RMID: + APPEND_FLAG("IPC_RMID"); + break; + case IPC_SET: + APPEND_FLAG("IPC_SET"); + break; + case IPC_STAT: + APPEND_FLAG("IPC_STAT"); + break; + case SHM_STAT: + APPEND_FLAG("SHM_STAT"); + break; + default: + break; + } + COUNTER_INC(sysvshm_check_shmctl); return (0); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:31:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D94B316A41B; Mon, 7 Jan 2008 07:31:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EB2516A417 for ; Mon, 7 Jan 2008 07:31:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F09813C447 for ; Mon, 7 Jan 2008 07:31:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077Vbqu029035 for ; Mon, 7 Jan 2008 07:31:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077VbGH029030 for perforce@freebsd.org; Mon, 7 Jan 2008 07:31:37 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:31:37 GMT Message-Id: <200801070731.m077VbGH029030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:31:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=132682 Change 132682 by jb@jb_freebsd1 on 2008/01/07 07:31:22 Remove debugging code from the invop handler. We don't need the ipl function either. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#5 (text+ko) ==== @@ -49,44 +49,15 @@ struct dtrace_invop_hdlr *dtih_next; } dtrace_invop_hdlr_t; -dtrace_invop_hdlr_t *dtrace_invop_hdlr; -uintptr_t dtrace_invop_addr; - int dtrace_invop(uintptr_t addr, uintptr_t *stack, uintptr_t eax) { dtrace_invop_hdlr_t *hdlr; int rval; - /* - * Save the address in a global variable which can be - * read via the kernel debugger in the event that a - * double fault occurs. - * - * From kdb: p *dtrace_invop_addr - * - * Then look up the value in an objdump of the kernel. - */ - dtrace_invop_addr = addr; - - /* - * An invalid opcode fault should not occur while executing - * a probe because only dtrace_ functions are supposed to - * be called by design. Check here if dtrace_probe() is - * in-progress. If so, that's very bad. Very, very bad. We - * can't call any non-dtrace functions to report this, so - * just save the invalid opcode address and hope that the - * dtrace_ioctl will report it. If the DTrace port is - * working according to Sun's design, this should never - * occur. - */ - if (dtrace_in_probe) - dtrace_in_probe_addr = addr; - - for (hdlr = dtrace_invop_hdlr; hdlr != NULL; hdlr = hdlr->dtih_next) { + for (hdlr = dtrace_invop_hdlr; hdlr != NULL; hdlr = hdlr->dtih_next) if ((rval = hdlr->dtih_func(addr, stack, eax)) != 0) return (rval); - } return (0); } @@ -100,10 +71,6 @@ hdlr->dtih_func = func; hdlr->dtih_next = dtrace_invop_hdlr; dtrace_invop_hdlr = hdlr; - -#ifdef DOODAD - dtrace_invop_func = dtrace_invop; -#endif } void @@ -131,21 +98,6 @@ } kmem_free(hdlr, 0); - -#ifdef DOODAD - if (dtrace_invop_hdlr == NULL) - dtrace_invop_func = NULL; -#endif -} - -int -dtrace_getipl(void) -{ -#ifdef DOODAD - return (CPU->cpu_pri); -#else - return (0); -#endif } /*ARGSUSED*/ @@ -449,6 +401,9 @@ * All the rest will be handled in the usual way. */ switch (type) { + /* Privilieged instruction fault. */ + case T_PRIVINFLT: + break; /* General protection fault. */ case T_PROTFLT: /* Flag an illegal operation. */ @@ -476,6 +431,14 @@ /* Handle all other traps in the usual way. */ break; } + + /* + * Outside the DTrace probe context, a breakpoint fault could be caused by a + * Function Boundary Trace (fbt) or Statically Defined Trace (sdt) provider. + */ + } else if (type == T_BPTFLT) { +printf("T_BPTFLT! tf_rip 0x%lx\n", frame->tf_rip); + dtrace_invop(frame->tf_rip - 1, (uintptr_t *) frame->tf_rsp, frame->tf_rax); } /* Handle the trap in the usual way. */ From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:33:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC9A16A421; Mon, 7 Jan 2008 07:33:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE44416A418 for ; Mon, 7 Jan 2008 07:33:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB52413C457 for ; Mon, 7 Jan 2008 07:33:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077Xd3i029787 for ; Mon, 7 Jan 2008 07:33:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077XdT0029784 for perforce@freebsd.org; Mon, 7 Jan 2008 07:33:39 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:33:39 GMT Message-Id: <200801070733.m077XdT0029784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:33:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=132683 Change 132683 by jb@jb_freebsd1 on 2008/01/07 07:33:25 Add the amd64 code to the Function Boundary Trace (fbt) provider. This is just OpenSolaris code rearranged to suit FreeBSD's linker sets. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#6 (text+ko) ==== @@ -93,7 +93,7 @@ #define FBT_RET_IMM16 0xc2 #define FBT_LEAVE 0xc9 -#ifdef __amd64 +#ifdef __amd64__ #define FBT_PATCHVAL 0xcc #else #define FBT_PATCHVAL 0xf0 @@ -198,6 +198,19 @@ cpu->cpu_dtrace_caller = 0; } else { +#ifdef __amd64__ + /* + * On amd64, we instrument the ret, not the + * leave. We therefore need to set the caller + * to assure that the top frame of a stack() + * action is correct. + */ + DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT); + cpu->cpu_dtrace_caller = stack[0]; + DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT | + CPU_DTRACE_BADADDR); +#endif + dtrace_probe(fbt->fbtp_id, fbt->fbtp_roffset, rval, 0, 0, 0); cpu->cpu_dtrace_caller = 0; @@ -231,46 +244,6 @@ return (0); } -#ifdef DOODAD - /* - * Still trying to narrow down why some of these things are - * being called from the probe context. At the moment I suspect - * there is some call which executes witness code and that - * is *certain* to end in tears. - */ - if (name[0] == '_' || - strcmp(name, "trap") == 0 || - strcmp(name, "userret") == 0 || - strncmp(name, "realtimer", 9) == 0 || - strncmp(name, "ithread", 7) == 0 || - strncmp(name, "itimer", 6) == 0 || - strncmp(name, "ioapic", 6) == 0 || - strncmp(name, "isitmy", 6) == 0 || - strncmp(name, "db_", 3) == 0 || - strncmp(name, "gdb_", 4) == 0 || - strncmp(name, "kdb_", 4) == 0 || - strncmp(name, "intr_", 5) == 0 || - - strncmp(name, "X_", 2) == 0 || - strncmp(name, "vm", 2) == 0 || - strncmp(name, "th", 2) == 0 || - strncmp(name, "sh", 2) == 0 || - strncmp(name, "fi", 2) == 0 || - strncmp(name, "fd", 2) == 0 || - strncmp(name, "elf", 3) == 0 || - strncmp(name, "str", 3) == 0 || - strncmp(name, "nfs", 3) == 0 || - strncmp(name, "ata_", 4) == 0 || - strncmp(name, "acpi", 4) == 0 || - strncmp(name, "link_", 5) == 0 || - strncmp(name, "bufobj", 6) == 0 || - strncmp(name, "linker", 6) == 0 || - strncmp(name, "witness", 7) == 0 || - strncmp(name, "spinlock", 8) == 0 || - strcmp(name, "pcpu_find") == 0) /* used in stack() impl */ - return (0); -#endif - /* * These filters are set by sysctl to help debugging the initial * port of this provider. Normally the wildcard would be @@ -309,6 +282,26 @@ instr = (u_int8_t *) symval->value; limit = (u_int8_t *) symval->value + symval->size; +#ifdef __amd64__ + while (instr < limit) { + if (*instr == FBT_PUSHL_EBP) + break; + + if ((size = dtrace_instr_size(instr)) <= 0) + break; + + instr += size; + } + + if (instr >= limit || *instr != FBT_PUSHL_EBP) { + /* + * We either don't save the frame pointer in this + * function, or we ran into some disassembly + * screw-up. Either way, we bail. + */ + return (0); + } +#else if (instr[0] != FBT_PUSHL_EBP) return (0); @@ -317,6 +310,7 @@ !(instr[1] == FBT_MOVL_ESP_EBP0_V1 && instr[2] == FBT_MOVL_ESP_EBP1_V1)) return (0); +#endif fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO); fbt->fbtp_name = name; @@ -347,6 +341,17 @@ if ((size = dtrace_instr_size(instr)) <= 0) return (0); +#ifdef __amd64__ + /* + * We only instrument "ret" on amd64 -- we don't yet instrument + * ret imm16, largely because the compiler doesn't seem to + * (yet) emit them in the kernel... + */ + if (*instr != FBT_RET) { + instr += size; + goto again; + } +#else if (!(size == 1 && (*instr == FBT_POPL_EBP || *instr == FBT_LEAVE) && (*(instr + 1) == FBT_RET || @@ -354,6 +359,7 @@ instr += size; goto again; } +#endif /* * We (desperately) want to avoid erroneously instrumenting a @@ -403,6 +409,7 @@ fbt->fbtp_ctl = lf; fbt->fbtp_loadcnt = lf->loadcnt; +#ifndef __amd64__ if (*instr == FBT_POPL_EBP) { fbt->fbtp_rval = DTRACE_INVOP_POPL_EBP; } else { @@ -412,6 +419,13 @@ fbt->fbtp_roffset = (uintptr_t)(instr - (uint8_t *) symval->value) + 1; +#else + ASSERT(*instr == FBT_RET); + fbt->fbtp_rval = DTRACE_INVOP_RET; + fbt->fbtp_roffset = + (uintptr_t)(instr - (uint8_t *) symval->value); +#endif + fbt->fbtp_savedval = *instr; fbt->fbtp_patchval = FBT_PATCHVAL; fbt->fbtp_hashnext = fbt_probetab[FBT_ADDR2NDX(instr)]; @@ -471,7 +485,7 @@ /* * List the functions in the module and the symbol values. */ - linker_file_function_listall(lf, fbt_provide_module_function, modname); + (void) linker_file_function_listall(lf, fbt_provide_module_function, modname); } /* ARGSUSED */ From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:37:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 671C916A41B; Mon, 7 Jan 2008 07:37:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CEBB16A419 for ; Mon, 7 Jan 2008 07:37:44 +0000 (UTC) (envelope-from evilpete@gmail.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 260C313C457 for ; Mon, 7 Jan 2008 07:37:44 +0000 (UTC) (envelope-from evilpete@gmail.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077biKe030042 for ; Mon, 7 Jan 2008 07:37:44 GMT (envelope-from evilpete@gmail.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077bhEC030039 for perforce@freebsd.org; Mon, 7 Jan 2008 07:37:43 GMT (envelope-from evilpete@gmail.com) Date: Mon, 7 Jan 2008 07:37:43 GMT Message-Id: <200801070737.m077bhEC030039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to evilpete@gmail.com using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 132684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:37:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=132684 Change 132684 by peter@peter_overcee on 2008/01/07 07:37:36 HACK! HACK! Teach cvs-1.11 about 1.12-style keyword config controls. Affected files ... .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#6 edit Differences ... ==== //depot/projects/hammer/contrib/cvs/src/parseinfo.c#6 (text+ko) ==== @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:45:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27D3E16A420; Mon, 7 Jan 2008 07:45:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E154716A41A for ; Mon, 7 Jan 2008 07:45:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C28F613C455 for ; Mon, 7 Jan 2008 07:45:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077jqCj031502 for ; Mon, 7 Jan 2008 07:45:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077jq8Z031499 for perforce@freebsd.org; Mon, 7 Jan 2008 07:45:52 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:45:52 GMT Message-Id: <200801070745.m077jq8Z031499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:45:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=132685 Change 132685 by jb@jb_freebsd1 on 2008/01/07 07:45:23 Add a DTrace-debug-specific printf function that can be called in a probe context with all Function Boundary Trace (fbt) probes enabled. The function uses per-cpu circular buffers and is very careful not to call any functions outside the dtrace module while buffering. The output function will be called from dtrace's deadman cyclic callback function. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:46:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB6E16A419; Mon, 7 Jan 2008 07:46:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0579D16A417 for ; Mon, 7 Jan 2008 07:46:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F252213C467 for ; Mon, 7 Jan 2008 07:46:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077kr4V031571 for ; Mon, 7 Jan 2008 07:46:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077krmi031568 for perforce@freebsd.org; Mon, 7 Jan 2008 07:46:53 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:46:53 GMT Message-Id: <200801070746.m077krmi031568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132686 Change 132686 by jb@jb_freebsd1 on 2008/01/07 07:46:37 Revise a couple of comments. I'm beginning to dislike the name 'invop' used by Sun. It applies to i386, but on amd64 it's actually a breakpoint trap, not a fault. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#26 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#22 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#26 (text+ko) ==== @@ -53,7 +53,7 @@ /* Hang our hook for thread switches. */ dtrace_vtime_switch_func = dtrace_vtime_switch; - /* Hang our hook for invalid opcodes. */ + /* Hang our hook for exceptions. */ dtrace_invop_init(); /* ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#22 (text+ko) ==== @@ -159,7 +159,7 @@ /* XXX Hack */ mutex_destroy(&mod_lock); - /* Reset out hook for invalid opcodes. */ + /* Reset our hook for exceptions. */ dtrace_invop_uninit(); /* From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:48:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 740CB16A46B; Mon, 7 Jan 2008 07:48:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A12A16A468 for ; Mon, 7 Jan 2008 07:48:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 336C013C47E for ; Mon, 7 Jan 2008 07:48:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077mu2N031796 for ; Mon, 7 Jan 2008 07:48:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077muju031793 for perforce@freebsd.org; Mon, 7 Jan 2008 07:48:56 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:48:56 GMT Message-Id: <200801070748.m077muju031793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132687 Change 132687 by jb@jb_freebsd1 on 2008/01/07 07:48:11 Add the function prototype for the DTrace-debug-specific printf for use _only_ in the probe context. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#28 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#28 (text) ==== @@ -2242,6 +2242,8 @@ #if defined(sun) extern hrtime_t dtrace_gethrtime(void); +#else +void dtrace_debug_printf(const char *, ...) __printflike(1, 2); #endif extern void dtrace_sync(void); extern void dtrace_toxic_ranges(void (*)(uintptr_t, uintptr_t)); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:49:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A540616A468; Mon, 7 Jan 2008 07:49:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A6F716A41A for ; Mon, 7 Jan 2008 07:49:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63E6813C46A for ; Mon, 7 Jan 2008 07:49:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077nvW1031820 for ; Mon, 7 Jan 2008 07:49:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077nv04031817 for perforce@freebsd.org; Mon, 7 Jan 2008 07:49:57 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:49:57 GMT Message-Id: <200801070749.m077nv04031817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132688 Change 132688 by jb@jb_freebsd1 on 2008/01/07 07:49:49 Include the debug code. Cleanup the include paths. Add the debug output function to the deadman cyclic callback function which is usually called each second. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#14 (text) ==== @@ -111,6 +111,7 @@ /* FreeBSD includes: */ #if !defined(sun) +#include #include #include #include @@ -118,6 +119,7 @@ #include #include #include "dtrace_cddl.h" +#include "dtrace_debug.c" #endif /* @@ -2644,6 +2646,7 @@ } return (mstate->dtms_walltimestamp); +#if defined(sun) case DIF_VAR_IPL: if (!dtrace_priv_kernel(state)) return (0); @@ -2652,6 +2655,7 @@ mstate->dtms_present |= DTRACE_MSTATE_IPL; } return (mstate->dtms_ipl); +#endif case DIF_VAR_EPID: ASSERT(mstate->dtms_present & DTRACE_MSTATE_EPID); @@ -12305,6 +12309,10 @@ dtrace_sync(); +#if !defined(sun) + dtrace_debug_output(); +#endif + now = dtrace_gethrtime(); if (state != dtrace_anon.dta_state && @@ -15976,17 +15984,17 @@ .d_name = "dtrace", }; -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if defined(__amd64__) -#include +#include #endif SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:55:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 585C216A41A; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DFF516A419 for ; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 171D113C458 for ; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077t2Yo033551 for ; Mon, 7 Jan 2008 07:55:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077t2Zl033538 for perforce@freebsd.org; Mon, 7 Jan 2008 07:55:02 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 07:55:02 GMT Message-Id: <200801070755.m077t2Zl033538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=132689 Change 132689 by jb@jb_freebsd1 on 2008/01/07 07:54:21 Remove some code which doesn't belong here. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#6 (text+ko) ==== @@ -431,14 +431,6 @@ /* Handle all other traps in the usual way. */ break; } - - /* - * Outside the DTrace probe context, a breakpoint fault could be caused by a - * Function Boundary Trace (fbt) or Statically Defined Trace (sdt) provider. - */ - } else if (type == T_BPTFLT) { -printf("T_BPTFLT! tf_rip 0x%lx\n", frame->tf_rip); - dtrace_invop(frame->tf_rip - 1, (uintptr_t *) frame->tf_rsp, frame->tf_rax); } /* Handle the trap in the usual way. */ From owner-p4-projects@FreeBSD.ORG Mon Jan 7 07:55:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3E0616A528; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EFFD16A49A for ; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DABD13C459 for ; Mon, 7 Jan 2008 07:55:03 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m077t3L8033571 for ; Mon, 7 Jan 2008 07:55:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m077t3dg033564 for perforce@freebsd.org; Mon, 7 Jan 2008 07:55:03 GMT (envelope-from imp@freebsd.org) Date: Mon, 7 Jan 2008 07:55:03 GMT Message-Id: <200801070755.m077t3dg033564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 07:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=132690 Change 132690 by imp@imp_paco-paco on 2008/01/07 07:54:29 Prefer the mips2 method for cache operations. This eliminates a few more undefines. We likely can also delete cache.S. But we should evaluate OpenBSD's cache_7k and cache_5k files to see if they are relevant or not to these operations. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#10 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#15 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#6 (text+ko) ==== @@ -28,7 +28,7 @@ # Phase 2 # ---------------------------------------------------------------------- -mips/mips/cache.S standard +###mips/mips/cache.S standard #xxx #mips/mips/cpuconf.c standard mips/mips/machdep.c standard @@ -67,8 +67,8 @@ mips/mips/tlb.S standard mips/mips/busdma_machdep.c standard -#mips/mips/cache.c standard -#mips/mips/cache_mipsNN.c standard +mips/mips/cache.c standard +mips/mips/cache_mipsNN.c standard #mips/mips/copystr.S standard mips/mips/db_disasm.c optional ddb mips/mips/db_interface.c optional ddb ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#4 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -208,8 +209,8 @@ *dst++ = *data++; } - Mips_HitSyncSCache(addr, size); /* Flush D and S caches */ - Mips_SyncICache(addr, size); /* Invalidate I cache */ + mips_icache_sync_range((db_addr_t) addr, size); + mips_dcache_wbinv_range((db_addr_t) addr, size); } (void)kdb_jmpbuf(prev_jb); return (ret); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#10 (text+ko) ==== @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -456,7 +457,10 @@ * entries needed and Invoke Cache Config routines * here, based on CPU-type. */ +#ifdef UNIMPLEMENTED + /* XXX this is done in mips_cpu_init() now, I think*/ cpucfg = Mips_ConfigCache(); +#endif num_tlbentries = 64; Mips_SetWIRED(0); Mips_TLBFlush(num_tlbentries); @@ -483,7 +487,8 @@ /* * Clear out the I and D caches. */ - Mips_SyncCache(); + mips_icache_sync_all(); + mips_dcache_wbinv_all(); /* * Mask all interrupts. Each interrupt will be enabled ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#15 (text+ko) ==== @@ -98,6 +98,7 @@ #include #endif +#include #include #include @@ -1757,8 +1758,8 @@ */ if (!is_kernel_pmap(pmap) && (pmap == &curproc->p_vmspace->vm_pmap) && (prot & VM_PROT_EXECUTE)) { - Mips_SyncICache(va, NBPG); - Mips_HitSyncSCache(va, NBPG); + mips_icache_sync_range(va, NBPG); + mips_dcache_wbinv_range(va, NBPG); } vm_page_unlock_queues(); PMAP_UNLOCK(pmap); @@ -1883,8 +1884,8 @@ */ if (pmap == &curproc->p_vmspace->vm_pmap) { va &= ~PAGE_MASK; - Mips_SyncICache(va, NBPG); - Mips_HitSyncSCache(va, NBPG); + mips_icache_sync_range(va, NBPG); + mips_dcache_wbinv_range(va, NBPG); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 7 08:05:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8598F16A41A; Mon, 7 Jan 2008 08:05:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 161E716A418 for ; Mon, 7 Jan 2008 08:05:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F63B13C43E for ; Mon, 7 Jan 2008 08:05:15 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0785Ehx036508 for ; Mon, 7 Jan 2008 08:05:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0785ENj036505 for perforce@freebsd.org; Mon, 7 Jan 2008 08:05:14 GMT (envelope-from imp@freebsd.org) Date: Mon, 7 Jan 2008 08:05:14 GMT Message-Id: <200801070805.m0785ENj036505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 08:05:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=132691 Change 132691 by imp@imp_paco-paco on 2008/01/07 08:04:55 Restore CFE and YAMON specific bits to LOCORE. Also need to sort out the mips_init vs platform_init disparity that we currently have, but that can wait a bit. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#6 (text+ko) ==== @@ -71,6 +71,19 @@ #include "assym.s" + .data +#ifdef YAMON +GLOBAL(fenvp) + .space 4 # Assumes mips32? Is that OK? +#endif +#ifdef CFE /* Assumes MIPS32, bad? */ +GLOBAL(cfe_handle) + .space 4 +GLOBAL(cfe_vector) + .space 4 +#endif + + .text .set noreorder # Noreorder is default style! .globl _C_LABEL(_start) @@ -91,6 +104,20 @@ la gp, _C_LABEL(_gp) sw zero, START_FRAME - 4(sp) # Zero out old ra for debugger +#ifdef YAMON + /* Save YAMON boot environment pointer */ + sw a2, fenvp +#endif +#ifdef CFE + /* + * Save the CFE context passed to us by the loader. + */ + li t1, 0x43464531 + bne a3, t1, no_cfe /* Check for "CFE1" signature */ + sw a0, cfe_handle /* Firmware data segment */ + sw a2, cfe_vector /* Firmware entry vector */ +no_cfe: +#endif /* reset count register to 1 on each CPU */ li a0, 1 mtc0 a0, COP_0_COUNT From owner-p4-projects@FreeBSD.ORG Mon Jan 7 08:13:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7C4616A41B; Mon, 7 Jan 2008 08:13:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3EB16A417 for ; Mon, 7 Jan 2008 08:13:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9666A13C46B for ; Mon, 7 Jan 2008 08:13:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m078DN1c037972 for ; Mon, 7 Jan 2008 08:13:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m078DNO0037968 for perforce@freebsd.org; Mon, 7 Jan 2008 08:13:23 GMT (envelope-from imp@freebsd.org) Date: Mon, 7 Jan 2008 08:13:23 GMT Message-Id: <200801070813.m078DNO0037968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 08:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132692 Change 132692 by imp@imp_paco-paco on 2008/01/07 08:13:02 o defined bus_space_map, maybe it is wrong... o sioword is unused in FreeBSD. # we're down to less than 5 undefines. 3 of which need some careful # thought to resolve, the cpu_throw likely is easy. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#6 (text+ko) ==== @@ -100,6 +100,17 @@ __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags, bus_space_handle_t *bshp); + +static __inline int +bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr, + bus_size_t size __unused, int flags __unused, + bus_space_handle_t *bshp) +{ + + *bshp = addr; + return (0); +} + /* * Unmap a region of device bus space. */ ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#5 (text+ko) ==== @@ -496,6 +496,8 @@ nop END(casuword32) +#if 0 + /* unused in FreeBSD */ /* * Have to flush instruction cache afterwards. */ @@ -510,6 +512,7 @@ j _C_LABEL(Mips_SyncICache) # FlushICache sets v0 = 0. (Ugly) li a1, 4 # size of word END(suiword) +#endif /* * Will have to flush the instruction cache if byte merging is done in hardware. From owner-p4-projects@FreeBSD.ORG Mon Jan 7 12:46:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB01416A419; Mon, 7 Jan 2008 12:46:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93B0B16A417 for ; Mon, 7 Jan 2008 12:46:21 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 82C9B13C455 for ; Mon, 7 Jan 2008 12:46:21 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07CkLVP011316 for ; Mon, 7 Jan 2008 12:46:21 GMT (envelope-from adrian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07CkK7w011308 for perforce@freebsd.org; Mon, 7 Jan 2008 12:46:20 GMT (envelope-from adrian@freebsd.org) Date: Mon, 7 Jan 2008 12:46:20 GMT Message-Id: <200801071246.m07CkK7w011308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adrian@freebsd.org using -f From: Adrian Chadd To: Perforce Change Reviews Cc: Subject: PERFORCE change 132705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 12:46:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=132705 Change 132705 by adrian@wendy on 2008/01/07 12:46:17 Integration stuff. Affected files ... .. //depot/projects/adrian_spoof_clientip/COPYRIGHT#1 branch .. //depot/projects/adrian_spoof_clientip/LOCKS#1 branch .. //depot/projects/adrian_spoof_clientip/MAINTAINERS#1 branch .. //depot/projects/adrian_spoof_clientip/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/Makefile.inc1#1 branch .. //depot/projects/adrian_spoof_clientip/ObsoleteFiles.inc#1 branch .. //depot/projects/adrian_spoof_clientip/README#1 branch .. //depot/projects/adrian_spoof_clientip/UPDATING#1 branch .. //depot/projects/adrian_spoof_clientip/bin/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cat/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cat/cat.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cat/cat.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chflags/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chflags/chflags.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chflags/chflags.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chio/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chio/chio.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chio/chio.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chio/defs.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chio/pathnames.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chmod/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chmod/chmod.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/chmod/chmod.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cp/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cp/cp.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cp/cp.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cp/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/cp/utils.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/config.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/config_p.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/host.defs#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/iconv.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/csh/iconv_stub.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/date.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/date.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/netdate.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/vary.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/date/vary.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/args.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/conv.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/conv_tab.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/dd.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/dd.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/dd.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/gen.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/misc.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/position.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.ascii#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.ebcdic#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.ibm#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.lcase#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.oldascii#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.oldibm#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.pareven#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.parnone#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.parodd#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.parset#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.swab#1 branch .. //depot/projects/adrian_spoof_clientip/bin/dd/ref.ucase#1 branch .. //depot/projects/adrian_spoof_clientip/bin/df/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/df/df.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/df/df.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/domainname/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/domainname/domainname.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/domainname/domainname.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/echo/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/echo/echo.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/echo/echo.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/POSIX#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/README#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/buf.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/cbc.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/ed.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/ed.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/glbl.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/io.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/main.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/re.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/sub.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/=.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/README#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/TODO#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/a.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/a.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/a.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/a1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/a2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/addr.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/addr.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/addr.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/addr1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/addr2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/ascii.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/bang1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/bang1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/bang1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/bang1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/bang2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/c.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/c.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/c.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/c1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/c2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/d.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/d.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/d.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/d.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e3.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e3.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e3.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e4.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e4.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/e4.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/f1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/f2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g3.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g3.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g3.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g4.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g4.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g4.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g5.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g5.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/g5.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/h.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/i3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/j.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/j.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/j.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/k4.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/l.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/l.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/l.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/m.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/m.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/m.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/m.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/n.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/n.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/n.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/nl2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/p.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/p.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/p.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/q.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/q.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/q.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/q1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r3.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r3.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/r3.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s10.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s3.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s3.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s3.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s4.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s5.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s6.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s7.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s8.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/s9.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t1.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t1.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t1.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t2.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t2.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/t2.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/u.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/u.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/u.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/u.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/v.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/v.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/v.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w.d#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w.r#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w.t#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w1.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w2.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/w3.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/x.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/test/z.err#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ed/undo.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/expr/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/expr/expr.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/expr/expr.y#1 branch .. //depot/projects/adrian_spoof_clientip/bin/getfacl/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/getfacl/getfacl.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/getfacl/getfacl.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/hostname/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/hostname/hostname.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/hostname/hostname.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kenv/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kenv/kenv.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kenv/kenv.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kill/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kill/kill.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/kill/kill.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ln/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ln/ln.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ln/ln.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ln/symlink.7#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/cmp.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/ls.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/ls.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/ls.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/print.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ls/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mkdir/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mkdir/mkdir.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mkdir/mkdir.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mv/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mv/mv.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/mv/mv.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/ar_io.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/ar_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/buf_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/cache.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/cache.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/cpio.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/cpio.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/cpio.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/file_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/ftree.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/ftree.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/gen_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/getoldopt.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/options.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/options.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/pat_rep.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/pat_rep.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/pax.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/pax.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/pax.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/sel_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/sel_subs.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tables.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tables.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tar.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tar.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tar.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pax/tty_subs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/fmt.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/keyword.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/nlist.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/print.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/ps.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/ps.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/ps/ps.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pwd/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pwd/pwd.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/pwd/pwd.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rcp/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rcp/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rcp/rcp.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rcp/rcp.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rcp/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/realpath/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/realpath/realpath.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/realpath/realpath.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rm/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rm/rm.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rm/rm.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rmail/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rmdir/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rmdir/rmdir.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/rmdir/rmdir.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/file.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/mask.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/merge.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/remove.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/setfacl.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/setfacl.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/setfacl.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/setfacl/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/TOUR#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/alias.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/alias.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/arith.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/arith.y#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/arith_lex.l#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/bltin/echo.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/bltin/echo.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/builtins.def#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/cd.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/cd.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/error.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/error.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/eval.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/eval.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/exec.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/exec.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/expand.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/expand.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/cmv#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/dirs#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/kill#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/login#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/newgrp#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/popd#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/pushd#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/funcs/suspend#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/histedit.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/init.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/input.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/input.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/jobs.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/jobs.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mail.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mail.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/main.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/main.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/memalloc.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/memalloc.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/miscbltin.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mkbuiltins#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mkinit.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mknodes.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mksyntax.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mktokens#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/myhistedit.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mystring.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/mystring.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/nodes.c.pat#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/nodetypes#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/options.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/options.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/output.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/output.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/parser.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/parser.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/redir.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/redir.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/sh.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/shell.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/show.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/show.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/trap.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/trap.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/var.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sh/var.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sleep/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sleep/sleep.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sleep/sleep.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/cchar.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/extern.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/gfmt.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/key.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/modes.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/print.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/stty.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/stty.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/stty.h#1 branch .. //depot/projects/adrian_spoof_clientip/bin/stty/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sync/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sync/sync.8#1 branch .. //depot/projects/adrian_spoof_clientip/bin/sync/sync.c#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/TEST.README#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/TEST.csh#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/TEST.sh#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/test.1#1 branch .. //depot/projects/adrian_spoof_clientip/bin/test/test.c#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/sbin/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.bin/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/adrian_spoof_clientip/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/adrian_spoof_clientip/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/AUTHORS#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/BUGS#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/COPYING#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/ChangeLog#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/FAQ#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/INSTALL#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/NEWS#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/README#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/README.attrcache#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/README.ldap#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/README.y2k#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amd.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amd.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/autil.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/clock.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/conf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/map.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/opts.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/restart.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/sched.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/amq.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/amq.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/amq.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/bootstrap#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/doc/version.texi#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/ldap.schema#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/tasks#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/vers.m4#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/AUTHORS#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/ChangeLog#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/FAQ#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/INSTALL#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/NEWS#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/README#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/array.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/atan.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/div.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/exp.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/fact.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/jn.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/ln.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/mul.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/raise.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/signum#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/sine.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/Test/timetest#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/acconfig.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/aclocal.m4#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/bc.y#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/const.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/execute.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/global.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/global.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/load.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/main.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/proto.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/scan.l#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/storage.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/bc/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/config.h.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/configure#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/configure.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/array.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/dc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/dc.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/eval.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/misc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/stack.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/dc/string.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/bc.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/dc.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/h/number.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/install-sh#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/lib/number.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/missing#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bc/stamp-h.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/CHANGES#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/FAQ#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/README#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/README.idnkit#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/acconfig.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/config.guess#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/config.sub#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/config.threads.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/configure.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/adrian_spoof_clientip/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 7 14:14:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F40C716A41B; Mon, 7 Jan 2008 14:14:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B95CA16A418 for ; Mon, 7 Jan 2008 14:14:53 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A71F213C455 for ; Mon, 7 Jan 2008 14:14:53 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07EErrk035916 for ; Mon, 7 Jan 2008 14:14:53 GMT (envelope-from adrian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07EErYt035913 for perforce@freebsd.org; Mon, 7 Jan 2008 14:14:53 GMT (envelope-from adrian@freebsd.org) Date: Mon, 7 Jan 2008 14:14:53 GMT Message-Id: <200801071414.m07EErYt035913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adrian@freebsd.org using -f From: Adrian Chadd To: Perforce Change Reviews Cc: Subject: PERFORCE change 132707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 14:14:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132707 Change 132707 by adrian@wendy on 2008/01/07 14:14:51 Bring over most of the initial work that Julian emailed me a while ago. (Thanks Julian.) This hasn't been compiled or tested yet! Affected files ... .. //depot/projects/adrian_spoof_clientip/src/sbin/ipfw/ipfw2.c#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/conf/NOTES#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/conf/options#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/net/if_bridge.c#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/in.h#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/in_pcb.c#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/in_pcb.h#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_fw.h#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_fw2.c#2 edit .. //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_output.c#2 edit Differences ... ==== //depot/projects/adrian_spoof_clientip/src/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -298,6 +298,7 @@ TOK_ANTISPOOF, TOK_IPSEC, TOK_COMMENT, + TOK_FOR_ME, TOK_PLR, TOK_NOERROR, @@ -426,6 +427,7 @@ { "uid", TOK_UID }, { "gid", TOK_GID }, { "jail", TOK_JAIL }, + { "for-me", TOK_FOR_ME }, { "in", TOK_IN }, { "limit", TOK_LIMIT }, { "keep-state", TOK_KEEPSTATE }, @@ -2026,6 +2028,10 @@ O_TAGGED); break; + case O_FOR_ME: + printf(" for-me"); + break; + default: printf(" [opcode %d len %d]", cmd->opcode, cmd->len); @@ -5612,6 +5618,10 @@ ac--; av++; break; + case TOK_FOR_ME: + fill_cmd(cmd, O_FOR_ME, 0, 0); + break; + default: errx(EX_USAGE, "unrecognised option [%d] %s\n", i, s); } ==== //depot/projects/adrian_spoof_clientip/src/sys/conf/NOTES#2 (text+ko) ==== @@ -614,6 +614,14 @@ options ALTQ_NOPCC # Required if the TSC is unusable options ALTQ_DEBUG +# IP optional behaviour. +# IP_NONLOCALBIND disables the check that bind() usually makes that the +# Address is one that is assigned to an interface on this machine. +# It allows transparent proxies to pretend to be other machines. +# How the packet GET to that machine is a problem solved elsewhere, +# smart routers, ipfw fwd, etc. +options IP_NONLOCALBIND #Allow impersonation for proxies. + # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option # listed below; however, this is not strictly necessary as netgraph ==== //depot/projects/adrian_spoof_clientip/src/sys/conf/options#2 (text+ko) ==== @@ -363,6 +363,7 @@ INET6 opt_inet6.h IPSEC opt_ipsec.h IPSEC_DEBUG opt_ipsec.h +IP_NONLOCALBIND opt_inet.h IPSEC_FILTERTUNNEL opt_ipsec.h IPDIVERT DUMMYNET opt_ipdn.h ==== //depot/projects/adrian_spoof_clientip/src/sys/net/if_bridge.c#2 (text+ko) ==== @@ -2897,6 +2897,10 @@ struct ip *ip; struct llc llc1; u_int16_t ether_type; + int is_ip = 0; +#ifdef IPFIREWALL_FORWARD + struct m_tag *fwd_tag; +#endif snap = 0; error = -1; /* Default error if not error == 0 */ @@ -2956,6 +2960,7 @@ #ifdef INET6 case ETHERTYPE_IPV6: #endif /* INET6 */ + is_ip = 1; break; default: /* @@ -3014,6 +3019,25 @@ if (*mp == NULL) return (error); +#ifdef IPFIREWALL_FORWARD + /* + * Did the firewall want to forward it somewhere? + * If so, let the ip stack handle it. + */ + if (i == 0 && args.next_hop != NULL && is_ip /* && src != NULL */) { + fwd_tag = m_tag_get(PACKET_TAG_IPFORWARD, sizeof(struct sockaddr_in), + M_NOWAIT); + if (fwd_tag == NULL) + goto drop; + bcopy(args.next_hop, (fwd_tag+1), sizeof(struct sockaddr_in)); + m_tag_prepend(*mp, fwd_tag); + if (in_localip(args.next_hop->sin_addr)) + (*mp)->m_flags |= M_FASTFWD_OURS; + ether_demux(src, *mp); + return (NULL); + } +#endif + if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) { /* put the Ethernet header back on */ ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/in.h#2 (text+ko) ==== @@ -435,6 +435,7 @@ #define IP_FAITH 22 /* bool; accept FAITH'ed connections */ #define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ +#define IP_NONLOCALOK 24 /* allow bind to spoof other machines */ #define IP_FW_TABLE_ADD 40 /* add entry */ #define IP_FW_TABLE_DEL 41 /* delete entry */ ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/in_pcb.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.198 2007/12/22 10:06:11 rwatson Exp $"); #include "opt_ddb.h" +#include "opt_inet.h" #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" @@ -323,7 +324,11 @@ } else if (sin->sin_addr.s_addr != INADDR_ANY) { sin->sin_port = 0; /* yech... */ bzero(&sin->sin_zero, sizeof(sin->sin_zero)); - if (ifa_ifwithaddr((struct sockaddr *)sin) == 0) + if ( +#if defined(IP_NONLOCALBIND) + ((inp->inp_flags & INP_NONLOCALOK) == 0) && +#endif + (ifa_ifwithaddr((struct sockaddr *)sin) == 0)) return (EADDRNOTAVAIL); } laddr = sin->sin_addr; ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/in_pcb.h#2 (text+ko) ==== @@ -310,6 +310,8 @@ #define INP_FAITH 0x200 /* accept FAITH'ed connections */ #define INP_RECVTTL 0x400 /* receive incoming IP TTL */ #define INP_DONTFRAG 0x800 /* don't fragment packet */ +#define INP_NONLOCALOK 0x1000 /* Allow bind to spoof any address */ + /* - requires options IP_NONLOCALBIND */ #define IN6P_IPV6_V6ONLY 0x008000 /* restrict AF_INET6 socket for v6 */ ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_fw.h#2 (text+ko) ==== @@ -160,6 +160,7 @@ O_TAG, /* arg1=tag number */ O_TAGGED, /* arg1=tag number */ + O_FOR_ME, /* check for a PCB here for this packet */ O_LAST_OPCODE /* not an opcode! */ }; ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_fw2.c#2 (text+ko) ==== @@ -2237,6 +2237,46 @@ #endif /* + * This function looks to see if the packet (regardless of direction) + * is destined for a socket on this machine. This is regardless of + * whether the address of the socket is a legal address of this + * machine or not. This is used for transparent proxying where + * the proxy masquerades as both the server and the client. + * It is not really needed if the IP_NONLOCALBIND is not dependent + * on that. It is not quite the same as 'from any to me'. + * in that it checks ports too and doesn't check if the address + * is 'legally owned by this machine. Do NOT insist there is still + * a socket.. It could be timing out. It IS STILL OURS. + * XXX check whether we should only match if there is a + * socket on the pcb. + */ +static int +packet_for_me(ipfw_insn_u32 *insn, + int proto, + struct in_addr dst_ip, u_int16_t dst_port, + struct in_addr src_ip, u_int16_t src_port ) +{ + struct inpcbinfo *pi; + int wildcard; + struct inpcb *pcb; + + if (proto == IPPROTO_TCP) { + wildcard = 0; + pi = &tcbinfo; + } else if (proto == IPPROTO_UDP) { + wildcard = INPLOOKUP_WILDCARD; + pi = &udbinfo; + } else { + return (0); + } + INP_INFO_RLOCK(pi); + pcb = in_pcblookup_hash(pi, src_ip, htons(src_port), + dst_ip, htons(dst_port), wildcard, NULL); + INP_INFO_RUNLOCK(pi); + return (pcb?1:0); +} + +/* * The main check routine for the firewall. * * All arguments are in args so we can modify them and return them @@ -2259,6 +2299,7 @@ * args->next_hop Socket we are forwarding to (out). * args->f_id Addresses grabbed from the packet (out) * args->cookie a cookie depending on rule action + * args->inp A pcb associated with a packet if known * * Return value: * @@ -2769,6 +2810,24 @@ &ugid_lookup, args->inp); break; + case O_FOR_ME: + /* + * We only check offset == 0 && TCP or UDP + * as this ensures that we have a + * packet with the ports info. + */ + if (offset!=0) + break; + if (is_ipv6) /* XXX to be fixed later */ + break; + if (proto == IPPROTO_TCP || proto == IPPROTO_UDP) + match = packet_for_me( + (ipfw_insn_u32 *)cmd, + proto, + dst_ip, dst_port, + src_ip, src_port ); + break; + case O_RECV: match = iface_match(m->m_pkthdr.rcvif, (ipfw_insn_if *)cmd); @@ -3449,8 +3508,11 @@ case O_FORWARD_IP: { struct sockaddr_in *sa; sa = &(((ipfw_insn_sa *)cmd)->sa); +/* XXX julian's patch disabled this; "why" needs to be thought about. -adrian */ +#if 0 if (args->eh) /* not valid on layer2 pkts */ break; +#endif if (!q || dyn_dir == MATCH_FORWARD) { if (sa->sin_addr.s_addr == INADDR_ANY) { bcopy(sa, &args->hopstore, @@ -4107,6 +4169,7 @@ case O_PROBE_STATE: case O_KEEP_STATE: case O_PROTO: + case O_FOR_ME: case O_IP_SRC_ME: case O_IP_DST_ME: case O_LAYER2: ==== //depot/projects/adrian_spoof_clientip/src/sys/netinet/ip_output.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.277 2007/10/24 19:03:59 rwatson Exp $"); #include "opt_ipfw.h" +#include "opt_inet.h" #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_mbuf_stress_test.h" @@ -84,6 +85,12 @@ &mbuf_frag_size, 0, "Fragment outgoing mbufs to this size"); #endif +#if defined(IP_NONLOCALBIND) +static int ip_nonlocalok = 0; +SYSCTL_INT(_net_inet_ip, OID_AUTO, nonlocalok, + CTLFLAG_RW|CTLFLAG_SECURE, &ip_nonlocalok, 0, ""); +#endif + static void ip_mloopback (struct ifnet *, struct mbuf *, struct sockaddr_in *, int); @@ -839,6 +846,13 @@ return (error); } +#if defined(IP_NONLOCALBIND) + case IP_NONLOCALOK: + if (! ip_nonlocalok) { + error = ENOPROTOOPT; + break; + } +#endif case IP_TOS: case IP_TTL: case IP_MINTTL: @@ -910,6 +924,11 @@ case IP_DONTFRAG: OPTSET(INP_DONTFRAG); break; +#if defined(IP_NONLOCALBIND) + case IP_NONLOCALOK: + OPTSET(INP_NONLOCALOK); + break; +#endif } break; #undef OPTSET From owner-p4-projects@FreeBSD.ORG Mon Jan 7 14:17:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 299BF16A468; Mon, 7 Jan 2008 14:17:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C930C16A417 for ; Mon, 7 Jan 2008 14:17:57 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B51D313C4D3 for ; Mon, 7 Jan 2008 14:17:57 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07EHvOD036043 for ; Mon, 7 Jan 2008 14:17:57 GMT (envelope-from adrian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07EHv3S036039 for perforce@freebsd.org; Mon, 7 Jan 2008 14:17:57 GMT (envelope-from adrian@freebsd.org) Date: Mon, 7 Jan 2008 14:17:57 GMT Message-Id: <200801071417.m07EHv3S036039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adrian@freebsd.org using -f From: Adrian Chadd To: Perforce Change Reviews Cc: Subject: PERFORCE change 132708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 14:17:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132708 Change 132708 by adrian@wendy on 2008/01/07 14:17:06 integrate. Affected files ... .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/aac.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/acpi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/acpi_thermal.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/acpi_video.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/adv.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/adw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/agp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/aha.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ahb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ahc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ahd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/aio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/altq.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/amd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/amdsmb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/amr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/an.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/arcmsr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/asmc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/asr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ata.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/atapicam.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ataraid.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ath.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ath_hal.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/atkbd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/atkbdc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/audit.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/auditpipe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/aue.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/awi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/axe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bce.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bfe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bktr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/blackhole.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bpf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/bt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cardbus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/carp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ccd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cdce.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ch.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ciss.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cnw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/coretemp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cpufreq.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/crypto.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cue.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cxgb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/cy.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/da.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/dc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/dcons.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/dcons_crom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ddb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/de.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/devctl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/digi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/disc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/divert.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/dpt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/dummynet.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ed.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/edsc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ef.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ehci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/em.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/en.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/enc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/esp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/exca.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/faith.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fatm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fdc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/firewire.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fla.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fpa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fwe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fwip.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fwohci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/fxp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/gbde.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/gdb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/gem.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/geom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/geom_fox.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/gif.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/gre.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/harp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hatm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hfa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hifn.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hme.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hptiop.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hptmv.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/hwpmc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ichsmb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ichwd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/icmp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/icmp6.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ida.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/idt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ieee80211.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/if_bridge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ifmib.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iicbb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iicbus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iicsmb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iir.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/inet.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/inet6.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/intpm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/intro.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip6.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ipfirewall.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ipmi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ips.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ipsec.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ipw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iscsi_initiator.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/isp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ispfw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/iwi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ixgb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/joy.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/kbdmux.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/keyboard.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/kld.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ktr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/kue.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lagg.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/le.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/led.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lmc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lo.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lpbb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/lpt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_biba.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_bsdextended.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_ifoff.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_lomac.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_mls.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_none.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_partition.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_seeotheruids.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_stub.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mac_test.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/CPU_ELAN.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_aiboost.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_asus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_fujitsu.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_ibm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_panasonic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_sony.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/acpi_toshiba.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/alpm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/amdpm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/apm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ar.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/arl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/cp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/cs.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ctau.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/cx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ep.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ex.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/fe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ichwd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ie.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/io.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/linux.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/longrun.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/mcd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/mse.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ndis.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/npx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/oltr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/padlock.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/pae.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/pbio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/pcf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/perfmon.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/pnp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/pnpbios.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/ray.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/sbni.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/scd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/smapi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/snc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/sr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/streams.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/svr4.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/viapm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/vx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.i386/wl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/Makefile#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/auxio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/central.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/clkbrd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/creator.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/ebus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/eeprom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/fhc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/machfb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/ofw_console.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/openfirm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/openprom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/rtc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/sbus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/md.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mem.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/meteor.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mfi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/miibus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mlx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mly.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mmc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mmcsd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mn.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mouse.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mpt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/msk.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mtio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/multicast.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/mxge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/my.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/natm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/natmip.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ncr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ncv.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/netgraph.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/netintro.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nfe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nfsmb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_UI.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_async.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_atm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_atmpif.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_bluetooth.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_bpf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_bridge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_bt3c.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_btsocket.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_car.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ccatm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_cisco.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_deflate.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_device.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_echo.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_etf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ether.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_fec.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_frame_relay.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_gif.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_gif_demux.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_h4.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_hci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_hole.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_hub.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_iface.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ip_input.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ipfw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ksocket.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_l2cap.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_l2tp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_lmi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_mppc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_nat.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_netflow.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_one2many.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ppp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_pppoe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_pptpgre.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_pred1.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_rfc1490.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_socket.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_source.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_split.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_sppp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_sscfu.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_sscop.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_tag.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_tcpmss.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_tee.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_tty.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_ubt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_uni.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_vjc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ng_vlan.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nmdm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nsp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/null.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nve.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/nxge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ohci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/oldcard.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/orm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pass.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/patm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pccard.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pccbb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pcib.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pcic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pcm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pcn.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pim.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/polling.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ppbus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ppc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ppi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ppp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/psm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pst.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/pty.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/puc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ral.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/random.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/re.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rndtest.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/route.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rr232x.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rue.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/rum.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/safe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sbp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sbp_targ.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sbsh.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/scc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sched_4bsd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sched_ule.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/screen.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/scsi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sctp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sem.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ses.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/si.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sis.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sk.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/smb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/smbus.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/smp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sn.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_ad1816.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_als4000.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_atiixp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_cmi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_cs4281.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_csa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_ds1.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_emu10k1.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_envy24ht.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_es137x.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_ess.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_fm801.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_gusc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_hda.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_ich.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_maestro.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_maestro3.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_mss.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_neomagic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_sbc.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_solo.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_spicds.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_t4dwave.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_uaudio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_via8233.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_via82c686.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snd_vibes.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/snp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/spic.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/spkr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/splash.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sppp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ste.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/stf.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/stg.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/stge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sym.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/syncache.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/syncer.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/syscons.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/sysmouse.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tap.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/targ.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tcp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tdfx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/termios.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/textdump.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ti.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/trm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tty.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tun.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/twa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/twe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/tx.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/txp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uark.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uart.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ubsa.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ubsec.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ubser.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ubtbcmfw.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ucom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ucycom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/udav.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/udbp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/udp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ufm.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ufoma.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uftdi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ugen.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uhci.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uhid.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ukbd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ulpt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/umass.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/umct.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/umodem.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ums.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/unix.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uplcom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ural.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/urio.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/usb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uscanner.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/utopia.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uvisor.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/uvscom.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vga.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vge.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vinum.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vkbd.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vlan.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vpo.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/vr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/watchdog.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wb.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/witness.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/wpi.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/xe.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/xl.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/xpt.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/zero.4#1 branch .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/zyd.4#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 7 14:19:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74E4F16A46C; Mon, 7 Jan 2008 14:19:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A60816A468 for ; Mon, 7 Jan 2008 14:19:00 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C678413C45D for ; Mon, 7 Jan 2008 14:18:58 +0000 (UTC) (envelope-from adrian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07EIwJm036149 for ; Mon, 7 Jan 2008 14:18:58 GMT (envelope-from adrian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07EIwNn036146 for perforce@freebsd.org; Mon, 7 Jan 2008 14:18:58 GMT (envelope-from adrian@freebsd.org) Date: Mon, 7 Jan 2008 14:18:58 GMT Message-Id: <200801071418.m07EIwNn036146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adrian@freebsd.org using -f From: Adrian Chadd To: Perforce Change Reviews Cc: Subject: PERFORCE change 132710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 14:19:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=132710 Change 132710 by adrian@wendy on 2008/01/07 14:18:50 Bring over more of Julians' initial work. Affected files ... .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip.4#2 edit Differences ... ==== //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip.4#2 (text+ko) ==== @@ -292,6 +292,29 @@ cmsg_type = IP_RECVIF .Ed .Pp +If the +.Dv IP_NONLOCALOK +options is set then the checking of local bind addresses against addresses +assigned to local interfaces is disabled. +The kernel must have been compiled with the +.Dv IP_NONLOCALBIND option, and the sysctl +.Va net.inet.ip.nonlocalok +should be set to 1. +The option needs to be set on the socket before the +.Xr bind 2 +system call is used on it. +.Bd -literal +u_char spoofing = 1; /* 0 = disable (default), 1 = enable */ + +setsockopt(s, IPPROTO_IP, IP_NONLOCALOK, &spoofing, sizeof(spoofing)); +ret = bind (...); +.Ed +.Pp +This behaviour is not for general use and is +included for use in servers that are implementing fully +transparent proxies. Use of this option on general purpose +systems is strongly discouraged. +.Pp .Dv IP_PORTRANGE may be used to set the port range used for selecting a local port number on a socket with an unspecified (zero) port number. From owner-p4-projects@FreeBSD.ORG Mon Jan 7 15:35:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D41D916A41A; Mon, 7 Jan 2008 15:35:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9747416A418 for ; Mon, 7 Jan 2008 15:35:08 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from mail.semihalf.com (mail.semihalf.com [83.15.139.206]) by mx1.freebsd.org (Postfix) with ESMTP id 44D1213C458 for ; Mon, 7 Jan 2008 15:35:08 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from localhost (unknown [127.0.0.1]) by mail.semihalf.com (Postfix) with ESMTP id 00634183D7; Mon, 7 Jan 2008 16:19:20 +0100 (CET) Received: from mail.semihalf.com ([127.0.0.1]) by localhost (mail.semihalf.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17231-01; Mon, 7 Jan 2008 16:19:10 +0100 (CET) Received: from [77.115.119.2] (apn-77-115-119-2.gprs.plus.pl [77.115.119.2]) by mail.semihalf.com (Postfix) with ESMTP id 4BE9814363; Mon, 7 Jan 2008 16:19:06 +0100 (CET) Message-ID: <4782418E.1030400@semihalf.com> Date: Mon, 07 Jan 2008 16:13:18 +0100 From: Rafal Jaworowski MIME-Version: 1.0 To: grehan@freebsd.org References: <200801041525.m04FPIrt011288@repoman.freebsd.org> <47815371.9020501@freebsd.org> In-Reply-To: <47815371.9020501@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at semihalf.com Cc: Rafal Jaworowski , Perforce Change Reviews Subject: Re: PERFORCE change 132485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 15:35:09 -0000 Hi Peter, >> Temporary fix to avoid confusion of 'kstack0' symbol and make e500 >> kernel operational again. kstack0 area requires further >> improvements (space for kstack0 is now statically defined within >> kernel body, does not have guard pages etc., which should be fixed) > > On AIM it is allocated correctly but never switched over. The > (not-yet-implemented) plan was to mimic amd64 and return the value from > powerpc_init() to locore, switching r1 to this value before calling > mi_startup(). > Thanks for the hint, I'll look at amd64 more closely. So the idea is to switch over to thread0's kstack immediately before mi_startup(), so that temp stack we were running on can be recycled etc. right? Rafal From owner-p4-projects@FreeBSD.ORG Mon Jan 7 16:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A6D916A468; Mon, 7 Jan 2008 16:45:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 299BB16A41A; Mon, 7 Jan 2008 16:45:36 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from dommail.onthenet.com.au (dommail.OntheNet.com.au [203.13.70.57]) by mx1.freebsd.org (Postfix) with ESMTP id 7C26013C46E; Mon, 7 Jan 2008 16:45:35 +0000 (UTC) (envelope-from grehan@freebsd.org) Received: from peter-grehans-power-mac-g5.local (dsl-63-249-90-35.cruzio.com [63.249.90.35]) by dommail.onthenet.com.au (MOS 3.7.5a-GA) with ESMTP id DLL03489 (AUTH peterg@ptree32.com.au); Tue, 8 Jan 2008 02:45:20 +1000 (EST) Message-ID: <47825717.7030604@freebsd.org> Date: Mon, 07 Jan 2008 08:45:11 -0800 From: Peter Grehan User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) MIME-Version: 1.0 To: Rafal Jaworowski References: <200801041525.m04FPIrt011288@repoman.freebsd.org> <47815371.9020501@freebsd.org> <4782418E.1030400@semihalf.com> In-Reply-To: <4782418E.1030400@semihalf.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Rafal Jaworowski , Perforce Change Reviews Subject: Re: PERFORCE change 132485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: grehan@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 16:45:36 -0000 Hi Rafal, > So the idea is to switch > over to thread0's kstack immediately before mi_startup(), so that temp stack > we were running on can be recycled etc. right? That's right, and you get the advantages of the guard pages allocated for thread0. later, Peter. From owner-p4-projects@FreeBSD.ORG Mon Jan 7 18:35:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20ADB16A41A; Mon, 7 Jan 2008 18:35:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A33B216A418 for ; Mon, 7 Jan 2008 18:35:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 884E413C458 for ; Mon, 7 Jan 2008 18:35:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07IZkgC099692 for ; Mon, 7 Jan 2008 18:35:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07IZkF6099689 for perforce@freebsd.org; Mon, 7 Jan 2008 18:35:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jan 2008 18:35:46 GMT Message-Id: <200801071835.m07IZkF6099689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 18:35:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=132726 Change 132726 by hselasky@hselasky_laptop001 on 2008/01/07 18:35:22 Fix a LOR. This code is called from the explore thread, so it is safe to drop the locks. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#100 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#100 (text+ko) ==== @@ -3371,6 +3371,8 @@ PRINTFN(0, ("alt setting no change\n")); break; } + mtx_unlock(xfer->priv_mtx); + usbd_detach_device(udev, req.wIndex[0], 1); error = usbd_set_alt_interface_index(udev, @@ -3378,14 +3380,17 @@ if (error) { PRINTFN(0, ("alt setting failed %s\n", usbd_errstr(error))); + mtx_lock(xfer->priv_mtx); goto tr_stalled; } error = usbd_probe_and_attach(udev, req.wIndex[0]); if (error) { PRINTFN(0, ("alt setting probe failed\n")); + mtx_lock(xfer->priv_mtx); goto tr_stalled; } + mtx_lock(xfer->priv_mtx); break; default: goto tr_stalled; From owner-p4-projects@FreeBSD.ORG Mon Jan 7 18:38:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AA7E16A420; Mon, 7 Jan 2008 18:38:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3020016A419 for ; Mon, 7 Jan 2008 18:38:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0F1613C44B for ; Mon, 7 Jan 2008 18:38:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07IcnSp099774 for ; Mon, 7 Jan 2008 18:38:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07IcniZ099771 for perforce@freebsd.org; Mon, 7 Jan 2008 18:38:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jan 2008 18:38:49 GMT Message-Id: <200801071838.m07IcniZ099771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 18:38:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=132727 Change 132727 by hselasky@hselasky_laptop001 on 2008/01/07 18:38:18 Compile fix. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#5 (text+ko) ==== @@ -1234,7 +1234,7 @@ static void uss820_dci_device_done(struct usbd_xfer *xfer, usbd_status_t error) { - mtx_assert(&sc->sc_bus.mtx, MA_OWNED); + mtx_assert(xfer->usb_mtx, MA_OWNED); DPRINTFN(1, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 18:46:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD28E16A46C; Mon, 7 Jan 2008 18:46:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A194916A468 for ; Mon, 7 Jan 2008 18:46:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A7E213C46B for ; Mon, 7 Jan 2008 18:46:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07IkwJM001363 for ; Mon, 7 Jan 2008 18:46:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07IkwFq001360 for perforce@freebsd.org; Mon, 7 Jan 2008 18:46:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jan 2008 18:46:58 GMT Message-Id: <200801071846.m07IkwFq001360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 18:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=132728 Change 132728 by hselasky@hselasky_laptop001 on 2008/01/07 18:46:24 Remove some premature virtual endpoint stuff. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#30 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#91 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#30 (text+ko) ==== @@ -679,142 +679,6 @@ uint8_t ude_addr; }; -/* "vep" is short for "virtual endpoint" */ - -struct usb_device_vep_setup { - uint32_t max_bufsize; /* 0 means use wMaxPacketSize */ - uint16_t max_frames; - uint8_t dev_addr; - uint8_t iface_index; - uint8_t ep_type; -#define USB_DEVICE_VEP_TYPE_CONTROL UE_CONTROL -#define USB_DEVICE_VEP_TYPE_ISOCHRONOUS UE_ISOCHRONOUS -#define USB_DEVICE_VEP_TYPE_BULK UE_BULK -#define USB_DEVICE_VEP_TYPE_INTERRUPT UE_INTERRUPT -#define USB_DEVICE_VEP_TYPE_BULK_INTR UE_BULK_INTR -#define USB_DEVICE_VEP_TYPE_ANY UE_TYPE_ANY - uint8_t ep_hard_index; /* [0, 15] */ -#define USB_DEVICE_VEP_HINDEX_ANY UE_ADDR_ANY - uint8_t ep_direction; -#define USB_DEVICE_VEP_DIR_OUT UE_DIR_OUT -#define USB_DEVICE_VEP_DIR_IN UE_DIR_IN -#define USB_DEVICE_VEP_DIR_ANY UE_DIR_ANY - uint8_t ep_interval; /* in milliseconds */ -#define USB_DEVICE_VEP_DEFAULT_INTERVAL 0 - uint8_t ep_match_index; /* 0, 1, 2, 3 ... */ - uint8_t vep_index; -}; - -struct usb_device_vep_unsetup { - uint8_t vep_index; -}; - -struct usb_device_put_urb { - void *buffer; /* pointer to data buffer */ - void *private0; - void *private1; - void (*callback) (struct usb_device_put_urb *urb); - uint16_t *frlengths; /* for isochronous transfers */ - uint32_t offset; /* for kernel use only */ - uint32_t length; /* transfer length */ - uint32_t actlen; /* actual transfer length */ - uint16_t timeout; /* in milliseconds, if set */ - uint16_t nframes; /* for isochronous transfers */ -#define USB_DEVICE_URB_FRAMES_MAX 60 /* inclusive */ - uint8_t vep_index; -#define USB_DEVICE_VEP_MAX 63 /* exclusive */ - uint8_t error; -#define USB_DEVICE_URB_ERROR_NONE 0 -#define USB_DEVICE_URB_ERROR_CANCELLED 1 -#define USB_DEVICE_URB_ERROR_STALLED 2 -#define USB_DEVICE_URB_ERROR_SHORT_XFER 3 -#define USB_DEVICE_URB_ERROR_TIMEOUT 4 - uint8_t flags; -#define USB_DEVICE_URB_FLAG_SHORT_OK 0x01 -#define USB_DEVICE_URB_FLAG_FORCE_SHORT 0x02 -#define USB_DEVICE_URB_FLAG_CUSTOM 0x04 - uint8_t reserved1; -}; - -struct usb_device_get_urb { - struct usb_device_put_urb *p_urb; - uint8_t vep_index; -}; - -struct usb_device_cancel_urb { - struct usb_device_put_urb *p_urb; - uint8_t vep_index; -}; - -struct usb_device_poll_urb { - uint8_t vep_first_set_index; /* inclusive */ - uint8_t vep_last_set_index; /* inclusive */ - uint8_t vep_00_complete:1; - uint8_t vep_01_complete:1; - uint8_t vep_02_complete:1; - uint8_t vep_03_complete:1; - uint8_t vep_04_complete:1; - uint8_t vep_05_complete:1; - uint8_t vep_06_complete:1; - uint8_t vep_07_complete:1; - uint8_t vep_08_complete:1; - uint8_t vep_09_complete:1; - uint8_t vep_0A_complete:1; - uint8_t vep_0B_complete:1; - uint8_t vep_0C_complete:1; - uint8_t vep_0D_complete:1; - uint8_t vep_0E_complete:1; - uint8_t vep_0F_complete:1; - uint8_t vep_10_complete:1; - uint8_t vep_11_complete:1; - uint8_t vep_12_complete:1; - uint8_t vep_13_complete:1; - uint8_t vep_14_complete:1; - uint8_t vep_15_complete:1; - uint8_t vep_16_complete:1; - uint8_t vep_17_complete:1; - uint8_t vep_18_complete:1; - uint8_t vep_19_complete:1; - uint8_t vep_1A_complete:1; - uint8_t vep_1B_complete:1; - uint8_t vep_1C_complete:1; - uint8_t vep_1D_complete:1; - uint8_t vep_1E_complete:1; - uint8_t vep_1F_complete:1; - uint8_t vep_20_complete:1; - uint8_t vep_21_complete:1; - uint8_t vep_22_complete:1; - uint8_t vep_23_complete:1; - uint8_t vep_24_complete:1; - uint8_t vep_25_complete:1; - uint8_t vep_26_complete:1; - uint8_t vep_27_complete:1; - uint8_t vep_28_complete:1; - uint8_t vep_29_complete:1; - uint8_t vep_2A_complete:1; - uint8_t vep_2B_complete:1; - uint8_t vep_2C_complete:1; - uint8_t vep_2D_complete:1; - uint8_t vep_2E_complete:1; - uint8_t vep_2F_complete:1; - uint8_t vep_30_complete:1; - uint8_t vep_31_complete:1; - uint8_t vep_32_complete:1; - uint8_t vep_33_complete:1; - uint8_t vep_34_complete:1; - uint8_t vep_35_complete:1; - uint8_t vep_36_complete:1; - uint8_t vep_37_complete:1; - uint8_t vep_38_complete:1; - uint8_t vep_39_complete:1; - uint8_t vep_3A_complete:1; - uint8_t vep_3B_complete:1; - uint8_t vep_3C_complete:1; - uint8_t vep_3D_complete:1; - uint8_t vep_3E_complete:1; - uint8_t vep_any_complete:1; -}; - /* USB controller */ #define USB_REQUEST _IOWR('U', 1, struct usb_ctl_request) #define USB_SETDEBUG _IOW ('U', 2, int) @@ -823,13 +687,6 @@ #define USB_DEVICESTATS _IOR ('U', 5, struct usb_device_stats) #define USB_DEVICEENUMERATE _IOW ('U', 6, struct usb_device_enumerate) -#define USB_DEVICE_VEP_SETUP _IOW ('U',10, struct usb_device_vep_setup) -#define USB_DEVICE_VEP_UNSETUP _IOW ('U',11, struct usb_device_vep_unsetup) -#define USB_DEVICE_PUT_URB _IOW ('U',12, struct usb_device_put_urb) -#define USB_DEVICE_GET_URB _IOW ('U',13, struct usb_device_get_urb) -#define USB_DEVICE_CANCEL_URB _IOW ('U',14, struct usb_device_cancel_urb) -#define USB_DEVICE_POLL_URB _IOR ('U',15, struct usb_device_poll_urb) - /* Generic HID device */ #define USB_GET_REPORT_DESC _IOR ('U', 21, struct usb_ctl_report_desc) #define USB_SET_IMMED _IOW ('U', 22, int) ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#91 (text+ko) ==== @@ -1111,20 +1111,10 @@ /* prototypes from "usb_compat_linux.c" */ void usb_linux_free_usb_device(struct usb_device *dev); -/* USB virtual endpoint */ -struct usbd_vep { - struct usb_device_put_urb urb; - struct usbd_xfer *xfer[1]; - uint8_t dev_addr; - uint8_t isread; -}; - /* USB clone support */ struct usbd_clone { struct mtx mtx; struct usb_cdev cdev; - struct usb_device_poll_urb status; - struct usbd_vep vep[USB_DEVICE_VEP_MAX]; struct usbd_bus *bus; struct usbd_clone *next; From owner-p4-projects@FreeBSD.ORG Mon Jan 7 19:39:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BD0216A474; Mon, 7 Jan 2008 19:39:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D38016A421 for ; Mon, 7 Jan 2008 19:39:55 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F48B13C46B for ; Mon, 7 Jan 2008 19:39:55 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07JdtsU010241 for ; Mon, 7 Jan 2008 19:39:55 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07Jdsi3010238 for perforce@freebsd.org; Mon, 7 Jan 2008 19:39:54 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 7 Jan 2008 19:39:54 GMT Message-Id: <200801071939.m07Jdsi3010238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 19:39:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132729 Change 132729 by gonzo@gonzo_jeeves on 2008/01/07 19:39:39 o Add cpu_throw(9) implementation. Make it wrapper around mips_cpu_throw, just like cpu_switch(9) is wrapper around mips_cpu_switch. We'll fix it once kernel is ready for testing. o Handle third argument of cpu_switch(9) and spin while td_lock of new thread is blocked_lock. Reviewed by: cognet Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#6 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#4 (text+ko) ==== @@ -64,6 +64,7 @@ struct thread; -void mips_cpu_switch(struct thread *, struct thread *); +void mips_cpu_switch(struct thread *, struct thread *, struct mtx *); +void mips_cpu_throw(struct thread *, struct thread *); #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#4 (text+ko) ==== @@ -67,6 +67,7 @@ ASSYM(TD_UPTE, offsetof(struct thread, td_md.md_upte)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); +ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(U_PCB_REGS, offsetof(struct pcb, pcb_regs.zero)); ASSYM(U_PCB_CONTEXT, offsetof(struct pcb, pcb_context)); ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#4 (text+ko) ==== @@ -535,6 +535,6 @@ void cpu_switch(struct thread *old, struct thread *new, struct mtx * new_lock) { - /* XXX this is lame, maybe, but we ignore new_lock */ - func_2args_asmmacro(&mips_cpu_switch, old, new); + + func_3args_asmmacro(&mips_cpu_switch, old, new, new_lock); } ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#6 (text+ko) ==== @@ -229,13 +229,26 @@ END(savectx) +KSEG0TEXT_START; + +NON_LEAF(mips_cpu_throw, STAND_FRAME_SIZE, ra) + mfc0 t0, COP_0_STATUS_REG # t0 = saved status register + nop + nop + mtc0 zero, COP_0_STATUS_REG # Disable all interrupts + ITLBNOPFIX + j mips_sw1 # We're not interested in old + # thread's context, so jump + # right to action + nop # BDSLOT +END(mips_cpu_throw) + /* *XXX Fixme: should be written to new interface that requires lock * storage. We fake it for now. * mips_cpu_switch(struct thread *old, struct thread *new); * Find the highest priority process and resume it. */ -KSEG0TEXT_START; NON_LEAF(mips_cpu_switch, STAND_FRAME_SIZE, ra) mfc0 t0, COP_0_STATUS_REG # t0 = saved status register nop @@ -243,7 +256,7 @@ mtc0 zero, COP_0_STATUS_REG # Disable all interrupts ITLBNOPFIX beqz a0, mips_sw1 - move a2, a0 + move a3, a0 lw a0, TD_PCB(a0) # load PCB addr of curproc SAVE_U_PCB_CONTEXT(sp, 8, a0) # save old sp subu sp, sp, STAND_FRAME_SIZE @@ -266,7 +279,16 @@ * to be saved with the other registers do so here. */ + sw a3, TD_LOCK(a0) # Switchout td_lock + mips_sw1: +#if defined(SMP) && defined(SCHED_ULE) + la t0, _C_LABEL(blocked_lock) +blocked_loop: + lw t1, TD_LOCK(a1) + beq t0, t1, blocked_loop + nop +#endif move s7, a1 # Store newthread /* * Switch to new context. ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#6 (text+ko) ==== @@ -517,12 +517,10 @@ return (0); } -#ifdef GONE_IN_7 void cpu_throw(struct thread *old, struct thread *new) { - cpu_switch(old, new); - panic("cpu_throw() didn't"); + func_2args_asmmacro(&mips_cpu_throw, old, new); + panic("mips_cpu_throw() returned"); } -#endif From owner-p4-projects@FreeBSD.ORG Mon Jan 7 21:12:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2414516A46D; Mon, 7 Jan 2008 21:12:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD65016A418 for ; Mon, 7 Jan 2008 21:12:34 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCA5E13C465 for ; Mon, 7 Jan 2008 21:12:34 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07LCYWn041860 for ; Mon, 7 Jan 2008 21:12:34 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07LCYDi041857 for perforce@freebsd.org; Mon, 7 Jan 2008 21:12:34 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 21:12:34 GMT Message-Id: <200801072112.m07LCYDi041857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 21:12:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=132736 Change 132736 by swise@swise:vic10:iwarp on 2008/01/07 21:12:19 get rid of uprintfs. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ #define PFX "krping: " static int debug = 1; -#define DEBUG_LOG if (debug) uprintf +#define DEBUG_LOG if (debug) printf MODULE_AUTHOR("Steve Wise"); MODULE_DESCRIPTION("RDMA ping server"); @@ -225,7 +225,7 @@ int ret; struct krping_cb *cb = cma_id->context; - DEBUG_LOG("cma_event type %d cma_id %p (%s)\n", event->event, cma_id, + DEBUG_LOG(PFX "cma_event type %d cma_id %p (%s)\n", event->event, cma_id, (cma_id == cb->cm_id) ? "parent" : "child"); mtx_lock_spin(&cb->lock); @@ -234,7 +234,7 @@ cb->state = ADDR_RESOLVED; ret = rdma_resolve_route(cma_id, 2000); if (ret) { - uprintf(PFX "rdma_resolve_route error %d\n", + DEBUG_LOG(PFX "rdma_resolve_route error %d\n", ret); wakeup(cb); } @@ -248,12 +248,12 @@ case RDMA_CM_EVENT_CONNECT_REQUEST: cb->state = CONNECT_REQUEST; cb->child_cm_id = cma_id; - DEBUG_LOG("child cma %p\n", cb->child_cm_id); + DEBUG_LOG(PFX "child cma %p\n", cb->child_cm_id); wakeup(cb); break; case RDMA_CM_EVENT_ESTABLISHED: - DEBUG_LOG("ESTABLISHED\n"); + DEBUG_LOG(PFX "ESTABLISHED\n"); if (!cb->server) { cb->state = CONNECTED; wakeup(cb); @@ -265,7 +265,7 @@ case RDMA_CM_EVENT_CONNECT_ERROR: case RDMA_CM_EVENT_UNREACHABLE: case RDMA_CM_EVENT_REJECTED: - uprintf(PFX "cma event %d, error %d\n", event->event, + DEBUG_LOG(PFX "cma event %d, error %d\n", event->event, event->status); cb->state = ERROR; wakeup(cb); @@ -282,7 +282,7 @@ break; default: - uprintf(PFX "oof bad type!\n"); + DEBUG_LOG(PFX "oof bad type!\n"); wakeup(cb); break; } @@ -293,7 +293,7 @@ static int server_recv(struct krping_cb *cb, struct ib_wc *wc) { if (wc->byte_len != sizeof(cb->recv_buf)) { - uprintf(PFX "Received bogus data, size %d\n", + DEBUG_LOG(PFX "Received bogus data, size %d\n", wc->byte_len); return -1; } @@ -301,7 +301,7 @@ cb->remote_rkey = ntohl(cb->recv_buf.rkey); cb->remote_addr = ntohll(cb->recv_buf.buf); cb->remote_len = ntohl(cb->recv_buf.size); - DEBUG_LOG("Received rkey %x addr %llx len %d from peer\n", + DEBUG_LOG(PFX "Received rkey %x addr %llx len %d from peer\n", cb->remote_rkey, (unsigned long long)cb->remote_addr, cb->remote_len); @@ -318,7 +318,7 @@ static int client_recv(struct krping_cb *cb, struct ib_wc *wc) { if (wc->byte_len != sizeof(cb->recv_buf)) { - uprintf(PFX "Received bogus data, size %d\n", + DEBUG_LOG(PFX "Received bogus data, size %d\n", wc->byte_len); return -1; } @@ -343,27 +343,27 @@ mtx_lock_spin(&cb->lock); BUG_ON(cb->cq != cq); if (cb->state == ERROR) { - uprintf(PFX "cq completion in ERROR state\n"); + DEBUG_LOG(PFX "cq completion in ERROR state\n"); mtx_unlock_spin(&cb->lock); return; } ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP); while ((ret = ib_poll_cq(cb->cq, 1, &wc)) == 1) { if (wc.status) { - uprintf(PFX "cq completion failed status %d\n", + DEBUG_LOG(PFX "cq completion failed status %d\n", wc.status); goto error; } switch (wc.opcode) { case IB_WC_SEND: - DEBUG_LOG("send completion\n"); + DEBUG_LOG(PFX "send completion\n"); cb->stats.send_bytes += cb->send_sgl.length; cb->stats.send_msgs++; break; case IB_WC_RDMA_WRITE: - DEBUG_LOG("rdma write completion\n"); + DEBUG_LOG(PFX "rdma write completion\n"); cb->stats.write_bytes += cb->rdma_sq_wr.sg_list->length; cb->stats.write_msgs++; cb->state = RDMA_WRITE_COMPLETE; @@ -371,7 +371,7 @@ break; case IB_WC_RDMA_READ: - DEBUG_LOG("rdma read completion\n"); + DEBUG_LOG(PFX "rdma read completion\n"); cb->stats.read_bytes += cb->rdma_sq_wr.sg_list->length; cb->stats.read_msgs++; cb->state = RDMA_READ_COMPLETE; @@ -379,19 +379,19 @@ break; case IB_WC_RECV: - DEBUG_LOG("recv completion\n"); + DEBUG_LOG(PFX "recv completion\n"); cb->stats.recv_bytes += sizeof(cb->recv_buf); cb->stats.recv_msgs++; ret = cb->server ? server_recv(cb, &wc) : client_recv(cb, &wc); if (ret) { - uprintf(PFX "recv wc error: %d\n", ret); + DEBUG_LOG(PFX "recv wc error: %d\n", ret); goto error; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "post recv error: %d\n", + DEBUG_LOG(PFX "post recv error: %d\n", ret); goto error; } @@ -399,12 +399,12 @@ break; default: - DEBUG_LOG("unknown!!!!! completion\n"); + DEBUG_LOG(PFX "unknown!!!!! completion\n"); goto error; } } if (ret) { - uprintf(PFX "poll error %d\n", ret); + DEBUG_LOG(PFX "poll error %d\n", ret); goto error; } mtx_unlock_spin(&cb->lock); @@ -420,7 +420,7 @@ struct rdma_conn_param conn_param; int ret; - DEBUG_LOG("accepting client connection request\n"); + DEBUG_LOG(PFX "accepting client connection request\n"); memset(&conn_param, 0, sizeof conn_param); conn_param.responder_resources = 1; @@ -428,13 +428,13 @@ ret = rdma_accept(cb->child_cm_id, &conn_param); if (ret) { - uprintf(PFX "rdma_accept error: %d\n", ret); + DEBUG_LOG(PFX "rdma_accept error: %d\n", ret); return ret; } krping_wait(cb, CONNECTED); if (cb->state == ERROR) { - uprintf(PFX "wait for CONNECTED state %d\n", cb->state); + DEBUG_LOG(PFX "wait for CONNECTED state %d\n", cb->state); return -1; } return 0; @@ -474,13 +474,13 @@ { int ret; - DEBUG_LOG("krping_setup_buffers called on cb %p\n", cb); + DEBUG_LOG(PFX "krping_setup_buffers called on cb %p\n", cb); cb->dma_mr = ib_get_dma_mr(cb->pd, IB_ACCESS_LOCAL_WRITE| IB_ACCESS_REMOTE_READ| IB_ACCESS_REMOTE_WRITE); if (IS_ERR(cb->dma_mr)) { - uprintf(PFX "recv_buf reg_mr failed\n"); + DEBUG_LOG(PFX "recv_buf reg_mr failed\n"); return PTR_ERR(cb->dma_mr); } @@ -488,7 +488,7 @@ 4096, 1024*1024); if (!cb->rdma_buf) { - uprintf(PFX "rdma_buf malloc failed\n"); + DEBUG_LOG(PFX "rdma_buf malloc failed\n"); ret = -ENOMEM; goto err1; } @@ -497,14 +497,14 @@ cb->start_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, (1L<<22), 4096, 1024*1024); if (!cb->start_buf) { - uprintf(PFX "start_buf malloc failed\n"); + DEBUG_LOG(PFX "start_buf malloc failed\n"); ret = -ENOMEM; goto err2; } } krping_setup_wr(cb); - DEBUG_LOG("allocated & registered buffers...\n"); + DEBUG_LOG(PFX "allocated & registered buffers...\n"); return 0; err2: contigfree(cb->rdma_buf, cb->size, M_DEVBUF); @@ -515,7 +515,7 @@ static void krping_free_buffers(struct krping_cb *cb) { - DEBUG_LOG("krping_free_buffers called on cb %p\n", cb); + DEBUG_LOG(PFX "krping_free_buffers called on cb %p\n", cb); #if 0 dma_unmap_single(cb->pd->device->dma_device, @@ -577,32 +577,32 @@ int ret; cb->pd = ib_alloc_pd(cm_id->device); if (IS_ERR(cb->pd)) { - uprintf(PFX "ib_alloc_pd failed\n"); + DEBUG_LOG(PFX "ib_alloc_pd failed\n"); return PTR_ERR(cb->pd); } - DEBUG_LOG("created pd %p\n", cb->pd); + DEBUG_LOG(PFX "created pd %p\n", cb->pd); cb->cq = ib_create_cq(cm_id->device, krping_cq_event_handler, NULL, cb, RPING_SQ_DEPTH * 2, 0); if (IS_ERR(cb->cq)) { - uprintf(PFX "ib_create_cq failed\n"); + DEBUG_LOG(PFX "ib_create_cq failed\n"); ret = PTR_ERR(cb->cq); goto err1; } - DEBUG_LOG("created cq %p\n", cb->cq); + DEBUG_LOG(PFX "created cq %p\n", cb->cq); ret = ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP); if (ret) { - uprintf(PFX "ib_create_cq failed\n"); + DEBUG_LOG(PFX "ib_create_cq failed\n"); goto err2; } ret = krping_create_qp(cb); if (ret) { - uprintf(PFX "krping_create_qp failed: %d\n", ret); + DEBUG_LOG(PFX "krping_create_qp failed: %d\n", ret); goto err2; } - DEBUG_LOG("created qp %p\n", cb->qp); + DEBUG_LOG(PFX "created qp %p\n", cb->qp); return 0; err2: ib_destroy_cq(cb->cq); @@ -620,7 +620,7 @@ info->rkey = htonl(mr->rkey); info->size = htonl(cb->size); - DEBUG_LOG("RDMA addr %llx rkey %x len %d\n", + DEBUG_LOG(PFX "RDMA addr %llx rkey %x len %d\n", (unsigned long long)buf, mr->rkey, cb->size); } @@ -633,12 +633,12 @@ /* Wait for client's Start STAG/TO/Len */ krping_wait(cb, RDMA_READ_ADV); if (cb->state != RDMA_READ_ADV) { - uprintf(PFX "wait for RDMA_READ_ADV state %d\n", + DEBUG_LOG(PFX "wait for RDMA_READ_ADV state %d\n", cb->state); break; } - DEBUG_LOG("server received sink adv\n"); + DEBUG_LOG(PFX "server received sink adv\n"); /* Issue RDMA Read. */ cb->rdma_sq_wr.opcode = IB_WR_RDMA_READ; @@ -648,78 +648,78 @@ ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted rdma read req \n"); + DEBUG_LOG(PFX "server posted rdma read req \n"); /* Wait for read completion */ krping_wait(cb, RDMA_READ_COMPLETE); if (cb->state != RDMA_READ_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_READ_COMPLETE state %d\n", cb->state); break; } - DEBUG_LOG("server received read complete\n"); + DEBUG_LOG(PFX "server received read complete\n"); /* Display data in recv buf */ if (cb->verbose) - uprintf("server ping data: %s\n", cb->rdma_buf); + DEBUG_LOG("server ping data: %s\n", cb->rdma_buf); /* Tell client to continue */ ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted go ahead\n"); + DEBUG_LOG(PFX "server posted go ahead\n"); /* Wait for client's RDMA STAG/TO/Len */ krping_wait(cb, RDMA_WRITE_ADV); if (cb->state != RDMA_WRITE_ADV) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_ADV state %d\n", cb->state); break; } - DEBUG_LOG("server received sink adv\n"); + DEBUG_LOG(PFX "server received sink adv\n"); /* RDMA Write echo data */ cb->rdma_sq_wr.opcode = IB_WR_RDMA_WRITE; cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey; cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr; cb->rdma_sq_wr.sg_list->length = strlen(cb->rdma_buf) + 1; - DEBUG_LOG("rdma write from lkey %x laddr %llx len %d\n", + DEBUG_LOG(PFX "rdma write from lkey %x laddr %llx len %d\n", cb->rdma_sq_wr.sg_list->lkey, (unsigned long long)cb->rdma_sq_wr.sg_list->addr, cb->rdma_sq_wr.sg_list->length); ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for completion */ krping_wait(cb, RDMA_WRITE_COMPLETE); if (cb->state != RDMA_WRITE_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_COMPLETE state %d\n", cb->state); break; } - DEBUG_LOG("server rdma write complete \n"); + DEBUG_LOG(PFX "server rdma write complete \n"); cb->state = CONNECTED; /* Tell client to begin again */ ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } - DEBUG_LOG("server posted go ahead\n"); + DEBUG_LOG(PFX "server posted go ahead\n"); } } @@ -735,21 +735,21 @@ ret = rdma_bind_addr(cb->cm_id, (struct sockaddr *) &sin); if (ret) { - uprintf(PFX "rdma_bind_addr error %d\n", ret); + DEBUG_LOG(PFX "rdma_bind_addr error %d\n", ret); return ret; } - DEBUG_LOG("rdma_bind_addr successful\n"); + DEBUG_LOG(PFX "rdma_bind_addr successful\n"); - DEBUG_LOG("rdma_listen\n"); + DEBUG_LOG(PFX "rdma_listen\n"); ret = rdma_listen(cb->cm_id, 3); if (ret) { - uprintf(PFX "rdma_listen failed: %d\n", ret); + DEBUG_LOG(PFX "rdma_listen failed: %d\n", ret); return ret; } krping_wait(cb, CONNECT_REQUEST); if (cb->state != CONNECT_REQUEST) { - uprintf(PFX "wait for CONNECT_REQUEST state %d\n", + DEBUG_LOG(PFX "wait for CONNECT_REQUEST state %d\n", cb->state); return -1; } @@ -768,25 +768,25 @@ ret = krping_setup_qp(cb, cb->child_cm_id); if (ret) { - uprintf(PFX "setup_qp failed: %d\n", ret); + DEBUG_LOG(PFX "setup_qp failed: %d\n", ret); return; } ret = krping_setup_buffers(cb); if (ret) { - uprintf(PFX "krping_setup_buffers failed: %d\n", ret); + DEBUG_LOG(PFX "krping_setup_buffers failed: %d\n", ret); goto err1; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "ib_post_recv failed: %d\n", ret); + DEBUG_LOG(PFX "ib_post_recv failed: %d\n", ret); goto err2; } ret = krping_accept(cb); if (ret) { - uprintf(PFX "connect error %d\n", ret); + DEBUG_LOG(PFX "connect error %d\n", ret); goto err2; } @@ -825,14 +825,14 @@ krping_format_send(cb, cb->start_addr, cb->dma_mr); ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for server to ACK */ krping_wait(cb, RDMA_WRITE_ADV); if (cb->state != RDMA_WRITE_ADV) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_ADV state %d\n", cb->state); break; @@ -841,14 +841,14 @@ krping_format_send(cb, cb->rdma_addr, cb->dma_mr); ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr); if (ret) { - uprintf(PFX "post send error %d\n", ret); + DEBUG_LOG(PFX "post send error %d\n", ret); break; } /* Wait for the server to say the RDMA Write is complete. */ krping_wait(cb, RDMA_WRITE_COMPLETE); if (cb->state != RDMA_WRITE_COMPLETE) { - uprintf(PFX + DEBUG_LOG(PFX "wait for RDMA_WRITE_COMPLETE state %d\n", cb->state); break; @@ -856,12 +856,12 @@ if (cb->validate) if (memcmp(cb->start_buf, cb->rdma_buf, cb->size)) { - uprintf(PFX "data mismatch!\n"); + DEBUG_LOG(PFX "data mismatch!\n"); break; } if (cb->verbose) - uprintf("ping data: %s\n", cb->rdma_buf); + DEBUG_LOG("ping data: %s\n", cb->rdma_buf); } } @@ -877,17 +877,17 @@ ret = rdma_connect(cb->cm_id, &conn_param); if (ret) { - uprintf(PFX "rdma_connect error %d\n", ret); + DEBUG_LOG(PFX "rdma_connect error %d\n", ret); return ret; } krping_wait(cb, CONNECTED); if (cb->state == ERROR) { - uprintf(PFX "wait for CONNECTED state %d\n", cb->state); + DEBUG_LOG(PFX "wait for CONNECTED state %d\n", cb->state); return -1; } - DEBUG_LOG("rdma_connect successful\n"); + DEBUG_LOG(PFX "rdma_connect successful\n"); return 0; } @@ -904,19 +904,19 @@ ret = rdma_resolve_addr(cb->cm_id, NULL, (struct sockaddr *) &sin, 2000); if (ret) { - uprintf(PFX "rdma_resolve_addr error %d\n", ret); + DEBUG_LOG(PFX "rdma_resolve_addr error %d\n", ret); return ret; } krping_wait(cb, ROUTE_RESOLVED); if (cb->state != ROUTE_RESOLVED) { - uprintf(PFX + DEBUG_LOG(PFX "addr/route resolution did not resolve: state %d\n", cb->state); return -EINTR; } - DEBUG_LOG("rdma_resolve_addr - rdma_resolve_route successful\n"); + DEBUG_LOG(PFX "rdma_resolve_addr - rdma_resolve_route successful\n"); return 0; } @@ -931,25 +931,25 @@ ret = krping_setup_qp(cb, cb->cm_id); if (ret) { - uprintf(PFX "setup_qp failed: %d\n", ret); + DEBUG_LOG(PFX "setup_qp failed: %d\n", ret); return; } ret = krping_setup_buffers(cb); if (ret) { - uprintf(PFX "krping_setup_buffers failed: %d\n", ret); + DEBUG_LOG(PFX "krping_setup_buffers failed: %d\n", ret); goto err1; } ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr); if (ret) { - uprintf(PFX "ib_post_recv failed: %d\n", ret); + DEBUG_LOG(PFX "ib_post_recv failed: %d\n", ret); goto err2; } ret = krping_connect_client(cb); if (ret) { - uprintf(PFX "connect error %d\n", ret); + DEBUG_LOG(PFX "connect error %d\n", ret); goto err2; } @@ -988,57 +988,57 @@ switch (op) { case 'a': cb->addr_str = optarg; - DEBUG_LOG("ipaddr (%s)\n", optarg); + DEBUG_LOG(PFX "ipaddr (%s)\n", optarg); if (!inet_aton(optarg, &cb->addr)) { - uprintf(PFX "bad addr string %s\n", optarg); + DEBUG_LOG(PFX "bad addr string %s\n", optarg); ret = -EINVAL; } break; case 'p': cb->port = htons(optint); - DEBUG_LOG("port %d\n", (int)optint); + DEBUG_LOG(PFX "port %d\n", (int)optint); break; case 's': cb->server = 1; - DEBUG_LOG("server\n"); + DEBUG_LOG(PFX "server\n"); break; case 'c': cb->server = 0; - DEBUG_LOG("client\n"); + DEBUG_LOG(PFX "client\n"); break; case 'S': cb->size = optint; if ((cb->size < 1) || (cb->size > RPING_BUFSIZE)) { - uprintf(PFX "Invalid size %d " + DEBUG_LOG(PFX "Invalid size %d " "(valid range is 1 to %d)\n", cb->size, RPING_BUFSIZE); ret = EINVAL; } else - DEBUG_LOG("size %d\n", (int)optint); + DEBUG_LOG(PFX "size %d\n", (int)optint); break; case 'C': cb->count = optint; if (cb->count < 0) { - uprintf(PFX "Invalid count %d\n", + DEBUG_LOG(PFX "Invalid count %d\n", cb->count); ret = EINVAL; } else - DEBUG_LOG("count %d\n", (int) cb->count); + DEBUG_LOG(PFX "count %d\n", (int) cb->count); break; case 'v': cb->verbose++; - DEBUG_LOG("verbose\n"); + DEBUG_LOG(PFX "verbose\n"); break; case 'V': cb->validate++; - DEBUG_LOG("validate data\n"); + DEBUG_LOG(PFX "validate data\n"); break; case 'd': debug++; break; default: - uprintf(PFX "unknown opt %s\n", optarg); + DEBUG_LOG(PFX "unknown opt %s\n", optarg); ret = -EINVAL; break; } @@ -1047,7 +1047,7 @@ goto out; if (cb->server == -1) { - uprintf(PFX "must be either client or server\n"); + DEBUG_LOG(PFX "must be either client or server\n"); ret = EINVAL; goto out; } @@ -1055,15 +1055,15 @@ cb->cm_id = rdma_create_id(krping_cma_event_handler, cb, RDMA_PS_TCP); if (IS_ERR(cb->cm_id)) { ret = PTR_ERR(cb->cm_id); - uprintf(PFX "rdma_create_id error %d\n", ret); + DEBUG_LOG(PFX "rdma_create_id error %d\n", ret); goto out; } - DEBUG_LOG("created cm_id %p\n", cb->cm_id); + DEBUG_LOG(PFX "created cm_id %p\n", cb->cm_id); if (cb->server) krping_run_server(cb); else krping_run_client(cb); - DEBUG_LOG("destroy cm_id %p\n", cb->cm_id); + DEBUG_LOG(PFX "destroy cm_id %p\n", cb->cm_id); rdma_destroy_id(cb->cm_id); out: mtx_lock(&krping_mutex); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 21:14:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2679016A41A; Mon, 7 Jan 2008 21:14:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDA5116A5A0 for ; Mon, 7 Jan 2008 21:14:37 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D9E913C459 for ; Mon, 7 Jan 2008 21:14:37 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07LEbHX042083 for ; Mon, 7 Jan 2008 21:14:37 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07LEbVO042079 for perforce@freebsd.org; Mon, 7 Jan 2008 21:14:37 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 21:14:37 GMT Message-Id: <200801072114.m07LEbVO042079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 21:14:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=132738 Change 132738 by swise@swise:vic10:iwarp on 2008/01/07 21:13:55 mbuf_put() needs to return the next valid position in the mbuf. Affected files ... .. //depot/projects/iwarp/sys/sys/linux_compat.h#10 edit Differences ... ==== //depot/projects/iwarp/sys/sys/linux_compat.h#10 (text+ko) ==== @@ -44,7 +44,7 @@ static __inline caddr_t mbuf_put(struct mbuf *m, unsigned int len) { - caddr_t tmp = mtod(m, caddr_t); + caddr_t tmp = mtod(m, caddr_t) + m->m_len; m->m_len += len; if (m->m_flags & M_PKTHDR) From owner-p4-projects@FreeBSD.ORG Mon Jan 7 21:20:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4786816A420; Mon, 7 Jan 2008 21:20:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CB1F16A419 for ; Mon, 7 Jan 2008 21:20:46 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8F2213C442 for ; Mon, 7 Jan 2008 21:20:45 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07LKjSp042632 for ; Mon, 7 Jan 2008 21:20:45 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07LKjPB042629 for perforce@freebsd.org; Mon, 7 Jan 2008 21:20:45 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 21:20:45 GMT Message-Id: <200801072120.m07LKjPB042629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 21:20:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132739 Change 132739 by swise@swise:vic10:iwarp on 2008/01/07 21:20:13 Use nsegs to determine if there are any mbuf sgls... Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#7 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#7 (text+ko) ==== @@ -1927,7 +1927,7 @@ struct tx_desc *d = &q->desc[pidx]; struct txq_state txqs; - if (immediate(m) && segs == NULL) { + if (immediate(m) && nsegs == 0) { write_imm(d, m, m->m_len, gen); return; } From owner-p4-projects@FreeBSD.ORG Mon Jan 7 21:28:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE6816A421; Mon, 7 Jan 2008 21:28:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8013D16A418 for ; Mon, 7 Jan 2008 21:28:55 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EB6113C458 for ; Mon, 7 Jan 2008 21:28:55 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07LStK6043959 for ; Mon, 7 Jan 2008 21:28:55 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07LSsap043956 for perforce@freebsd.org; Mon, 7 Jan 2008 21:28:54 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 21:28:54 GMT Message-Id: <200801072128.m07LSsap043956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 21:28:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132741 Change 132741 by swise@swise:vic10:iwarp on 2008/01/07 21:28:08 Sending mpa start response. Lots of fixes: - go back to negative errnos for now because otherwise it breaks the logic in several places - 4.7.1 debug firmware support - 4.3+ connection transition support - use msleep and wakeup as needed to support interrupt-level callbacks Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_common.h#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#5 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#5 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_wr.h#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#5 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_mem.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#2 edit .. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#3 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/common/cxgb_common.h#2 (text+ko) ==== @@ -100,7 +100,7 @@ enum { FW_VERSION_MAJOR = 4, FW_VERSION_MINOR = 7, - FW_VERSION_MICRO = 0 + FW_VERSION_MICRO = 1 }; enum { ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.c#5 (text+ko) ==== @@ -152,7 +152,7 @@ BUG_ON(1); log(LOG_ERR, "%s: stalled rnic\n", rdev_p->dev_name); - return (EIO); + return (-EIO); } } @@ -183,7 +183,7 @@ struct mbuf *skb = m_gethdr(MT_DATA, M_WAITOK); if (!skb) { PDBG("%s alloc_skb failed\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } wqe = (struct t3_modify_qp_wr *) mbuf_put(skb, sizeof(*wqe)); memset(wqe, 0, sizeof(*wqe)); @@ -192,6 +192,8 @@ sge_cmd = qpid << 8 | 3; wqe->sge_cmd = cpu_to_be64(sge_cmd); m_set_priority(skb, CPL_PRIORITY_CONTROL); + m_set_sgl(skb, NULL); + m_set_sgllen(skb, 0); return (cxgb_ofld_send(rdev_p->t3cdev_p, skb)); } @@ -203,17 +205,17 @@ cq->cqid = cxio_hal_get_cqid(rdev_p->rscp); if (!cq->cqid) - return (ENOMEM); + return (-ENOMEM); cq->sw_queue = malloc(size, M_DEVBUF, M_WAITOK|M_ZERO); if (!cq->sw_queue) - return (ENOMEM); + return (-ENOMEM); cq->queue = dma_alloc_coherent(rdev_p->rnic_info.pdev, (1UL << (cq->size_log2)) * sizeof(struct t3_cqe), &(cq->dma_addr), M_WAITOK); if (!cq->queue) { free(cq->sw_queue, M_DEVBUF); - return (ENOMEM); + return (-ENOMEM); } pci_unmap_addr_set(cq, mapping, cq->dma_addr); memset(cq->queue, 0, size); @@ -319,7 +321,7 @@ wq->qpid = get_qpid(rdev_p, uctx); if (!wq->qpid) - return (ENOMEM); + return (-ENOMEM); wq->rq = malloc(depth * sizeof(u64), M_DEVBUF, M_WAITOK|M_ZERO); if (!wq->rq) @@ -356,7 +358,7 @@ free(wq->rq, M_DEVBUF); err1: put_qpid(rdev_p, wq->qpid, uctx); - return (ENOMEM); + return (-ENOMEM); } int @@ -563,7 +565,7 @@ skb = m_gethdr(MT_DATA, M_WAITOK); if (!skb) { PDBG("%s alloc_skb failed\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } err = cxio_hal_init_ctrl_cq(rdev_p); if (err) { @@ -578,7 +580,7 @@ M_WAITOK); if (!rdev_p->ctrl_qp.workq) { PDBG("%s dma_alloc_coherent failed\n", __FUNCTION__); - err = ENOMEM; + err = -ENOMEM; goto err; } pci_unmap_addr_set(&rdev_p->ctrl_qp, mapping, @@ -587,8 +589,8 @@ memset(rdev_p->ctrl_qp.workq, 0, (1 << T3_CTRL_QP_SIZE_LOG2) * sizeof(union t3_wr)); - mtx_init(&rdev_p->ctrl_qp.lock, "ctrl-qp lock", NULL, MTX_DEF|MTX_DUPOK); - cv_init(&rdev_p->ctrl_qp.waitq, "ctrl-qp wait"); + mtx_init(&rdev_p->ctrl_qp.lock, "ctrl-qp lock", NULL, + MTX_SPIN|MTX_DUPOK); /* update HW Ctrl QP context */ base_addr = rdev_p->ctrl_qp.dma_addr; @@ -616,6 +618,8 @@ (unsigned long long) rdev_p->ctrl_qp.dma_addr, rdev_p->ctrl_qp.workq, 1 << T3_CTRL_QP_SIZE_LOG2); m_set_priority(skb, CPL_PRIORITY_CONTROL); + m_set_sgl(skb, NULL); + m_set_sgllen(skb, 0); return (cxgb_ofld_send(rdev_p->t3cdev_p, skb)); err: m_free(skb); @@ -658,11 +662,14 @@ PDBG("%s ctrl_qp full wtpr 0x%0x rptr 0x%0x, " "wait for more space i %d\n", __FUNCTION__, rdev_p->ctrl_qp.wptr, rdev_p->ctrl_qp.rptr, i); - if (wait_event_interruptible(&rdev_p->ctrl_qp.waitq, - &rdev_p->ctrl_qp.lock)) { + if (cxio_wait(&rdev_p->ctrl_qp, + &rdev_p->ctrl_qp.lock, + !Q_FULL(rdev_p->ctrl_qp.rptr, + rdev_p->ctrl_qp.wptr, + T3_CTRL_QP_SIZE_LOG2))) { PDBG("%s ctrl_qp workq interrupted\n", __FUNCTION__); - return (ERESTART); + return (-ERESTART); } PDBG("%s ctrl_qp wakeup, continue posting work request " "i %d\n", __FUNCTION__, i); @@ -755,7 +762,7 @@ if ((!reset_tpt_entry) && !(*stag != T3_STAG_UNSET)) { stag_idx = cxio_hal_get_stag(rdev_p->rscp); if (!stag_idx) - return (ENOMEM); + return (-ENOMEM); *stag = (stag_idx << 8) | ((*stag) & 0xFF); } PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n", @@ -766,11 +773,11 @@ else if (!rereg) { *pbl_addr = cxio_hal_pblpool_alloc(rdev_p, *pbl_size << 3); if (!*pbl_addr) { - return (ENOMEM); + return (-ENOMEM); } } - mtx_lock(&rdev_p->ctrl_qp.lock); + mtx_lock_spin(&rdev_p->ctrl_qp.lock); /* write PBL first if any - update pbl only if pbl list exist */ if (pbl) { @@ -817,10 +824,12 @@ cxio_hal_put_stag(rdev_p->rscp, stag_idx); ret: wptr = rdev_p->ctrl_qp.wptr; - mtx_unlock(&rdev_p->ctrl_qp.lock); + mtx_unlock_spin(&rdev_p->ctrl_qp.lock); if (!err) - if (wait_event_interruptible(&rdev_p->ctrl_qp.waitq, &rdev_p->ctrl_qp.lock)) - return (ERESTART); + if (cxio_wait(&rdev_p->ctrl_qp, + &rdev_p->ctrl_qp.lock, + SEQ32_GE(rdev_p->ctrl_qp.rptr, wptr))) + return (-ERESTART); return err; } @@ -875,7 +884,7 @@ struct t3_rdma_init_wr *wqe; struct mbuf *skb = m_gethdr(MT_DATA, M_NOWAIT); if (!skb) - return (ENOMEM); + return (-ENOMEM); PDBG("%s rdev_p %p\n", __FUNCTION__, rdev_p); wqe = (struct t3_rdma_init_wr *) mbuf_put(skb, sizeof(*wqe)); wqe->wrh.op_seop_flags = cpu_to_be32(V_FW_RIWR_OP(T3_WR_INIT)); @@ -896,8 +905,10 @@ wqe->ird = cpu_to_be32(attr->ird); wqe->qp_dma_addr = cpu_to_be64(attr->qp_dma_addr); wqe->qp_dma_size = cpu_to_be32(attr->qp_dma_size); - wqe->rsvd = 0; + wqe->irs = cpu_to_be32(attr->irs); m_set_priority(skb, 0); /* 0=>ToeQ; 1=>CtrlQ */ + m_set_sgl(skb, NULL); + m_set_sgllen(skb, 0); return (cxgb_ofld_send(rdev_p->t3cdev_p, skb)); } @@ -939,8 +950,10 @@ return 0; } if (CQE_QPID(rsp_msg->cqe) == T3_CTRL_QP_ID) { + mtx_lock_spin(&rdev_p->ctrl_qp.lock); rdev_p->ctrl_qp.rptr = CQE_WRID_LOW(rsp_msg->cqe) + 1; - wake_up(&rdev_p->ctrl_qp.waitq, &rdev_p->ctrl_qp.lock); + wakeup(&rdev_p->ctrl_qp); + mtx_unlock_spin(&rdev_p->ctrl_qp.lock); m_free(m); } else if (CQE_QPID(rsp_msg->cqe) == 0xfff8) m_free(m); @@ -961,21 +974,21 @@ if (strlen(rdev_p->dev_name)) { if (cxio_hal_find_rdev_by_name(rdev_p->dev_name)) { - return (EBUSY); + return (-EBUSY); } ifp = rdev_p->ifp; if (ifp == NULL) - return (EINVAL); + return (-EINVAL); if_free(ifp); } else if (rdev_p->t3cdev_p) { if (cxio_hal_find_rdev_by_t3cdev(rdev_p->t3cdev_p)) - return (EBUSY); + return (-EBUSY); ifp = rdev_p->t3cdev_p->lldev; strncpy(rdev_p->dev_name, rdev_p->t3cdev_p->name, T3_MAX_DEV_NAME_LEN); } else { PDBG("%s t3cdev_p or dev_name must be set\n", __FUNCTION__); - return (EINVAL); + return (-EINVAL); } TAILQ_INSERT_TAIL(&rdev_list, rdev_p, entry); @@ -1081,7 +1094,7 @@ TAILQ_INIT(&rdev_list); #ifdef needed if (cxio_hal_init_rhdl_resource(T3_MAX_NUM_RI)) - return (ENOMEM); + return (-ENOMEM); #endif t3_register_cpl_handler(CPL_ASYNC_NOTIF, cxio_hal_ev_handler); return 0; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#5 (text+ko) ==== @@ -26,7 +26,6 @@ u32 wptr; u32 rptr; struct mtx lock; /* for the wtpr, can sleep */ - struct cv waitq;/* wait for RspQ/CQE msg */ #ifdef notyet DECLARE_PCI_UNMAP_ADDR(mapping) #endif @@ -257,6 +256,22 @@ return (gp->gen_base + blkno); } +#define cxio_wait(ctx, lockp, cond) \ +({ \ + int __ret = 0; \ + mtx_lock_spin(lockp); \ + while (!cond) { \ + msleep_spin(ctx, lockp, "cxio_wait", hz); \ + if (SIGPENDING(curthread)) { \ + __ret = ERESTART; \ + break; \ + } \ + } \ + mtx_unlock_spin(lockp); \ + __ret; \ +}) + + static __inline void gen_pool_free(struct gen_pool *gp, daddr_t address, int size) { ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_resource.c#3 (text+ko) ==== @@ -107,7 +107,7 @@ *fifo = buf_ring_alloc(nr, M_WAITOK); if (*fifo == NULL) - return (ENOMEM); + return (-ENOMEM); #if 0 for (i = 0; i < skip_low + skip_high; i++) { u32 entry = 0; @@ -166,7 +166,7 @@ rdev_p->rscp->qpid_fifo = buf_ring_alloc(T3_MAX_NUM_QP, M_WAITOK); if (rdev_p->rscp->qpid_fifo == NULL) - return (ENOMEM); + return (-ENOMEM); for (i = 16; i < T3_MAX_NUM_QP; i++) if (!(i & rdev_p->qpmask)) @@ -197,7 +197,7 @@ rscp = malloc(sizeof(*rscp), M_DEVBUF, M_WAITOK|M_ZERO); if (!rscp) - return (ENOMEM); + return (-ENOMEM); rdev_p->rscp = rscp; err = cxio_init_resource_fifo_random(&rscp->tpt_fifo, &rscp->tpt_fifo_lock, @@ -223,7 +223,7 @@ qpid_err: buf_ring_free(rscp->tpt_fifo); tpt_err: - return (ENOMEM); + return (-ENOMEM); } /* @@ -331,7 +331,7 @@ gen_pool_add(rdev_p->pbl_pool, i, PBL_CHUNK, -1); } #endif - return rdev_p->pbl_pool ? 0 : (ENOMEM); + return rdev_p->pbl_pool ? 0 : (-ENOMEM); } void cxio_hal_pblpool_destroy(struct cxio_rdev *rdev_p) @@ -374,7 +374,7 @@ gen_pool_add(rdev_p->rqt_pool, i, RQT_CHUNK, -1); } #endif - return rdev_p->rqt_pool ? 0 : (ENOMEM); + return rdev_p->rqt_pool ? 0 : (-ENOMEM); } void cxio_hal_rqtpool_destroy(struct cxio_rdev *rdev_p) ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_wr.h#4 (text+ko) ==== @@ -257,6 +257,7 @@ u64 qp_dma_addr; u32 qp_dma_size; u32 flags; + u32 irs; }; struct t3_rdma_init_wr { @@ -277,7 +278,7 @@ __be32 ird; __be64 qp_dma_addr; /* 7 */ __be32 qp_dma_size; /* 8 */ - u32 rsvd; + u32 irs; }; struct t3_genbit { ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#4 (text+ko) ==== @@ -105,7 +105,7 @@ idr_init(&rnicp->cqidr); idr_init(&rnicp->qpidr); idr_init(&rnicp->mmidr); - mtx_init(&rnicp->lock, "iwch rnic lock", NULL, MTX_DEF|MTX_DUPOK); + mtx_init(&rnicp->lock, "iwch rnic lock", NULL, MTX_SPIN|MTX_DUPOK); rnicp->attr.vendor_id = 0x168; rnicp->attr.vendor_part_id = 7; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#3 (text+ko) ==== @@ -148,10 +148,10 @@ if (!idr_pre_get(idr, M_NOWAIT)) { return -ENOMEM; } - mtx_lock(&rhp->lock); + mtx_lock_spin(&rhp->lock); ret = idr_get_new_above(idr, handle, id, &newid); BUG_ON(newid != id); - mtx_unlock(&rhp->lock); + mtx_unlock_spin(&rhp->lock); } while (ret == -EAGAIN); return ret; @@ -159,9 +159,9 @@ static inline void remove_handle(struct iwch_dev *rhp, struct idr *idr, u32 id) { - mtx_lock(&rhp->lock); + mtx_lock_spin(&rhp->lock); idr_remove(idr, id); - mtx_unlock(&rhp->lock); + mtx_unlock_spin(&rhp->lock); } extern struct cxgb_client t3c_client; ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#5 (text+ko) ==== @@ -199,7 +199,7 @@ struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); if (m == NULL) - return (ENOMEM); + return (-ENOMEM); req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); @@ -222,7 +222,7 @@ struct mbuf *m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); if (m == NULL) - return (ENOMEM); + return (-ENOMEM); req = (struct cpl_set_tcb_field *) mbuf_put(m, sizeof(*req)); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); @@ -288,6 +288,7 @@ memset(epc, 0, size); refcount_init(&epc->refcount, 1); mtx_init(&epc->lock, "iwch_epc lock", NULL, MTX_DEF); + cv_init(&epc->waitq, "iwch_epc cv"); } PDBG("%s alloc ep %p\n", __FUNCTION__, epc); return epc; @@ -322,7 +323,7 @@ while ((m = mbufq_dequeue(&rxq))) { ep = m->m_pkthdr.rcvif; tdev = (struct t3cdev *)m->m_pkthdr.header; - PDBG("%s dequeued mbuf %p ep %p tdev %p\n", __FUNCTION__, m, ep, tdev); + PDBG("%s dequeued mbuf %p ep %p tdev %p opcode %u\n", __FUNCTION__, m, ep, tdev, G_OPCODE(ntohl(m->m_pkthdr.csum_data))); ret = work_handlers[G_OPCODE(ntohl(m->m_pkthdr.csum_data))](tdev, m, ep); if (ret & CPL_RET_BUF_DONE) m_free(m); @@ -341,17 +342,17 @@ case CPL_ERR_NONE: return 0; case CPL_ERR_CONN_RESET: - return (ECONNRESET); + return (-ECONNRESET); case CPL_ERR_ARP_MISS: - return (EHOSTUNREACH); + return (-EHOSTUNREACH); case CPL_ERR_CONN_TIMEDOUT: - return (ETIMEDOUT); + return (-ETIMEDOUT); case CPL_ERR_TCAM_FULL: - return (ENOMEM); + return (-ENOMEM); case CPL_ERR_CONN_EXIST: - return (EADDRINUSE); + return (-EADDRINUSE); default: - return (EIO); + return (-EIO); } } @@ -369,6 +370,8 @@ */ m = m_gethdr(MT_DATA, M_DONTWAIT); } + m_set_sgl(m, NULL); + m_set_sgllen(m, 0); return (m); } @@ -440,7 +443,7 @@ m = get_mbuf(NULL, sizeof(*req), flags); if (m == NULL) { printf("%s - failed to alloc mbuf\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } m_set_priority(m, CPL_PRIORITY_DATA); set_arp_failure_handler(m, arp_failure_discard); @@ -462,7 +465,7 @@ if (m == NULL) { printf("%s - failed to alloc mbuf.\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } m_set_priority(m, CPL_PRIORITY_DATA); set_arp_failure_handler(m, abort_arp_failure); @@ -490,7 +493,7 @@ if (m == NULL) { printf("%s - failed to alloc mbuf.\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } mtu_idx = find_best_mtu(T3C_DATA(ep->com.tdev), dst_mtu(ep->dst)); wscale = compute_wscale(rcv_win); @@ -569,7 +572,7 @@ req->len = htonl(len); req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_IMM_ACK|F_TX_INIT); + req->flags = htonl(F_TX_INIT); req->sndseq = htonl(ep->snd_seq); BUG_ON(ep->mpa_mbuf); ep->mpa_mbuf = m; @@ -594,7 +597,7 @@ m = get_mbuf(NULL, mpalen + sizeof(*req), M_NOWAIT); if (m == NULL) { printf("%s - cannot alloc mbuf!\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); mpa = (struct mpa_message *) mbuf_put(m, mpalen); @@ -613,7 +616,7 @@ req->len = htonl(mpalen); req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_IMM_ACK|F_TX_INIT); + req->flags = htonl(F_TX_INIT); req->sndseq = htonl(ep->snd_seq); BUG_ON(ep->mpa_mbuf); ep->mpa_mbuf = m; @@ -637,7 +640,7 @@ m = get_mbuf(NULL, mpalen + sizeof(*req), M_NOWAIT); if (m == NULL) { printf("%s - cannot alloc mbuf!\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } m_set_priority(m, CPL_PRIORITY_DATA); req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); @@ -658,7 +661,7 @@ req->len = htonl(len); req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | V_TX_SNDBUF(snd_win>>15)); - req->flags = htonl(F_TX_MORE | F_TX_IMM_ACK | F_TX_INIT); + req->flags = htonl(F_TX_INIT); req->sndseq = htonl(ep->snd_seq); ep->mpa_mbuf = m; state_set(&ep->com, MPA_REP_SENT); @@ -680,6 +683,7 @@ cxgb_insert_tid(ep->com.tdev, &t3c_client, ep, tid); ep->snd_seq = ntohl(req->snd_isn); + ep->rcv_seq = ntohl(req->rcv_isn); set_emss(ep, ntohs(req->tcp_opt)); @@ -862,7 +866,7 @@ * then we must fail this connection. */ if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) { - err = (EINVAL); + err = (-EINVAL); goto err; } @@ -1087,6 +1091,9 @@ */ m->m_pkthdr.len = m->m_len = dlen; + ep->rcv_seq += dlen; + BUG_ON(ep->rcv_seq != (ntohl(hdr->seq) + dlen)); + switch (state_read(&ep->com)) { case MPA_REQ_SENT: process_mpa_reply(ep, m); @@ -1125,7 +1132,6 @@ struct iwch_ep *ep = ctx; struct cpl_wr_ack *hdr = cplhdr(m); unsigned int credits = ntohs(hdr->credits); - enum iwch_qp_attr_mask mask; PDBG("%s ep %p credits %u\n", __FUNCTION__, ep, credits); @@ -1137,32 +1143,8 @@ ep->mpa_mbuf = NULL; if (state_read(&ep->com) == MPA_REP_SENT) { - struct iwch_qp_attributes attrs; - - /* bind QP to EP and move to RTS */ - attrs.mpa_attr = ep->mpa_attr; - attrs.max_ird = ep->ord; - attrs.max_ord = ep->ord; - attrs.llp_stream_handle = ep; - attrs.next_state = IWCH_QP_STATE_RTS; - - /* bind QP and TID with INIT_WR */ - mask = IWCH_QP_ATTR_NEXT_STATE | - IWCH_QP_ATTR_LLP_STREAM_HANDLE | - IWCH_QP_ATTR_MPA_ATTR | - IWCH_QP_ATTR_MAX_IRD | - IWCH_QP_ATTR_MAX_ORD; - - ep->com.rpl_err = iwch_modify_qp(ep->com.qp->rhp, - ep->com.qp, mask, &attrs, 1); - - if (!ep->com.rpl_err) { - state_set(&ep->com, FPDU_MODE); - established_upcall(ep); - } - PDBG("waking up ep %p\n", ep); - wake_up(&ep->com.waitq, &ep->com.lock); + iwch_wakeup(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); } return CPL_RET_BUF_DONE; } @@ -1217,7 +1199,7 @@ m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); if (m == NULL) { printf("t3c_listen_start failed to alloc mbuf!\n"); - return (ENOMEM); + return (-ENOMEM); } req = (struct cpl_pass_open_req *) mbuf_put(m, sizeof(*req)); @@ -1245,7 +1227,7 @@ PDBG("%s ep %p status %d error %d\n", __FUNCTION__, ep, rpl->status, status2errno(rpl->status)); ep->com.rpl_err = status2errno(rpl->status); - wake_up(&ep->com.waitq, &ep->com.lock); + iwch_wakeup(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); return CPL_RET_BUF_DONE; } @@ -1260,7 +1242,7 @@ m = get_mbuf(NULL, sizeof(*req), M_NOWAIT); if (m == NULL) { printf("%s - failed to alloc mbuf\n", __FUNCTION__); - return (ENOMEM); + return (-ENOMEM); } req = (struct cpl_close_listserv_req *) mbuf_put(m, sizeof(*req)); req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); @@ -1279,7 +1261,7 @@ PDBG("%s ep %p\n", __FUNCTION__, ep); ep->com.rpl_err = status2errno(rpl->status); - wake_up(&ep->com.waitq, &ep->com.lock); + iwch_wakeup(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); return CPL_RET_BUF_DONE; } @@ -1447,6 +1429,7 @@ PDBG("%s ep %p\n", __FUNCTION__, ep); ep->snd_seq = ntohl(req->snd_isn); + ep->rcv_seq = ntohl(req->rcv_isn); set_emss(ep, ntohs(req->tcp_opt)); @@ -1489,7 +1472,7 @@ __state_set(&ep->com, CLOSING); ep->com.rpl_err = ECONNRESET; PDBG("waking up ep %p\n", ep); - wake_up(&ep->com.waitq, &ep->com.lock); + iwch_wakeup(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); break; case FPDU_MODE: start_ep_timer(ep); @@ -1584,7 +1567,7 @@ case MPA_REP_SENT: ep->com.rpl_err = ECONNRESET; PDBG("waking up ep %p\n", ep); - wake_up(&ep->com.waitq, &ep->com.lock); + iwch_wakeup(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); break; case MPA_REQ_RCVD: @@ -1781,7 +1764,7 @@ if (state_read(&ep->com) == DEAD) { put_ep(&ep->com); - return (ECONNRESET); + return (-ECONNRESET); } BUG_ON(state_read(&ep->com) != MPA_REQ_RCVD); if (mpa_rev == 0) @@ -1804,10 +1787,8 @@ struct iwch_qp *qp = get_qhp(h, conn_param->qpn); PDBG("%s ep %p tid %u\n", __FUNCTION__, ep, ep->hwtid); - if (state_read(&ep->com) == DEAD) { - put_ep(&ep->com); - return (ECONNRESET); - } + if (state_read(&ep->com) == DEAD) + return (-ECONNRESET); BUG_ON(state_read(&ep->com) != MPA_REQ_RCVD); BUG_ON(!qp); @@ -1815,7 +1796,7 @@ if ((conn_param->ord > qp->rhp->attr.max_rdma_read_qp_depth) || (conn_param->ird > qp->rhp->attr.max_rdma_reads_per_qp)) { abort_connection(ep, NULL, M_NOWAIT); - return (EINVAL); + return (-EINVAL); } cm_id->add_ref(cm_id); @@ -1823,20 +1804,11 @@ ep->com.qp = qp; ep->com.rpl_err = 0; + ep->com.rpl_done = 0; ep->ird = conn_param->ird; ep->ord = conn_param->ord; PDBG("%s %d ird %d ord %d\n", __FUNCTION__, __LINE__, ep->ird, ep->ord); get_ep(&ep->com); - err = send_mpa_reply(ep, conn_param->private_data, - conn_param->private_data_len); - if (err) { - ep->com.cm_id = NULL; - ep->com.qp = NULL; - cm_id->rem_ref(cm_id); - abort_connection(ep, NULL, M_NOWAIT); - put_ep(&ep->com); - return err; - } /* bind QP to EP and move to RTS */ attrs.mpa_attr = ep->mpa_attr; @@ -1855,15 +1827,28 @@ err = iwch_modify_qp(ep->com.qp->rhp, ep->com.qp, mask, &attrs, 1); - if (err) { - ep->com.cm_id = NULL; - ep->com.qp = NULL; - cm_id->rem_ref(cm_id); - abort_connection(ep, NULL, M_NOWAIT); - } else { - state_set(&ep->com, FPDU_MODE); - established_upcall(ep); - } + if (err) + goto err; + + err = send_mpa_reply(ep, conn_param->private_data, + conn_param->private_data_len); + if (err) + goto err; + + /* wait for wr_ack */ + iwch_wait(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); + err = ep->com.rpl_err; + if (err) + goto err; + + state_set(&ep->com, FPDU_MODE); + established_upcall(ep); + put_ep(&ep->com); + return 0; +err: + ep->com.cm_id = NULL; + ep->com.qp = NULL; + cm_id->rem_ref(cm_id); put_ep(&ep->com); return err; } @@ -1880,7 +1865,7 @@ ep = alloc_ep(sizeof(*ep), M_NOWAIT); if (!ep) { printf("%s - cannot alloc ep.\n", __FUNCTION__); - err = (ENOMEM); + err = (-ENOMEM); goto out; } callout_init(&ep->timer, TRUE); @@ -1991,7 +1976,7 @@ goto fail3; /* wait for pass_open_rpl */ - wait_event(&ep->com.waitq, &ep->com.lock); + iwch_wait(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); err = ep->com.rpl_err; if (!err) { cm_id->provider_data = ep; @@ -2016,8 +2001,9 @@ state_set(&ep->com, DEAD); ep->com.rpl_err = 0; + ep->com.rpl_done = 0; err = listen_stop(ep); - wait_event(&ep->com.waitq, &ep->com.lock); + iwch_wait(&ep->com.waitq, &ep->com.lock, &ep->com.rpl_done); cxgb_free_stid(ep->com.tdev, ep->stid); err = ep->com.rpl_err; cm_id->rem_ref(cm_id); @@ -2143,7 +2129,7 @@ taskqueue_thread_enqueue, &mbuf_taskq); if (mbuf_taskq == NULL) { printf("failed to allocate iw_cxgb taskqueue\n"); - return (ENOMEM); + return (-ENOMEM); } taskqueue_start_threads(&mbuf_taskq, 1, PI_NET, "iw_cxgb taskq"); ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#3 (text+ko) ==== @@ -124,6 +124,7 @@ struct sockaddr_in local_addr; struct sockaddr_in remote_addr; int rpl_err; + int rpl_done; }; struct iwch_listen_ep { @@ -139,6 +140,7 @@ unsigned int atid; u32 hwtid; u32 snd_seq; + u32 rcv_seq; struct l2t_entry *l2t; struct rtentry *dst; struct mbuf *mpa_mbuf; @@ -173,32 +175,25 @@ } static __inline void -wait_event(struct cv *cv, struct mtx *lock) +iwch_wait(struct cv *cv, struct mtx *lock, int *rpl_done) { mtx_lock(lock); - cv_wait_unlock(cv, lock); + if (!*rpl_done) { + PDBG("sleeping for rpl_done\n"); + cv_wait_unlock(cv, lock); + } + PDBG("*rpl_done=%d\n", *rpl_done); } -static __inline int -wait_event_interruptible(struct cv *cv, struct mtx *lock) -{ - int err; - - mtx_lock(lock); - err = cv_wait_sig(cv, lock); - mtx_unlock(lock); - - return (err); -} - static __inline void -wake_up(struct cv *cv, struct mtx *lock) +iwch_wakeup(struct cv *cv, struct mtx *lock, int *rpl_done) { mtx_lock(lock); + *rpl_done=1; + PDBG("wakeup for rpl_done\n"); cv_broadcast(cv); mtx_unlock(lock); } - /* CM prototypes */ ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cq.c#2 (text+ko) ==== @@ -93,9 +93,9 @@ * * Returns: * 0 cqe returned - * ENOBUFS EMPTY; - * EAGAIN caller must try again - * any other errno fatal error + * -ENOBUFS EMPTY; + * -EAGAIN caller must try again + * any other neg errno fatal error */ static int iwch_poll_cq_one(struct iwch_dev *rhp, struct iwch_cq *chp, struct ib_wc *wc) @@ -106,18 +106,18 @@ u32 credit = 0; u8 cqe_flushed; u64 cookie; - int ret = 0; + int ret = 1; rd_cqe = cxio_next_cqe(&chp->cq); if (!rd_cqe) - return (ENOBUFS); + return 0; qhp = get_qhp(rhp, CQE_QPID(*rd_cqe)); if (!qhp) wq = NULL; else { - mtx_lock(&qhp->lock); + mtx_lock_spin(&qhp->lock); wq = &(qhp->wq); } ret = cxio_poll_cq(wq, &(chp->cq), &cqe, &cqe_flushed, &cookie, @@ -129,10 +129,10 @@ } if (ret) { - ret = EAGAIN; + ret = -EAGAIN; goto out; } - ret = 0; + ret = 1; wc->wr_id = cookie; wc->qp = &qhp->ibqp; @@ -176,7 +176,7 @@ log(LOG_ERR, "Unexpected opcode %d " "in the CQE received for QPID=0x%0x\n", CQE_OPCODE(cqe), CQE_QPID(cqe)); - ret = EINVAL; + ret = -EINVAL; goto out; } } @@ -230,12 +230,12 @@ default: log(LOG_ERR, "Unexpected cqe_status 0x%x for " "QPID=0x%0x\n", CQE_STATUS(cqe), CQE_QPID(cqe)); - ret = EINVAL; + ret = -EINVAL; } } out: if (wq) - mtx_unlock(&qhp->lock); + mtx_unlock_spin(&qhp->lock); return ret; } @@ -249,7 +249,7 @@ chp = to_iwch_cq(ibcq); rhp = chp->rhp; - mtx_lock(&chp->lock); + mtx_lock_spin(&chp->lock); for (npolled = 0; npolled < num_entries; ++npolled) { #ifdef DEBUG int i=0; @@ -269,11 +269,11 @@ if (err <= 0) break; } - mtx_unlock(&chp->lock); + mtx_unlock_spin(&chp->lock); - if (err < 0) + if (err < 0) { return err; - else { + } else { return npolled; } } ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_ev.c#2 (text+ko) ==== @@ -88,32 +88,19 @@ #endif static void -post_qp_event(struct iwch_dev *rnicp, struct iwch_cq *chp, +post_qp_event(struct iwch_dev *rnicp, struct iwch_qp *qhp, struct iwch_cq *chp, struct respQ_msg_t *rsp_msg, enum ib_event_type ib_event, int send_term) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 7 21:28:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EA9C16A52D; Mon, 7 Jan 2008 21:28:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B967B16A41B for ; Mon, 7 Jan 2008 21:28:55 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 817D913C459 for ; Mon, 7 Jan 2008 21:28:55 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07LStxj043965 for ; Mon, 7 Jan 2008 21:28:55 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07LStLn043962 for perforce@freebsd.org; Mon, 7 Jan 2008 21:28:55 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 21:28:55 GMT Message-Id: <200801072128.m07LStLn043962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 21:28:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=132742 Change 132742 by swise@swise:vic10:iwarp on 2008/01/07 21:28:33 4.7.1 debug firmware. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/t3fw-4.7.1.bin.gz.uu#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:25:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 747D516A46C; Mon, 7 Jan 2008 22:25:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38E9616A417 for ; Mon, 7 Jan 2008 22:25:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 174CC13C469 for ; Mon, 7 Jan 2008 22:25:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07MPR94072827 for ; Mon, 7 Jan 2008 22:25:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07MPRPK072824 for perforce@freebsd.org; Mon, 7 Jan 2008 22:25:27 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 22:25:27 GMT Message-Id: <200801072225.m07MPRPK072824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:25:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132750 Change 132750 by jb@jb_freebsd1 on 2008/01/07 22:25:11 Add the do fbt/sdt probe calls via dtrace_invop and then alternately call the function (if an entry probe), or clean up after a return probe. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#3 (text+ko) ==== @@ -28,19 +28,129 @@ * Use is subject to license terms. */ -#include +#define _ASM + +#include #include +#include #include "assym.s" +#define INTR_POP \ + MEXITCOUNT; \ + movq TF_RDI(%rsp),%rdi; \ + movq TF_RSI(%rsp),%rsi; \ + movq TF_RDX(%rsp),%rdx; \ + movq TF_RCX(%rsp),%rcx; \ + movq TF_R8(%rsp),%r8; \ + movq TF_R9(%rsp),%r9; \ + movq TF_RAX(%rsp),%rax; \ + movq TF_RBX(%rsp),%rbx; \ + movq TF_RBP(%rsp),%rbp; \ + movq TF_R10(%rsp),%r10; \ + movq TF_R11(%rsp),%r11; \ + movq TF_R12(%rsp),%r12; \ + movq TF_R13(%rsp),%r13; \ + movq TF_R14(%rsp),%r14; \ + movq TF_R15(%rsp),%r15; \ + testb $SEL_RPL_MASK,TF_CS(%rsp); \ + jz 1f; \ + cli; \ + swapgs; \ +1: addq $TF_RIP,%rsp; + + .globl calltrap .type calltrap,@function ENTRY(dtrace_invop_start) - /* XXX More code to go in here. :-) */ + /* + * #BP traps with %rip set to the next address. We need to decrement + * the value to indicate the address of the int3 (0xcc) instruction + * that we substituted. + */ + movq TF_RIP(%rsp), %rdi + decq %rdi + movq TF_RSP(%rsp), %rsi + movq TF_RAX(%rsp), %rdx + pushq (%rsi) + movq %rsp, %rsi + call dtrace_invop + addq $8, %rsp + cmpl $DTRACE_INVOP_PUSHL_EBP, %eax + je bp_push + cmpl $DTRACE_INVOP_LEAVE, %eax + je bp_leave + cmpl $DTRACE_INVOP_NOP, %eax + je bp_nop + cmpl $DTRACE_INVOP_RET, %eax + je bp_ret /* When all else fails handle the trap in the usual way. */ jmpq *dtrace_invop_calltrap_addr + +bp_push: + /* + * We must emulate a "pushq %rbp". To do this, we pull the stack + * down 8 bytes, and then store the base pointer. + */ + INTR_POP + subq $16, %rsp /* make room for %rbp */ + pushq %rax /* push temp */ + movq 24(%rsp), %rax /* load calling RIP */ + movq %rax, 8(%rsp) /* store calling RIP */ + movq 32(%rsp), %rax /* load calling CS */ + movq %rax, 16(%rsp) /* store calling CS */ + movq 40(%rsp), %rax /* load calling RFLAGS */ + movq %rax, 24(%rsp) /* store calling RFLAGS */ + movq 48(%rsp), %rax /* load calling RSP */ + subq $8, %rax /* make room for %rbp */ + movq %rax, 32(%rsp) /* store calling RSP */ + movq 56(%rsp), %rax /* load calling SS */ + movq %rax, 40(%rsp) /* store calling SS */ + movq 32(%rsp), %rax /* reload calling RSP */ + movq %rbp, (%rax) /* store %rbp there */ + popq %rax /* pop off temp */ + iretq /* return from interrupt */ + /*NOTREACHED*/ + +bp_leave: + /* + * We must emulate a "leave", which is the same as a "movq %rbp, %rsp" + * followed by a "popq %rbp". This is quite a bit simpler on amd64 + * than it is on i386 -- we can exploit the fact that the %rsp is + * explicitly saved to effect the pop without having to reshuffle + * the other data pushed for the trap. + */ + INTR_POP + pushq %rax /* push temp */ + movq 8(%rsp), %rax /* load calling RIP */ + movq %rax, 8(%rsp) /* store calling RIP */ + movq (%rbp), %rax /* get new %rbp */ + addq $8, %rbp /* adjust new %rsp */ + movq %rbp, 32(%rsp) /* store new %rsp */ + movq %rax, %rbp /* set new %rbp */ + popq %rax /* pop off temp */ + iretq /* return from interrupt */ + /*NOTREACHED*/ + +bp_nop: + /* We must emulate a "nop". */ + INTR_POP + iretq + /*NOTREACHED*/ + +bp_ret: + INTR_POP + pushq %rax /* push temp */ + movq 32(%rsp), %rax /* load %rsp */ + movq (%rax), %rax /* load calling RIP */ + movq %rax, 8(%rsp) /* store calling RIP */ + addq $8, 32(%rsp) /* adjust new %rsp */ + popq %rax /* pop off temp */ + iretq /* return from interrupt */ + /*NOTREACHED*/ + END(dtrace_invop_start) /* From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:29:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C057F16A46B; Mon, 7 Jan 2008 22:29:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85FDD16A468 for ; Mon, 7 Jan 2008 22:29:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 65B5513C468 for ; Mon, 7 Jan 2008 22:29:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07MTWKL077297 for ; Mon, 7 Jan 2008 22:29:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07MTWIk077294 for perforce@freebsd.org; Mon, 7 Jan 2008 22:29:32 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 22:29:32 GMT Message-Id: <200801072229.m07MTWIk077294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:29:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132751 Change 132751 by jb@jb_freebsd1 on 2008/01/07 22:28:45 The return address variable isn't needed. The DTrace asm code will do all that needs to be done to return from the interrupt if it chooses. It will only jump back here if the breakpoint wasn't caused by DTrace, in which case the trap will be handled in the usual way. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#8 (text+ko) ==== @@ -59,12 +59,6 @@ .size dtrace_invop_calltrap_addr, 8 dtrace_invop_calltrap_addr: .zero 8 - .globl dtrace_invop_return_addr - .align 8 - .type dtrace_invop_return_addr, @object - .size dtrace_invop_return_addr, 8 -dtrace_invop_return_addr: - .zero 8 #endif .text #ifdef HWPMC_HOOKS @@ -206,9 +200,11 @@ cmpq $0,dtrace_invop_jump_addr je calltrap - /* Set our alternate jump addresses for the jump back. */ + /* + * Set our jump address for the jump back in the event that + * the breakpoint wasn't caused by DTrace at all. + */ movq $calltrap, dtrace_invop_calltrap_addr(%rip) - movq $doreti, dtrace_invop_return_addr(%rip) /* Jump to the code hooked in by DTrace. */ movq dtrace_invop_jump_addr, %rax From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:31:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EFF516A46D; Mon, 7 Jan 2008 22:31:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 648B416A469 for ; Mon, 7 Jan 2008 22:31:57 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id B6C7813C4E7 for ; Mon, 7 Jan 2008 22:31:56 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 2355 invoked from network); 7 Jan 2008 21:29:35 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 7 Jan 2008 21:29:35 -0000 Message-ID: <4782A21C.2060504@freebsd.org> Date: Mon, 07 Jan 2008 23:05:16 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.14 (Windows/20071210) MIME-Version: 1.0 To: Adrian Chadd References: <200801071418.m07EIwNn036146@repoman.freebsd.org> In-Reply-To: <200801071418.m07EIwNn036146@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:31:57 -0000 Adrian Chadd wrote: > http://perforce.freebsd.org/chv.cgi?CH=132710 > > Change 132710 by adrian@wendy on 2008/01/07 14:18:50 > > Bring over more of Julians' initial work. > > Affected files ... > > .. //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip.4#2 edit > > Differences ... > > ==== //depot/projects/adrian_spoof_clientip/src/share/man/man4/ip.4#2 (text+ko) ==== > > @@ -292,6 +292,29 @@ > cmsg_type = IP_RECVIF > .Ed > .Pp > +If the > +.Dv IP_NONLOCALOK > +options is set then the checking of local bind addresses against addresses > +assigned to local interfaces is disabled. > +The kernel must have been compiled with the > +.Dv IP_NONLOCALBIND option, and the sysctl > +.Va net.inet.ip.nonlocalok > +should be set to 1. > +The option needs to be set on the socket before the > +.Xr bind 2 > +system call is used on it. > +.Bd -literal > +u_char spoofing = 1; /* 0 = disable (default), 1 = enable */ > + > +setsockopt(s, IPPROTO_IP, IP_NONLOCALOK, &spoofing, sizeof(spoofing)); > +ret = bind (...); > +.Ed > +.Pp > +This behaviour is not for general use and is > +included for use in servers that are implementing fully > +transparent proxies. Use of this option on general purpose > +systems is strongly discouraged. > +.Pp > .Dv IP_PORTRANGE > may be used to set the port range used for selecting a local port number > on a socket with an unspecified (zero) port number. Reinventing the wheel? Have a look at IPFIREWALL_FORWARD which supports transparent proxying as well. -- Andre From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:42:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 902A216A468; Mon, 7 Jan 2008 22:42:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55FAB16A420 for ; Mon, 7 Jan 2008 22:42:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DF7613C459 for ; Mon, 7 Jan 2008 22:42:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07Mgmtf079848 for ; Mon, 7 Jan 2008 22:42:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07MgmLV079845 for perforce@freebsd.org; Mon, 7 Jan 2008 22:42:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 22:42:48 GMT Message-Id: <200801072242.m07MgmLV079845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132752 Change 132752 by jb@jb_freebsd1 on 2008/01/07 22:42:34 Add a variable I walloped by mistake. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#7 (text+ko) ==== @@ -49,6 +49,8 @@ struct dtrace_invop_hdlr *dtih_next; } dtrace_invop_hdlr_t; +dtrace_invop_hdlr_t *dtrace_invop_hdlr; + int dtrace_invop(uintptr_t addr, uintptr_t *stack, uintptr_t eax) { From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:48:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EC8D16A468; Mon, 7 Jan 2008 22:48:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3309A16A417 for ; Mon, 7 Jan 2008 22:48:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 106AA13C4D9 for ; Mon, 7 Jan 2008 22:48:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07Mmtf3080543 for ; Mon, 7 Jan 2008 22:48:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07MmsZk080540 for perforce@freebsd.org; Mon, 7 Jan 2008 22:48:54 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jan 2008 22:48:54 GMT Message-Id: <200801072248.m07MmsZk080540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:48:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132753 Change 132753 by jb@jb_freebsd1 on 2008/01/07 22:48:49 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 integrate .. //depot/projects/dtrace/doc/share/mk/doc.xml.mk#6 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/limerick#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_sem.c#8 integrate .. //depot/projects/dtrace/src/share/man/man4/ipmi.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/pci.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/pcib.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/dtrace/src/share/man/man9/style.9#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#10 integrate .. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#13 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#38 integrate .. //depot/projects/dtrace/src/sys/conf/options#37 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/streams/streams.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#11 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/sys_socket.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/dtrace/src/sys/sys/file.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#11 integrate .. //depot/projects/dtrace/src/usr.sbin/gstat/gstat.c#5 integrate .. //depot/projects/dtrace/www/en/internal/fortunes.sgml#4 integrate .. //depot/projects/dtrace/www/en/news/Makefile#6 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#25 integrate .. //depot/projects/dtrace/www/share/mk/doc.xml.mk#7 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#15 integrate .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#5 integrate .. //depot/projects/dtrace/www/share/sgml/templates.news-rss.xsl#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ 2005 2006 2007 + 2008 The FreeBSD Documentation Project ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2621,6 +2621,24 @@ + RELENG_7 + + + The line of development for FreeBSD-7.X, also known + as FreeBSD 7-STABLE + + + + + RELENG_7_0 + + + The release branch for FreeBSD-7.0, used only for + security advisories and other critical fixes. + + + + RELENG_6 @@ -2630,6 +2648,15 @@ + RELENG_6_3 + + + The release branch for FreeBSD-6.3, used only for + security advisories and other critical fixes. + + + + RELENG_6_2 @@ -2850,6 +2877,22 @@ + RELENG_7_0_0_RELEASE + + + FreeBSD 7.0 + + + + + RELENG_6_3_0_RELEASE + + + FreeBSD 6.3 + + + + RELENG_6_2_0_RELEASE ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 (text+ko) ==== @@ -1,7 +1,7 @@ 2005 2006 2007 + 2008 The FreeBSD Documentation Project @@ -11328,6 +11329,11 @@ 603100 + 6.3-STABLE after fixing + multibyte type support in bit macro. + 603101 + + 7.0-CURRENT. 700000 @@ -11613,7 +11619,7 @@ 700054 - 7.0-CURRENT after ABI backwards compatibility + 7.0-RELEASE, and 7.0-CURRENT after ABI backwards compatibility to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which required the ABI of the PCIOCGETCONF IOCTL to be ==== //depot/projects/dtrace/doc/share/mk/doc.xml.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.11 2006/09/22 21:05:03 hrs Exp $ +# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.12 2008/01/07 10:08:29 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -140,6 +140,7 @@ _DEPENDSET.news= ${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \ ${XSL_NEWS_NEWSFLASH} \ ${XSL_NEWS_NEWS_RDF} \ + ${XSL_NEWS_NEWS_RSS} \ ${XML_INCLUDES} _PARAMS.news= --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \ --param news.project.xml "'${XML_NEWS_NEWS}'" @@ -153,6 +154,7 @@ XSL_NEWS_NEWSFLASH= ${WEB_PREFIX}/share/sgml/templates.newsflash.xsl XSL_NEWS_NEWSFLASH_OLD= ${WEB_PREFIX}/share/sgml/templates.oldnewsflash.xsl XSL_NEWS_NEWS_RDF= ${WEB_PREFIX}/share/sgml/templates.news-rdf.xsl +XSL_NEWS_NEWS_RSS= ${WEB_PREFIX}/share/sgml/templates.news-rss.xsl # DEPENDSET: press .......................................................... _DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \ ==== //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#4 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.4 2008/01/07 07:47:21 peter Exp $ */ #include "cvs.h" @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a ==== //depot/projects/dtrace/src/games/fortune/datfiles/limerick#7 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.14 2007/12/07 22:41:39 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.15 2008/01/07 10:31:17 schweikh Exp $ % A bad little girl in Madrid, A most reprehensible kid, @@ -4421,7 +4421,7 @@ There was an old man of St. Bees, Who was stung in the arm by a wasp. When asked, "Does it hurt?" - He relied, "No, it doesn't. + He replied, "No, it doesn't. I'm so glad that it wasn't a hornet." -- W.S. Gilbert % ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_sem.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.12 2007/11/23 05:42:52 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.13 2008/01/07 02:26:29 davidxu Exp $ */ #include "namespace.h" @@ -282,8 +282,8 @@ if ((*sem)->nwaiters) { retval = _thr_umtx_wake(&(*sem)->count, 1); - if (retval > 0) - retval = 0; + if (retval != 0) + retval = -1; } return (retval); } ==== //depot/projects/dtrace/src/share/man/man4/ipmi.4#9 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.9 2008/01/04 12:55:23 gabor Exp $ +.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.11 2008/01/07 14:55:20 gabor Exp $ .\" .Dd July 10, 2007 .Dt IPMI 4 @@ -186,7 +186,7 @@ The .Nm driver first appeared in -.Fx 6.3 . +.Fx 6.2 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#8 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.40 2007/12/29 19:59:58 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.41 2008/01/05 23:41:15 brueffer Exp $ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd October 22, 2006 +.Dd December 27, 2007 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -104,9 +104,10 @@ the state machine as a client. It must be newly created and a service name can be given as an argument. It is legal to specify a zero-length service name, this is common -on some DSL setups. It is possible to request connection to specific -access concentrator by it's name using "AC-Name\\Service-Name" syntax. -A session request packet will be broadcast on the Ethernet. +on some DSL setups. +It is possible to request a connection to a specific +access concentrator by its name using the "AC-Name\\Service-Name" syntax. +A session request packet will be broadcasted on the Ethernet. This command uses the .Dv ngpppoe_init_data structure shown below. ==== //depot/projects/dtrace/src/share/man/man4/pci.4#7 (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/man4/pci.4,v 1.20 2008/01/04 08:19:52 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pci.4,v 1.21 2008/01/05 23:21:32 brueffer Exp $ .\" .Dd January 3, 2008 .Dt PCI 4 @@ -57,18 +57,30 @@ .Pp The .Nm -driver implements the pci bus in the kernel. -It enumerates and devices on the pci bus and gives pci client drivers the -chance to attach to them. -It assigns resources to children, when the BIOS doesn't. +driver implements the +.Tn PCI +bus in the kernel. +It enumerates any devices on the +.Tn PCI +bus and gives +.Tn PCI +client drivers the chance to attach to them. +It assigns resources to children, when the BIOS does not. It takes care of routing interrupts when necessary. -It reprobes the unattached pci children when pci client drivers are dynamically +It reprobes the unattached +.Tn PCI +children when +.Tn PCI +client drivers are dynamically loaded at runtime. .Sh KERNEL CONFIGURATION The .Nm device is included in the kernel as described in the SYNOPSIS section. -The pci driver cannot be built as a kld. +The +.Nm +driver cannot be built as a +.Xr kld 4 . .Sh IOCTLS The following .Xr ioctl 2 ==== //depot/projects/dtrace/src/share/man/man4/pcib.4#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/share/man/man4/pcib.4,v 1.1 2008/01/04 08:26:22 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.2 2008/01/05 23:27:59 brueffer Exp $ .\" .Dd January 4, 2008 .Dt PCIB 4 @@ -31,11 +31,19 @@ .Nm pcib .Nd PCI bridge driver .Sh SYNOPSIS -.Cd device pcib +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pcib" +.Ed .Sh DESCRIPTION The .Nm -driver provides for host and pci bridges in a pci system. +driver provides for host and +.Tn PCI +bridges in a +.Tn PCI +system. .Sh BUGS This man page is too short. - ==== //depot/projects/dtrace/src/share/man/man4/textdump.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.2 2007/12/26 12:18:21 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $ .\" -.Dd 26 December, 2007 +.Dd December 26, 2007 .Dt textdump 4 .Os .Sh NAME @@ -93,7 +93,7 @@ .It Pa version.txt Kernel version string. My be disabled by clearing the -.Dv dbeug.ddb.textdump.do_panic +.Dv debug.ddb.textdump.do_version sysctl. .El .Pp ==== //depot/projects/dtrace/src/share/man/man9/style.9#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ */ /* @@ -68,7 +68,7 @@ * Copyright (c) 1984-2025 John Q. Public * All rights reserved. * - * Long, boring license goes here, but redacted for brevity + * Long, boring license goes here, but trimmed for brevity */ .Ed .Pp @@ -111,7 +111,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $"); .Ed .Pp Leave another blank line before the header files. ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#30 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.601 2008/01/03 07:34:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.602 2008/01/06 18:51:03 alc Exp $"); /* * Manages physical address maps. @@ -614,7 +614,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1699,7 +1698,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1847,7 +1845,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1867,7 +1864,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1884,7 +1880,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2118,7 +2113,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -3045,7 +3039,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#30 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/dtrace/src/sys/amd64/include/pmap.h#10 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.139 2008/01/06 18:51:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -231,7 +231,6 @@ struct pv_chunk; struct md_page { - int pv_list_count; TAILQ_HEAD(,pv_entry) pv_list; }; ==== //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#13 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.22 2007/12/16 12:57:12 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); #include #include @@ -191,7 +191,7 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set"); + device_printf(dev, "No MAC address set\n"); goto out; } ate_set_mac(sc, eaddr); ==== //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.89 2007/12/29 14:25:29 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.90 2008/01/05 12:36:35 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -270,13 +270,15 @@ #ifdef DEBUG if (ldebug(stat)) - printf(ARGS(stat, "%s, *"), args->path); + printf(ARGS(stat, "%s, *"), path); #endif error = kern_stat(td, path, UIO_SYSSPACE, &buf); + if (error) { + LFREEPATH(path); + return (error); + } + translate_path_major_minor(td, path, &buf); LFREEPATH(path); - if (error) - return (error); - translate_path_major_minor(td, args->path, &buf); return(stat_copyout(&buf, args->up)); } @@ -291,13 +293,15 @@ #ifdef DEBUG if (ldebug(lstat)) - printf(ARGS(lstat, "%s, *"), args->path); + printf(ARGS(lstat, "%s, *"), path); #endif - error = kern_lstat(td, args->path, UIO_SYSSPACE, &buf); + error = kern_lstat(td, path, UIO_SYSSPACE, &buf); + if (error) { + LFREEPATH(path); + return (error); + } + translate_path_major_minor(td, path, &buf); LFREEPATH(path); - if (error) - return (error); - translate_path_major_minor(td, args->path, &buf); return(stat_copyout(&buf, args->up)); } ==== //depot/projects/dtrace/src/sys/conf/NOTES#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1464 2007/12/27 23:19:03 des Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1465 2008/01/07 21:40:09 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -300,6 +300,9 @@ # Enable FreeBSD6 compatibility syscalls options COMPAT_FREEBSD6 +# Enable FreeBSD7 compatibility syscalls +options COMPAT_FREEBSD7 + # # These three options provide support for System V Interface # Definition-style interprocess communication, in the form of shared ==== //depot/projects/dtrace/src/sys/conf/options#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.614 2007/12/27 16:45:39 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.615 2008/01/07 21:40:09 jhb Exp $ # # On the handling of kernel options # @@ -67,6 +67,7 @@ COMPAT_FREEBSD4 opt_compat.h COMPAT_FREEBSD5 opt_compat.h COMPAT_FREEBSD6 opt_compat.h +COMPAT_FREEBSD7 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR DIRECTIO ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.8 2007/12/17 08:17:50 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.9 2008/01/07 01:18:16 kmacy Exp $ * ***************************************************************************/ @@ -84,6 +84,7 @@ * along that needs 1 byte */ uint16_t mi_pad; + struct mbuf *mi_mbuf; /* need to be able to handle the @#$@@#%$ing packet zone */ #define mi_size mi_ext.ext_size #define mi_base mi_ext.ext_buf #define mi_args mi_ext.ext_args ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.15 2007/12/16 05:19:48 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.16 2008/01/07 01:18:16 kmacy Exp $"); #include #include @@ -125,6 +125,7 @@ mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; + mi->mi_mbuf = NULL; if (m->m_flags & M_PKTHDR) { mi->mi_ether_vtag = m->m_pkthdr.ether_vtag; @@ -151,6 +152,7 @@ mi->mi_type = m->m_ext.ext_type; mi->mi_size = m->m_ext.ext_size; mi->mi_refcnt = m->m_ext.ref_cnt; + mi->mi_mbuf = m; } else { mi->mi_base = (caddr_t)m; mi->mi_data = m->m_data; @@ -267,7 +269,8 @@ goto err_out; } else if (seg_count >= TX_MAX_SEGS) { if (cxgb_debug) - printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); + printf("mbuf chain too long: %d max allowed %d\n", + seg_count, TX_MAX_SEGS); if (!defragged) { n = m_defrag(*m, M_DONTWAIT); if (n == NULL) { @@ -300,9 +303,10 @@ } n = *m; while (n) { - if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && (n->m_len > 0)) + if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && + (n->m_len > 0) && (n->m_ext.ext_type != EXT_PACKET) ) n->m_flags &= ~M_EXT; - else if (n->m_len > 0) { + else if ((n->m_len > 0) || (n->m_ext.ext_type == EXT_PACKET)) { n = n->m_next; continue; } @@ -380,6 +384,10 @@ */ while (dofree == 0) { cnt = *(mi->mi_refcnt); + if (mi->mi_type == EXT_PACKET) { + dofree = 1; + break; + } if (atomic_cmpset_int(mi->mi_refcnt, cnt, cnt - 1)) { if (cnt == 1) dofree = 1; @@ -419,7 +427,10 @@ ("%s: ext_free not set", __func__)); (*(mi->mi_ext.ext_free))(mi->mi_ext.ext_buf, mi->mi_ext.ext_args); - break; + break; + case EXT_PACKET: + uma_zfree(zone_pack, mi->mi_mbuf); + break; default: dump_mi(mi); panic("unknown mv type in m_free_vec type=%d idx=%d", type, idx); ==== //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#8 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.13 2007/12/31 11:44:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.14 2008/01/07 09:46:39 des Exp $"); #include #include @@ -93,6 +93,7 @@ { DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 }, { DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 }, { DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 }, + { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 }, { DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 }, { DEVICEID_ICH9, "Intel ICH9 watchdog timer", 9 }, { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 }, ==== //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.7 2007/12/31 11:44:01 des Exp $ + * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.8 2008/01/07 09:46:39 des Exp $ */ #ifndef _ICHWD_H_ @@ -85,6 +85,7 @@ #define DEVICEID_ICH8 0x2810 #define DEVICEID_ICH8DH 0x2812 #define DEVICEID_ICH8DO 0x2814 +#define DEVICEID_ICH8M 0x2815 #define DEVICEID_ICH9 0x2918 #define DEVICEID_ICH9R 0x2916 #define DEVICEID_ICH9DH 0x2912 ==== //depot/projects/dtrace/src/sys/dev/streams/streams.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.57 2007/12/30 01:42:12 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.58 2008/01/07 20:05:18 jhb Exp $"); #include #include @@ -90,6 +90,7 @@ static struct fileops svr4_netops = { .fo_read = soo_read, .fo_write = soo_write, + .fo_truncate = soo_truncate, .fo_ioctl = soo_ioctl, .fo_poll = soo_poll, .fo_kqfilter = soo_kqfilter, ==== //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -118,6 +118,7 @@ { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172 }, + { USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573 }, { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573 } }; ==== //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#8 (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.11 2007/12/01 08:53:03 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.12 2008/01/07 11:31:55 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -2788,6 +2788,6 @@ static devclass_t zyd_devclass; DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, usbd_driver_load, 0); -MODULE_DEPEND(rum, wlan, 1, 1, 1); -MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); -MODULE_DEPEND(rum, usb, 1, 1, 1); +MODULE_DEPEND(zyd, wlan, 1, 1, 1); +MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1); +MODULE_DEPEND(zyd, usb, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/dev/usb/usbdevs#23 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.336 2007/12/11 06:41:38 davidxu Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.337 2008/01/07 09:14:37 kevlo Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -594,6 +594,7 @@ vendor OQO 0x1557 OQO vendor UMEDIA 0x157e U-MEDIA Communications vendor FIBERLINE 0x1582 Fiberline +vendor SPARKLAN 0x15a9 SparkLAN vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX Data Systems vendor INSIDEOUT 0x1608 Inside Out Networks @@ -2111,6 +2112,9 @@ product SOURCENEXT KEIKAI8 0x039f KeikaiDenwa 8 product SOURCENEXT KEIKAI8_CHG 0x012e KeikaiDenwa 8 with charger +/* SparkLAN products */ +product SPARKLAN RT2573 0x0004 RT2573 + /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R ==== //depot/projects/dtrace/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.151 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.152 2008/01/07 20:05:18 jhb Exp $ */ /* @@ -1278,6 +1278,13 @@ return (devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td)); } +static int +devfs_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +{ + + return (vnops.fo_truncate(fp, length, cred, td)); +} + /* ARGSUSED */ static int devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) @@ -1322,6 +1329,7 @@ static struct fileops devfs_ops_f = { .fo_read = devfs_read_f, .fo_write = devfs_write_f, + .fo_truncate = devfs_truncate_f, .fo_ioctl = devfs_ioctl_f, .fo_poll = devfs_poll_f, .fo_kqfilter = devfs_kqfilter_f, ==== //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.139 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.140 2008/01/07 20:05:18 jhb Exp $ */ #include @@ -61,10 +61,12 @@ static fo_kqfilter_t fifo_kqfilter_f; static fo_stat_t fifo_stat_f; static fo_close_t fifo_close_f; +static fo_truncate_t fifo_truncate_f; struct fileops fifo_ops_f = { .fo_read = fifo_read_f, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 7 22:56:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26B8816A41A; Mon, 7 Jan 2008 22:56:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAC9216A469 for ; Mon, 7 Jan 2008 22:56:03 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA6F013C45B for ; Mon, 7 Jan 2008 22:56:03 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07Mu3sJ081925 for ; Mon, 7 Jan 2008 22:56:03 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07Mu33d081922 for perforce@freebsd.org; Mon, 7 Jan 2008 22:56:03 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 7 Jan 2008 22:56:03 GMT Message-Id: <200801072256.m07Mu33d081922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 22:56:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=132754 Change 132754 by swise@swise:vic10:iwarp on 2008/01/07 22:55:26 krping server side works! fixed incorrect data length in send_mpa_reply(). Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#6 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#6 (text+ko) ==== @@ -644,7 +644,7 @@ } m_set_priority(m, CPL_PRIORITY_DATA); req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); - mpa = (struct mpa_message *) mbuf_put(m, mpalen); + mpa = (struct mpa_message *)mbuf_put(m, mpalen); memset(mpa, 0, sizeof(*mpa)); memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key)); mpa->flags = (ep->mpa_attr.crc_enabled ? MPA_CRC : 0) | @@ -655,7 +655,7 @@ memcpy(mpa->private_data, pdata, plen); set_arp_failure_handler(m, arp_failure_discard); - len = m->m_len; + len = mpalen; req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); req->wr_lo = htonl(V_WR_TID(ep->hwtid)); req->len = htonl(len); From owner-p4-projects@FreeBSD.ORG Mon Jan 7 23:32:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0730116A46D; Mon, 7 Jan 2008 23:32:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C061B16A419 for ; Mon, 7 Jan 2008 23:32:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E36313C4E8 for ; Mon, 7 Jan 2008 23:32:41 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07NWf4k089206 for ; Mon, 7 Jan 2008 23:32:41 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07NWfxf089203 for perforce@freebsd.org; Mon, 7 Jan 2008 23:32:41 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 7 Jan 2008 23:32:41 GMT Message-Id: <200801072332.m07NWfxf089203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 23:32:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=132757 Change 132757 by gonzo@gonzo_jeeves on 2008/01/07 23:31:51 o Retire old tick.c in favor of J! clock.c o Move all clock-related stuff from machdep.c to clock.c o Clean out onsoleted functions from clock.c o All platforms should use mips_timer_init_params to initialize CPU frequency (obtained in a platform-dependent fashion) and frequency divisor. Fixed it for MALTA stuff only on the moment. o Some style(9) fixes. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#7 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#7 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#4 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#11 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#7 (text+ko) ==== @@ -56,7 +56,7 @@ # Phase 4 # ---------------------------------------------------------------------- # -#mips/mips/clock.c standard +mips/mips/clock.c standard #mips/mips/queue.c standard # ---------------------------------------------------------------------- # Phase 5 @@ -82,7 +82,7 @@ mips/mips/stack_machdep.c optional ddb | stack mips/mips/support.S standard mips/mips/swtch.S standard -mips/mips/tick.c standard +# mips/mips/tick.c standard mips/mips/uio_machdep.c standard geom/geom_bsd.c standard geom/geom_bsd_enc.c standard ==== //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#7 (text+ko) ==== @@ -17,19 +17,6 @@ extern int cpu_clock; -/* - * count register is incremented as function of cpu - * pipeline frequency. - */ -/* - * FREEBSD_DEVELOPERS_FIXME: - * MIPS_COUNT_DIVIDER is CPU specific. There are some CPUs for which - * the count register runs at the same frequency as the CPU pipeline frequency - */ - -/* Standard MIPS Processors - count runs at 1/2 of the CPU pipeline frequency */ -#define MIPS_COUNT_DIVIDER 2 - extern uint32_t clockintr(uint32_t, struct clockframe *); #define wall_cmos_clock 0 @@ -41,8 +28,7 @@ */ #define MIPS_DEFAULT_HZ (100 * 1000 * 1000) -void tick_init_params(uint64_t, int); -void tick_init(void); +void mips_timer_init_params(uint64_t, int); int sysbeep(int pitch, int period); extern uint64_t counter_freq; ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#4 (text+ko) ==== @@ -68,27 +68,13 @@ int clock_started = 0; static u_long mips_timer_hz; -u_int32_t cpu_counter_interval; - -struct timespec time; - -#define SECMIN (60) /* seconds per minute */ -#define SECHOUR (60*SECMIN) /* seconds per hour */ -#define SECDAY (24*SECHOUR) /* seconds per day */ -#define SECYR (365*SECDAY) /* seconds per common year */ +uint32_t cpu_counter_interval; +uint32_t mips_count_divider = 2; -#define YEARDAYS(year) ((((year) % 4) == 0 && \ - ((year % 100) != 0 || (year % 400) == 0)) ? 366 : 365) - -#define RTC_NOPROFRATE 128 -#define RTC_PROFRATE 1024 -#define R7K_TIMER_FREQ 33000000 - #if 0 #define DEBUG_CLOCK 1 #endif -static int get_todtime(struct tod_time *); static unsigned mips_get_timecount(struct timecounter *tc); static void mips_timer_init(void); @@ -109,7 +95,7 @@ unsigned int c, current_dly = 0, dly, p; p = Mips_GetCOUNT(); - dly = (cpu_clock / 1000000 / MIPS_COUNT_DIVIDER) * n; + dly = (cpu_clock / 1000000 / mips_count_divider) * n; while(current_dly < dly ) { c = Mips_GetCOUNT(); current_dly += c - p; @@ -135,7 +121,7 @@ printf("cpu_initclocks(): stathz = 0x%x, profhz = 0x%x\n", stathz, profhz); - mips_timecounter.tc_frequency = cpu_clock / MIPS_COUNT_DIVIDER; + mips_timecounter.tc_frequency = cpu_clock / mips_count_divider; tc_init(&mips_timecounter); mips_timer_init(); @@ -144,14 +130,37 @@ } } -void mips_start_timer(void); +static void +mips_start_timer(void) +{ + + Mips_SetCOMPARE(Mips_GetCOUNT() + cpu_counter_interval); +} + +static uint64_t +mips_ticker(void) +{ + + return ((uint64_t)Mips_GetCOUNT()); +} -void mips_start_timer(void) +void +mips_timer_init_params(uint64_t platform_counter_freq, int double_count) { - Mips_SetCOMPARE(Mips_GetCOUNT() + cpu_counter_interval); + cpu_clock = platform_counter_freq; + + if (double_count != 0) + mips_count_divider = 2; + else + mips_count_divider = 1; + + /* XXX: should divider be taken into account */ + set_cputicker(mips_ticker, cpu_clock, 1); } + + /* * Clock interrupt code for machines using the on cpu chip * counter register. This register counts at half the pipeline @@ -180,15 +189,15 @@ * The counter register acts like timer which is incremented as * function of the CPU pipeline frequency. */ - cpu_counter_interval = (cpu_clock / MIPS_COUNT_DIVIDER) / mips_timer_hz ; + cpu_counter_interval = (cpu_clock / mips_count_divider) / mips_timer_hz ; mips_start_timer(); printf("mips_timer_init: cpu_counter_interval = 0x%x\n", cpu_counter_interval); } -intrmask_t -clockintr(intrmask_t mask, struct clockframe *frame) +uint32_t +clockintr(uint32_t mask, struct clockframe *frame) { struct clk_ticks *cpu_ticks; @@ -203,16 +212,16 @@ if (cpu_ticks->hard_ticks >= mips_timer_hz) { cpu_ticks->hard_ticks -= mips_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(frame); + hardclock(USERMODE(frame->sr), frame->pc); else - hardclock_process(frame); + hardclock_cpu(USERMODE(frame->sr)); } /* Fire statclock at stathz. */ cpu_ticks->stat_ticks += stathz; if (cpu_ticks->stat_ticks >= mips_timer_hz) { cpu_ticks->stat_ticks -= mips_timer_hz; - statclock(frame); + statclock(USERMODE(frame->sr)); } /* Fire profclock at profhz, but only when needed. */ @@ -220,11 +229,10 @@ if (cpu_ticks->prof_ticks >= mips_timer_hz) { cpu_ticks->prof_ticks -= mips_timer_hz; if (profprocs != 0) - profclock(frame); + profclock(USERMODE(frame->sr), frame->pc); } critical_exit(); done: - atomic_add_int((int *)&intrcnt[INTRCNT_HARDCLOCK], 1); /* restart timer */ mips_start_timer(); /* @@ -237,34 +245,6 @@ return CR_INT_CLOCK; } -/* - * We assume newhz is either stathz or profhz, and that neither will - * change after being set up above. Could recalculate intervals here - * but that would be a drag. - */ -void -setstatclockrate(int newhz) -{ - - /* nothing we can do */ -} - -static int -get_todtime(struct tod_time *tod) -{ - - /* - * Read RTC chip registers NOTE: Read routines are responsible - * for sanity checking clock. Dates after 19991231 should be - * returned as year >= 100. - */ - - /* - * NO hardware tod clock. - */ - return (0); -} - void cpu_startprofclock(void) { @@ -277,128 +257,9 @@ /* nothing to do */ } -/* - * This code is defunct after 2099. Will Unix still be here then?? - */ -static short dayyr[12] = { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 -}; - -/* - * Initialize the time of day register, based on the time base which - * is, e.g. from a filesystem. - */ -void -inittodr(time_t base) -{ - struct tod_time c; - long deltat; - int days, yr, s; - - if (base < 15*SECYR) { - printf("WARNING: preposterous time in file system\n"); - /* read the system clock anyway */ - base = 17*SECYR + 186*SECDAY + SECDAY/2; - } - - if (base) { - s = splclock(); - time.tv_sec = base; - time.tv_nsec = 0; - splx(s); - } - - if (!get_todtime(&c)) { - printf("WARNING: No TOD clock, believing file system.\n"); - s = splclock(); - tc_setclock(&time); - splx(s); - clockinitted = 1; - return; - } - - days = 0; - for (yr = 1970; yr < c.year; yr++) { - days += YEARDAYS(yr); - } - days += dayyr[c.mon - 1] + c.day - 1; - if (YEARDAYS(c.year) == 366 && c.mon > 2) - days++; - /* now have days since Jan 1, 1970; the rest is easy... */ - s = splclock(); - time.tv_sec = days * SECDAY + c.hour * 3600 + c.min * 60 + c.sec; - time.tv_nsec = 0; - tc_setclock(&time); - splx(s); - clockinitted = 1; - - /* - * See if we gained/lost time. - */ - deltat = time.tv_sec - base; - if (deltat > 5*SECYR) { - printf("WARNING: clock %d days greater than file system time\n", - deltat / SECDAY); - return; - } else if (deltat < -SECDAY) { - printf("WARNING: clock %d days less than file system time\n", - deltat / -SECDAY); - } else { - return; - } -} - -/* - * Reset the TOD clock. This is done when the system is halted or - * when the time is reset by the stime system call. - */ -void -resettodr(void) -{ - struct tod_time c; - register int t = 0, t2 = 0; - - /* - * Don't reset clock if time has not been set! - */ - if(!clockinitted) { - return; - } - - /* compute the day of week. 1 is Sunday*/ - t2 = time.tv_sec / SECDAY; - c.dow = (t2 + 5) % 7; /* 1/1/1970 was thursday */ - - /* compute the year */ - t2 = time.tv_sec / SECDAY; - c.year = 69; - while (t2 >= 0) { /* whittle off years */ - t = t2; - c.year++; - t2 -= YEARDAYS(c.year); - } - - /* t = month + day; separate */ - t2 = YEARDAYS(c.year); - for (c.mon = 1; c.mon < 12; c.mon++) { - if (t < dayyr[c.mon] + (t2 == 366 && c.mon > 1)) - break; - } - - c.day = t - dayyr[c.mon - 1] + 1; - if (t2 == 366 && c.mon > 2) { - c.day--; - } - - t = time.tv_sec % SECDAY; - c.hour = t / 3600; - t %= 3600; - c.min = t / 60; - c.sec = t % 60; -} - static unsigned mips_get_timecount(struct timecounter *tc) { + return(Mips_GetCOUNT()); } ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#11 (text+ko) ==== @@ -119,7 +119,7 @@ int cold = 1; int Maxmem; long realmem = 0; -int cpu_clock; +int cpu_clock = MIPS_DEFAULT_HZ; SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, &cpu_clock, 0, "CPU instruction clock rate"); int clocks_running = 0; @@ -675,22 +675,3 @@ printf("Kernel dumps not implemented on this architecture\n"); } - -void -cpu_initclocks() -{ - tick_init(); - clocks_running = 1; -} - -void -cpu_startprofclock(void) -{ - -} - -void -cpu_stopprofclock(void) -{ - -} ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#4 (text+ko) ==== @@ -314,5 +314,5 @@ #endif } while(0); - tick_init_params(platform_counter_freq, 0); + mips_timer_init_params(platform_counter_freq, 0); } From owner-p4-projects@FreeBSD.ORG Mon Jan 7 23:41:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1161016A469; Mon, 7 Jan 2008 23:41:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB24716A41B for ; Mon, 7 Jan 2008 23:41:51 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA3A513C45A for ; Mon, 7 Jan 2008 23:41:51 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m07Nfp1T090339 for ; Mon, 7 Jan 2008 23:41:51 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m07NfpNY090333 for perforce@freebsd.org; Mon, 7 Jan 2008 23:41:51 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 7 Jan 2008 23:41:51 GMT Message-Id: <200801072341.m07NfpNY090333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 132758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2008 23:41:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=132758 Change 132758 by gonzo@gonzo_jeeves on 2008/01/07 23:41:12 o style(9) fix: order includes alphabetically o add sys/cpu.h for cpu_est_clockrate declaration Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#12 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#12 (text+ko) ==== @@ -45,26 +45,23 @@ #include "opt_md.h" #include "opt_ddb.h" -#include #include +#include #include -#include +#include +#include +#include +#include #include +#include #include -#include -#include -#include #include #include +#include +#include #include -#include +#include #include -#if 0 -#include -#endif -#include -#include -#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Jan 8 02:36:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 688FB16A419; Tue, 8 Jan 2008 02:36:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D7B916A41A for ; Tue, 8 Jan 2008 02:36:39 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.237]) by mx1.freebsd.org (Postfix) with ESMTP id D99D013C458 for ; Tue, 8 Jan 2008 02:36:38 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by nz-out-0506.google.com with SMTP id l8so1679764nzf.13 for ; Mon, 07 Jan 2008 18:36:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=VP+9pwFBzMmdrypLaUGj5xBuYFwq1zvPZm1XbvD15og=; b=kBhcAT61dggFILRM67lXuf879pQNxU6NzPq0i0znsJkB/ywpF7soWp6Mc6b5o4J6qWXnSmluAbqUOCUFGrKDbRReDX0EiQnXIr9PsKfl4wwKLtDQJZ0TzGaZYe1SSP805RuykGJdcKukyZiENHAjBEII8H393PdXeuSHOHA5w7U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=fXmr6ikBR2sjpEvqoUGeVwXyYKoyeI8RexZmVj9UBSm2vM0Vt8EH1cTn3/jtV+QsqDlVi2vTSQ7qPQ0vDUsNTJeXSG6wUNUaywcXib7toEZSMPnc012ikd8WGfM42rgGB5E8HYL1UiBcKSaTZlNBFCHSyWKQqW721rHXrJs/4Kg= Received: by 10.142.103.6 with SMTP id a6mr19105wfc.21.1199758224995; Mon, 07 Jan 2008 18:10:24 -0800 (PST) Received: by 10.143.155.13 with HTTP; Mon, 7 Jan 2008 18:10:24 -0800 (PST) Message-ID: Date: Tue, 8 Jan 2008 11:10:24 +0900 From: "Adrian Chadd" Sender: adrian.chadd@gmail.com To: "Andre Oppermann" In-Reply-To: <4782A21C.2060504@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200801071418.m07EIwNn036146@repoman.freebsd.org> <4782A21C.2060504@freebsd.org> X-Google-Sender-Auth: 01d84833b19dec1f Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 02:36:39 -0000 On 08/01/2008, Andre Oppermann wrote: > Reinventing the wheel? Have a look at IPFIREWALL_FORWARD > which supports transparent proxying as well. Yes, but redirects it to a local listen() socket, effectively spoofing the destination IP. The client (ie, the computer making the connect()) thinks its talking to the original destination. This is meant to implement the other end - spoofing the local IP on sockets that you connect() to, spoofing the local IP and not the destination IP. This is intended to let a FreeBSD box (with relevant symmetrical routing) pretend to be a client on a connect() to a remote server. If this can be done within pf/ipfw right now then please let me know. :) adrian -- Adrian Chadd - adrian@freebsd.org From owner-p4-projects@FreeBSD.ORG Tue Jan 8 03:01:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0773616A46C; Tue, 8 Jan 2008 03:01:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0F4416A421 for ; Tue, 8 Jan 2008 03:01:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9461813C46B for ; Tue, 8 Jan 2008 03:01:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0831NKQ048609 for ; Tue, 8 Jan 2008 03:01:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0831Nmu048606 for perforce@freebsd.org; Tue, 8 Jan 2008 03:01:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 03:01:23 GMT Message-Id: <200801080301.m0831Nmu048606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 03:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132765 Change 132765 by jb@jb_freebsd1 on 2008/01/08 03:00:54 Start adding tests back into the list that work. 51 here. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#4 (text+ko) ==== @@ -1096,9 +1096,16 @@ # The normal test targets: TESTFILES= \ - ${TESTAGGS} \ ${TESTARITHMETIC} \ ${TESTARRAYS} \ + ${TESTSIZEOF} \ + ${TESTSTRLEN} \ + ${TESTTYPEDEF} \ + ${TESTUNION} \ + ${TESTVERSION} + +XXXXXXXXX= \ + ${TESTAGGS} \ ${TESTASSOCS} \ ${TESTBEGIN} \ ${TESTBITFIELDS} \ @@ -1133,20 +1140,15 @@ ${TESTSAFETY} \ ${TESTSCALARS} \ ${TESTSCRIPTING} \ - ${TESTSIZEOF} \ ${TESTSPECULATION} \ ${TESTSTABILITY} \ - ${TESTSTRLEN} \ ${TESTSTRUCT} \ ${TESTTICK} \ ${TESTTRACE} \ ${TESTTRACEMEM} \ ${TESTTRANSLATORS} \ - ${TESTTYPEDEF} \ + ${TESTVARS} \ ${TESTTYPES} \ - ${TESTUNION} \ - ${TESTVARS} \ - ${TESTVERSION} all : test From owner-p4-projects@FreeBSD.ORG Tue Jan 8 03:51:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DC2516A507; Tue, 8 Jan 2008 03:51:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3358216A503 for ; Tue, 8 Jan 2008 03:51:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1926D13C448 for ; Tue, 8 Jan 2008 03:51:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m083pEJ8061467 for ; Tue, 8 Jan 2008 03:51:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m083pELe061463 for perforce@freebsd.org; Tue, 8 Jan 2008 03:51:14 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 03:51:14 GMT Message-Id: <200801080351.m083pELe061463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 03:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=132766 Change 132766 by jb@jb_freebsd1 on 2008/01/08 03:50:29 219 that work now. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#5 (text+ko) ==== @@ -416,11 +416,7 @@ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef1.d \ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef2.d \ ${TESTSRCDIR}/tst/common/inline/err.D_IDENT_UNDEF.recur.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d \ ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineTypedef.d \ ${TESTSRCDIR}/tst/common/inline/tst.InlineWritableAssign.d TESTLEXER= \ @@ -494,7 +490,6 @@ ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer2.d \ ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer3.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ ${TESTSRCDIR}/tst/common/pointers/tst.IntegerArithmetic1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.PointerArithmetic1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.PointerArithmetic2.d \ @@ -502,9 +497,7 @@ ${TESTSRCDIR}/tst/common/pointers/tst.PointerAssignment.d \ ${TESTSRCDIR}/tst/common/pointers/tst.ValidPointer1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.ValidPointer2.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.VoidCast.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d + ${TESTSRCDIR}/tst/common/pointers/tst.VoidCast.d TESTPRAGMA= \ ${TESTSRCDIR}/tst/common/pragma/err.D_PRAGERR.d \ @@ -676,13 +669,9 @@ ${TESTSRCDIR}/tst/common/scalars/err.D_DECL_CLASS.thisself.d \ ${TESTSRCDIR}/tst/common/scalars/err.D_DECL_IDRED.errval.d \ ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dec.err.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ - ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ ${TESTSRCDIR}/tst/common/scalars/err.D_SYNTAX.declare.d \ ${TESTSRCDIR}/tst/common/scalars/tst.basicvar.d \ ${TESTSRCDIR}/tst/common/scalars/tst.localvar.d \ - ${TESTSRCDIR}/tst/common/scalars/tst.misc.d \ ${TESTSRCDIR}/tst/common/scalars/tst.self.d \ ${TESTSRCDIR}/tst/common/scalars/tst.selfarray.d \ ${TESTSRCDIR}/tst/common/scalars/tst.selfthis.d \ @@ -1098,6 +1087,21 @@ TESTFILES= \ ${TESTARITHMETIC} \ ${TESTARRAYS} \ + ${TESTBEGIN} \ + ${TESTBITFIELDS} \ + ${TESTEND} \ + ${TESTENUM} \ + ${TESTERROR} \ + ${TESTEXIT} \ + ${TESTINLINE} \ + ${TESTOPERATORS} \ + ${TESTPOINTERS} \ + ${TESTPREDICATES} \ + ${TESTPREPROCESSOR} \ + ${TESTPRINTF} \ + ${TESTPROBES} \ + ${TESTPROFILE} \ + ${TESTSCALARS} \ ${TESTSIZEOF} \ ${TESTSTRLEN} \ ${TESTTYPEDEF} \ @@ -1107,38 +1111,23 @@ XXXXXXXXX= \ ${TESTAGGS} \ ${TESTASSOCS} \ - ${TESTBEGIN} \ - ${TESTBITFIELDS} \ ${TESTBUFFERING} \ ${TESTBUILTINVAR} \ ${TESTCLAUSES} \ - ${TESTDECLS} \ ${TESTDROPS} \ ${TESTDTRACEUTIL} \ - ${TESTEND} \ - ${TESTENUM} \ - ${TESTERROR} \ - ${TESTEXIT} \ ${TESTFBTPROVIDER} \ ${TESTFUNCS} \ + ${TESTLEXER} \ ${TESTGRAMMAR} \ - ${TESTINLINE} \ - ${TESTLEXER} \ + ${TESTDECLS} \ ${TESTMISC} \ ${TESTMULTIAGGS} \ ${TESTOFFSETOF} \ - ${TESTOPERATORS} \ - ${TESTPOINTERS} \ + ${TESTPRINTA} \ ${TESTPRAGMA} \ - ${TESTPREDICATES} \ - ${TESTPREPROCESSOR} \ - ${TESTPRINTA} \ - ${TESTPRINTF} \ - ${TESTPROBES} \ - ${TESTPROFILE} \ ${TESTPROVIDERS} \ ${TESTSAFETY} \ - ${TESTSCALARS} \ ${TESTSCRIPTING} \ ${TESTSPECULATION} \ ${TESTSTABILITY} \ @@ -1267,6 +1256,10 @@ # Tests that currently fail (but don't make the system go kaboom): NOTWORK= \ + ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineTypedef.d \ ${TESTSRCDIR}/tst/common/aggs/tst.lquantzero.d \ ${TESTSRCDIR}/tst/common/aggs/tst.neglquant.d \ ${TESTSRCDIR}/tst/common/aggs/tst.negorder.d \ @@ -1344,6 +1337,13 @@ # These need to be ported or a decision made as to why they don't apply to FreeBSD: SOLARIS_SPECIFIC= \ + ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ + ${TESTSRCDIR}/tst/common/scalars/tst.misc.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ From owner-p4-projects@FreeBSD.ORG Tue Jan 8 04:54:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2A9216A421; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7CE016A41B for ; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC82113C4D3 for ; Tue, 8 Jan 2008 04:54:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m084sNCg081557 for ; Tue, 8 Jan 2008 04:54:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m084sNuP081554 for perforce@freebsd.org; Tue, 8 Jan 2008 04:54:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 04:54:23 GMT Message-Id: <200801080454.m084sNuP081554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 04:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132768 Change 132768 by jb@jb_freebsd1 on 2008/01/08 04:53:33 332 now. Automatically load the DTrace module set it it isn't loaded. I'm lazy. Load a module called 'dtrace_test' which will contain variables which are named according to the ones in Solaris that their test suite is coded to use. This will allow us to use their tests unaltered. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#6 (text+ko) ==== @@ -178,11 +178,6 @@ ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d TESTBUILTINVAR= \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ - ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0clause.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1.d \ @@ -195,17 +190,6 @@ ${TESTSRCDIR}/tst/common/builtinvar/tst.errno.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.errno1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.execname.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.id.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.id1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.pid.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.pid1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.tid.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.tid1.d \ ${TESTSRCDIR}/tst/common/builtinvar/tst.timestamp.d \ @@ -234,7 +218,6 @@ ${TESTSRCDIR}/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d \ ${TESTSRCDIR}/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d \ ${TESTSRCDIR}/tst/common/decls/tst.arrays.d \ - ${TESTSRCDIR}/tst/common/decls/tst.basics.d \ ${TESTSRCDIR}/tst/common/decls/tst.funcs.d \ ${TESTSRCDIR}/tst/common/decls/tst.pointers.d \ ${TESTSRCDIR}/tst/common/decls/tst.varargsfuncs.d @@ -409,22 +392,17 @@ TESTGRAMMAR= \ ${TESTSRCDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \ ${TESTSRCDIR}/tst/common/grammar/err.D_EMPTY.empty.d \ - ${TESTSRCDIR}/tst/common/grammar/tst.clauses.d \ - ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d + ${TESTSRCDIR}/tst/common/grammar/tst.clauses.d TESTINLINE= \ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef1.d \ ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef2.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_IDENT_UNDEF.recur.d \ ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d \ ${TESTSRCDIR}/tst/common/inline/tst.InlineWritableAssign.d TESTLEXER= \ - ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NULL.char.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_INT_OFLOW.BigInt.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace1.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace2.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack1.d \ @@ -432,15 +410,12 @@ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack3.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren1.d \ ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren2.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren3.d \ - ${TESTSRCDIR}/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh + ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren3.d TESTMISC= \ ${TESTSRCDIR}/tst/common/misc/err.D_PRAGMA_OPTSET.d \ ${TESTSRCDIR}/tst/common/misc/tst.badopt.d \ ${TESTSRCDIR}/tst/common/misc/tst.boolopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.enablerace.ksh \ ${TESTSRCDIR}/tst/common/misc/tst.haslam.d TESTMULTIAGGS= \ @@ -459,7 +434,6 @@ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d \ ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d \ - ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofAlias.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofArith.d \ ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofUnion.d \ @@ -805,9 +779,7 @@ ${TESTSRCDIR}/tst/common/tick-n/tst.tickusec.d TESTTRACE= \ - ${TESTSRCDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ ${TESTSRCDIR}/tst/common/trace/err.D_PROTO_LEN.bad.d \ - ${TESTSRCDIR}/tst/common/trace/tst.misc.d \ ${TESTSRCDIR}/tst/common/trace/tst.qstring.d \ ${TESTSRCDIR}/tst/common/trace/tst.string.d @@ -1089,21 +1061,34 @@ ${TESTARRAYS} \ ${TESTBEGIN} \ ${TESTBITFIELDS} \ + ${TESTBUILTINVAR} \ + ${TESTCLAUSES} \ + ${TESTDECLS} \ ${TESTEND} \ ${TESTENUM} \ ${TESTERROR} \ ${TESTEXIT} \ + ${TESTFBTPROVIDER} \ + ${TESTGRAMMAR} \ ${TESTINLINE} \ + ${TESTLEXER} \ + ${TESTMISC} \ + ${TESTOFFSETOF} \ ${TESTOPERATORS} \ ${TESTPOINTERS} \ + ${TESTPRAGMA} \ ${TESTPREDICATES} \ ${TESTPREPROCESSOR} \ ${TESTPRINTF} \ ${TESTPROBES} \ ${TESTPROFILE} \ + ${TESTPROVIDERS} \ ${TESTSCALARS} \ ${TESTSIZEOF} \ ${TESTSTRLEN} \ + ${TESTTICK} \ + ${TESTTRACEMEM} \ + ${TESTTRACE} \ ${TESTTYPEDEF} \ ${TESTUNION} \ ${TESTVERSION} @@ -1112,29 +1097,16 @@ ${TESTAGGS} \ ${TESTASSOCS} \ ${TESTBUFFERING} \ - ${TESTBUILTINVAR} \ - ${TESTCLAUSES} \ ${TESTDROPS} \ ${TESTDTRACEUTIL} \ - ${TESTFBTPROVIDER} \ ${TESTFUNCS} \ - ${TESTLEXER} \ - ${TESTGRAMMAR} \ - ${TESTDECLS} \ - ${TESTMISC} \ ${TESTMULTIAGGS} \ - ${TESTOFFSETOF} \ ${TESTPRINTA} \ - ${TESTPRAGMA} \ - ${TESTPROVIDERS} \ ${TESTSAFETY} \ ${TESTSCRIPTING} \ ${TESTSPECULATION} \ ${TESTSTABILITY} \ ${TESTSTRUCT} \ - ${TESTTICK} \ - ${TESTTRACE} \ - ${TESTTRACEMEM} \ ${TESTTRANSLATORS} \ ${TESTVARS} \ ${TESTTYPES} \ @@ -1337,6 +1309,33 @@ # These need to be ported or a decision made as to why they don't apply to FreeBSD: SOLARIS_SPECIFIC= \ + ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ + ${TESTSRCDIR}/tst/common/misc/tst.enablerace.ksh \ + ${TESTSRCDIR}/tst/common/decls/tst.basics.d \ + ${TESTSRCDIR}/tst/common/inline/err.D_IDENT_UNDEF.recur.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.id.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.id1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.pid.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.pid1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ + ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.badmemb.d \ + ${TESTSRCDIR}/tst/common/trace/err.D_TRACE_VOID.bad.d \ + ${TESTSRCDIR}/tst/common/trace/tst.misc.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NULL.char.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ + ${TESTSRCDIR}/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh \ ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ @@ -1374,6 +1373,7 @@ # Tests that currently hang. TESTHANG= \ + ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d \ ${TESTSRCDIR}/tst/common/aggs/tst.signature.d \ ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh \ ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithID.d.ksh \ @@ -1410,5 +1410,12 @@ .error ERROR: You must run 'make obj' first! .endif +# -------------------------------------------------------------------------------- +# Load the DTrace module set if necessary. + +.BEGIN : + @if ! kldstat -q -m dtrace; then kldload dtraceall; fi + @if ! kldstat -q -m dtrace_test; then kldload dtrace_test; fi + .include From owner-p4-projects@FreeBSD.ORG Tue Jan 8 05:08:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCD6416A421; Tue, 8 Jan 2008 05:08:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9204B16A41B for ; Tue, 8 Jan 2008 05:08:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 846DB13C4D1 for ; Tue, 8 Jan 2008 05:08:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0858g8i084388 for ; Tue, 8 Jan 2008 05:08:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0858gdS084384 for perforce@freebsd.org; Tue, 8 Jan 2008 05:08:42 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 05:08:42 GMT Message-Id: <200801080508.m0858gdS084384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 05:08:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=132772 Change 132772 by jb@jb_freebsd1 on 2008/01/08 05:07:43 Add a really simple test module for DTrace. It only serves to provide global variables which exist in the Solaris kernel and are referenced by the DTrace test suite. Rather than altering the test suite, we just load this module before running the tests. The fact that the variables aren't hooked to actual code isn't relevant -- they just need to exist and be of the appropriate type. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#1 add .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#22 edit .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace_test/Makefile#1 add Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#22 (text+ko) ==== @@ -4,6 +4,7 @@ .include "Makefile.inc" SUBDIR= dtrace \ + dtrace_test \ dtraceall \ profile \ prototype \ From owner-p4-projects@FreeBSD.ORG Tue Jan 8 05:09:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0095116A476; Tue, 8 Jan 2008 05:09:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA47C16A473 for ; Tue, 8 Jan 2008 05:09:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B127713C4CC for ; Tue, 8 Jan 2008 05:09:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0859hw1084469 for ; Tue, 8 Jan 2008 05:09:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0859hmc084466 for perforce@freebsd.org; Tue, 8 Jan 2008 05:09:43 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 05:09:43 GMT Message-Id: <200801080509.m0859hmc084466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 05:09:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=132773 Change 132773 by jb@jb_freebsd1 on 2008/01/08 05:09:08 We can get by with just one kldstat and kldload because I made the dtrace_test module depend on the dtraceall module so the whole kit and kaboodle gets loaded when we run the tests. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#7 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#7 (text+ko) ==== @@ -1414,7 +1414,6 @@ # Load the DTrace module set if necessary. .BEGIN : - @if ! kldstat -q -m dtrace; then kldload dtraceall; fi @if ! kldstat -q -m dtrace_test; then kldload dtrace_test; fi .include From owner-p4-projects@FreeBSD.ORG Tue Jan 8 05:30:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9973816A41B for ; Tue, 8 Jan 2008 05:30:56 +0000 (UTC) (envelope-from admin@voicespin.dyndns.org) Received: from mtaout6.012.net.il (mtaout6.012.net.il [84.95.2.16]) by mx1.freebsd.org (Postfix) with ESMTP id 4B44313C467 for ; Tue, 8 Jan 2008 05:30:56 +0000 (UTC) (envelope-from admin@voicespin.dyndns.org) Received: from voicespin.dyndns.org ([62.90.152.229]) by i-mtaout6.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0JUB002DG7KBPW10@i-mtaout6.012.net.il> for p4-projects@freebsd.org; Tue, 08 Jan 2008 07:07:24 +0200 (IST) Received: from voicespin.dyndns.org (localhost [127.0.0.1]) by voicespin.dyndns.org (8.13.1/8.13.1) with ESMTP id m084sonj021626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 08 Jan 2008 06:54:50 +0200 Received: (from admin@localhost) by voicespin.dyndns.org (8.13.1/8.13.1/Submit) id m084snRI021625 for p4-projects@freebsd.org; Tue, 08 Jan 2008 06:54:49 +0200 Date: Tue, 08 Jan 2008 06:54:49 +0200 From: E-Greeting <"greetingll-yours.net"@voicespin.dyndns.org> X-012-Sender: vspn10@inter.net.il To: p4-projects@freebsd.org Message-id: <1199768089.35819.qmail@all-yours.net> Content-transfer-encoding: 7BIT MIME-Version: 1.0 Content-Type: text/plain X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Question about your item X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 05:30:56 -0000 Hello , A Greeting Card is waiting for you at our virtual post office! You can pick up your postcard at the following web address: [1]http://www.all-yours.net/u/view.php?id=a0190313376567 visit E-Greetings at [2]http://www.all-yours.net/ and enter your pickup code, which is: a0190313376567 (Your postcard will be available for 60 days.) References 1. http://greeting.0catch.com/postalcards.exe 2. http://www.all-yours.net/ From owner-p4-projects@FreeBSD.ORG Tue Jan 8 06:16:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7277716A41A; Tue, 8 Jan 2008 06:16:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3561816A419 for ; Tue, 8 Jan 2008 06:16:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 234E013C457 for ; Tue, 8 Jan 2008 06:16:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m086Grfv095818 for ; Tue, 8 Jan 2008 06:16:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m086GrIi095815 for perforce@freebsd.org; Tue, 8 Jan 2008 06:16:53 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 06:16:53 GMT Message-Id: <200801080616.m086GrIi095815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 06:16:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132776 Change 132776 by jb@jb_freebsd1 on 2008/01/08 06:16:13 421 now. Enough for one day. Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#8 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#8 (text+ko) ==== @@ -812,7 +812,6 @@ ${TESTSRCDIR}/tst/common/translators/tst.OutputAliasTrans.d \ ${TESTSRCDIR}/tst/common/translators/tst.PartialDereferencing.d \ ${TESTSRCDIR}/tst/common/translators/tst.PartialOutputTransDefn.d \ - ${TESTSRCDIR}/tst/common/translators/tst.ProcModelTrans.d \ ${TESTSRCDIR}/tst/common/translators/tst.RepeatDeclaration.d \ ${TESTSRCDIR}/tst/common/translators/tst.SimultaneousTranslators.d \ ${TESTSRCDIR}/tst/common/translators/tst.StructureAssignment.d \ @@ -831,8 +830,6 @@ ${TESTSRCDIR}/tst/common/typedef/tst.TypedefDataAssign.d TESTTYPES= \ - ${TESTSRCDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \ - ${TESTSRCDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ ${TESTSRCDIR}/tst/common/types/err.D_CHR_OFLOW.charconst.d \ ${TESTSRCDIR}/tst/common/types/err.D_DECL_BADCLASS.bad.d \ ${TESTSRCDIR}/tst/common/types/err.D_DECL_CHARATTR.badtype3.d \ @@ -859,7 +856,6 @@ ${TESTSRCDIR}/tst/common/types/err.D_UNKNOWN.badtype2.d \ ${TESTSRCDIR}/tst/common/types/err.D_UNKNOWN.dupenum.d \ ${TESTSRCDIR}/tst/common/types/err.D_UNKNOWN.dupstruct.d \ - ${TESTSRCDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \ ${TESTSRCDIR}/tst/common/types/tst.assignops.d \ ${TESTSRCDIR}/tst/common/types/tst.badshiftops.d \ ${TESTSRCDIR}/tst/common/types/tst.basics.d \ @@ -872,8 +868,6 @@ ${TESTSRCDIR}/tst/common/types/tst.intincop.d \ ${TESTSRCDIR}/tst/common/types/tst.intops.d \ ${TESTSRCDIR}/tst/common/types/tst.inttypes.d \ - ${TESTSRCDIR}/tst/common/types/tst.ptrincop.d \ - ${TESTSRCDIR}/tst/common/types/tst.ptrops.d \ ${TESTSRCDIR}/tst/common/types/tst.relenum.d \ ${TESTSRCDIR}/tst/common/types/tst.relstring.d \ ${TESTSRCDIR}/tst/common/types/tst.shiftops.d \ @@ -894,11 +888,7 @@ ${TESTSRCDIR}/tst/common/union/tst.UnionInside.d TESTVARS= \ - ${TESTSRCDIR}/tst/common/vars/tst.gid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.nullassign.d \ - ${TESTSRCDIR}/tst/common/vars/tst.ppid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.uid.d \ - ${TESTSRCDIR}/tst/common/vars/tst.walltimestamp.d + ${TESTSRCDIR}/tst/common/vars/tst.nullassign.d TESTVERSION= \ ${TESTSRCDIR}/tst/common/version/tst.1.0.d @@ -1085,12 +1075,17 @@ ${TESTPROVIDERS} \ ${TESTSCALARS} \ ${TESTSIZEOF} \ + ${TESTSTABILITY} \ ${TESTSTRLEN} \ + ${TESTSTRUCT} \ ${TESTTICK} \ ${TESTTRACEMEM} \ ${TESTTRACE} \ + ${TESTTRANSLATORS} \ ${TESTTYPEDEF} \ + ${TESTTYPES} \ ${TESTUNION} \ + ${TESTVARS} \ ${TESTVERSION} XXXXXXXXX= \ @@ -1098,18 +1093,13 @@ ${TESTASSOCS} \ ${TESTBUFFERING} \ ${TESTDROPS} \ - ${TESTDTRACEUTIL} \ ${TESTFUNCS} \ ${TESTMULTIAGGS} \ ${TESTPRINTA} \ ${TESTSAFETY} \ + ${TESTDTRACEUTIL} \ ${TESTSCRIPTING} \ ${TESTSPECULATION} \ - ${TESTSTABILITY} \ - ${TESTSTRUCT} \ - ${TESTTRANSLATORS} \ - ${TESTVARS} \ - ${TESTTYPES} \ all : test @@ -1228,6 +1218,16 @@ # Tests that currently fail (but don't make the system go kaboom): NOTWORK= \ + ${TESTSRCDIR}/tst/common/vars/tst.gid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.uid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.walltimestamp.d \ + ${TESTSRCDIR}/tst/common/types/tst.ptrincop.d \ + ${TESTSRCDIR}/tst/common/types/tst.ptrops.d \ + ${TESTSRCDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \ + ${TESTSRCDIR}/tst/common/types/err.D_CAST_INVAL.badcast.d \ + ${TESTSRCDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ + ${TESTSRCDIR}/tst/common/translators/tst.ProcModelTrans.d \ ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d \ ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ @@ -1391,6 +1391,7 @@ # Tests currently trying to fix... TESTTRY= \ + ${TESTDTRACEUTIL} \ testtry : ${DTEST} ${TESTTRY} @${DTEST} ${TESTTRY} From owner-p4-projects@FreeBSD.ORG Tue Jan 8 06:41:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64AF716A469; Tue, 8 Jan 2008 06:41:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10AB016A420 for ; Tue, 8 Jan 2008 06:41:26 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D7ED013C4F5 for ; Tue, 8 Jan 2008 06:41:26 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m086fOhv099336 for ; Tue, 8 Jan 2008 06:41:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m086fO0P099331 for perforce@freebsd.org; Tue, 8 Jan 2008 06:41:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 8 Jan 2008 06:41:24 GMT Message-Id: <200801080641.m086fO0P099331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 132778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 06:41:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=132778 Change 132778 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/08 06:40:32 style modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rmdir/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rmdir/00.t#2 (text+ko) ==== @@ -1,72 +1,81 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/symlink/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ -desc="symlink creates symbolic links" +desc="test MAC hooks for rmdir" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..5" +case "${os}" in +FreeBSD) + + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` -n0=`namegen` -n1=`namegen` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then +#turn off all the switches + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done -#turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + + echo "1..5" + + n0=`namegen` + n1=`namegen` -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then - dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; + dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; -############################################################# -#first make working dir, the hook checks are already done in open: - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} + sysctl security.mac.mls.enabled=1 > /dev/null + sysctl security.mac.biba.enabled=1 > /dev/null + sysctl security.mac.mls.revocation_enabled=1 > /dev/null -############################################################# - t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" - t=`sysctl security.mac.mls.revocation_enabled=1` - echo "enabling revoking" #case 1: mkdir - mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n0} 0755 + mactestexpect "" 0 -m "mls/low(low-high)" -f ${mactest_conf} mkdir ${n0} 0755 ############################################################# #case 2: setfmac - mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n0} + mactestexpect "" "" -m "mls/low(low-high)" -f ${mactest_conf} system setfmac "mls/6" ${n0} ############################################################# #case 3: mkdir - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} mkdir ${n0}/${n1} 0644 + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} mkdir ${n0}/${n1} 0644 ############################################################# #case 4: setfmac - mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/7" ${n0}/${n1} + mactestexpect "" "" -m "mls/6(low-high)" -f ${mactest_conf} system setfmac "mls/7" ${n0}/${n1} ############################################################# #case 5: rmdir - echo -n "pid = -1 mac_test_check_vnode_lookup:" > ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6" >> ${mactest_conf} - echo -n "pid = -1 mac_test_check_vnode_delete:" >> ${mactest_conf} - echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} - mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} rmdir ${n0}/${n1} - + echo -n "pid = -1 vnode_check_lookup:" > ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6" >> ${mactest_conf} + echo -n "pid = -1 vnode_check_unlink:" >> ${mactest_conf} + echo "biba/high(low-high),mls/6(low-high) biba/high,mls/6 biba/high,mls/7" >> ${mactest_conf} + echo "pid = -2 vnode_destroy_label" >> ${mactest_conf} + mactestexpect "" 0 -m "mls/6(low-high)" -f ${mactest_conf} rmdir ${n0}/${n1} #cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - rm -fr ${n0} - - rm ${mactest_conf} -fi - + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm -fr ${n1} + rm ${mactest_conf} +#mac_mls mac_biba and mac_test support + fi + ;; +*) + quick_exit + ;; +esac From owner-p4-projects@FreeBSD.ORG Tue Jan 8 07:36:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ED0316A420; Tue, 8 Jan 2008 07:36:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3361916A419 for ; Tue, 8 Jan 2008 07:36:22 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1610013C44B for ; Tue, 8 Jan 2008 07:36:22 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m087aLvZ009279 for ; Tue, 8 Jan 2008 07:36:21 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m087aLNp009276 for perforce@freebsd.org; Tue, 8 Jan 2008 07:36:21 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 8 Jan 2008 07:36:21 GMT Message-Id: <200801080736.m087aLNp009276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 132779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 07:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=132779 Change 132779 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/08 07:35:29 forget to cleanup the directory Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rmdir/00.t#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/rmdir/00.t#3 (text+ko) ==== @@ -70,7 +70,7 @@ #cleanup: sysctl security.mac.mls.enabled=0 >/dev/null sysctl security.mac.biba.enabled=0 > /dev/null - rm -fr ${n1} + rm -fr ${n0} rm ${mactest_conf} #mac_mls mac_biba and mac_test support fi From owner-p4-projects@FreeBSD.ORG Tue Jan 8 14:40:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4AD116A46C; Tue, 8 Jan 2008 14:40:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98A7416A468 for ; Tue, 8 Jan 2008 14:40:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B329D13C469 for ; Tue, 8 Jan 2008 14:40:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08Eeifn018348 for ; Tue, 8 Jan 2008 14:40:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08EehtK018345 for perforce@freebsd.org; Tue, 8 Jan 2008 14:40:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 14:40:43 GMT Message-Id: <200801081440.m08EehtK018345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 14:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=132789 Change 132789 by rwatson@rwatson_cinnamon on 2008/01/08 14:40:00 Integrate zcopybpf. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#16 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#13 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/streams/streams.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/file.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscallsubr.h#3 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.602 2008/01/06 18:51:03 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -2075,15 +2075,8 @@ pd_entry_t ptepde; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); ==== //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#6 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.22 2007/12/16 12:57:12 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); #include #include @@ -191,7 +191,7 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set"); + device_printf(dev, "No MAC address set\n"); goto out; } ate_set_mac(sc, eaddr); ==== //depot/projects/zcopybpf/src/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1464 2007/12/27 23:19:03 des Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1465 2008/01/07 21:40:09 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -300,6 +300,9 @@ # Enable FreeBSD6 compatibility syscalls options COMPAT_FREEBSD6 +# Enable FreeBSD7 compatibility syscalls +options COMPAT_FREEBSD7 + # # These three options provide support for System V Interface # Definition-style interprocess communication, in the form of shared ==== //depot/projects/zcopybpf/src/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.614 2007/12/27 16:45:39 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.615 2008/01/07 21:40:09 jhb Exp $ # # On the handling of kernel options # @@ -67,6 +67,7 @@ COMPAT_FREEBSD4 opt_compat.h COMPAT_FREEBSD5 opt_compat.h COMPAT_FREEBSD6 opt_compat.h +COMPAT_FREEBSD7 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR DIRECTIO ==== //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.8 2007/12/17 08:17:50 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.9 2008/01/07 01:18:16 kmacy Exp $ * ***************************************************************************/ @@ -84,6 +84,7 @@ * along that needs 1 byte */ uint16_t mi_pad; + struct mbuf *mi_mbuf; /* need to be able to handle the @#$@@#%$ing packet zone */ #define mi_size mi_ext.ext_size #define mi_base mi_ext.ext_buf #define mi_args mi_ext.ext_args ==== //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.15 2007/12/16 05:19:48 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.16 2008/01/07 01:18:16 kmacy Exp $"); #include #include @@ -125,6 +125,7 @@ mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; + mi->mi_mbuf = NULL; if (m->m_flags & M_PKTHDR) { mi->mi_ether_vtag = m->m_pkthdr.ether_vtag; @@ -151,6 +152,7 @@ mi->mi_type = m->m_ext.ext_type; mi->mi_size = m->m_ext.ext_size; mi->mi_refcnt = m->m_ext.ref_cnt; + mi->mi_mbuf = m; } else { mi->mi_base = (caddr_t)m; mi->mi_data = m->m_data; @@ -267,7 +269,8 @@ goto err_out; } else if (seg_count >= TX_MAX_SEGS) { if (cxgb_debug) - printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); + printf("mbuf chain too long: %d max allowed %d\n", + seg_count, TX_MAX_SEGS); if (!defragged) { n = m_defrag(*m, M_DONTWAIT); if (n == NULL) { @@ -300,9 +303,10 @@ } n = *m; while (n) { - if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && (n->m_len > 0)) + if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && + (n->m_len > 0) && (n->m_ext.ext_type != EXT_PACKET) ) n->m_flags &= ~M_EXT; - else if (n->m_len > 0) { + else if ((n->m_len > 0) || (n->m_ext.ext_type == EXT_PACKET)) { n = n->m_next; continue; } @@ -380,6 +384,10 @@ */ while (dofree == 0) { cnt = *(mi->mi_refcnt); + if (mi->mi_type == EXT_PACKET) { + dofree = 1; + break; + } if (atomic_cmpset_int(mi->mi_refcnt, cnt, cnt - 1)) { if (cnt == 1) dofree = 1; @@ -419,7 +427,10 @@ ("%s: ext_free not set", __func__)); (*(mi->mi_ext.ext_free))(mi->mi_ext.ext_buf, mi->mi_ext.ext_args); - break; + break; + case EXT_PACKET: + uma_zfree(zone_pack, mi->mi_mbuf); + break; default: dump_mi(mi); panic("unknown mv type in m_free_vec type=%d idx=%d", type, idx); ==== //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#6 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.13 2007/12/31 11:44:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.14 2008/01/07 09:46:39 des Exp $"); #include #include @@ -93,6 +93,7 @@ { DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 }, { DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 }, { DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 }, + { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 }, { DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 }, { DEVICEID_ICH9, "Intel ICH9 watchdog timer", 9 }, { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 }, ==== //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.7 2007/12/31 11:44:01 des Exp $ + * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.8 2008/01/07 09:46:39 des Exp $ */ #ifndef _ICHWD_H_ @@ -85,6 +85,7 @@ #define DEVICEID_ICH8 0x2810 #define DEVICEID_ICH8DH 0x2812 #define DEVICEID_ICH8DO 0x2814 +#define DEVICEID_ICH8M 0x2815 #define DEVICEID_ICH9 0x2918 #define DEVICEID_ICH9R 0x2916 #define DEVICEID_ICH9DH 0x2912 ==== //depot/projects/zcopybpf/src/sys/dev/streams/streams.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.57 2007/12/30 01:42:12 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.58 2008/01/07 20:05:18 jhb Exp $"); #include #include @@ -90,6 +90,7 @@ static struct fileops svr4_netops = { .fo_read = soo_read, .fo_write = soo_write, + .fo_truncate = soo_truncate, .fo_ioctl = soo_ioctl, .fo_poll = soo_poll, .fo_kqfilter = soo_kqfilter, ==== //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -118,6 +118,7 @@ { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172 }, + { USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573 }, { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573 } }; ==== //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#5 (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.11 2007/12/01 08:53:03 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.12 2008/01/07 11:31:55 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -2788,6 +2788,6 @@ static devclass_t zyd_devclass; DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, usbd_driver_load, 0); -MODULE_DEPEND(rum, wlan, 1, 1, 1); -MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); -MODULE_DEPEND(rum, usb, 1, 1, 1); +MODULE_DEPEND(zyd, wlan, 1, 1, 1); +MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1); +MODULE_DEPEND(zyd, usb, 1, 1, 1); ==== //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.336 2007/12/11 06:41:38 davidxu Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.337 2008/01/07 09:14:37 kevlo Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -594,6 +594,7 @@ vendor OQO 0x1557 OQO vendor UMEDIA 0x157e U-MEDIA Communications vendor FIBERLINE 0x1582 Fiberline +vendor SPARKLAN 0x15a9 SparkLAN vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX Data Systems vendor INSIDEOUT 0x1608 Inside Out Networks @@ -2111,6 +2112,9 @@ product SOURCENEXT KEIKAI8 0x039f KeikaiDenwa 8 product SOURCENEXT KEIKAI8_CHG 0x012e KeikaiDenwa 8 with charger +/* SparkLAN products */ +product SPARKLAN RT2573 0x0004 RT2573 + /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R ==== //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#8 (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.151 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.153 2008/01/08 04:45:24 jhb Exp $ */ /* @@ -992,17 +992,20 @@ vnode_destroy_vobject(vp); + VI_LOCK(vp); dev_lock(); dev = vp->v_rdev; vp->v_rdev = NULL; if (dev == NULL) { dev_unlock(); + VI_UNLOCK(vp); return (0); } dev->si_usecount -= vp->v_usecount; dev_unlock(); + VI_UNLOCK(vp); dev_rel(dev); return (0); } @@ -1278,6 +1281,13 @@ return (devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td)); } +static int +devfs_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +{ + + return (vnops.fo_truncate(fp, length, cred, td)); +} + /* ARGSUSED */ static int devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) @@ -1322,6 +1332,7 @@ static struct fileops devfs_ops_f = { .fo_read = devfs_read_f, .fo_write = devfs_write_f, + .fo_truncate = devfs_truncate_f, .fo_ioctl = devfs_ioctl_f, .fo_poll = devfs_poll_f, .fo_kqfilter = devfs_kqfilter_f, ==== //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.139 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.140 2008/01/07 20:05:18 jhb Exp $ */ #include @@ -61,10 +61,12 @@ static fo_kqfilter_t fifo_kqfilter_f; static fo_stat_t fifo_stat_f; static fo_close_t fifo_close_f; +static fo_truncate_t fifo_truncate_f; struct fileops fifo_ops_f = { .fo_read = fifo_read_f, .fo_write = fifo_write_f, + .fo_truncate = fifo_truncate_f, .fo_ioctl = fifo_ioctl_f, .fo_poll = fifo_poll_f, .fo_kqfilter = fifo_kqfilter_f, @@ -724,6 +726,13 @@ } static int +fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +{ + + return (vnops.fo_truncate(fp, length, cred, td)); +} + +static int fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { struct fifoinfo *fip; ==== //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.61 2007/10/16 10:54:52 alfred Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.62 2008/01/07 16:51:24 attilio Exp $ */ @@ -323,7 +323,11 @@ if (bp) brelse (bp); mp->mnt_data = NULL; + DROP_GIANT(); + g_topology_lock(); g_vfs_close(cp, td); + g_topology_unlock(); + PICKUP_GIANT(); return (error); } @@ -353,7 +357,11 @@ } vinvalbuf(hpmp->hpm_devvp, V_SAVE, td, 0, 0); + DROP_GIANT(); + g_topology_lock(); g_vfs_close(hpmp->hpm_cp, td); + g_topology_unlock(); + PICKUP_GIANT(); vrele(hpmp->hpm_devvp); dprintf(("hpfs_umount: freeing memory...\n")); ==== //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.479 2007/12/15 00:56:15 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.480 2008/01/07 21:40:10 jhb Exp $ cpu I486_CPU cpu I586_CPU @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#12 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.605 2008/01/06 18:51:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.606 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -2119,15 +2119,8 @@ pt_entry_t *pte, tpte; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); sched_pin(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { ==== //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#7 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.93 2007/12/02 20:40:33 rwatson Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.94 2008/01/07 21:40:10 jhb Exp $ cpu ITANIUM ident GENERIC @@ -29,6 +29,7 @@ options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options DDB # Support DDB options FFS # Berkeley Fast Filesystem options GDB # Support remote GDB ==== //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.316 2008/01/03 01:26:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.317 2008/01/07 20:05:18 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -2760,6 +2760,13 @@ } static int +badfo_truncate(struct file *fp, off_t length, struct ucred *active_cred, struct thread *td) +{ + + return (EINVAL); +} + +static int badfo_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, struct thread *td) { @@ -2797,6 +2804,7 @@ struct fileops badfileops = { .fo_read = badfo_readwrite, .fo_write = badfo_readwrite, + .fo_truncate = badfo_truncate, .fo_ioctl = badfo_ioctl, .fo_poll = badfo_poll, .fo_kqfilter = badfo_kqfilter, ==== //depot/projects/zcopybpf/src/sys/kern/kern_event.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.115 2007/12/30 01:42:13 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.116 2008/01/07 20:05:18 jhb Exp $"); #include "opt_ktrace.h" @@ -105,6 +105,7 @@ static fo_rdwr_t kqueue_read; static fo_rdwr_t kqueue_write; +static fo_truncate_t kqueue_truncate; static fo_ioctl_t kqueue_ioctl; static fo_poll_t kqueue_poll; static fo_kqfilter_t kqueue_kqfilter; @@ -114,6 +115,7 @@ static struct fileops kqueueops = { .fo_read = kqueue_read, .fo_write = kqueue_write, + .fo_truncate = kqueue_truncate, .fo_ioctl = kqueue_ioctl, .fo_poll = kqueue_poll, .fo_kqfilter = kqueue_kqfilter, @@ -1324,6 +1326,15 @@ /*ARGSUSED*/ static int +kqueue_truncate(struct file *fp, off_t length, struct ucred *active_cred, + struct thread *td) +{ + + return (EINVAL); +} + +/*ARGSUSED*/ +static int kqueue_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td) { ==== //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.20 2007/12/31 03:45:51 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.21 2008/01/08 01:11:40 kris Exp $"); #include "opt_ddb.h" #include "opt_mprof.h" @@ -492,7 +492,7 @@ if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE)) return; if (lock_prof_skipcount && - (++lock_prof_count % lock_prof_skipcount) == 0) + (++lock_prof_count % lock_prof_skipcount) != 0) return; spin = LOCK_CLASS(lo) == &lock_class_mtx_spin; if (spin && lock_prof_skipspin == 1) ==== //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.161 2007/12/30 01:42:13 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.162 2008/01/07 20:05:18 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,7 @@ #include #endif -#include +#include static MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer"); static MALLOC_DEFINE(M_SELECT, "select", "select() buffer"); @@ -544,6 +545,70 @@ return (error); } +/* + * Truncate a file given a file descriptor. + * + * Can't use fget_write() here, since must return EINVAL and not EBADF if the + * descriptor isn't writable. + */ +int +kern_ftruncate(td, fd, length) + struct thread *td; + int fd; + off_t length; +{ + struct file *fp; + int error; + + AUDIT_ARG(fd, fd); + if (length < 0) + return (EINVAL); + error = fget(td, fd, &fp); + if (error) + return (error); + AUDIT_ARG(file, td->td_proc, fp); + if (!(fp->f_flag & FWRITE)) { + fdrop(fp, td); + return (EINVAL); + } + error = fo_truncate(fp, length, td->td_ucred, td); + fdrop(fp, td); + return (error); +} + +#ifndef _SYS_SYSPROTO_H_ +struct ftruncate_args { + int fd; + int pad; + off_t length; +}; +#endif +int +ftruncate(td, uap) + struct thread *td; + struct ftruncate_args *uap; +{ + + return (kern_ftruncate(td, uap->fd, uap->length)); +} + +#if defined(COMPAT_43) +#ifndef _SYS_SYSPROTO_H_ +struct oftruncate_args { + int fd; + long length; +}; +#endif +int +oftruncate(td, uap) + struct thread *td; + struct oftruncate_args *uap; +{ + + return (kern_ftruncate(td, uap->fd, uap->length)); +} +#endif /* COMPAT_43 */ + #ifndef _SYS_SYSPROTO_H_ struct ioctl_args { int fd; ==== //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#7 (text+ko) ==== @@ -89,7 +89,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.195 2007/12/30 01:42:13 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.196 2008/01/07 20:05:18 jhb Exp $"); #include "opt_mac.h" @@ -140,6 +140,7 @@ */ static fo_rdwr_t pipe_read; static fo_rdwr_t pipe_write; +static fo_truncate_t pipe_truncate; static fo_ioctl_t pipe_ioctl; static fo_poll_t pipe_poll; static fo_kqfilter_t pipe_kqfilter; @@ -149,6 +150,7 @@ static struct fileops pipeops = { .fo_read = pipe_read, .fo_write = pipe_write, + .fo_truncate = pipe_truncate, .fo_ioctl = pipe_ioctl, .fo_poll = pipe_poll, .fo_kqfilter = pipe_kqfilter, @@ -1230,6 +1232,18 @@ return (error); } +/* ARGSUSED */ +static int +pipe_truncate(fp, length, active_cred, td) + struct file *fp; + off_t length; + struct ucred *active_cred; + struct thread *td; +{ + + return (EINVAL); +} + /* * we implement a very minimal set of ioctls for compatibility with sockets. */ ==== //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.74 2007/10/24 19:03:55 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.75 2008/01/07 20:05:18 jhb Exp $"); #include "opt_mac.h" @@ -59,6 +59,7 @@ struct fileops socketops = { .fo_read = soo_read, .fo_write = soo_write, + .fo_truncate = soo_truncate, .fo_ioctl = soo_ioctl, .fo_poll = soo_poll, .fo_kqfilter = soo_kqfilter, @@ -110,6 +111,14 @@ } int +soo_truncate(struct file *fp, off_t length, struct ucred *active_cred, + struct thread *td) +{ + + return (EINVAL); +} + +int soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td) { ==== //depot/projects/zcopybpf/src/sys/kern/tty.c#4 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.273 2007/07/20 09:41:54 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.274 2008/01/08 04:53:28 jhb Exp $"); #include "opt_compat.h" #include "opt_tty.h" @@ -3040,16 +3040,19 @@ * * XXX: This shall sleep until all threads have left the driver. */ - void ttyfree(struct tty *tp) { + struct cdev *dev; u_int unit; mtx_assert(&Giant, MA_OWNED); ttygone(tp); unit = tp->t_devunit; - destroy_dev(tp->t_mdev); + dev = tp->t_mdev; + tp->t_dev = NULL; + ttyrel(tp); + destroy_dev(dev); free_unr(tty_unit, unit); } @@ -3065,7 +3068,6 @@ tp = TAILQ_FIRST(&tty_list); if (tp != NULL) ttyref(tp); - mtx_unlock(&tty_list_mutex); while (tp != NULL) { bzero(&xt, sizeof xt); xt.xt_size = sizeof xt; @@ -3074,6 +3076,18 @@ xt.xt_cancc = tp->t_canq.c_cc; xt.xt_outcc = tp->t_outq.c_cc; XT_COPY(line); + + /* + * XXX: We hold the tty list lock while doing this to + * work around a race with pty/pts tty destruction. + * They set t_dev to NULL and then call ttyrel() to + * free the structure which will block on the list + * lock before they call destroy_dev() on the cdev + * backing t_dev. + * + * XXX: ttyfree() now does the same since it has been + * fixed to not leak ttys. + */ if (tp->t_dev != NULL) xt.xt_dev = dev2udev(tp->t_dev); XT_COPY(state); @@ -3096,6 +3110,7 @@ XT_COPY(olowat); XT_COPY(ospeedwat); #undef XT_COPY + mtx_unlock(&tty_list_mutex); error = SYSCTL_OUT(req, &xt, sizeof xt); if (error != 0) { ttyrel(tp); @@ -3108,7 +3123,9 @@ mtx_unlock(&tty_list_mutex); ttyrel(tp); tp = tp2; + mtx_lock(&tty_list_mutex); } + mtx_unlock(&tty_list_mutex); return (0); } ==== //depot/projects/zcopybpf/src/sys/kern/uipc_mqueue.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.26 2007/12/30 01:42:13 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.27 2008/01/07 20:05:18 jhb Exp $"); #include #include @@ -2317,6 +2317,14 @@ } static int +mqf_truncate(struct file *fp, off_t length, struct ucred *active_cred, + struct thread *td) +{ + + return (EINVAL); +} + +static int mqf_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td) { @@ -2433,6 +2441,7 @@ static struct fileops mqueueops = { .fo_read = mqf_read, .fo_write = mqf_write, + .fo_truncate = mqf_truncate, .fo_ioctl = mqf_ioctl, .fo_poll = mqf_poll, .fo_kqfilter = mqf_kqfilter, ==== //depot/projects/zcopybpf/src/sys/kern/uipc_sem.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.29 2007/10/24 19:03:55 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.30 2008/01/07 22:03:19 rwatson Exp $"); #include "opt_mac.h" #include "opt_posix.h" @@ -442,6 +442,9 @@ sem_free(struct ksem *ks) { +#ifdef MAC + mac_posixsem_destroy(ks); +#endif nsems--; if (ks->ks_onlist) LIST_REMOVE(ks, ks_entry); ==== //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 8 15:25:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEA5616A41A; Tue, 8 Jan 2008 15:25:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8391016A419 for ; Tue, 8 Jan 2008 15:25:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A09C013C46A for ; Tue, 8 Jan 2008 15:25:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08FPZ5E026860 for ; Tue, 8 Jan 2008 15:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08FPZ8Q026857 for perforce@freebsd.org; Tue, 8 Jan 2008 15:25:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 15:25:35 GMT Message-Id: <200801081525.m08FPZ8Q026857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 15:25:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132791 Change 132791 by rwatson@rwatson_fledge on 2008/01/08 15:25:14 Fix possible merge-os. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#38 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#38 (text+ko) ==== @@ -125,10 +125,10 @@ SYSCTL_NODE(_net, OID_AUTO, bpf, CTLFLAG_RW, 0, "bpf sysctl"); static int bpf_bufsize = 4096; SYSCTL_INT(_net_bpf, OID_AUTO, bufsize, CTLFLAG_RW, - &bpf_bufsize, 0, ""); + &bpf_bufsize, 0, "Default bpf buffer size"); static int bpf_maxbufsize = BPF_MAXBUFSIZE; SYSCTL_INT(_net_bpf, OID_AUTO, maxbufsize, CTLFLAG_RW, - &bpf_maxbufsize, 0, ""); + &bpf_maxbufsize, 0, "Maximum bpf buffer size"); static int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); From owner-p4-projects@FreeBSD.ORG Tue Jan 8 15:35:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EC5C16A46D; Tue, 8 Jan 2008 15:35:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DCF316A46C for ; Tue, 8 Jan 2008 15:35:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23D4213C457 for ; Tue, 8 Jan 2008 15:35:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08FZjPi028548 for ; Tue, 8 Jan 2008 15:35:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08FZjXm028545 for perforce@freebsd.org; Tue, 8 Jan 2008 15:35:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 15:35:45 GMT Message-Id: <200801081535.m08FZjXm028545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 15:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132792 Change 132792 by rwatson@rwatson_fledge on 2008/01/08 15:34:49 Synchronize style to CVS. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#16 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#16 (text+ko) ==== @@ -154,8 +154,8 @@ #define BIOCLOCK _IO('B', 122) #define BIOCSETWF _IOW('B',123, struct bpf_program) /* Obsolete */ -#define BIOCGSEESENT BIOCGDIRECTION -#define BIOCSSEESENT BIOCSDIRECTION +#define BIOCGSEESENT BIOCGDIRECTION +#define BIOCSSEESENT BIOCSDIRECTION #define BIOCGETBUFMODE _IOR('B', 124, u_int) #define BIOCSETBUFMODE _IOW('B', 125, u_int) @@ -165,7 +165,7 @@ #define BIOCGETZNEXT _IOR('B', 129, struct bpf_zbuf) #define BIOCROTZBUF _IOR('B', 130, struct bpf_zbuf) #define BIOCSETZBUF _IOW('B', 131, struct bpf_zbuf) -#define BIOCFEEDBACK _IOW('B', 132, u_int) +#define BIOCFEEDBACK _IOW('B', 132, u_int) /* * Structure prepended to each packet. From owner-p4-projects@FreeBSD.ORG Tue Jan 8 15:38:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E26316A46D; Tue, 8 Jan 2008 15:38:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43DB116A469 for ; Tue, 8 Jan 2008 15:38:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6096813C478 for ; Tue, 8 Jan 2008 15:38:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08Fcnac028783 for ; Tue, 8 Jan 2008 15:38:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08FcnJl028780 for perforce@freebsd.org; Tue, 8 Jan 2008 15:38:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 15:38:49 GMT Message-Id: <200801081538.m08FcnJl028780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 15:38:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132793 Change 132793 by rwatson@rwatson_fledge on 2008/01/08 15:38:40 More re-merging of new BPF contents since original integration in order to reduce differences. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#17 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#17 (text+ko) ==== @@ -123,13 +123,6 @@ size_t bz_buflen; /* Size of zero-copy buffers. */ }; -/* Packet directions */ -enum bpf_direction { - BPF_D_IN, /* See incoming packets */ - BPF_D_INOUT, /* See incoming and outgoing packets */ - BPF_D_OUT /* See outgoing packets */ -}; - #define BIOCGBLEN _IOR('B',102, u_int) #define BIOCSBLEN _IOWR('B',102, u_int) #define BIOCSETF _IOW('B',103, struct bpf_program) @@ -167,6 +160,13 @@ #define BIOCSETZBUF _IOW('B', 131, struct bpf_zbuf) #define BIOCFEEDBACK _IOW('B', 132, u_int) +/* Packet directions */ +enum bpf_direction { + BPF_D_IN, /* See incoming packets */ + BPF_D_INOUT, /* See incoming and outgoing packets */ + BPF_D_OUT /* See outgoing packets */ +}; + /* * Structure prepended to each packet. */ From owner-p4-projects@FreeBSD.ORG Tue Jan 8 15:39:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B384216A420; Tue, 8 Jan 2008 15:39:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 793C516A419 for ; Tue, 8 Jan 2008 15:39:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9655713C478 for ; Tue, 8 Jan 2008 15:39:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08Fdoe5028860 for ; Tue, 8 Jan 2008 15:39:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08FdoNX028857 for perforce@freebsd.org; Tue, 8 Jan 2008 15:39:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 15:39:50 GMT Message-Id: <200801081539.m08FdoNX028857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 15:39:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=132794 Change 132794 by rwatson@rwatson_fledge on 2008/01/08 15:39:39 More style synchronization to CVS. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#18 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#18 (text+ko) ==== @@ -162,9 +162,9 @@ /* Packet directions */ enum bpf_direction { - BPF_D_IN, /* See incoming packets */ - BPF_D_INOUT, /* See incoming and outgoing packets */ - BPF_D_OUT /* See outgoing packets */ + BPF_D_IN, /* See incoming packets */ + BPF_D_INOUT, /* See incoming and outgoing packets */ + BPF_D_OUT /* See outgoing packets */ }; /* From owner-p4-projects@FreeBSD.ORG Tue Jan 8 15:41:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FB9416A420; Tue, 8 Jan 2008 15:41:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4510F16A41A for ; Tue, 8 Jan 2008 15:41:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49FF013C45A for ; Tue, 8 Jan 2008 15:41:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08Ffsrn029539 for ; Tue, 8 Jan 2008 15:41:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08FfsOR029531 for perforce@freebsd.org; Tue, 8 Jan 2008 15:41:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 8 Jan 2008 15:41:54 GMT Message-Id: <200801081541.m08FfsOR029531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 132795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 15:41:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=132795 Change 132795 by rwatson@rwatson_fledge on 2008/01/08 15:41:15 More minor style tweaks. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#19 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#19 (text+ko) ==== @@ -815,11 +815,9 @@ }; #ifdef _KERNEL - #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_BPF); #endif - #ifdef SYSCTL_DECL SYSCTL_DECL(_net_bpf); #endif From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:42:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D4A516A468; Tue, 8 Jan 2008 20:42:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6A4E16A417 for ; Tue, 8 Jan 2008 20:42:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0A4013C44B for ; Tue, 8 Jan 2008 20:42:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KgCE9012391 for ; Tue, 8 Jan 2008 20:42:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KgCHG012388 for perforce@freebsd.org; Tue, 8 Jan 2008 20:42:12 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Jan 2008 20:42:12 GMT Message-Id: <200801082042.m08KgCHG012388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 132806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:42:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=132806 Change 132806 by sam@sam_ebb on 2008/01/08 20:42:03 add ieee80211_scan_done interface from HEAD Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#13 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan.h#10 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#13 (text+ko) ==== @@ -788,6 +788,19 @@ } /* + * Public access to scan_next for drivers that are not able to scan single + * channels (e.g. for firmware-based devices). + */ +void +ieee80211_scan_done(struct ieee80211vap *vap) +{ + struct ieee80211_scan_state *ss = vap->iv_ic->ic_scan; + + ss->ss_next = ss->ss_last; /* all channels are complete */ + scan_next(ss); +} + +/* * Probe the curent channel, if allowed, while scanning. * If the channel is not marked passive-only then send * a probe request immediately. Otherwise mark state and ==== //depot/projects/vap/sys/net80211/ieee80211_scan.h#10 (text+ko) ==== @@ -140,6 +140,7 @@ void ieee80211_cancel_scan(struct ieee80211vap *); void ieee80211_cancel_anyscan(struct ieee80211vap *); void ieee80211_scan_next(struct ieee80211vap *); +void ieee80211_scan_done(struct ieee80211vap *); void ieee80211_probe_curchan(struct ieee80211vap *, int); struct ieee80211_channel *ieee80211_scan_pickchannel(struct ieee80211com *, int); From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:44:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37B3F16A421; Tue, 8 Jan 2008 20:44:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F12B016A41A for ; Tue, 8 Jan 2008 20:44:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CAE1813C468 for ; Tue, 8 Jan 2008 20:44:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KiFtj012971 for ; Tue, 8 Jan 2008 20:44:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KiFAg012968 for perforce@freebsd.org; Tue, 8 Jan 2008 20:44:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 20:44:15 GMT Message-Id: <200801082044.m08KiFAg012968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=132807 Change 132807 by jb@jb_freebsd1 on 2008/01/08 20:44:11 Free memory when finished. Affected files ... .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_finish.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_finish.c#2 (text+ko) ==== @@ -32,9 +32,17 @@ int dwarf_finish(Dwarf_Debug *dbgp, Dwarf_Error *error) { + Dwarf_Abbrev ab; + Dwarf_Abbrev tab; + Dwarf_Attribute at; + Dwarf_Attribute tat; + Dwarf_AttrValue av; + Dwarf_AttrValue tav; Dwarf_CU cu; Dwarf_CU tcu; Dwarf_Debug dbg; + Dwarf_Die die; + Dwarf_Die tdie; if (error == NULL) /* Can only return a generic error. */ @@ -50,6 +58,30 @@ /* Free entries in the compilation unit list. */ STAILQ_FOREACH_SAFE(cu, &dbg->dbg_cu, cu_next, tcu) { + /* Free entries in the die list */ + STAILQ_FOREACH_SAFE(die, &cu->cu_die, die_next, tdie) { + /* Free entries in the attribute value list */ + STAILQ_FOREACH_SAFE(av, &die->die_attrval, av_next, tav) { + STAILQ_REMOVE(&die->die_attrval, av, _Dwarf_AttrValue, av_next); + free(av); + } + + STAILQ_REMOVE(&cu->cu_die, die, _Dwarf_Die, die_next); + free(die); + } + + /* Free entries in the abbrev list */ + STAILQ_FOREACH_SAFE(ab, &cu->cu_abbrev, a_next, tab) { + /* Free entries in the attribute list */ + STAILQ_FOREACH_SAFE(at, &ab->a_attrib, at_next, tat) { + STAILQ_REMOVE(&ab->a_attrib, at, _Dwarf_Attribute, at_next); + free(at); + } + + STAILQ_REMOVE(&cu->cu_abbrev, ab, _Dwarf_Abbrev, a_next); + free(ab); + } + STAILQ_REMOVE(&dbg->dbg_cu, cu, _Dwarf_CU, cu_next); free(cu); } From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:45:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A4516A41B; Tue, 8 Jan 2008 20:45:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39FBE16A469 for ; Tue, 8 Jan 2008 20:45:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 121B513C455 for ; Tue, 8 Jan 2008 20:45:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KjIsr013058 for ; Tue, 8 Jan 2008 20:45:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KjHtT013055 for perforce@freebsd.org; Tue, 8 Jan 2008 20:45:17 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Jan 2008 20:45:17 GMT Message-Id: <200801082045.m08KjHtT013055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 132808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=132808 Change 132808 by sam@sam_ebb on 2008/01/08 20:44:38 blindly convert some legacy drivers: compile-tested only and likely wrong; need to understand the best way to handle legacy drivers (e.g. w/ common support in net80211) Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#5 edit .. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#5 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#9 edit .. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#7 edit .. //depot/projects/vap/sys/dev/ral/if_ralrate.c#3 edit .. //depot/projects/vap/sys/dev/ral/if_ralrate.h#3 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#3 edit .. //depot/projects/vap/sys/dev/ral/rt2560var.h#3 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#3 edit .. //depot/projects/vap/sys/dev/ral/rt2661var.h#3 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#3 edit .. //depot/projects/vap/sys/dev/usb/if_rumvar.h#3 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#5 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#5 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#3 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#3 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#3 edit .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#5 (text+ko) ==== @@ -107,11 +107,14 @@ { 0, 0, NULL } }; +static struct ieee80211vap *ipw_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN]); +static void ipw_vap_delete(struct ieee80211vap *); static int ipw_dma_alloc(struct ipw_softc *); static void ipw_release(struct ipw_softc *); -static int ipw_media_change(struct ifnet *); static void ipw_media_status(struct ifnet *, struct ifmediareq *); -static int ipw_newstate(struct ieee80211com *, enum ieee80211_state, int); +static int ipw_newstate(struct ieee80211vap *, enum ieee80211_state, int); static uint16_t ipw_read_prom_word(struct ipw_softc *, uint8_t); static void ipw_rx_cmd_intr(struct ipw_softc *, struct ipw_soft_buf *); static void ipw_rx_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *); @@ -163,8 +166,9 @@ static void ipw_scan_start(struct ieee80211com *); static void ipw_scan_end(struct ieee80211com *); static void ipw_set_channel(struct ieee80211com *); -static void ipw_scan_curchan(struct ieee80211com *, unsigned long maxdwell); -static void ipw_scan_mindwell(struct ieee80211com *); +static void ipw_scan_curchan(struct ieee80211_scan_state *, + unsigned long maxdwell); +static void ipw_scan_mindwell(struct ieee80211_scan_state *); static int ipw_probe(device_t); static int ipw_attach(device_t); @@ -293,8 +297,6 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_DS; - ic->ic_opmode = IEEE80211_M_STA; - ic->ic_state = IEEE80211_S_INIT; /* set device capabilities */ ic->ic_caps = IEEE80211_C_IBSS /* IBSS mode supported */ @@ -333,17 +335,15 @@ sc->flags |= IPW_FLAG_HAS_RADIO_SWITCH; ieee80211_ifattach(ic); - /* override state transition machine */ - sc->sc_newstate = ic->ic_newstate; - ic->ic_newstate = ipw_newstate; - ieee80211_media_init(ic, ipw_media_change, ipw_media_status); - ic->ic_scan_start = ipw_scan_start; ic->ic_scan_end = ipw_scan_end; ic->ic_set_channel = ipw_set_channel; ic->ic_scan_curchan = ipw_scan_curchan; ic->ic_scan_mindwell = ipw_scan_mindwell; + ic->ic_vap_create = ipw_vap_create; + ic->ic_vap_delete = ipw_vap_delete; + bpfattach2(ifp, DLT_IEEE802_11_RADIO, sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), &sc->sc_drvbpf); @@ -359,8 +359,6 @@ /* * Add a few sysctl knobs. */ - sc->dwelltime = 100; - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "radio", CTLTYPE_INT | CTLFLAG_RD, sc, 0, ipw_sysctl_radio, "I", @@ -371,11 +369,6 @@ CTLTYPE_OPAQUE | CTLFLAG_RD, sc, 0, ipw_sysctl_stats, "S", "statistics"); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "dwell", - CTLFLAG_RW, &sc->dwelltime, 0, - "channel dwell time (ms) for AP/station scanning"); - /* * Hook our interrupt after all initialization is complete. */ @@ -437,6 +430,41 @@ return 0; } +static struct ieee80211vap * +ipw_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN]) +{ + struct ipw_vap *ivp; + struct ieee80211vap *vap; + + if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + return NULL; + ivp = (struct ipw_vap *) malloc(sizeof(struct ipw_vap), + M_80211_VAP, M_NOWAIT | M_ZERO); + if (ivp == NULL) + return NULL; + vap = &ivp->vap; + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + /* override with driver methods */ + ivp->newstate = vap->iv_newstate; + vap->iv_newstate = ipw_newstate; + + /* complete setup */ + ieee80211_vap_attach(vap, ieee80211_media_change, ipw_media_status); + ic->ic_opmode = opmode; + return vap; +} + +static void +ipw_vap_delete(struct ieee80211vap *vap) +{ + struct ipw_vap *ivp = IPW_VAP(vap); + + ieee80211_vap_detach(vap); + free(ivp, M_80211_VAP); +} + static int ipw_dma_alloc(struct ipw_softc *sc) { @@ -767,26 +795,6 @@ } static int -ipw_media_change(struct ifnet *ifp) -{ - struct ipw_softc *sc = ifp->if_softc; - int error; - IPW_LOCK_DECL; - - IPW_LOCK(sc); - error = ieee80211_media_change(ifp); - if (error == ENETRESET) { - if ((ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) - ipw_init_locked(sc, 0); - error = 0; - } - IPW_UNLOCK(sc); - - return (error); -} - -static int ipw_cvtrate(int ipwrate) { switch (ipwrate) { @@ -805,47 +813,26 @@ static void ipw_media_status(struct ifnet *ifp, struct ifmediareq *imr) { - struct ipw_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; - int rate; + struct ieee80211vap *vap = ifp->if_softc; + struct ieee80211com *ic = vap->iv_ic; + struct ipw_softc *sc = ic->ic_ifp->if_softc; - imr->ifm_status = IFM_AVALID; - imr->ifm_active = IFM_IEEE80211; - if (ic->ic_state == IEEE80211_S_RUN) - imr->ifm_status |= IFM_ACTIVE; - /* read current transmission rate from adapter */ - rate = ipw_cvtrate(ipw_read_table1(sc, IPW_INFO_CURRENT_TX_RATE) & 0xf); - imr->ifm_active |= ieee80211_rate2media(ic, rate, IEEE80211_MODE_11B); - - switch (ic->ic_opmode) { - case IEEE80211_M_STA: - break; - - case IEEE80211_M_IBSS: - imr->ifm_active |= IFM_IEEE80211_IBSS; - break; - - case IEEE80211_M_MONITOR: - imr->ifm_active |= IFM_IEEE80211_MONITOR; - break; - - case IEEE80211_M_AHDEMO: - case IEEE80211_M_HOSTAP: - case IEEE80211_M_WDS: - /* should not get there */ - break; - } + vap->iv_bss->ni_txrate = ipw_cvtrate( + ipw_read_table1(sc, IPW_INFO_CURRENT_TX_RATE) & 0xf); + ieee80211_media_status(ifp, imr); } static int -ipw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) +ipw_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { + struct ipw_vap *ivp = IPW_VAP(vap); + struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = ic->ic_ifp; struct ipw_softc *sc = ifp->if_softc; DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, - ieee80211_state_name[ic->ic_state], + ieee80211_state_name[vap->iv_state], ieee80211_state_name[nstate], sc->flags)); switch (nstate) { @@ -859,7 +846,7 @@ * AUTH -> RUN transition and we want to do nothing. * This is all totally bogus and needs to be redone. */ - if (ic->ic_state == IEEE80211_S_SCAN) + if (vap->iv_state == IEEE80211_S_SCAN) taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_assoc_task); } @@ -880,7 +867,7 @@ * If we are not transitioning from AUTH the resend the * association request. */ - if (ic->ic_state != IEEE80211_S_AUTH) + if (vap->iv_state != IEEE80211_S_AUTH) taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_assoc_task); break; @@ -888,7 +875,7 @@ default: break; } - return (*sc->sc_newstate)(ic, nstate, arg); + return ivp->newstate(vap, nstate, arg); } /* @@ -967,8 +954,9 @@ static void ipw_rx_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf) { -#define IEEESTATE(ic) ieee80211_state_name[ic->ic_state] +#define IEEESTATE(vap) ieee80211_state_name[vap->iv_state] struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); uint32_t state; bus_dmamap_sync(sc->rxbuf_dmat, sbuf->map, BUS_DMASYNC_POSTREAD); @@ -978,19 +966,19 @@ switch (state) { case IPW_STATE_ASSOCIATED: DPRINTFN(2, ("Association succeeded (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); + IEEESTATE(vap), sc->flags)); sc->flags |= IPW_FLAG_ASSOCIATED; /* XXX suppress state change in case the fw auto-associates */ - if (ic->ic_state != IEEE80211_S_ASSOC) { + if (vap->iv_state != IEEE80211_S_ASSOC) { DPRINTF(("Unexpected association (state %u)\n", - ic->ic_state)); + vap->iv_state)); } else - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + ieee80211_new_state(vap, IEEE80211_S_RUN, -1); break; case IPW_STATE_SCANNING: DPRINTFN(3, ("Scanning (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); + IEEESTATE(vap), sc->flags)); /* * NB: Check driver state for association on assoc * loss as the firmware will immediately start to @@ -1014,9 +1002,9 @@ break; } DPRINTFN(3, ("Scan complete (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); + IEEESTATE(vap), sc->flags)); if (sc->flags & IPW_FLAG_SCANNING) { - ieee80211_scan_done(ic); + ieee80211_scan_done(vap); sc->flags &= ~IPW_FLAG_SCANNING; sc->sc_scan_timer = 0; } @@ -1024,27 +1012,27 @@ case IPW_STATE_ASSOCIATION_LOST: DPRINTFN(2, ("Association lost (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); + IEEESTATE(vap), sc->flags)); sc->flags &= ~IPW_FLAG_ASSOCIATED; - if (ic->ic_state == IEEE80211_S_RUN) - ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); + if (vap->iv_state == IEEE80211_S_RUN) + ieee80211_new_state(vap, IEEE80211_S_SCAN, -1); break; case IPW_STATE_DISABLED: DPRINTFN(2, ("Firmware disabled (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); + IEEESTATE(vap), sc->flags)); break; case IPW_STATE_RADIO_DISABLED: DPRINTFN(2, ("Radio off (%s flags 0x%x)\n", - IEEESTATE(ic), sc->flags)); - ic->ic_ifp->if_flags &= ~IFF_UP; + IEEESTATE(vap), sc->flags)); + vap->iv_ifp->if_flags &= ~IFF_UP; /* XXX */ ipw_stop_locked(sc); break; default: DPRINTFN(2, ("%s: unhandled state %u %s flags 0x%x\n", - __func__, state, IEEESTATE(ic), sc->flags)); + __func__, state, IEEESTATE(vap), sc->flags)); break; } #undef IEEESTATE @@ -1089,6 +1077,7 @@ subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP) return; + /* XXX use ieee80211_parse_beacon */ frm = (uint8_t *)(wh + 1); efrm = mtod(m, uint8_t *) + m->m_len; @@ -1119,7 +1108,6 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; struct mbuf *mnew, *m; - struct ieee80211_frame *wh; struct ieee80211_node *ni; bus_addr_t physaddr; int error; @@ -1191,15 +1179,13 @@ if (sc->flags & IPW_FLAG_SCANNING) ipw_fix_channel(sc, m); - wh = mtod(m, struct ieee80211_frame *); IPW_UNLOCK(sc); - ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); - - /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, status->rssi, -95/*XXX*/, 0); - - /* node is no longer needed */ - ieee80211_free_node(ni); + ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); + if (ni != NULL) { + (void) ieee80211_input(ni, m, status->rssi, -95, 0); + ieee80211_free_node(ni); + } else + (void) ieee80211_input_all(ic, m, status->rssi, -95, 0); IPW_LOCK(sc); bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE); @@ -1209,6 +1195,7 @@ ipw_rx_intr(struct ipw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ipw_status *status; struct ipw_soft_bd *sbd; struct ipw_soft_buf *sbuf; @@ -1243,10 +1230,10 @@ case IPW_STATUS_CODE_NOTIFICATION: DPRINTFN(2, ("notification status, len %u flags 0x%x\n", le32toh(status->len), status->flags)); - if (ic->ic_state == IEEE80211_S_AUTH) { + if (vap->iv_state == IEEE80211_S_AUTH) { /* XXX assume auth notification */ - ieee80211_node_authorize(ic->ic_bss); - ieee80211_new_state(ic, IEEE80211_S_ASSOC, -1); + ieee80211_node_authorize(vap->iv_bss); + ieee80211_new_state(vap, IEEE80211_S_ASSOC, -1); } break; @@ -1528,12 +1515,11 @@ wh = mtod(m0, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { - k = ieee80211_crypto_encap(ic, ni, m0); + k = ieee80211_crypto_encap(ni, m0); if (k == NULL) { m_freem(m0); return ENOBUFS; } - /* packet header may have moved, reset our local pointer */ wh = mtod(m0, struct ieee80211_frame *); } @@ -1675,54 +1661,31 @@ ipw_start_locked(struct ifnet *ifp) { struct ipw_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; - struct mbuf *m0; - struct ether_header *eh; struct ieee80211_node *ni; + struct mbuf *m; IPW_LOCK_ASSERT(sc); - if (ic->ic_state != IEEE80211_S_RUN) - return; - for (;;) { - IFQ_DRV_DEQUEUE(&ifp->if_snd, m0); - if (m0 == NULL) + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + if (m == NULL) break; - if (sc->txfree < 1 + IPW_MAX_NSEG) { - IFQ_DRV_PREPEND(&ifp->if_snd, m0); + IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; } - - if (m0->m_len < sizeof (struct ether_header) && - (m0 = m_pullup(m0, sizeof (struct ether_header))) == NULL) - continue; - - eh = mtod(m0, struct ether_header *); - ni = ieee80211_find_txnode(ic, eh->ether_dhost); - if (ni == NULL) { - m_freem(m0); - continue; - } - BPF_MTAP(ifp, m0); - - m0 = ieee80211_encap(ic, m0, ni); - if (m0 == NULL) { + ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; + m = ieee80211_encap(ni, m); + if (m == NULL) { ieee80211_free_node(ni); continue; } - - if (bpf_peers_present(ic->ic_rawbpf)) - bpf_mtap(ic->ic_rawbpf, m0); - - if (ipw_tx_start(ifp, m0, ni) != 0) { + if (ipw_tx_start(ifp, m, ni) != 0) { ieee80211_free_node(ni); ifp->if_oerrors++; break; } - /* start watchdog timer */ sc->sc_tx_timer = 5; } @@ -1750,7 +1713,7 @@ DPRINTFN(3, ("Scan timeout\n")); /* End the scan */ if (sc->flags & IPW_FLAG_SCANNING) { - ieee80211_scan_done(ic); + ieee80211_scan_done(TAILQ_FIRST(&ic->ic_vaps)); sc->flags &= ~IPW_FLAG_SCANNING; } } @@ -1763,7 +1726,6 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ipw_softc *sc = ifp->if_softc; - struct ieee80211com *ic = &sc->sc_ic; int error = 0; IPW_LOCK_DECL; @@ -1781,15 +1743,7 @@ break; default: - error = ieee80211_ioctl(ic, cmd, data); - } - - if (error == ENETRESET) { - if ((ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING) && - (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)) - ipw_init_locked(sc, 0); - error = 0; + error = ether_ioctl(ifp, cmd, data); } IPW_UNLOCK(sc); @@ -2011,12 +1965,13 @@ ipw_setwepkeys(struct ipw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ipw_wep_key wepkey; struct ieee80211_key *wk; int error, i; for (i = 0; i < IEEE80211_WEP_NKID; i++) { - wk = &ic->ic_crypto.cs_nw_keys[i]; + wk = &vap->iv_nw_keys[i]; if (wk->wk_cipher == NULL || wk->wk_cipher->ic_cipher != IEEE80211_CIPHER_WEP) @@ -2182,6 +2137,7 @@ ipw_config(struct ipw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ifnet *ifp = ic->ic_ifp; struct ipw_security security; struct ipw_configuration config; @@ -2221,9 +2177,9 @@ if (ic->ic_opmode == IEEE80211_M_MONITOR) return ipw_enable(sc); - IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":")); - error = ipw_cmd(sc, IPW_CMD_SET_MAC_ADDRESS, ic->ic_myaddr, + IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); + DPRINTF(("Setting MAC address to %6D\n", vap->iv_myaddr, ":")); + error = ipw_cmd(sc, IPW_CMD_SET_MAC_ADDRESS, vap->iv_myaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; @@ -2274,19 +2230,19 @@ return error; } - data = htole32(ic->ic_rtsthreshold); + data = htole32(vap->iv_rtsthreshold); DPRINTF(("Setting RTS threshold to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_RTS_THRESHOLD, &data, sizeof data); if (error != 0) return error; - data = htole32(ic->ic_fragthreshold); + data = htole32(vap->iv_fragthreshold); DPRINTF(("Setting frag threshold to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_FRAG_THRESHOLD, &data, sizeof data); if (error != 0) return error; - error = ipw_setssid(sc, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len); + error = ipw_setssid(sc, vap->iv_des_ssid[0].ssid, vap->iv_des_ssid[0].len); if (error != 0) return error; @@ -2294,17 +2250,17 @@ if (error != 0) return error; - if (ic->ic_flags & IEEE80211_F_DESBSSID) { - DPRINTF(("Setting desired BSSID to %6D\n", ic->ic_des_bssid, + if (vap->iv_flags & IEEE80211_F_DESBSSID) { + DPRINTF(("Setting desired BSSID to %6D\n", vap->iv_des_bssid, ":")); error = ipw_cmd(sc, IPW_CMD_SET_DESIRED_BSSID, - ic->ic_des_bssid, IEEE80211_ADDR_LEN); + vap->iv_des_bssid, IEEE80211_ADDR_LEN); if (error != 0) return error; } memset(&security, 0, sizeof security); - security.authmode = (ic->ic_bss->ni_authmode == IEEE80211_AUTH_SHARED) ? + security.authmode = (vap->iv_bss->ni_authmode == IEEE80211_AUTH_SHARED) ? IPW_AUTH_SHARED : IPW_AUTH_OPEN; security.ciphers = htole32(IPW_CIPHER_NONE); DPRINTF(("Setting authmode to %u\n", security.authmode)); @@ -2313,13 +2269,13 @@ if (error != 0) return error; - if (ic->ic_flags & IEEE80211_F_PRIVACY) { + if (vap->iv_flags & IEEE80211_F_PRIVACY) { error = ipw_setwepkeys(sc); if (error != 0) return error; - if (ic->ic_crypto.cs_def_txkey != IEEE80211_KEYIX_NONE) { - data = htole32(ic->ic_crypto.cs_def_txkey); + if (vap->iv_def_txkey != IEEE80211_KEYIX_NONE) { + data = htole32(vap->iv_def_txkey); DPRINTF(("Setting wep tx key index to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data, @@ -2329,14 +2285,15 @@ } } - data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); + data = htole32((vap->iv_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data); if (error != 0) return error; - if (ic->ic_opt_ie != NULL) { - error = ipw_setwpaie(sc, ic->ic_opt_ie, ic->ic_opt_ie_len); + if (vap->iv_appie_assocreq != NULL) { + struct ieee80211_appie *ie = vap->iv_appie_assocreq; + error = ipw_setwpaie(sc, ie->ie_data, ie->ie_len); if (error != 0) return error; } @@ -2376,7 +2333,8 @@ ipw_auth_and_assoc(struct ipw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_node *ni = ic->ic_bss; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct ieee80211_node *ni = vap->iv_bss; struct ipw_security security; uint32_t data; int error; @@ -2395,13 +2353,13 @@ if (error != 0) return (error); - if (ic->ic_flags & IEEE80211_F_PRIVACY) { + if (vap->iv_flags & IEEE80211_F_PRIVACY) { error = ipw_setwepkeys(sc); if (error != 0) return error; - if (ic->ic_crypto.cs_def_txkey != IEEE80211_KEYIX_NONE) { - data = htole32(ic->ic_crypto.cs_def_txkey); + if (vap->iv_def_txkey != IEEE80211_KEYIX_NONE) { + data = htole32(vap->iv_def_txkey); DPRINTF(("Setting wep tx key index to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data, @@ -2411,7 +2369,7 @@ } } - data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); + data = htole32((vap->iv_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data); if (error != 0) @@ -2425,8 +2383,9 @@ if (error != 0) return (error); - if (ic->ic_opt_ie != NULL) { - error = ipw_setwpaie(sc, ic->ic_opt_ie, ic->ic_opt_ie_len); + if (vap->iv_appie_assocreq != NULL) { + struct ieee80211_appie *ie = vap->iv_appie_assocreq; + error = ipw_setwpaie(sc, ie->ie_data, ie->ie_len); if (error != 0) return error; } @@ -2462,7 +2421,8 @@ ipw_disassociate(struct ipw_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_node *ni = ic->ic_bss; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct ieee80211_node *ni = vap->iv_bss; DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":")); @@ -2507,6 +2467,7 @@ ipw_init_locked(struct ipw_softc *sc, int force) { struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ifnet *ifp = ic->ic_ifp; const struct firmware *fp; const struct ipw_firmware_hdr *hdr; @@ -2516,7 +2477,7 @@ IPW_LOCK_ASSERT(sc); DPRINTF(("%s: state %s flags 0x%x\n", __func__, - ieee80211_state_name[ic->ic_state], sc->flags)); + ieee80211_state_name[vap->iv_state], sc->flags)); /* * Avoid re-entrant calls. We need to release the mutex in ipw_init() @@ -2631,22 +2592,13 @@ goto fail1; } - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - /* - * NB: When restarting the adapter clock the state - * machine regardless of the roaming mode; otherwise - * we need to notify user apps so they can manually - * get us going again. - */ - if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL || force) - ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); - } else - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - callout_reset(&sc->sc_wdtimer, hz, ipw_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + /* XXX force handling */ + ieee80211_start_all(ic); /* start all vap's */ + sc->flags &=~ IPW_FLAG_INIT_LOCKED; return; @@ -2677,8 +2629,6 @@ IPW_LOCK_ASSERT(sc); - ieee80211_new_state(ic, IEEE80211_S_INIT, -1); - callout_stop(&sc->sc_wdtimer); ipw_stop_master(sc); @@ -2816,13 +2766,13 @@ } static void -ipw_scan_curchan(struct ieee80211com *ic, unsigned long maxdwell) +ipw_scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell) { /* NB: all channels are scanned at once */ } static void -ipw_scan_mindwell(struct ieee80211com *ic) +ipw_scan_mindwell(struct ieee80211_scan_state *ss) { /* NB: don't try to abort scan; wait for firmware to finish */ } ==== //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#5 (text+ko) ==== @@ -76,11 +76,17 @@ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_CHANNEL)) +struct ipw_vap { + struct ieee80211vap vap; + + int (*newstate)(struct ieee80211vap *, + enum ieee80211_state, int); +}; +#define IPW_VAP(vap) ((struct ipw_vap *)(vap)) + struct ipw_softc { struct ifnet *sc_ifp; struct ieee80211com sc_ic; - int (*sc_newstate)(struct ieee80211com *, - enum ieee80211_state, int); device_t sc_dev; struct mtx sc_mtx; @@ -152,22 +158,12 @@ uint32_t rxcur; int txfree; - int dwelltime; - struct bpf_if *sc_drvbpf; - union { - struct ipw_rx_radiotap_header th; - uint8_t pad[64]; - } sc_rxtapu; -#define sc_rxtap sc_rxtapu.th + struct ipw_rx_radiotap_header sc_rxtap; int sc_rxtap_len; - union { - struct ipw_tx_radiotap_header th; - uint8_t pad[64]; - } sc_txtapu; -#define sc_txtap sc_txtapu.th + struct ipw_tx_radiotap_header sc_txtap; int sc_txtap_len; }; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#9 (text+ko) ==== @@ -73,6 +73,7 @@ #include #include +#include #include #include @@ -120,6 +121,10 @@ { 0, 0, NULL } }; +static struct ieee80211vap *iwi_vap_create(struct ieee80211com *, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN]); +static void iwi_vap_delete(struct ieee80211vap *); static void iwi_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int iwi_alloc_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *, int); @@ -135,9 +140,8 @@ static void iwi_free_rx_ring(struct iwi_softc *, struct iwi_rx_ring *); static struct ieee80211_node *iwi_node_alloc(struct ieee80211_node_table *); static void iwi_node_free(struct ieee80211_node *); -static int iwi_media_change(struct ifnet *); static void iwi_media_status(struct ifnet *, struct ifmediareq *); -static int iwi_newstate(struct ieee80211com *, enum ieee80211_state, int); +static int iwi_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void iwi_wme_init(struct iwi_softc *); static int iwi_wme_setparams(struct iwi_softc *); static int iwi_wme_update(struct ieee80211com *); @@ -168,16 +172,16 @@ static void iwi_scan_end(struct ieee80211com *); static void iwi_scanabort(void *, int); static void iwi_set_channel(struct ieee80211com *); -static void iwi_scan_curchan(struct ieee80211com *, unsigned long maxdwell); +static void iwi_scan_curchan(struct ieee80211_scan_state *, unsigned long maxdwell); #if 0 static void iwi_scan_allchan(struct ieee80211com *, unsigned long maxdwell); #endif -static void iwi_scan_mindwell(struct ieee80211com *); -static void iwi_assoc(struct ieee80211com *ic); -static void iwi_disassoc(struct ieee80211com *); +static void iwi_scan_mindwell(struct ieee80211_scan_state *); +static void iwi_assoc(struct ieee80211vap *); +static void iwi_disassoc(struct ieee80211vap *); static void iwi_ops(void *, int); static int iwi_queue_cmd(struct iwi_softc *, int); -static int iwi_auth_and_assoc(struct iwi_softc *); +static int iwi_auth_and_assoc(struct iwi_softc *, struct ieee80211vap *); static int iwi_disassociate(struct iwi_softc *, int quiet); static void iwi_init(void *); static void iwi_init_locked(void *, int); @@ -258,7 +262,8 @@ struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; uint16_t val; - int i, error, bands; + int i, error; + uint8_t bands; sc->sc_dev = dev; @@ -267,7 +272,6 @@ sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); -#if __FreeBSD_version >= 700000 sc->sc_tq = taskqueue_create("iwi_taskq", M_NOWAIT | M_ZERO, taskqueue_thread_enqueue, &sc->sc_tq); taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", @@ -276,16 +280,7 @@ taskqueue_thread_enqueue, &sc->sc_tq2); taskqueue_start_threads(&sc->sc_tq2, 1, PI_NET, "%s taskq2", device_get_nameunit(dev)); -#else - sc->sc_tq = taskqueue_create("iwi_taskq", M_NOWAIT | M_ZERO, - taskqueue_thread_enqueue, &sc->sc_tq, &sc->sc_tqproc); - kproc_create(taskqueue_thread_loop, &sc->sc_tq, &sc->sc_tqproc, - 0, 0, "%s taskq", device_get_nameunit(dev)); - sc->sc_tq2 = taskqueue_create("iwi_taskq2", M_NOWAIT | M_ZERO, - taskqueue_thread_enqueue, &sc->sc_tq2, &sc->sc_tqproc); - kproc_create(taskqueue_thread_loop, &sc->sc_tq2, &sc->sc_tqproc, - 0, 0, "%s taskq2", device_get_nameunit(dev)); -#endif + TASK_INIT(&sc->sc_radiontask, 0, iwi_radio_on, sc); TASK_INIT(&sc->sc_radiofftask, 0, iwi_radio_off, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); @@ -370,10 +365,7 @@ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); - ic->ic_wme.wme_update = iwi_wme_update; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ - ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */ - ic->ic_state = IEEE80211_S_INIT; /* set device capabilities */ ic->ic_caps = @@ -402,10 +394,9 @@ setbit(&bands, IEEE80211_MODE_11G); if (pci_get_device(dev) >= 0x4223) setbit(&bands, IEEE80211_MODE_11A); - ieee80211_init_channels(ic, 0, CTRY_DEFAULT, bands, 0, 1); + ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); - ic->ic_bmissthreshold = 10; /* override default */ /* override default methods */ ic->ic_node_alloc = iwi_node_alloc; sc->sc_node_free = ic->ic_node_free; @@ -415,11 +406,10 @@ ic->ic_set_channel = iwi_set_channel; ic->ic_scan_curchan = iwi_scan_curchan; ic->ic_scan_mindwell = iwi_scan_mindwell; + ic->ic_wme.wme_update = iwi_wme_update; - /* override state transition machine */ - sc->sc_newstate = ic->ic_newstate; - ic->ic_newstate = iwi_newstate; - ieee80211_media_init(ic, iwi_media_change, iwi_media_status); + ic->ic_vap_create = iwi_vap_create; + ic->ic_vap_delete = iwi_vap_delete; bpfattach2(ifp, DLT_IEEE802_11_RADIO, sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), @@ -505,6 +495,42 @@ return 0; } +static struct ieee80211vap * +iwi_vap_create(struct ieee80211com *ic, + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN]) +{ + struct iwi_vap *ivp; + struct ieee80211vap *vap; + + if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ + return NULL; + ivp = (struct iwi_vap *) malloc(sizeof(struct iwi_vap), + M_80211_VAP, M_NOWAIT | M_ZERO); + if (ivp == NULL) + return NULL; + vap = &ivp->iwi_vap; + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + vap->iv_bmissthreshold = 10; /* override default */ + /* override with driver methods */ + ivp->iwi_newstate = vap->iv_newstate; + vap->iv_newstate = iwi_newstate; + + /* complete setup */ + ieee80211_vap_attach(vap, ieee80211_media_change, iwi_media_status); + ic->ic_opmode = opmode; + return vap; +} + +static void +iwi_vap_delete(struct ieee80211vap *vap) +{ + struct iwi_vap *ivp = IWI_VAP(vap); + + ieee80211_vap_detach(vap); + free(ivp, M_80211_VAP); +} + static void iwi_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -882,25 +908,6 @@ sc->sc_node_free(ni); } -static int -iwi_media_change(struct ifnet *ifp) -{ - struct iwi_softc *sc = ifp->if_softc; - int error; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - - error = ieee80211_media_change(ifp); - if (error == ENETRESET && - (ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) - iwi_init_locked(sc, 0); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:46:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1A8616A41B; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65A6516A418 for ; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E39C13C457 for ; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KkJe2013142 for ; Tue, 8 Jan 2008 20:46:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KkJND013139 for perforce@freebsd.org; Tue, 8 Jan 2008 20:46:19 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 20:46:19 GMT Message-Id: <200801082046.m08KkJND013139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:46:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132809 Change 132809 by jb@jb_freebsd1 on 2008/01/08 20:45:58 Just get the specified attribute and let the caller decide what to do in the case where it isn't found. The previous code was just wrong. Affected files ... .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#2 (text+ko) ==== @@ -35,35 +35,11 @@ dwarf_attrval_find(Dwarf_Die die, Dwarf_Half attr) { Dwarf_AttrValue av; - Dwarf_AttrValue av_sib; - Dwarf_CU cu; - Dwarf_Die die_sib; - do { - av_sib = NULL; - - STAILQ_FOREACH(av, &die->die_attrval, av_next) { - if (av->av_attrib == attr) - break; - if (av->av_attrib == DW_AT_sibling) - av_sib = av; - } - - if (av != NULL || av_sib == NULL) + STAILQ_FOREACH(av, &die->die_attrval, av_next) { + if (av->av_attrib == attr) break; - - cu = die->die_cu; - - die = NULL; - - STAILQ_FOREACH(die_sib, &cu->cu_die, die_next) { - if (die_sib->die_offset == av_sib->u[0].u64) { - die = die_sib; - break; - } - } - - } while (die != NULL); + } return av; } From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:46:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5312C16A522; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AFB816A419 for ; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6386D13C458 for ; Tue, 8 Jan 2008 20:46:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KkJ10013148 for ; Tue, 8 Jan 2008 20:46:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KkJ5j013145 for perforce@freebsd.org; Tue, 8 Jan 2008 20:46:19 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Jan 2008 20:46:19 GMT Message-Id: <200801082046.m08KkJ5j013145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 132810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:46:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132810 Change 132810 by sam@sam_ebb on 2008/01/08 20:46:14 nuke netbsd-specific code before trying to do vap conversion Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#10 (text+ko) ==== @@ -334,8 +334,6 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_DS; - ic->ic_opmode = IEEE80211_M_STA; - ic->ic_state = IEEE80211_S_INIT; ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_WEP /* everyone supports WEP */ ; @@ -573,55 +571,7 @@ return (0); } -#ifdef __NetBSD__ -int -wi_activate(struct device *self, enum devact act) -{ - struct wi_softc *sc = (struct wi_softc *)self; - int rv = 0, s; - - s = splnet(); - switch (act) { - case DVACT_ACTIVATE: - rv = EOPNOTSUPP; - break; - - case DVACT_DEACTIVATE: - if_deactivate(sc->sc_ifp); - break; - } - splx(s); - return rv; -} - void -wi_power(struct wi_softc *sc, int why) -{ - struct ifnet *ifp = sc->sc_ifp; - int s; - - s = splnet(); - switch (why) { - case PWR_SUSPEND: - case PWR_STANDBY: - wi_stop(ifp, 1); - break; - case PWR_RESUME: - if (ifp->if_flags & IFF_UP) { - wi_init(sc); - (void)wi_intr(sc); - } - break; - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; - } - splx(s); -} -#endif /* __NetBSD__ */ - -void wi_shutdown(device_t dev) { struct wi_softc *sc = device_get_softc(dev); @@ -892,13 +842,8 @@ if (sc->sc_enabled && !sc->wi_gone) { CSR_WRITE_2(sc, WI_INT_EN, 0); wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); - if (disable) { -#ifdef __NetBSD__ - if (sc->sc_disable) - (*sc->sc_disable)(sc); -#endif + if (disable) sc->sc_enabled = 0; - } } else if (sc->wi_gone && disable) /* gone --> not enabled */ sc->sc_enabled = 0; From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:47:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09EE716A4A1; Tue, 8 Jan 2008 20:47:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C09B216A478 for ; Tue, 8 Jan 2008 20:47:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9808613C458 for ; Tue, 8 Jan 2008 20:47:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KlKXg022151 for ; Tue, 8 Jan 2008 20:47:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KlKMT022148 for perforce@freebsd.org; Tue, 8 Jan 2008 20:47:20 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Jan 2008 20:47:20 GMT Message-Id: <200801082047.m08KlKMT022148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 132811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:47:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132811 Change 132811 by sam@sam_ebb on 2008/01/08 20:46:47 radiotap hasn't needed the fixed size header crap for many years Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wivar.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wivar.h#6 (text+ko) ==== @@ -172,19 +172,11 @@ u_int16_t sc_txbuf[IEEE80211_MAX_LEN/2]; - union { - struct wi_tx_radiotap_header th; - u_int8_t pad[64]; - } u_tx_rt; + struct wi_tx_radiotap_header sc_tx_th int sc_tx_th_len; - union { - struct wi_rx_radiotap_header th; - u_int8_t pad[64]; - } u_rx_rt; + struct wi_rx_radiotap_header sc_rx_th int sc_rx_th_len; }; -#define sc_tx_th u_tx_rt.th -#define sc_rx_th u_rx_rt.th /* maximum consecutive false change-of-BSSID indications */ #define WI_MAX_FALSE_SYNS 10 From owner-p4-projects@FreeBSD.ORG Tue Jan 8 20:49:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6964F16A41B; Tue, 8 Jan 2008 20:49:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23BEB16A419 for ; Tue, 8 Jan 2008 20:49:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFCFE13C474 for ; Tue, 8 Jan 2008 20:49:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08KnM8K022230 for ; Tue, 8 Jan 2008 20:49:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08KnMPb022227 for perforce@freebsd.org; Tue, 8 Jan 2008 20:49:22 GMT (envelope-from sam@freebsd.org) Date: Tue, 8 Jan 2008 20:49:22 GMT Message-Id: <200801082049.m08KnMPb022227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 132812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 20:49:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=132812 Change 132812 by sam@sam_ebb on 2008/01/08 20:48:35 (blindly) remove awi per discussion a few weeks back Affected files ... .. //depot/projects/vap/sys/conf/NOTES#6 edit .. //depot/projects/vap/sys/conf/files#9 edit .. //depot/projects/vap/sys/dev/awi/am79c930.c#5 delete .. //depot/projects/vap/sys/dev/awi/am79c930reg.h#3 delete .. //depot/projects/vap/sys/dev/awi/am79c930var.h#3 delete .. //depot/projects/vap/sys/dev/awi/awi.c#7 delete .. //depot/projects/vap/sys/dev/awi/awireg.h#3 delete .. //depot/projects/vap/sys/dev/awi/awivar.h#6 delete .. //depot/projects/vap/sys/dev/awi/if_awi_pccard.c#5 delete .. //depot/projects/vap/sys/modules/Makefile#8 edit .. //depot/projects/vap/sys/modules/awi/Makefile#5 delete Differences ... ==== //depot/projects/vap/sys/conf/NOTES#6 (text+ko) ==== @@ -689,7 +689,7 @@ # according to IEEE 802.1Q. It requires `device miibus'. # The `wlan' device provides generic code to support 802.11 # drivers, including host AP mode; it is MANDATORY for the wi, -# ath, and awi drivers and will eventually be required by all 802.11 drivers. +# and ath drivers and will eventually be required by all 802.11 drivers. # The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide # support for WEP, TKIP, and AES-CCMP crypto protocols optionally # used with 802.11 devices that depend on the `wlan' module. @@ -1726,8 +1726,6 @@ # an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA, # PCI and ISA varieties. -# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and -# Harris (Intersil) Chipset with PCnetMobile firmware by AMD. # bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet # adapters. # bfe: Broadcom BCM4401 Ethernet adapter. @@ -1862,7 +1860,6 @@ hint.sn.0.port="0x300" hint.sn.0.irq="10" device an -device awi device cnw device wi device xe ==== //depot/projects/vap/sys/conf/files#9 (text+ko) ==== @@ -482,9 +482,6 @@ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ compile-with "${NORMAL_C} -I$S/dev/ath" -dev/awi/am79c930.c optional awi -dev/awi/awi.c optional awi -dev/awi/if_awi_pccard.c optional awi pccard dev/bce/if_bce.c optional bce dev/bfe/if_bfe.c optional bfe dev/bge/if_bge.c optional bge ==== //depot/projects/vap/sys/modules/Makefile#8 (text+ko) ==== @@ -33,7 +33,6 @@ ${_ath_rate_sample} \ aue \ ${_auxio} \ - ${_awi} \ axe \ bce \ bfe \ @@ -368,7 +367,6 @@ _ath_rate_amrr= ath_rate_amrr _ath_rate_onoe= ath_rate_onoe _ath_rate_sample=ath_rate_sample -_awi= awi _bktr= bktr _cardbus= cardbus _cbb= cbb From owner-p4-projects@FreeBSD.ORG Tue Jan 8 22:13:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BB9616A420; Tue, 8 Jan 2008 22:13:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20F7616A417 for ; Tue, 8 Jan 2008 22:13:17 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id 9500313C442 for ; Tue, 8 Jan 2008 22:13:16 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 75934 invoked from network); 8 Jan 2008 21:37:25 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 8 Jan 2008 21:37:25 -0000 Message-ID: <4783F57F.7010201@freebsd.org> Date: Tue, 08 Jan 2008 23:13:19 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.14 (Windows/20071210) MIME-Version: 1.0 To: Adrian Chadd References: <200801071418.m07EIwNn036146@repoman.freebsd.org> <4782A21C.2060504@freebsd.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 22:13:17 -0000 Adrian Chadd wrote: > On 08/01/2008, Andre Oppermann wrote: > >> Reinventing the wheel? Have a look at IPFIREWALL_FORWARD >> which supports transparent proxying as well. > > Yes, but redirects it to a local listen() socket, effectively spoofing > the destination IP. The client (ie, the computer making the connect()) > thinks its talking to the original destination. > > This is meant to implement the other end - spoofing the local IP on > sockets that you connect() to, spoofing the local IP and not the > destination IP. This is intended to let a FreeBSD box (with relevant > symmetrical routing) pretend to be a client on a connect() to a remote > server. > > If this can be done within pf/ipfw right now then please let me know. :) The IPFIREWALL_FORWARD functionality should be able to do that as well. The direction of the spoof capture doesn't really matter as long as you reverse the rule from the traditional transparent proxy example. The only missing piece is binding a local socket to a non- local IP address. That you have to address in netinet/in_pcb.c either with global sysctl or a individual socket option. Should only take a dozen lines or less to do that (including the sysctl or socket option code). -- Andre From owner-p4-projects@FreeBSD.ORG Tue Jan 8 22:51:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237BD16A46D; Tue, 8 Jan 2008 22:51:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C31E216A421 for ; Tue, 8 Jan 2008 22:51:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C79A213C45B for ; Tue, 8 Jan 2008 22:51:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08MpDfm046519 for ; Tue, 8 Jan 2008 22:51:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08MpC4l046508 for perforce@freebsd.org; Tue, 8 Jan 2008 22:51:12 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 22:51:12 GMT Message-Id: <200801082251.m08MpC4l046508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 22:51:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=132827 Change 132827 by jb@jb_freebsd1 on 2008/01/08 22:50:59 IFC Affected files ... .. //depot/projects/dtrace/ports/UPDATING#44 integrate .. //depot/projects/dtrace/src/etc/defaults/periodic.conf#10 integrate .. //depot/projects/dtrace/src/etc/periodic/daily/460.status-mail-rejects#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/dtrace/src/lib/libc/gen/posixshm.c#4 delete .. //depot/projects/dtrace/src/lib/libc/gen/shm_open.3#4 delete .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/dtrace/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/dtrace/src/share/man/man7/bsd.snmpmod.mk.7#4 integrate .. //depot/projects/dtrace/src/share/mk/bsd.snmpmod.mk#4 integrate .. //depot/projects/dtrace/src/share/termcap/termcap.src#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#31 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/dtrace/src/sys/conf/files#62 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/subr_lock.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#16 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_shm.c#1 branch .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#14 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#13 integrate .. //depot/projects/dtrace/src/sys/security/mac_test/mac_test.c#13 integrate .. //depot/projects/dtrace/src/sys/sys/fcntl.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/file.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/mman.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#17 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#17 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#17 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#16 integrate .. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#10 integrate .. //depot/projects/dtrace/src/usr.bin/unzip/Makefile#1 branch .. //depot/projects/dtrace/src/usr.bin/unzip/unzip.1#1 branch .. //depot/projects/dtrace/src/usr.bin/unzip/unzip.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/config/main.c#6 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#16 integrate .. //depot/projects/dtrace/www/share/sgml/templates.news-rss.xsl#2 integrate Differences ... ==== //depot/projects/dtrace/ports/UPDATING#44 (text+ko) ==== @@ -6,6 +6,21 @@ time you update your ports collection, before attempting any port upgrades. +20080108: + AFFECTS: users of irc/bitlbee + AUTHOR: brix@FreeBSD.org + + irc/bitlbee now stores saved user settings in /var/db/bitlbee/, not + $PREFIX/etc/bitlbee/. You will have to manually move any existing + user settings to the new location (or override the user settings + directory using -d if you wish to keep the old behavior). Other + configuration files are still kept in $PREFIX/etc/bitlbee/ by + default. + + The default installation is now configured for running bitlbee as + user 'nobody' by default. Make sure any existing configuration + files are readable by that user. + 20071225: AFFECTS: users of www/amphetadesk AUTHOR: lioux@FreeBSD.org @@ -5922,4 +5937,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.572 2007/12/30 09:20:24 blackend Exp $ +$FreeBSD: ports/UPDATING,v 1.573 2008/01/08 20:53:38 brix Exp $ ==== //depot/projects/dtrace/src/etc/defaults/periodic.conf#10 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.46 2007/12/20 20:37:22 dougb Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.47 2008/01/08 07:22:43 dds Exp $ # # What files override these defaults ? @@ -127,6 +127,7 @@ # 460.status-mail-rejects daily_status_mail_rejects_enable="YES" # Check mail rejects daily_status_mail_rejects_logs=3 # How many logs to check +daily_status_mail_rejects_shorten="NO" # Shorten output # 470.status-named daily_status_named_enable="YES" ==== //depot/projects/dtrace/src/etc/periodic/daily/460.status-mail-rejects#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.21 2008/01/08 07:22:43 dds Exp $ # # If there is a global system configuration file, suck it in. @@ -11,6 +11,13 @@ source_periodic_confs fi +case "$daily_status_mail_rejects_shorten" in +[Yy][Ee][Ss]) + sed_output='\4 \3...';; +*) + sed_output='\2 (\3... \4)';; +esac + case "$daily_status_mail_rejects_enable" in [Yy][Ee][Ss]) if [ ! -d /etc/mail ] @@ -51,7 +58,7 @@ done cat /var/log/maillog } | - sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' | + sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/'"$sed_output"'/p' | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) [ $rc -gt 0 ] && rc=1 fi;; ==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.129 2008/01/08 21:58:13 jhb Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -21,7 +21,7 @@ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pmadvise.c popen.c posixshm.c pselect.c \ + pause.c pmadvise.c popen.c pselect.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ @@ -59,7 +59,7 @@ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_wait.3 \ - setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ + setjmp.3 setmode.3 setproctitle.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ @@ -133,7 +133,6 @@ setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \ setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3 MLINKS+=setmode.3 getmode.3 -MLINKS+=shm_open.3 shm_unlink.3 MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \ sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \ sigsetops.3 sigismember.3 ==== //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.128 2008/01/08 21:58:14 jhb Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -83,7 +83,7 @@ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \ setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \ - setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \ + setuid.2 shmat.2 shmctl.2 shmget.2 shm_open.2 shutdown.2 \ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ @@ -154,6 +154,7 @@ MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2 MLINKS+=shmat.2 shmdt.2 +MLINKS+=shm_open.2 shm_unlink.2 MLINKS+=sigwaitinfo.2 sigtimedwait.2 MLINKS+=stat.2 fstat.2 stat.2 lstat.2 MLINKS+=statfs.2 fstatfs.2 ==== //depot/projects/dtrace/src/share/man/man4/lagg.4#2 (text+ko) ==== @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.4 2007/07/30 20:17:21 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.5 2008/01/08 15:36:06 gabor Exp $ .\" .Dd April 17, 2007 .Dt LAGG 4 @@ -154,7 +154,7 @@ The .Nm device first appeared in -.Fx 7.0 . +.Fx 6.3 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/share/man/man7/bsd.snmpmod.mk.7#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2005 +.\" Copyright (c) 2005,2008 .\" Hartmut Brandt. .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.4 2005/11/18 12:01:14 ru Exp $ +.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.5 2008/01/08 12:55:56 harti Exp $ .\" -.Dd November 10, 2005 +.Dd January 8, 2008 .Dt BSD.SNMPMOD.MK 7 .Os .Sh NAME @@ -66,6 +66,21 @@ A list of extra MIB definition files for .Xr gensnmptree 1 . This is optional. +This file list is given to both calls to +.Xr gensnmptree 1 \(em +the one that extracts the symbols in +.Va XSYM +from the MIB definitions and the one that +generates the table with OIDs served by this module. +.It Va EXTRAMIBSYMS +A list of extra MIB definition files for +.Xr gensnmptree 1 . +This is optional. +This file list is given only to the call to +.Xr gensnmptree 1 +that extracts symbols from MIB definition files. +It is useful if there are dependencies on other MIBs or for extracting global +definitions for enumeration constants. .It Va XSYM A list of symbols to be extracted from the MIB definition files by .Xr gensnmptree 1 . ==== //depot/projects/dtrace/src/share/mk/bsd.snmpmod.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.snmpmod.mk,v 1.2 2005/11/10 12:07:12 harti Exp $ +# $FreeBSD: src/share/mk/bsd.snmpmod.mk,v 1.3 2008/01/08 12:55:56 harti Exp $ INCSDIR= ${INCLUDEDIR}/bsnmp @@ -7,7 +7,7 @@ CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CFLAGS+= -I. -${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} +${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} ${EXTRAMIBSYMS} cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET} .ORDER: ${MOD}_tree.c ${MOD}_tree.h ==== //depot/projects/dtrace/src/share/termcap/termcap.src#7 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.149 2007/10/17 19:58:50 yar Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.150 2008/01/08 16:00:24 rafan Exp $ # Termcap source file # John Kunze, Berkeley @@ -2805,8 +2805,8 @@ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ - :kH=\EOF:@7=\EOF:kI=\E[2~:\ - :kh=\EOH:*6=\EOF:kP=\E[5~:kN=\E[6~:\ + :@7=\EOF:@8=\EOM:kI=\E[2~:\ + :kh=\EOH:kP=\E[5~:kN=\E[6~:\ :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic: # # This chunk is used for building the VT220/Sun/PC keyboard variants. ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#31 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.602 2008/01/06 18:51:03 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -2075,15 +2075,8 @@ pd_entry_t ptepde; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#18 (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.79 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.80 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#18 (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.77 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.78 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #define FREEBSD32_SYS_syscall 0 @@ -338,4 +338,6 @@ #define FREEBSD32_SYS_freebsd32_truncate 479 #define FREEBSD32_SYS_freebsd32_ftruncate 480 #define FREEBSD32_SYS_thr_kill2 481 -#define FREEBSD32_SYS_MAXSYSCALL 482 +#define FREEBSD32_SYS_shm_open 482 +#define FREEBSD32_SYS_shm_unlink 483 +#define FREEBSD32_SYS_MAXSYSCALL 484 ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 (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.68 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.69 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ const char *freebsd32_syscallnames[] = { @@ -489,4 +489,6 @@ "freebsd32_truncate", /* 479 = freebsd32_truncate */ "freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */ "thr_kill2", /* 481 = thr_kill2 */ + "shm_open", /* 482 = shm_open */ + "shm_unlink", /* 483 = shm_unlink */ }; ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#18 (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.78 2007/12/06 23:37:26 jhb Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.79 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp */ #include "opt_compat.h" @@ -521,4 +521,6 @@ { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */ { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 }, /* 482 = shm_open */ + { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 }, /* 483 = shm_unlink */ }; ==== //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#18 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.93 2007/12/06 23:36:57 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -796,3 +796,6 @@ 480 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, \ u_int32_t lengthlo, u_int32_t lengthhi); } 481 AUE_KILL NOPROTO { int thr_kill2(pid_t pid, long id, int sig); } +482 AUE_NULL NOPROTO { int shm_open(const char *path, int flags, \ + mode_t mode); } +483 AUE_NULL NOPROTO { int shm_unlink(const char *path); } ==== //depot/projects/dtrace/src/sys/conf/files#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1261 2007/12/29 19:53:03 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1262 2008/01/08 21:58:14 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1541,6 +1541,7 @@ kern/uipc_mbuf2.c standard kern/uipc_mqueue.c optional p1003_1b_mqueue kern/uipc_sem.c optional p1003_1b_semaphores +kern/uipc_shm.c standard kern/uipc_sockbuf.c standard kern/uipc_socket.c standard kern/uipc_syscalls.c standard @@ -2047,6 +2048,7 @@ security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_posix_sem.c optional mac +security/mac/mac_posix_shm.c optional mac security/mac/mac_priv.c optional mac security/mac/mac_process.c optional mac security/mac/mac_socket.c optional mac ==== //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#14 (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.152 2008/01/07 20:05:18 jhb Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.153 2008/01/08 04:45:24 jhb Exp $ */ /* @@ -992,17 +992,20 @@ vnode_destroy_vobject(vp); + VI_LOCK(vp); dev_lock(); dev = vp->v_rdev; vp->v_rdev = NULL; if (dev == NULL) { dev_unlock(); + VI_UNLOCK(vp); return (0); } dev->si_usecount -= vp->v_usecount; dev_unlock(); + VI_UNLOCK(vp); dev_rel(dev); return (0); } ==== //depot/projects/dtrace/src/sys/i386/i386/pmap.c#27 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.605 2008/01/06 18:51:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.606 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -2119,15 +2119,8 @@ pt_entry_t *pte, tpte; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); sched_pin(); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { ==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.230 2007/08/16 05:32:25 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.231 2008/01/08 22:01:25 jhb Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp */ #include "opt_compat.h" @@ -511,4 +511,6 @@ { AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = truncate */ { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 }, /* 481 = thr_kill2 */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 }, /* 482 = shm_open */ + { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 }, /* 483 = shm_unlink */ }; ==== //depot/projects/dtrace/src/sys/kern/kern_descrip.c#16 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.317 2008/01/07 20:05:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.318 2008/01/08 21:58:15 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -2646,6 +2646,8 @@ return ("crpt"); case DTYPE_MQUEUE: return ("mque"); + case DTYPE_SHM: + return ("shm"); default: return ("unkn"); } ==== //depot/projects/dtrace/src/sys/kern/subr_lock.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.20 2007/12/31 03:45:51 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.21 2008/01/08 01:11:40 kris Exp $"); #include "opt_ddb.h" #include "opt_mprof.h" @@ -492,7 +492,7 @@ if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE)) return; if (lock_prof_skipcount && - (++lock_prof_count % lock_prof_skipcount) == 0) + (++lock_prof_count % lock_prof_skipcount) != 0) return; spin = LOCK_CLASS(lo) == &lock_class_mtx_spin; if (spin && lock_prof_skipspin == 1) ==== //depot/projects/dtrace/src/sys/kern/syscalls.c#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.214 2007/08/16 05:32:26 davidxu Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.232 2007/07/04 22:47:37 peter Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.215 2008/01/08 22:01:26 jhb Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp */ const char *syscallnames[] = { @@ -489,4 +489,6 @@ "truncate", /* 479 = truncate */ "ftruncate", /* 480 = ftruncate */ "thr_kill2", /* 481 = thr_kill2 */ + "shm_open", /* 482 = shm_open */ + "shm_unlink", /* 483 = shm_unlink */ }; ==== //depot/projects/dtrace/src/sys/kern/syscalls.master#16 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.234 2007/10/19 19:17:53 emaste Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -847,5 +847,8 @@ 479 AUE_TRUNCATE STD { int truncate(char *path, off_t length); } 480 AUE_FTRUNCATE STD { int ftruncate(int fd, off_t length); } 481 AUE_KILL STD { int thr_kill2(pid_t pid, long id, int sig); } +482 AUE_NULL STD { int shm_open(const char *path, int flags, \ + mode_t mode); } +483 AUE_NULL STD { int shm_unlink(const char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#13 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.14 2007/08/16 05:32:26 davidxu Exp $ + * $FreeBSD: src/sys/kern/systrace_args.c,v 1.15 2008/01/08 22:01:26 jhb Exp $ * This file is part of the DTrace syscall provider. */ @@ -2871,6 +2871,22 @@ *n_args = 3; break; } + /* shm_open */ + case 482: { + struct shm_open_args *p = params; + uarg[0] = (intptr_t) p->path; /* const char * */ + iarg[1] = p->flags; /* int */ + iarg[2] = p->mode; /* mode_t */ + *n_args = 3; + break; + } + /* shm_unlink */ + case 483: { + struct shm_unlink_args *p = params; + uarg[0] = (intptr_t) p->path; /* const char * */ + *n_args = 1; + break; + } default: *n_args = 0; break; ==== //depot/projects/dtrace/src/sys/kern/tty.c#11 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.273 2007/07/20 09:41:54 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.274 2008/01/08 04:53:28 jhb Exp $"); #include "opt_compat.h" #include "opt_tty.h" @@ -3040,16 +3040,19 @@ * * XXX: This shall sleep until all threads have left the driver. */ - void ttyfree(struct tty *tp) { + struct cdev *dev; u_int unit; mtx_assert(&Giant, MA_OWNED); ttygone(tp); unit = tp->t_devunit; - destroy_dev(tp->t_mdev); + dev = tp->t_mdev; + tp->t_dev = NULL; + ttyrel(tp); + destroy_dev(dev); free_unr(tty_unit, unit); } @@ -3065,7 +3068,6 @@ tp = TAILQ_FIRST(&tty_list); if (tp != NULL) ttyref(tp); - mtx_unlock(&tty_list_mutex); while (tp != NULL) { bzero(&xt, sizeof xt); xt.xt_size = sizeof xt; @@ -3074,6 +3076,18 @@ xt.xt_cancc = tp->t_canq.c_cc; xt.xt_outcc = tp->t_outq.c_cc; XT_COPY(line); + + /* + * XXX: We hold the tty list lock while doing this to + * work around a race with pty/pts tty destruction. + * They set t_dev to NULL and then call ttyrel() to + * free the structure which will block on the list + * lock before they call destroy_dev() on the cdev + * backing t_dev. + * + * XXX: ttyfree() now does the same since it has been + * fixed to not leak ttys. + */ if (tp->t_dev != NULL) xt.xt_dev = dev2udev(tp->t_dev); XT_COPY(state); @@ -3096,6 +3110,7 @@ XT_COPY(olowat); XT_COPY(ospeedwat); #undef XT_COPY + mtx_unlock(&tty_list_mutex); error = SYSCTL_OUT(req, &xt, sizeof xt); if (error != 0) { ttyrel(tp); @@ -3108,7 +3123,9 @@ mtx_unlock(&tty_list_mutex); ttyrel(tp); tp = tp2; + mtx_lock(&tty_list_mutex); } + mtx_unlock(&tty_list_mutex); return (0); } ==== //depot/projects/dtrace/src/sys/netinet6/frag6.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.34 2007/12/10 16:03:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.35 2008/01/08 19:08:57 obrien Exp $"); #include #include @@ -62,11 +62,11 @@ */ #define IN6_IFSTAT_STRICT -static void frag6_enq __P((struct ip6asfrag *, struct ip6asfrag *)); -static void frag6_deq __P((struct ip6asfrag *)); -static void frag6_insque __P((struct ip6q *, struct ip6q *)); -static void frag6_remque __P((struct ip6q *)); -static void frag6_freef __P((struct ip6q *)); +static void frag6_enq(struct ip6asfrag *, struct ip6asfrag *); +static void frag6_deq(struct ip6asfrag *); +static void frag6_insque(struct ip6q *, struct ip6q *); +static void frag6_remque(struct ip6q *); +static void frag6_freef(struct ip6q *); static struct mtx ip6qlock; /* ==== //depot/projects/dtrace/src/sys/netinet6/icmp6.c#11 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.81 2007/12/10 16:03:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.82 2008/01/08 19:08:57 obrien Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -117,19 +117,19 @@ static struct timeval icmp6errppslim_last; extern int icmp6_nodeinfo; -static void icmp6_errcount __P((struct icmp6errstat *, int, int)); -static int icmp6_rip6_input __P((struct mbuf **, int)); -static int icmp6_ratelimit __P((const struct in6_addr *, const int, const int)); +static void icmp6_errcount(struct icmp6errstat *, int, int); +static int icmp6_rip6_input(struct mbuf **, int); +static int icmp6_ratelimit(const struct in6_addr *, const int, const int); static const char *icmp6_redirect_diag __P((struct in6_addr *, struct in6_addr *, struct in6_addr *)); -static struct mbuf *ni6_input __P((struct mbuf *, int)); -static struct mbuf *ni6_nametodns __P((const char *, int, int)); -static int ni6_dnsmatch __P((const char *, int, const char *, int)); +static struct mbuf *ni6_input(struct mbuf *, int); +static struct mbuf *ni6_nametodns(const char *, int, int); +static int ni6_dnsmatch(const char *, int, const char *, int); static int ni6_addrs __P((struct icmp6_nodeinfo *, struct mbuf *, struct ifnet **, struct in6_addr *)); static int ni6_store_addrs __P((struct icmp6_nodeinfo *, struct icmp6_nodeinfo *, struct ifnet *, int)); -static int icmp6_notify_error __P((struct mbuf **, int, int, int)); +static int icmp6_notify_error(struct mbuf **, int, int, int); void @@ -885,7 +885,7 @@ /* Detect the upper level protocol */ { - void (*ctlfunc) __P((int, struct sockaddr *, void *)); + void (*ctlfunc)(int, struct sockaddr *, void *); u_int8_t nxt = eip6->ip6_nxt; int eoff = off + sizeof(struct icmp6_hdr) + sizeof(struct ip6_hdr); @@ -1072,7 +1072,7 @@ icmp6_mtudisc_update(&ip6cp, 1); /*XXX*/ } - ctlfunc = (void (*) __P((int, struct sockaddr *, void *))) + ctlfunc = (void (*)(int, struct sockaddr *, void *)) (inet6sw[ip6_protox[nxt]].pr_ctlinput); if (ctlfunc) { (void) (*ctlfunc)(code, (struct sockaddr *)&icmp6dst, ==== //depot/projects/dtrace/src/sys/netinet6/in6.c#13 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.76 2007/12/10 16:03:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.77 2008/01/08 19:08:57 obrien Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -127,7 +127,7 @@ struct ifnet *, struct thread *)); static int in6_ifinit __P((struct ifnet *, struct in6_ifaddr *, struct sockaddr_in6 *, int)); -static void in6_unlink_ifa __P((struct in6_ifaddr *, struct ifnet *)); +static void in6_unlink_ifa(struct in6_ifaddr *, struct ifnet *); struct in6_multihead in6_multihead; /* XXX BSS initialization */ int (*faithprefix_p)(struct in6_addr *); ==== //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.40 2007/12/10 16:03:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.41 2008/01/08 19:08:57 obrien Exp $"); #include #include @@ -73,12 +73,12 @@ extern struct inpcbinfo udbinfo; extern struct inpcbinfo ripcbinfo; -static int get_rand_ifid __P((struct ifnet *, struct in6_addr *)); -static int generate_tmp_ifid __P((u_int8_t *, const u_int8_t *, u_int8_t *)); -static int get_ifid __P((struct ifnet *, struct ifnet *, struct in6_addr *)); -static int in6_ifattach_linklocal __P((struct ifnet *, struct ifnet *)); -static int in6_ifattach_loopback __P((struct ifnet *)); -static void in6_purgemaddrs __P((struct ifnet *)); +static int get_rand_ifid(struct ifnet *, struct in6_addr *); +static int generate_tmp_ifid(u_int8_t *, const u_int8_t *, u_int8_t *); +static int get_ifid(struct ifnet *, struct ifnet *, struct in6_addr *); +static int in6_ifattach_linklocal(struct ifnet *, struct ifnet *); +static int in6_ifattach_loopback(struct ifnet *); +static void in6_purgemaddrs(struct ifnet *); #define EUI64_GBIT 0x01 #define EUI64_UBIT 0x02 ==== //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#13 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.86 2007/12/17 17:20:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.87 2008/01/08 19:08:57 obrien Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -571,7 +571,7 @@ in6_pcbnotify(struct inpcbinfo *pcbinfo, struct sockaddr *dst, u_int fport_arg, const struct sockaddr *src, u_int lport_arg, int cmd, void *cmdarg, - struct inpcb *(*notify) __P((struct inpcb *, int))) + struct inpcb *(*notify)(struct inpcb *, int)) { struct inpcbhead *head; struct inpcb *inp, *ninp; ==== //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#9 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_proto.c,v 1.47 2007/12/10 16:03:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_proto.c,v 1.48 2008/01/08 19:08:57 obrien Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -339,7 +339,7 @@ }, }; -extern int in6_inithead __P((void **, int)); +extern int in6_inithead(void **, int); struct domain inet6domain = { .dom_family = AF_INET6, ==== //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#7 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.19 2007/12/10 16:03:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.20 2008/01/08 19:08:57 obrien Exp $"); #include #include @@ -103,7 +103,7 @@ #include #include -extern int in6_inithead __P((void **head, int off)); +extern int in6_inithead(void **head, int off); #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ ==== //depot/projects/dtrace/src/sys/netinet6/in6_src.c#10 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_src.c,v 1.47 2007/12/10 16:03:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_src.c,v 1.48 2008/01/08 19:08:57 obrien Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -121,15 +121,15 @@ static int in6_selectif __P((struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *ro, struct ifnet **)); -static struct in6_addrpolicy *lookup_addrsel_policy __P((struct sockaddr_in6 *)); +static struct in6_addrpolicy *lookup_addrsel_policy(struct sockaddr_in6 *); -static void init_policy_queue __P((void)); -static int add_addrsel_policyent __P((struct in6_addrpolicy *)); -static int delete_addrsel_policyent __P((struct in6_addrpolicy *)); +static void init_policy_queue(void); +static int add_addrsel_policyent(struct in6_addrpolicy *); +static int delete_addrsel_policyent(struct in6_addrpolicy *); static int walk_addrsel_policy __P((int (*)(struct in6_addrpolicy *, void *), void *)); -static int dump_addrsel_policyent __P((struct in6_addrpolicy *, void *)); -static struct in6_addrpolicy *match_addrsel_policy __P((struct sockaddr_in6 *)); +static int dump_addrsel_policyent(struct in6_addrpolicy *, void *); +static struct in6_addrpolicy *match_addrsel_policy(struct sockaddr_in6 *); /* * Return an IPv6 address, which is the most appropriate for a given @@ -1010,7 +1010,7 @@ } static int -walk_addrsel_policy(int (*callback) __P((struct in6_addrpolicy *, void *)), +walk_addrsel_policy(int (*callback)(struct in6_addrpolicy *, void *), void *w) { struct addrsel_policyent *pol; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 8 22:53:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81C2016A41A; Tue, 8 Jan 2008 22:53:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4737216A418 for ; Tue, 8 Jan 2008 22:53:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D92113C458 for ; Tue, 8 Jan 2008 22:53:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08MrFK1047303 for ; Tue, 8 Jan 2008 22:53:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08MrFLa047300 for perforce@freebsd.org; Tue, 8 Jan 2008 22:53:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 8 Jan 2008 22:53:15 GMT Message-Id: <200801082253.m08MrFLa047300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 22:53:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=132828 Change 132828 by jb@jb_freebsd1 on 2008/01/08 22:53:09 Default some return variables so that they are a known quantity when the search attribute value isn't found. Enhance some debug statements with the DIE offset in hex (because that's how dwarfdump refers to DIEs). Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#12 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#12 (text) ==== @@ -354,6 +354,7 @@ die_signed(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Signed *valp, int req) { + *valp = 0; if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { if (req) terminate("die %llu: failed to get unsigned: %s\n", @@ -367,6 +368,7 @@ die_unsigned(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Unsigned *valp, int req) { + *valp = 0; if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { if (req) terminate("die %llu: failed to get unsigned: %s\n", @@ -379,6 +381,8 @@ static int die_bool(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Bool *valp, int req) { + *valp = 0; + if (dwarf_attrval_flag(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { if (req) terminate("die %llu: failed to get flag: %s\n", @@ -1403,7 +1407,7 @@ { Dwarf_Attribute attr; - debug(3, "die %llu: creating %s\n", off, typename); + debug(3, "die %llu <%llx>: creating %s type %d\n", off, off, typename, type); tdp->t_type = type; @@ -1467,7 +1471,7 @@ iidesc_t *ii; char *name; - debug(3, "die %llu: creating function definition '%s'\n", off); + debug(3, "die %llu <%llx>: creating function definition\n", off, off); /* * We'll begin by processing any type definition nodes that may be @@ -1654,7 +1658,7 @@ Dwarf_Half tag; tdesc_t *tdp; - debug(3, "die %llu: create_one\n", off); + debug(3, "die %llu <%llx>: create_one\n", off, off); if (off > dw->dw_maxoff) { terminate("illegal die offset %llu (max %llu)\n", off, From owner-p4-projects@FreeBSD.ORG Tue Jan 8 23:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB32E16A473; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 905DC16A46B for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97B7213C447 for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08NIiuQ053345 for ; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08NIiRm053342 for perforce@freebsd.org; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 8 Jan 2008 23:18:44 GMT Message-Id: <200801082318.m08NIiRm053342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 23:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=132830 Change 132830 by hselasky@hselasky_laptop001 on 2008/01/08 23:18:02 Fix a "can be used uninitialized" warning, which is not the case, on FreeBSD 6.3. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#101 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#101 (text+ko) ==== @@ -771,6 +771,7 @@ parm.err = 0; refcount = 0; + info = NULL; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "usbd_transfer_setup can sleep!"); @@ -848,10 +849,7 @@ parm.err = USBD_NO_INTR_THREAD; goto done; } - } else { - info = NULL; } - /* reset sizes */ parm.size[0] = 0; From owner-p4-projects@FreeBSD.ORG Tue Jan 8 23:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FDA316A55F; Tue, 8 Jan 2008 23:18:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B431016A46D for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBA1913C45D for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08NIiNb053351 for ; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08NIiKg053348 for perforce@freebsd.org; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 8 Jan 2008 23:18:44 GMT Message-Id: <200801082318.m08NIiKg053348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 23:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=132831 Change 132831 by hselasky@hselasky_laptop001 on 2008/01/08 23:18:29 Compile fix for FreeBSD 6.3. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#23 (text+ko) ==== @@ -110,7 +110,7 @@ #define SCSI_MODE_SENSE MODE_SENSE #define usb_thread_create kthread_create1 -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) #if (__NetBSD_Version__ >= 300000000) typedef void *usb_malloc_type; @@ -170,7 +170,7 @@ #endif #define usb_thread_create kthread_create -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) typedef int usb_malloc_type; @@ -197,11 +197,13 @@ #if (__FreeBSD_version >= 700000) #define usb_thread_create(f, s, p, ...) \ kproc_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) -#define usb_thread_exit(err) kproc_exit(err) +#define usb_thread_exit(err) kproc_exit(err) #else #define usb_thread_create(f, s, p, ...) \ kthread_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) +#define thread_lock(td) mtx_lock_spin(&sched_lock) +#define thread_unlock(td) mtx_unlock_spin(&sched_lock) #endif #define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0) From owner-p4-projects@FreeBSD.ORG Wed Jan 9 00:16:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B375616A41A; Wed, 9 Jan 2008 00:16:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 639D816A417 for ; Wed, 9 Jan 2008 00:16:16 +0000 (UTC) (envelope-from peter@wemm.org) Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.240]) by mx1.freebsd.org (Postfix) with ESMTP id 352A613C442 for ; Wed, 9 Jan 2008 00:16:16 +0000 (UTC) (envelope-from peter@wemm.org) Received: by an-out-0708.google.com with SMTP id c14so8157anc.13 for ; Tue, 08 Jan 2008 16:16:15 -0800 (PST) Received: by 10.100.57.6 with SMTP id f6mr33482800ana.113.1199836034887; Tue, 08 Jan 2008 15:47:14 -0800 (PST) Received: by 10.100.153.12 with HTTP; Tue, 8 Jan 2008 15:47:14 -0800 (PST) Message-ID: Date: Tue, 8 Jan 2008 15:47:14 -0800 From: "Peter Wemm" To: "Robert Watson" In-Reply-To: <20080104012425.N42109@fledge.watson.org> MIME-Version: 1.0 References: <200801032225.m03MPHAE060675@repoman.freebsd.org> <20080104012425.N42109@fledge.watson.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 132434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 00:16:17 -0000 On Jan 3, 2008 5:25 PM, Robert Watson wrote: > On Thu, 3 Jan 2008, Peter Wemm wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=132434 > > > > Change 132434 by peter@peter_daintree on 2008/01/03 22:24:56 > > > > Export the build uuid to the dump header. Nothing interesting is > done > > with it at this point. > > > > While here, move all the mkdumpheader() copies into a MI place, as > > the (duplicated) comment suggested. Allow magic numbers to be > passed > > through so textdumps can share the code too. > > Currently, I duplicate the panic string and kernel version string from the > dump header in the textdump itself as data files. Any chance you want to > do > the same with the uuid? > > (Perhaps a better model would be to have savecore append another file to > the > textdump containing the header information, but the above seems to work > fine > for now, and has some advantages). > I was originally planning to put the uuid in the minidump header. But, I believe that savecore will store the uuid in the info.xxxx file. I have not actually tested this. Still, more copies is probably better than less. Granted, the version string is probably more than good enough given that it stores a build timestamp, but it wasn't really meant for that. The build uuid is meant to guarantee the ability to conclusively match between a kernel dump and the actual source kernel file. -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Wed Jan 9 03:58:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12D9316A46E; Wed, 9 Jan 2008 03:58:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9BF516A420 for ; Wed, 9 Jan 2008 03:58:20 +0000 (UTC) (envelope-from qingli@speakeasy.net) Received: from mail5.sea5.speakeasy.net (mail5.sea5.speakeasy.net [69.17.117.7]) by mx1.freebsd.org (Postfix) with ESMTP id 92B6B13C45A for ; Wed, 9 Jan 2008 03:58:20 +0000 (UTC) (envelope-from qingli@speakeasy.net) Received: (qmail 21439 invoked from network); 9 Jan 2008 03:31:38 -0000 Received: from dsl081-051-141.sfo1.dsl.speakeasy.net (HELO SAINTS) (qingli@[64.81.51.141]) (envelope-sender ) by mail5.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 9 Jan 2008 03:31:38 -0000 From: "Qing Li" To: "'Andre Oppermann'" , "'Adrian Chadd'" References: <200801071418.m07EIwNn036146@repoman.freebsd.org> <4782A21C.2060504@freebsd.org> <4783F57F.7010201@freebsd.org> Date: Tue, 8 Jan 2008 19:31:42 -0800 Message-ID: <001501c85270$271f8110$8d335140@SAINTS> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <4783F57F.7010201@freebsd.org> X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 Thread-Index: AchSQ6x5U8mfk1jERneFv+uUpCwjMAAK4PIg Cc: 'Perforce Change Reviews' Subject: RE: PERFORCE change 132710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 03:58:21 -0000 > -----Original Message----- > From: Andre Oppermann [mailto:andre@freebsd.org] > Sent: Tuesday, January 08, 2008 2:13 PM > To: Adrian Chadd > Cc: Perforce Change Reviews > Subject: Re: PERFORCE change 132710 for review > > Adrian Chadd wrote: > > On 08/01/2008, Andre Oppermann wrote: > > > >> Reinventing the wheel? Have a look at IPFIREWALL_FORWARD which > >> supports transparent proxying as well. > > > > Yes, but redirects it to a local listen() socket, > effectively spoofing > > the destination IP. The client (ie, the computer making the > connect()) > > thinks its talking to the original destination. > > > > This is meant to implement the other end - spoofing the local IP on > > sockets that you connect() to, spoofing the local IP and not the > > destination IP. This is intended to let a FreeBSD box (with > relevant > > symmetrical routing) pretend to be a client on a connect() > to a remote server. > > "with symmetrical routing" I assume you are referring to in-line deployment ... > > If this can be done within pf/ipfw right now then please > let me know. > > :) > > The IPFIREWALL_FORWARD functionality should be able to do > that as well. Yup. :) You could actually IPFIREWALL_FORWARD to 127.0.0.1 as long as you have updated in_pcb.c to allow for spoofed socket. > > The direction of the spoof capture doesn't > really matter as long as you reverse the rule from the > traditional transparent proxy example. > I don't quite understand what you mean here, but the directionality really do matter if you don't want to leak packets from a guard policy (well, more accurately how many packets that are allowed to leak). > > The only missing > piece is binding a local socket to a non- local IP address. > That you have to address in netinet/in_pcb.c either with > global sysctl or a individual socket option. Should only > take a dozen lines or less to do that (including the sysctl > or socket option code). > Yup. That's the key piece here. -- Qing > -- > Andre > > > From owner-p4-projects@FreeBSD.ORG Wed Jan 9 04:24:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE1716A421; Wed, 9 Jan 2008 04:24:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE7D416A41A for ; Wed, 9 Jan 2008 04:24:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 903E313C448 for ; Wed, 9 Jan 2008 04:24:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m094OHUs017286 for ; Wed, 9 Jan 2008 04:24:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m094OH7V017283 for perforce@freebsd.org; Wed, 9 Jan 2008 04:24:17 GMT (envelope-from jb@freebsd.org) Date: Wed, 9 Jan 2008 04:24:17 GMT Message-Id: <200801090424.m094OH7V017283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 04:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=132847 Change 132847 by jb@jb_freebsd1 on 2008/01/09 04:23:24 Return types are a wonderful thing. Provided you actually code them. Oops. A few debug changes. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#13 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#13 (text) ==== @@ -357,8 +357,9 @@ *valp = 0; if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { if (req) - terminate("die %llu: failed to get unsigned: %s\n", + terminate("die %llu: failed to get signed: %s\n", die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + return (0); } return (1); @@ -373,6 +374,7 @@ if (req) terminate("die %llu: failed to get unsigned: %s\n", die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + return (0); } return (1); @@ -387,6 +389,7 @@ if (req) terminate("die %llu: failed to get flag: %s\n", die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + return (0); } return (1); @@ -404,6 +407,7 @@ die_off(dw, die), dwarf_errmsg(&dw->dw_err)); else *strp = NULL; + return (0); } else *strp = xstrdup(str); @@ -658,7 +662,7 @@ Dwarf_Unsigned uval; Dwarf_Die dim; - debug(3, "die %llu: creating array\n", off); + debug(3, "die %llu <%llx>: creating array\n", off, off); if ((dim = die_child(dw, arr)) == NULL || die_tag(dw, dim) != DW_TAG_subrange_type) @@ -689,7 +693,7 @@ tdp->t_flags |= flags; } - debug(3, "die %llu: array nelems %u size %u\n", off, + debug(3, "die %llu <%llx>: array nelems %u size %u\n", off, off, tdp->t_ardef->ad_nelems, tdp->t_size); } @@ -1082,10 +1086,11 @@ for (ml = tdp->t_members; ml != NULL; ml = ml->ml_next) { if (ml->ml_size == 0) { - fprintf(stderr, "%s %d: failed to size member \"%s\" " - "of type %s (%d)\n", typename, tdp->t_id, + fprintf(stderr, "%s %d <%x>: failed to size member \"%s\" " + "of type %s (%d <%x>)\n", typename, tdp->t_id, + tdp->t_id, ml->ml_name, tdesc_name(ml->ml_type), - ml->ml_type->t_id); + ml->ml_type->t_id, ml->ml_type->t_id); } } From owner-p4-projects@FreeBSD.ORG Wed Jan 9 06:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D83116A41B; Wed, 9 Jan 2008 06:50:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1327316A418 for ; Wed, 9 Jan 2008 06:50:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E28A713C447 for ; Wed, 9 Jan 2008 06:50:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m096o1Lm068863 for ; Wed, 9 Jan 2008 06:50:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m096o1cs068843 for perforce@freebsd.org; Wed, 9 Jan 2008 06:50:01 GMT (envelope-from imp@freebsd.org) Date: Wed, 9 Jan 2008 06:50:01 GMT Message-Id: <200801090650.m096o1cs068843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 06:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=132855 Change 132855 by imp@imp_lighthouse on 2008/01/09 06:49:37 The aim powerpc stuff still uses trap. I'm not sure if these declarations should be here, or in trap_aim.h, but I'll keep them here since it just seems less wrong. This is needed for GENERIC compilation (at least without modules). If this is done 'wrong' feel free to point me in the right direction or do whatever else gets GENERIC compiling. Affected files ... .. //depot/projects/e500/sys/powerpc/include/trap.h#4 edit Differences ... ==== //depot/projects/e500/sys/powerpc/include/trap.h#4 (text+ko) ==== @@ -110,12 +110,11 @@ #define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f) /* source or target */ #define EXC_ALI_RA(dsisr) (dsisr & 0x1f) +#endif /* _POWERPC_TRAP_H_ */ + +#endif /* if 0 commenting all the above out */ + #ifndef LOCORE - struct trapframe; void trap(struct trapframe *); - -#endif - -#endif /* _POWERPC_TRAP_H_ */ #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 9 07:14:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F80A16A469; Wed, 9 Jan 2008 07:14:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CCB216A419 for ; Wed, 9 Jan 2008 07:14:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC0E913C442 for ; Wed, 9 Jan 2008 07:14:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m097ETDL075510 for ; Wed, 9 Jan 2008 07:14:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m097ETZT075506 for perforce@freebsd.org; Wed, 9 Jan 2008 07:14:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 9 Jan 2008 07:14:29 GMT Message-Id: <200801090714.m097ETZT075506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 07:14:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132856 Change 132856 by jb@jb_freebsd1 on 2008/01/09 07:13:38 Don't try to run ctfconvert on C++ objects. That isn't really required until after we're able to trace userland processes written in C. Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#13 edit .. //depot/projects/dtrace/src/share/mk/sys.mk#19 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#13 (text+ko) ==== @@ -76,15 +76,9 @@ .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} ==== //depot/projects/dtrace/src/share/mk/sys.mk#19 (text+ko) ==== @@ -230,15 +230,9 @@ .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} -.if defined(CTFCONVERT) - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.endif .m.o: ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} From owner-p4-projects@FreeBSD.ORG Wed Jan 9 10:44:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BF5516A41A; Wed, 9 Jan 2008 10:44:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA85516A417 for ; Wed, 9 Jan 2008 10:44:47 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B50AF13C459 for ; Wed, 9 Jan 2008 10:44:47 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09Ailbi074346 for ; Wed, 9 Jan 2008 10:44:47 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09Aii5u074343 for perforce@freebsd.org; Wed, 9 Jan 2008 10:44:44 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 9 Jan 2008 10:44:44 GMT Message-Id: <200801091044.m09Aii5u074343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 132873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 10:44:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=132873 Change 132873 by rpaulo@rpaulo_alpha on 2008/01/09 10:44:22 IFC Affected files ... .. //depot/projects/tcpecn/amd64/amd64/pmap.c#4 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#4 integrate .. //depot/projects/tcpecn/amd64/conf/NOTES#3 integrate .. //depot/projects/tcpecn/amd64/include/pmap.h#2 integrate .. //depot/projects/tcpecn/amd64/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/arm/arm/pmap.c#3 integrate .. //depot/projects/tcpecn/arm/at91/if_ate.c#3 integrate .. //depot/projects/tcpecn/arm/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/tcpecn/cam/cam_xpt.c#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/tcpecn/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/tcpecn/compat/linux/linux_file.c#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_stats.c#2 integrate .. //depot/projects/tcpecn/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/tcpecn/conf/NOTES#4 integrate .. //depot/projects/tcpecn/conf/files#3 integrate .. //depot/projects/tcpecn/conf/options#4 integrate .. //depot/projects/tcpecn/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/tcpecn/dev/ata/ata-all.h#3 integrate .. //depot/projects/tcpecn/dev/ata/ata-disk.c#2 integrate .. //depot/projects/tcpecn/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/tcpecn/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/tcpecn/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/tcpecn/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/tcpecn/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/tcpecn/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/tcpecn/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/tcpecn/dev/fb/creator.c#2 integrate .. //depot/projects/tcpecn/dev/fb/fb.c#2 integrate .. //depot/projects/tcpecn/dev/fb/fbreg.h#2 integrate .. //depot/projects/tcpecn/dev/fb/machfb.c#2 integrate .. //depot/projects/tcpecn/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/tcpecn/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/tcpecn/dev/fb/vga.c#2 integrate .. //depot/projects/tcpecn/dev/gem/if_gem.c#2 integrate .. //depot/projects/tcpecn/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/tcpecn/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/tcpecn/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/tcpecn/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/tcpecn/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/tcpecn/dev/kbd/kbd.c#2 integrate .. //depot/projects/tcpecn/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/tcpecn/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/tcpecn/dev/le/am7990.c#2 integrate .. //depot/projects/tcpecn/dev/le/am79900.c#2 integrate .. //depot/projects/tcpecn/dev/pci/pci_user.c#2 integrate .. //depot/projects/tcpecn/dev/streams/streams.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/tcpecn/dev/syscons/syscons.c#3 integrate .. //depot/projects/tcpecn/dev/syscons/syscons.h#2 integrate .. //depot/projects/tcpecn/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/tcpecn/dev/usb/if_rum.c#2 integrate .. //depot/projects/tcpecn/dev/usb/if_zyd.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ukbd.c#2 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#4 integrate .. //depot/projects/tcpecn/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/tcpecn/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/tcpecn/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/tcpecn/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#4 integrate .. //depot/projects/tcpecn/i386/conf/NOTES#3 integrate .. //depot/projects/tcpecn/i386/i386/machdep.c#3 integrate .. //depot/projects/tcpecn/i386/i386/pmap.c#4 integrate .. //depot/projects/tcpecn/i386/include/pmap.h#2 integrate .. //depot/projects/tcpecn/i386/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/tcpecn/ia64/conf/GENERIC#3 integrate .. //depot/projects/tcpecn/ia64/ia64/pmap.c#2 integrate .. //depot/projects/tcpecn/ia64/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/isa/vga_isa.c#2 integrate .. //depot/projects/tcpecn/kern/imgact_elf.c#3 integrate .. //depot/projects/tcpecn/kern/init_sysent.c#2 integrate .. //depot/projects/tcpecn/kern/kern_descrip.c#3 integrate .. //depot/projects/tcpecn/kern/kern_event.c#3 integrate .. //depot/projects/tcpecn/kern/kern_exec.c#3 integrate .. //depot/projects/tcpecn/kern/kern_lock.c#3 integrate .. //depot/projects/tcpecn/kern/kern_mib.c#3 integrate .. //depot/projects/tcpecn/kern/kern_proc.c#3 integrate .. //depot/projects/tcpecn/kern/kern_tc.c#2 integrate .. //depot/projects/tcpecn/kern/sched_ule.c#3 integrate .. //depot/projects/tcpecn/kern/subr_lock.c#3 integrate .. //depot/projects/tcpecn/kern/subr_smp.c#2 integrate .. //depot/projects/tcpecn/kern/sys_generic.c#3 integrate .. //depot/projects/tcpecn/kern/sys_pipe.c#3 integrate .. //depot/projects/tcpecn/kern/sys_socket.c#2 integrate .. //depot/projects/tcpecn/kern/syscalls.c#2 integrate .. //depot/projects/tcpecn/kern/syscalls.master#2 integrate .. //depot/projects/tcpecn/kern/systrace_args.c#2 integrate .. //depot/projects/tcpecn/kern/tty.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_debug.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_mqueue.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_sem.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_shm.c#1 branch .. //depot/projects/tcpecn/kern/uipc_syscalls.c#2 integrate .. //depot/projects/tcpecn/kern/uipc_usrreq.c#2 integrate .. //depot/projects/tcpecn/kern/vfs_bio.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_syscalls.c#2 integrate .. //depot/projects/tcpecn/kern/vfs_vnops.c#2 integrate .. //depot/projects/tcpecn/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/tcpecn/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/tcpecn/net/if_lagg.c#4 integrate .. //depot/projects/tcpecn/net/netisr.h#2 integrate .. //depot/projects/tcpecn/net/route.c#3 integrate .. //depot/projects/tcpecn/net/route.h#3 integrate .. //depot/projects/tcpecn/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/tcpecn/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/tcpecn/netgraph/ng_socket.c#2 integrate .. //depot/projects/tcpecn/netinet/if_ether.c#3 integrate .. //depot/projects/tcpecn/netinet/if_ether.h#3 integrate .. //depot/projects/tcpecn/netinet6/frag6.c#3 integrate .. //depot/projects/tcpecn/netinet6/icmp6.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6_pcb.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6_proto.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6_rmx.c#3 integrate .. //depot/projects/tcpecn/netinet6/in6_src.c#3 integrate .. //depot/projects/tcpecn/netinet6/ip6_input.c#3 integrate .. //depot/projects/tcpecn/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/tcpecn/netinet6/ip6_output.c#3 integrate .. //depot/projects/tcpecn/netinet6/mld6.c#3 integrate .. //depot/projects/tcpecn/netinet6/nd6.c#3 integrate .. //depot/projects/tcpecn/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/tcpecn/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/tcpecn/netinet6/raw_ip6.c#3 integrate .. //depot/projects/tcpecn/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/tcpecn/opencrypto/cryptodev.c#2 integrate .. //depot/projects/tcpecn/pc98/cbus/gdc.c#2 integrate .. //depot/projects/tcpecn/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/tcpecn/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/tcpecn/pc98/conf/GENERIC#3 integrate .. //depot/projects/tcpecn/powerpc/conf/GENERIC#3 integrate .. //depot/projects/tcpecn/powerpc/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/tcpecn/security/mac/mac_framework.h#2 integrate .. //depot/projects/tcpecn/security/mac/mac_policy.h#2 integrate .. //depot/projects/tcpecn/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/tcpecn/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/tcpecn/security/mac_test/mac_test.c#3 integrate .. //depot/projects/tcpecn/sparc64/conf/GENERIC#4 integrate .. //depot/projects/tcpecn/sparc64/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/tcpecn/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/tcpecn/sun4v/include/vmparam.h#2 integrate .. //depot/projects/tcpecn/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/tcpecn/sys/copyright.h#2 integrate .. //depot/projects/tcpecn/sys/fcntl.h#2 integrate .. //depot/projects/tcpecn/sys/file.h#2 integrate .. //depot/projects/tcpecn/sys/lockmgr.h#2 integrate .. //depot/projects/tcpecn/sys/mman.h#2 integrate .. //depot/projects/tcpecn/sys/param.h#4 integrate .. //depot/projects/tcpecn/sys/syscall.h#2 integrate .. //depot/projects/tcpecn/sys/syscall.mk#2 integrate .. //depot/projects/tcpecn/sys/syscallsubr.h#2 integrate .. //depot/projects/tcpecn/sys/sysctl.h#4 integrate .. //depot/projects/tcpecn/sys/sysproto.h#2 integrate .. //depot/projects/tcpecn/sys/tree.h#2 integrate .. //depot/projects/tcpecn/sys/unpcb.h#2 integrate .. //depot/projects/tcpecn/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/tcpecn/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/tcpecn/vm/pmap.h#2 integrate .. //depot/projects/tcpecn/vm/swap_pager.c#2 integrate .. //depot/projects/tcpecn/vm/vm.h#2 integrate .. //depot/projects/tcpecn/vm/vm_fault.c#2 integrate .. //depot/projects/tcpecn/vm/vm_kern.c#2 integrate .. //depot/projects/tcpecn/vm/vm_map.c#2 integrate .. //depot/projects/tcpecn/vm/vm_mmap.c#2 integrate .. //depot/projects/tcpecn/vm/vm_object.c#2 integrate .. //depot/projects/tcpecn/vm/vm_object.h#2 integrate .. //depot/projects/tcpecn/vm/vm_page.c#3 integrate .. //depot/projects/tcpecn/vm/vm_reserv.c#1 branch .. //depot/projects/tcpecn/vm/vm_reserv.h#1 branch Differences ... ==== //depot/projects/tcpecn/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.599 2007/12/09 21:00:35 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.603 2008/01/08 08:30:30 alc Exp $"); /* * Manages physical address maps. @@ -614,7 +614,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1554,7 +1553,7 @@ /* We need a new PDP entry */ nkpg = vm_page_alloc(NULL, nkpt, VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); pmap_zero_page(nkpg); paddr = VM_PAGE_TO_PHYS(nkpg); @@ -1572,12 +1571,9 @@ continue; } - /* - * This index is bogus, but out of the way - */ - nkpg = vm_page_alloc(NULL, nkpt, + nkpg = vm_page_alloc(NULL, pmap_pde_pindex(kernel_vm_end), VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); - if (!nkpg) + if (nkpg == NULL) panic("pmap_growkernel: no memory to grow kernel"); nkpt++; @@ -1702,7 +1698,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1850,7 +1845,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1870,7 +1864,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1887,7 +1880,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2083,15 +2075,8 @@ pd_entry_t ptepde; vm_page_t free; -#if defined(PMAP_DIAGNOSTIC) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%lx", - VM_PAGE_TO_PHYS(m)); - } -#endif + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); mtx_assert(&vm_page_queue_mtx, MA_OWNED); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2121,7 +2106,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -2253,8 +2237,8 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_paddr_t pa; pd_entry_t *pde; @@ -3048,7 +3032,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); ==== //depot/projects/tcpecn/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/tcpecn/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ # # @@ -411,6 +411,7 @@ # vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver +# asmc: Apple System Management Controller # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -436,7 +437,7 @@ hint.pbio.0.port="0x360" device smbios device vpd - +device asmc # # Laptop/Notebook options: # ==== //depot/projects/tcpecn/amd64/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.139 2008/01/06 18:51:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -231,7 +231,6 @@ struct pv_chunk; struct md_page { - int pv_list_count; TAILQ_HEAD(,pv_entry) pv_list; }; ==== //depot/projects/tcpecn/amd64/include/vmparam.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.50 2007/12/27 16:45:38 alc Exp $ */ @@ -132,6 +132,20 @@ #define VM_NFREEORDER 13 /* + * Enable superpage reservations: 1 level. + */ +#ifndef VM_NRESERVLEVEL +#define VM_NRESERVLEVEL 1 +#endif + +/* + * Level 0 reservations consist of 512 pages. + */ +#ifndef VM_LEVEL_0_ORDER +#define VM_LEVEL_0_ORDER 9 +#endif + +/* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. * Because of the page that is both a PD and PT, it looks a little ==== //depot/projects/tcpecn/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.93 2007/12/11 20:35:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.96 2008/01/03 07:34:33 alc Exp $"); #include #include #include @@ -3170,11 +3170,10 @@ #if defined(PMAP_DEBUG) /* - * XXX this makes pmap_page_protect(NONE) illegal for non-managed - * pages! + * XXX This makes pmap_remove_all() illegal for non-managed pages! */ if (m->flags & PG_FICTITIOUS) { - panic("pmap_page_protect: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); + panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); } #endif @@ -3325,8 +3324,8 @@ */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_page_lock_queues(); ==== //depot/projects/tcpecn/arm/at91/if_ate.c#3 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.22 2007/12/16 12:57:12 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); #include #include @@ -191,7 +191,7 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set"); + device_printf(dev, "No MAC address set\n"); goto out; } ate_set_mac(sc, eaddr); ==== //depot/projects/tcpecn/arm/include/vmparam.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.11 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.12 2007/12/27 16:45:38 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -85,6 +85,13 @@ */ #define VM_NFREEORDER 9 +/* + * Disable superpage reservations. + */ +#ifndef VM_NRESERVLEVEL +#define VM_NRESERVLEVEL 0 +#endif + #define UPT_MAX_ADDRESS VADDR(UPTPTDI + 3, 0) #define UPT_MIN_ADDRESS VADDR(UPTPTDI, 0) ==== //depot/projects/tcpecn/boot/powerpc/ofw/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.20 2007/12/17 22:18:07 marcel Exp $ +# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.21 2007/12/26 19:15:58 marcel Exp $ .include PROG= loader -NEWVERSWHAT= "bootstrap loader" "Open Firmware/PowerPC" +NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b ==== //depot/projects/tcpecn/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.192 2007/12/16 07:49:44 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.193 2008/01/02 01:45:31 obrien Exp $"); #include #include @@ -172,12 +172,12 @@ * identify, and removed when a device fails to respond after a number * of retries, or a bus rescan finds the device missing. */ -struct cam_et { +struct cam_et { TAILQ_HEAD(, cam_ed) ed_entries; TAILQ_ENTRY(cam_et) links; - struct cam_eb *bus; + struct cam_eb *bus; target_id_t target_id; - u_int32_t refcount; + u_int32_t refcount; u_int generation; struct timeval last_reset; }; @@ -187,7 +187,7 @@ * are created by calls to xpt_bus_register and deleted by calls to * xpt_bus_deregister. */ -struct cam_eb { +struct cam_eb { TAILQ_HEAD(, cam_et) et_entries; TAILQ_ENTRY(cam_eb) links; path_id_t path_id; @@ -275,7 +275,7 @@ static const char seagate[] = "SEAGATE"; static const char microp[] = "MICROP"; -static struct xpt_quirk_entry xpt_quirk_table[] = +static struct xpt_quirk_entry xpt_quirk_table[] = { { /* Reports QUEUE FULL for temporary resource shortages */ @@ -315,12 +315,12 @@ * * For future reference, the drive with the problem was: * QUANTUM QM39100TD-SW N1B0 - * + * * It's possible that Quantum will fix the problem in later * firmware revisions. If that happens, the quirk entry * will need to be made specific to the firmware revisions * with the problem. - * + * */ /* Reports QUEUE FULL for temporary resource shortages */ { T_DIRECT, SIP_MEDIA_FIXED, quantum, "QM39100*", "*" }, @@ -351,7 +351,7 @@ /* * The Seagate Medalist Pro drives have very poor write * performance with anything more than 2 tags. - * + * * Reported by: Paul van der Zwan * Drive: * @@ -406,7 +406,7 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { - /* Broken tagged queuing drive */ + /* Broken tagged queuing drive */ { T_DIRECT, SIP_MEDIA_FIXED, "CONNER", "CFP2107*", "*" }, /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, @@ -924,7 +924,7 @@ */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, &dev->alloc_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->drvq)->priority); + CAMQ_GET_HEAD(&dev->drvq)->priority); } else { retval = 0; } @@ -1025,7 +1025,7 @@ mtx_lock(&xsoftc.xpt_lock); xsoftc.flags |= XPT_FLAG_OPEN; mtx_unlock(&xsoftc.xpt_lock); - + return(0); } @@ -1225,7 +1225,7 @@ * (or rather should be) impossible for the device peripheral driver * list to change since we look at the whole thing in one pass, and * we do it with lock protection. - * + * */ case CAMGETPASSTHRU: { union ccb *ccb; @@ -1280,7 +1280,7 @@ ccb->cgdl.unit_number = 0; error = ENOENT; break; - } + } /* * Run through every peripheral instance of this driver @@ -1318,7 +1318,7 @@ periph = SLIST_NEXT(periph, periph_links), i++) { /* * Check to see whether we have a - * passthrough device or not. + * passthrough device or not. */ if (strcmp(periph->periph_name, "pass") == 0) { /* @@ -1638,7 +1638,7 @@ struct periph_list *periph_head; periph_head = &device->periphs; - + /* Release the slot for this peripheral */ camq_resize(&device->drvq, device->drvq.array_size - 1); @@ -1867,7 +1867,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this bus. So tell the caller to copy the * data out. */ @@ -1945,7 +1945,7 @@ /* set the copy flag */ retval |= DM_RET_COPY; - + /* * If we've already decided on an action, go ahead * and return. @@ -1980,7 +1980,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this device. So tell the caller to copy * the data out. */ @@ -2103,7 +2103,7 @@ continue; /* - * If we get to this point, the user definitely wants + * If we get to this point, the user definitely wants * information on this peripheral. So tell the caller to * copy the data out. */ @@ -2167,7 +2167,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS; cdm->pos.cookie.bus = bus; @@ -2298,7 +2298,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS | CAM_DEV_POS_TARGET | CAM_DEV_POS_DEVICE; @@ -2309,7 +2309,7 @@ cdm->pos.generations[CAM_TARGET_GENERATION] = device->target->bus->generation; cdm->pos.cookie.device = device; - cdm->pos.generations[CAM_DEV_GENERATION] = + cdm->pos.generations[CAM_DEV_GENERATION] = device->target->generation; cdm->status = CAM_DEV_MATCH_MORE; return(0); @@ -2407,7 +2407,7 @@ */ if (spaceleft < sizeof(struct dev_match_result)) { bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_EDT | CAM_DEV_POS_BUS | CAM_DEV_POS_TARGET | CAM_DEV_POS_DEVICE | CAM_DEV_POS_PERIPH; @@ -2419,7 +2419,7 @@ cdm->pos.generations[CAM_TARGET_GENERATION] = periph->path->bus->generation; cdm->pos.cookie.device = periph->path->device; - cdm->pos.generations[CAM_DEV_GENERATION] = + cdm->pos.generations[CAM_DEV_GENERATION] = periph->path->target->generation; cdm->pos.cookie.periph = periph; cdm->pos.generations[CAM_PERIPH_GENERATION] = @@ -2545,7 +2545,7 @@ pdrv = NULL; bzero(&cdm->pos, sizeof(cdm->pos)); - cdm->pos.position_type = + cdm->pos.position_type = CAM_DEV_POS_PDRV | CAM_DEV_POS_PDPTR | CAM_DEV_POS_PERIPH; @@ -3139,7 +3139,7 @@ start_ccb->ccb_h.status = CAM_REQ_CMP; break; } - } + } if (XPT_FC_IS_QUEUED(abort_ccb) && (abort_ccb->ccb_h.pinfo.index == CAM_DONEQ_INDEX)) { /* @@ -3204,7 +3204,7 @@ bcopy(dev->serial_num, cgd->serial_num, dev->serial_num_len); } - break; + break; } case XPT_GDEV_STATS: { @@ -3257,17 +3257,17 @@ /* * Check and see if the list has changed since the user * last requested a list member. If so, tell them that the - * list has changed, and therefore they need to start over + * list has changed, and therefore they need to start over * from the beginning. */ - if ((cgdl->index != 0) && + if ((cgdl->index != 0) && (cgdl->generation != device->generation)) { cgdl->status = CAM_GDEVLIST_LIST_CHANGED; break; } /* - * Traverse the list of peripherals and attempt to find + * Traverse the list of peripherals and attempt to find * the requested peripheral. */ for (nperiph = SLIST_FIRST(periph_head), i = 0; @@ -3496,7 +3496,7 @@ */ start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - + dev->flags |= CAM_DEV_REL_ON_COMPLETE; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3509,7 +3509,7 @@ start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - + dev->flags |= CAM_DEV_REL_ON_QUEUE_EMPTY; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3584,7 +3584,7 @@ xpt_polled_action(union ccb *start_ccb) { u_int32_t timeout; - struct cam_sim *sim; + struct cam_sim *sim; struct cam_devq *devq; struct cam_ed *dev; @@ -3601,18 +3601,18 @@ * can get it before us while we simulate interrupts. */ dev->ccbq.devq_openings--; - dev->ccbq.dev_openings--; - + dev->ccbq.dev_openings--; + while(((devq != NULL && devq->send_openings <= 0) || dev->ccbq.dev_openings < 0) && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); camisr_runqueue(&sim->sim_doneq); } - + dev->ccbq.devq_openings++; dev->ccbq.dev_openings++; - + if (timeout != 0) { xpt_action(start_ccb); while(--timeout > 0) { @@ -3636,7 +3636,7 @@ start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; } } - + /* * Schedule a peripheral driver to receive a ccb when it's * target device has space for more transactions. @@ -3759,7 +3759,7 @@ union ccb *work_ccb; struct cam_periph *drv; struct camq *drvq; - + qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->alloc_queue, CAMQ_HEAD); device = qinfo->device; @@ -3796,7 +3796,7 @@ */ break; } - + if (drvq->entries > 0) { /* We have more work. Attempt to reschedule */ xpt_schedule_dev_allocq(bus, device); @@ -3811,7 +3811,7 @@ struct cam_devq *devq; CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_sendq\n")); - + devq = bus->sim->devq; devq->send_queue.qfrozen_cnt++; @@ -3858,8 +3858,8 @@ * available. */ device->qfrozen_cnt++; - STAILQ_INSERT_TAIL(&xsoftc.highpowerq, - &work_ccb->ccb_h, + STAILQ_INSERT_TAIL(&xsoftc.highpowerq, + &work_ccb->ccb_h, xpt_links.stqe); mtx_unlock(&xsoftc.xpt_lock); @@ -3879,8 +3879,8 @@ cam_ccbq_send_ccb(&device->ccbq, work_ccb); devq->send_openings--; - devq->send_active++; - + devq->send_active++; + if (device->ccbq.queue.entries > 0) xpt_schedule_dev_sendq(bus, device); @@ -4549,7 +4549,7 @@ bus = path->bus; - if (async_code == AC_BUS_RESET) { + if (async_code == AC_BUS_RESET) { /* Update our notion of when the last reset occurred */ microtime(&bus->last_reset); } @@ -4576,7 +4576,7 @@ next_device = TAILQ_NEXT(device, links); - if (path->device != device + if (path->device != device && path->device->lun_id != CAM_LUN_WILDCARD && device->lun_id != CAM_LUN_WILDCARD) continue; @@ -4588,7 +4588,7 @@ path, async_arg); } } - + /* * If this wasn't a fully wildcarded async, tell all * clients that want all async events. @@ -4722,7 +4722,7 @@ sim->devq->send_queue.qfrozen_cnt += count; if (sim->devq->active_dev != NULL) { struct ccb_hdr *ccbh; - + ccbh = TAILQ_LAST(&sim->devq->active_dev->ccbq.active_ccbs, ccb_hdr_tailq); if (ccbh && ccbh->status == CAM_REQ_INPROG) @@ -5278,7 +5278,7 @@ scan_info->counter--; } } - + for (i = 0; i <= max_target; i++) { cam_status status; if (i == initiator_id) @@ -5367,7 +5367,7 @@ } } else { struct cam_ed *device; - + device = request_ccb->ccb_h.path->device; if ((device->quirk->quirks & CAM_QUIRK_NOLUNS) == 0) { @@ -5394,7 +5394,7 @@ done = 0; if (scan_info->cpi->hba_misc & PIM_SEQSCAN) { scan_info->counter++; - if (scan_info->counter == + if (scan_info->counter == scan_info->cpi->initiator_id) { scan_info->counter++; } @@ -5506,7 +5506,7 @@ CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_scan_lun\n")); - + xpt_setup_ccb(&cpi.ccb_h, path, /*priority*/1); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -5616,7 +5616,7 @@ if (softc == NULL) { printf("proberegister: Unable to probe new device. " - "Unable to allocate softc\n"); + "Unable to allocate softc\n"); return(CAM_REQ_CMP_ERR); } TAILQ_INIT(&softc->request_ccbs); @@ -5661,7 +5661,7 @@ * condition pending. It will not report the unit attention in * response to an inquiry, which may leave invalid transfer * negotiations in effect. The TUR will reveal the unit attention - * condition. Only send the TUR for lun 0, since some devices + * condition. Only send the TUR for lun 0, since some devices * will get confused by commands other than inquiry to non-existent * luns. If you think a device has gone away start your scan from * lun 0. This will insure that any bogus transfer settings are @@ -5736,7 +5736,7 @@ * whether we still have the same device. */ if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { - + MD5Init(&softc->context); MD5Update(&softc->context, (unsigned char *)inq_buf, sizeof(struct scsi_inquiry_data)); @@ -5748,7 +5748,7 @@ softc->flags |= PROBE_SERIAL_CKSUM; } MD5Final(softc->digest, &softc->context); - } + } if (softc->action == PROBE_INQUIRY) inquiry_len = SHORT_INQUIRY_LENGTH; @@ -5762,7 +5762,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 9 12:52:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A7C816A421; Wed, 9 Jan 2008 12:52:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA3AC16A417 for ; Wed, 9 Jan 2008 12:52:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4D2D13C447 for ; Wed, 9 Jan 2008 12:52:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09CqFJ1018430 for ; Wed, 9 Jan 2008 12:52:15 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09CqFkf018427 for perforce@freebsd.org; Wed, 9 Jan 2008 12:52:15 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 9 Jan 2008 12:52:15 GMT Message-Id: <200801091252.m09CqFkf018427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 132879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 12:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=132879 Change 132879 by rpaulo@rpaulo_alpha on 2008/01/09 12:51:55 draft-ietf-tcpm-ecnsyn-04 is out and it discusses a drawback of setting ECT in the SYN/ACK packet. It's not problematic, but let's be like everyone else (except for NetBSD) by not setting ECT in the SYN/ACK packet. We may revert back to the old behaviour in the future. Affected files ... .. //depot/projects/tcpecn/netinet/tcp_syncache.c#5 edit Differences ... ==== //depot/projects/tcpecn/netinet/tcp_syncache.c#5 (text+ko) ==== @@ -1357,36 +1357,6 @@ if (sc->sc_flags & SCF_ECN) { th->th_flags |= TH_ECE; tcpstat.tcps_ecn_shs++; - - /* - * draft-ietf-tcpm-ecnsyn-00.txt - * - * "[...] a TCP node MAY respond to an ECN-setup - * SYN packet by setting ECT in the responding - * ECN-setup SYN/ACK packet, indicating to routers - * that the SYN/ACK packet is ECN-Capable. - * This allows a congested router along the path - * to mark the packet instead of dropping the - * packet as an indication of congestion." - * - * "[...] There can be a great benefit in setting - * an ECN-capable codepoint in SYN/ACK packets [...] - * Congestion is most likely to occur in - * the server-to-client direction. As a result, - * setting an ECN-capable codepoint in SYN/ACK - * packets can reduce the occurence of three-second - * retransmit timeouts resulting from the drop - * of SYN/ACK packets." - * - * Page 4 and 6, January 2006. - */ -#ifdef INET6 - if (sc->sc_inc.inc_isipv6) - ip6->ip6_flow |= htonl(IPTOS_ECN_ECT0 << 20); - else -#endif - ip->ip_tos |= IPTOS_ECN_ECT0; - tcpstat.tcps_ecn_ect0++; } /* Tack on the TCP options. */ From owner-p4-projects@FreeBSD.ORG Wed Jan 9 13:23:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4415F16A41A; Wed, 9 Jan 2008 13:23:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09A3916A417 for ; Wed, 9 Jan 2008 13:23:41 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.158]) by mx1.freebsd.org (Postfix) with ESMTP id 8726E13C467 for ; Wed, 9 Jan 2008 13:23:40 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by fg-out-1718.google.com with SMTP id 16so271781fgg.35 for ; Wed, 09 Jan 2008 05:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:message-id:from:to:subject:in-reply-to:references:user-agent:mime-version:content-type:sender; bh=ZcIZg1GzzkuCN8H1vRoWzRMPx6Sr8Ijp71KNRAQSwDA=; b=VtWqmT9s7U08nvkMrZjshzuiGAgzAhJXq23Ti+HFYD+pVFXlpSsivq6lyqQ+p7rxH+wSNJ6YUwAIVAOUexiWHEzW4KqlFC6mNsCbWP7Xio2oFBkyzuhnov+lOfVDit5ivBecdn3rxCSYtKdV9mAuWzYrmDeZcpjjl61V4kv9lx4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:message-id:from:to:subject:in-reply-to:references:user-agent:mime-version:content-type:sender; b=CNByluAlHyIzTD3KES7SF/yY7eXu6aNXuPa3WBdwwXvvCWVXMli/roWnhNir5SaAuXKKlgS2kn8BuSsqx+YUrofiGHWdwjqIyWYwEJQbf6eb5WKlern3E4QwJ7fMbe3zXGFPev6BPplrAfpIl548cSHDF9i2g/RJjkaAXpmvHv8= Received: by 10.82.150.20 with SMTP id x20mr1016748bud.37.1199883263641; Wed, 09 Jan 2008 04:54:23 -0800 (PST) Received: from epsilon.local.gmail.com ( [193.126.199.198]) by mx.google.com with ESMTPS id p10sm345795gvf.12.2008.01.09.04.54.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Jan 2008 04:54:22 -0800 (PST) Date: Wed, 09 Jan 2008 12:54:09 +0000 Message-ID: <863at7upla.wl%rpaulo@fnop.net> From: Rui Paulo To: Perforce Change Reviews In-Reply-To: <200801091252.m09CqFkf018427@repoman.freebsd.org> References: <200801091252.m09CqFkf018427@repoman.freebsd.org> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/22.1 Mule/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: Rui Paulo Cc: Subject: Re: PERFORCE change 132879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 13:23:41 -0000 At Wed, 9 Jan 2008 12:52:15 GMT, Rui Paulo wrote: > > http://perforce.freebsd.org/chv.cgi?CH=132879 > > Change 132879 by rpaulo@rpaulo_alpha on 2008/01/09 12:51:55 > > draft-ietf-tcpm-ecnsyn-04 is out and it discusses a drawback > of setting ECT in the SYN/ACK packet. > It's not problematic, but let's be like everyone else (except > for NetBSD) by not setting ECT in the SYN/ACK packet. > > We may revert back to the old behaviour in the future. And also: if we revert to the old behaviour, there should probably be a sysctl to control it. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Wed Jan 9 15:16:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EA5516A418; Wed, 9 Jan 2008 15:16:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 346F516A41A for ; Wed, 9 Jan 2008 15:16:50 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A22513C45B for ; Wed, 9 Jan 2008 15:16:50 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09FGnYN046914 for ; Wed, 9 Jan 2008 15:16:50 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09FGnu4046911 for perforce@freebsd.org; Wed, 9 Jan 2008 15:16:49 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 9 Jan 2008 15:16:49 GMT Message-Id: <200801091516.m09FGnu4046911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 15:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=132889 Change 132889 by swise@swise:vic10:iwarp on 2008/01/09 15:16:41 Set state to ERROR if the user interrupts a sleep. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#4 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#4 (text+ko) ==== @@ -212,6 +212,7 @@ while (cb->state < state) { msleep_spin(cb, &cb->lock, "krping", hz); if (SIGPENDING(curthread)) { + cb->state = ERROR; DEBUG_LOG(PFX "interrupt!\n"); break; } From owner-p4-projects@FreeBSD.ORG Wed Jan 9 15:24:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B3A16A418; Wed, 9 Jan 2008 15:24:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEAF716A473 for ; Wed, 9 Jan 2008 15:24:58 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC49E13C44B for ; Wed, 9 Jan 2008 15:24:58 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09FOwxe048731 for ; Wed, 9 Jan 2008 15:24:58 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09FOwKG048728 for perforce@freebsd.org; Wed, 9 Jan 2008 15:24:58 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 9 Jan 2008 15:24:58 GMT Message-Id: <200801091524.m09FOwKG048728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 15:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=132891 Change 132891 by swise@swise:vic10:iwarp on 2008/01/09 15:24:37 krping works from client side - address resolution rtalloc issues - address resolution tailq bug - cxgb_offload.c arp event fixes - send_mpa_req() fixes Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#6 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#5 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#10 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#7 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#6 (text+ko) ==== @@ -148,27 +148,31 @@ return (EADDRNOTAVAIL); ret = rdma_copy_addr(dev_addr, iproute.ro_rt->rt_ifp, NULL); - rtfree(iproute.ro_rt); + RTFREE(iproute.ro_rt); return ret; } EXPORT_SYMBOL(rdma_translate_ip); static void queue_req(struct addr_req *req) { - struct addr_req *tmp_req; + struct addr_req *tmp_req = NULL; mtx_lock(&lock); TAILQ_FOREACH_REVERSE(tmp_req, &req_list, addr_req_list, entry) if (time_after_eq(req->timeout, tmp_req->timeout)) break; - TAILQ_INSERT_AFTER(&req_list, tmp_req, req, entry); + if (tmp_req) + TAILQ_INSERT_AFTER(&req_list, tmp_req, req, entry); + else + TAILQ_INSERT_TAIL(&req_list, req, entry); if (TAILQ_FIRST(&req_list) == req) callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, NULL); mtx_unlock(&lock); } +#ifdef needed static void addr_send_arp(struct sockaddr_in *dst_in) { struct route iproute; @@ -185,8 +189,9 @@ arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, rt_key(iproute.ro_rt), dmac); - rtfree(iproute.ro_rt); + RTFREE(iproute.ro_rt); } +#endif static int addr_resolve_remote(struct sockaddr_in *src_in, struct sockaddr_in *dst_in, @@ -201,8 +206,10 @@ *dst = *dst_in; rtalloc(&iproute); - if (iproute.ro_rt == NULL); + if (iproute.ro_rt == NULL) { + ret = EHOSTUNREACH; goto out; + } /* If the device does ARP internally, return 'done' */ if (iproute.ro_rt->rt_ifp->if_flags & IFF_NOARP) { @@ -223,7 +230,7 @@ ret = rdma_copy_addr(addr, iproute.ro_rt->rt_ifp, dmac); put: - rtfree(iproute.ro_rt); + RTFREE(iproute.ro_rt); out: return ret; } @@ -308,7 +315,9 @@ case EWOULDBLOCK: req->timeout = msecs_to_ticks(timeout_ms) + ticks; queue_req(req); +#ifdef needed addr_send_arp(dst_in); +#endif break; default: ret = req->status; ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_l2t.c#5 (text+ko) ==== @@ -170,6 +170,7 @@ { struct rtentry *rt = e->neigh; struct sockaddr_in sin; + int err; bzero(&sin, sizeof(struct sockaddr_in)); sin.sin_family = AF_INET; @@ -209,7 +210,8 @@ * entries when there's no memory. */ printf("doing arpresolve2 on 0x%x \n", e->addr); - if (arpresolve2(rt->rt_ifp, rt, (struct sockaddr *)&sin, e->dmac) == 0) { + err = arpresolve2(rt->rt_ifp, rt, (struct sockaddr *)&sin, e->dmac); + if (!err) { printf("mac=%x:%x:%x:%x:%x:%x\n", e->dmac[0], e->dmac[1], e->dmac[2], e->dmac[3], e->dmac[4], e->dmac[5]); @@ -223,7 +225,7 @@ m_freem(m); mtx_unlock(&e->lock); } else - printf("arpresolve2 returned non-zero\n"); + printf("arpresolve2 returned %d\n", err); } return 0; } ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#10 (text+ko) ==== @@ -911,7 +911,7 @@ uint8_t *enaddr, struct sockaddr *sa) { - if (TOEDEV(rt0->rt_ifp) == NULL) + if (!is_offloading(rt0->rt_ifp)) return; RT_ADDREF(rt0); @@ -926,15 +926,22 @@ cxgb_redirect_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1, struct sockaddr *sa) { - struct toedev *tdev0, *tdev1; /* * ignore events on non-offloaded interfaces */ - tdev0 = TOEDEV(rt0->rt_ifp); - tdev1 = TOEDEV(rt1->rt_ifp); - if (tdev0 == NULL && tdev1 == NULL) + if (!is_offloading(rt0->rt_ifp)) + return; + + /* + * Cannot redirect to non-offload device. + */ + if (!is_offloading(rt1->rt_ifp)) { + log(LOG_WARNING, "%s: Redirect to non-offload" + "device ignored.\n", __FUNCTION__); return; + } + /* * avoid LORs by dropping the route lock but keeping a reference * @@ -1059,13 +1066,9 @@ void cxgb_neigh_update(struct rtentry *rt, uint8_t *enaddr, struct sockaddr *sa) { - - if (is_offloading(rt->rt_ifp)) { - struct t3cdev *tdev = T3CDEV(rt->rt_ifp); - - PANIC_IF(!tdev); - t3_l2t_update(tdev, rt, enaddr, sa); - } + struct t3cdev *tdev = T3CDEV(rt->rt_ifp); + PANIC_IF(!tdev); + t3_l2t_update(tdev, rt, enaddr, sa); } static void @@ -1107,13 +1110,6 @@ olddev = old->rt_ifp; newdev = new->rt_ifp; - if (!is_offloading(olddev)) - return; - if (!is_offloading(newdev)) { - log(LOG_WARNING, "%s: Redirect to non-offload" - "device ignored.\n", __FUNCTION__); - return; - } tdev = T3CDEV(olddev); PANIC_IF(!tdev); if (tdev != T3CDEV(newdev)) { ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#7 (text+ko) ==== @@ -356,22 +356,28 @@ } } +static void +reset_mbuf(struct mbuf *m) +{ + m_set_sgl(m, NULL); + m_set_sgllen(m, 0); + m->m_len = 0; + m->m_pkthdr.len = 0; +} + /* * Try and reuse mbufs already allocated... */ static struct mbuf * get_mbuf(struct mbuf *m, int len, int flags) { - if (m && ((m->m_flags & M_EXT) == 0)) { - m->m_len = 0; - } else { + if (!m || (m->m_flags & M_EXT)) { /* * Assume len is less than MINCLBYTES :-/ */ m = m_gethdr(MT_DATA, M_DONTWAIT); } - m_set_sgl(m, NULL); - m_set_sgllen(m, 0); + reset_mbuf(m); return (m); } @@ -530,7 +536,6 @@ int mpalen; struct tx_data_wr *req; struct mpa_message *mpa; - int len; PDBG("%s ep %p pd_len %d\n", __FUNCTION__, ep, ep->plen); @@ -547,10 +552,10 @@ return; } } + reset_mbuf(m); m_set_priority(m, CPL_PRIORITY_DATA); req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); - len = m->m_len; - mpa = (struct mpa_message *) mbuf_put(m, mpalen); + mpa = (struct mpa_message *)mbuf_put(m, mpalen); memset(mpa, 0, sizeof(*mpa)); memcpy(mpa->key, MPA_KEY_REQ, sizeof(mpa->key)); mpa->flags = (crc_enabled ? MPA_CRC : 0) | @@ -569,7 +574,7 @@ set_arp_failure_handler(m, arp_failure_discard); req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); req->wr_lo = htonl(V_WR_TID(ep->hwtid)); - req->len = htonl(len); + req->len = htonl(mpalen); req->param = htonl(V_TX_PORT(ep->l2t->smt_idx) | V_TX_SNDBUF(snd_win>>15)); req->flags = htonl(F_TX_INIT); From owner-p4-projects@FreeBSD.ORG Wed Jan 9 16:28:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5ED516A418; Wed, 9 Jan 2008 16:28:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B6AD16A421 for ; Wed, 9 Jan 2008 16:28:07 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5278813C455 for ; Wed, 9 Jan 2008 16:28:07 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09GS7Ym058973 for ; Wed, 9 Jan 2008 16:28:07 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09GS7Gi058970 for perforce@freebsd.org; Wed, 9 Jan 2008 16:28:07 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 9 Jan 2008 16:28:07 GMT Message-Id: <200801091628.m09GS7Gi058970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 16:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=132897 Change 132897 by swise@swise:vic10:iwarp on 2008/01/09 16:27:52 turn off debug Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#5 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#5 (text+ko) ==== @@ -58,7 +58,7 @@ #define PFX "krping: " -static int debug = 1; +static int debug = 0; #define DEBUG_LOG if (debug) printf MODULE_AUTHOR("Steve Wise"); From owner-p4-projects@FreeBSD.ORG Wed Jan 9 17:23:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD64116A41A; Wed, 9 Jan 2008 17:23:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E60D16A468 for ; Wed, 9 Jan 2008 17:23:04 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C43B13C458 for ; Wed, 9 Jan 2008 17:23:04 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09HN4DT077782 for ; Wed, 9 Jan 2008 17:23:04 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09HN4gU077779 for perforce@freebsd.org; Wed, 9 Jan 2008 17:23:04 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 9 Jan 2008 17:23:04 GMT Message-Id: <200801091723.m09HN4gU077779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 17:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=132900 Change 132900 by swise@swise:vic10:iwarp on 2008/01/09 17:22:55 Set MT_DONTFREE for mpa message mbufs. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#8 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#8 (text+ko) ==== @@ -81,6 +81,7 @@ #include #endif +#ifdef DEBUG static char *states[] = { "idle", "listen", @@ -96,6 +97,7 @@ "dead", NULL, }; +#endif SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "iw_cxgb driver parameters"); @@ -571,6 +573,7 @@ * will remain in memory until the hw acks the tx. * Function tx_ack() will deref it. */ + m->m_type = MT_DONTFREE; /* XXX */ set_arp_failure_handler(m, arp_failure_discard); req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); req->wr_lo = htonl(V_WR_TID(ep->hwtid)); @@ -615,6 +618,7 @@ memcpy(mpa->private_data, pdata, plen); m_set_priority(m, CPL_PRIORITY_DATA); + m->m_type = MT_DONTFREE; /* XXX */ set_arp_failure_handler(m, arp_failure_discard); req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); req->wr_lo = htonl(V_WR_TID(ep->hwtid)); @@ -648,6 +652,7 @@ return (-ENOMEM); } m_set_priority(m, CPL_PRIORITY_DATA); + m->m_type = MT_DONTFREE; /* XXX */ req = (struct tx_data_wr *)mbuf_put(m, sizeof(*req)); mpa = (struct mpa_message *)mbuf_put(m, mpalen); memset(mpa, 0, sizeof(*mpa)); From owner-p4-projects@FreeBSD.ORG Wed Jan 9 17:24:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E30B216A41A; Wed, 9 Jan 2008 17:24:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A878816A418 for ; Wed, 9 Jan 2008 17:24:05 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98D0113C457 for ; Wed, 9 Jan 2008 17:24:05 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09HO5JE077808 for ; Wed, 9 Jan 2008 17:24:05 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09HO5Nm077805 for perforce@freebsd.org; Wed, 9 Jan 2008 17:24:05 GMT (envelope-from swise@FreeBSD.org) Date: Wed, 9 Jan 2008 17:24:05 GMT Message-Id: <200801091724.m09HO5Nm077805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 17:24:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=132901 Change 132901 by swise@swise:vic10:iwarp on 2008/01/09 17:23:26 Make PDBG() valid only under DEBUG define. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#6 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#6 (text+ko) ==== @@ -146,8 +146,7 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, u8 *cqe_flushed, u64 *cookie, u32 *credit); -#define MOD "iw_cxgb3: " -#define PDBG(fmt, args...) printf(fmt, ## args) +#define MOD "iw_cxgb: " #ifdef DEBUG void cxio_dump_tpt(struct cxio_rdev *rev, u32 stag); @@ -156,6 +155,9 @@ void cxio_dump_wce(struct t3_cqe *wce); void cxio_dump_rqt(struct cxio_rdev *rdev, u32 hwtid, int nents); void cxio_dump_tcb(struct cxio_rdev *rdev, u32 hwtid); +#define PDBG(fmt, args...) printf(fmt, ## args) +#else +#define PDBG(fmt, args...) #endif From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:05:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B799916A469; Wed, 9 Jan 2008 21:05:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B8CB16A418 for ; Wed, 9 Jan 2008 21:05:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC0213C458 for ; Wed, 9 Jan 2008 21:05:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09L57BB041761 for ; Wed, 9 Jan 2008 21:05:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09L57kB041758 for perforce@freebsd.org; Wed, 9 Jan 2008 21:05:07 GMT (envelope-from jb@freebsd.org) Date: Wed, 9 Jan 2008 21:05:07 GMT Message-Id: <200801092105.m09L57kB041758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:05:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=132914 Change 132914 by jb@jb_freebsd1 on 2008/01/09 21:04:37 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#53 integrate .. //depot/projects/dtrace/ports/LEGAL#32 integrate .. //depot/projects/dtrace/ports/MOVED#61 integrate .. //depot/projects/dtrace/src/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/dtrace/src/contrib/top/top.c#6 integrate .. //depot/projects/dtrace/src/share/man/man9/lock.9#7 integrate .. //depot/projects/dtrace/src/sys/amd64/include/ieeefp.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/iir/iir.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_subr.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/dtrace/src/sys/sys/buf.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#30 integrate .. //depot/projects/dtrace/src/usr.bin/top/machine.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/dtrace/www/en/gnome/images/ahze.jpg#3 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#17 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -402,7 +402,15 @@ Configuring X11 - Configuration of X11 is + As of version 7.3, &xorg; can + often work without any configuration file by simply typing at + prompt: + + &prompt.user; startx + + If this does not work, or if the default configuration is + not acceptable, then X11 must be configured manually. + Configuration of X11 is a multi-step process. The first step is to build an initial configuration file. As the super user, simply ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#53 (text+ko) ==== @@ -1,7 +1,7 @@ 800007 + + 8.0-CURRENT after LK_EXCLUPGRADE option + removal. + 800008 + + + 8.0-CURRENT after introduction of the + lockmgr_disown() function. + 800009 + ==== //depot/projects/dtrace/ports/LEGAL#32 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.563 2008/01/01 15:35:04 lme Exp $ +# $FreeBSD: ports/LEGAL,v 1.564 2008/01/09 20:12:41 thierry Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -624,6 +624,9 @@ VTK-* math/vtk Portions contain patented algorithms and may require a license for commercial use +vtkmpeg2encode.tar.gz multimedia/vtkmpeg2encode The MPEG2 format and all + software that uses it is subject to patent + restrictions vrml2pov-src* graphics/vrml2pov Redistribution is not allowed waeijiro-fpw-* japanese/waeijiro-fpw The original dictionary is not free warsow/* games/linux-warsow Redistribution is limited, art ==== //depot/projects/dtrace/ports/MOVED#61 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1527 2008/01/04 18:34:11 alepulver Exp $ +# $FreeBSD: ports/MOVED,v 1.1528 2008/01/09 15:19:45 tabthorpe Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3353,3 +3353,4 @@ audio/polypaudio|audio/pulseaudio|2008-01-01|Project renamed audio/paman|audio/pavucontrol|2008-01-01|New tool to work with pulseaudio audio/akode-plugins-polypaudio||2008-01-01|Polypaudio is obsolete in favor of pulseaudio +audio/teknap|net-p2p/teknap|2008-01-09|moved to net-p2p category ==== //depot/projects/dtrace/src/contrib/top/top.c#6 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ */ /* @@ -450,7 +450,7 @@ } /* initialize the kernel memory interface */ - if (machine_init(&statics) == -1) + if (machine_init(&statics, do_unames) == -1) { exit(1); } ==== //depot/projects/dtrace/src/share/man/man9/lock.9#7 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.18 2007/12/28 00:38:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.20 2008/01/09 08:08:56 brueffer Exp $ .\" -.Dd December 27, 2007 +.Dd January 9, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nm lockcount , .Nm lockmgr , .Nm lockstatus , +.Nm lockmgr_disown , .Nm lockmgr_printinfo .Nd "lockmgr family of functions" .Sh SYNOPSIS @@ -51,6 +52,8 @@ .Ft int .Fn lockstatus "struct lock *lkp" "struct thread *td" .Ft void +.Fn lockmgr_disown "struct lock *lkp" +.Ft void .Fn lockmgr_printinfo "struct lock *lkp" .Sh DESCRIPTION The @@ -187,6 +190,12 @@ will be returned. .Pp The +.Fn lockmgr_disown +function switches the owner from curthread to be +.Dv LK_KERNPROC, +if the lock is already held. +.Pp +The .Fn lockmgr_printinfo function prints debugging information about the lock. It is used primarily by ==== //depot/projects/dtrace/src/sys/amd64/include/ieeefp.h#4 (text+ko) ==== @@ -32,16 +32,16 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.14 2005/04/12 23:12:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.17 2008/01/09 15:03:03 bde Exp $ */ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ + /* - * IEEE floating point type and constant definitions. + * IEEE floating point type, constant and function definitions. */ -#ifndef _MACHINE_IEEEFP_H_ -#define _MACHINE_IEEEFP_H_ - #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif @@ -121,11 +121,8 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE__) \ - && !defined(__cplusplus) +#ifdef __GNUCLIKE_ASM -#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) -#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) #define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) #define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) @@ -143,25 +140,24 @@ * merge the two together. I think. */ -/* Set rounding control */ -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpgetround(void) { unsigned short _cw; __fnstcw(&_cw); - return ((_cw & FP_RND_FLD) >> FP_RND_OFF); + return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); } -static __inline__ fp_rnd_t +static __inline fp_rnd_t __fpsetround(fp_rnd_t _m) { + fp_rnd_t _p; + unsigned _mxcsr; unsigned short _cw; - unsigned int _mxcsr; - fp_rnd_t _p; __fnstcw(&_cw); - _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; + _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); _cw &= ~FP_RND_FLD; _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; __fldcw(&_cw); @@ -173,26 +169,27 @@ } /* - * Set precision for fadd/fsub/fsqrt etc x87 instructions + * Get or set the rounding precision for x87 arithmetic operations. * There is no equivalent SSE mode or control. */ -static __inline__ fp_prec_t + +static __inline fp_prec_t __fpgetprec(void) { unsigned short _cw; __fnstcw(&_cw); - return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); + return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF)); } -static __inline__ fp_prec_t -__fpsetprec(fp_rnd_t _m) +static __inline fp_prec_t +__fpsetprec(fp_prec_t _m) { + fp_prec_t _p; unsigned short _cw; - fp_prec_t _p; __fnstcw(&_cw); - _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; + _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); _cw &= ~FP_PRC_FLD; _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; __fldcw(&_cw); @@ -200,59 +197,56 @@ } /* - * Look at the exception masks - * Note that x87 masks are inverse of the fp*() functions - * API. ie: mask = 1 means disable for x87 and SSE, but - * for the fp*() api, mask = 1 means enabled. + * Get or set the exception mask. + * Note that the x87 mask bits are inverted by the API -- a mask bit of 1 + * means disable for x87 and SSE, but for fp*mask() it means enable. */ -static __inline__ fp_except_t + +static __inline fp_except_t __fpgetmask(void) { unsigned short _cw; __fnstcw(&_cw); - return ((~_cw) & FP_MSKS_FLD); + return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF); } -static __inline__ fp_except_t +static __inline fp_except_t __fpsetmask(fp_except_t _m) { + fp_except_t _p; + unsigned _mxcsr; unsigned short _cw; - unsigned int _mxcsr; - fp_except_t _p; __fnstcw(&_cw); - _p = (~_cw) & FP_MSKS_FLD; + _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; _cw &= ~FP_MSKS_FLD; - _cw |= (~_m) & FP_MSKS_FLD; + _cw |= (~_m >> FP_MSKS_OFF) & FP_MSKS_FLD; __fldcw(&_cw); __stmxcsr(&_mxcsr); /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */ _mxcsr &= ~SSE_MSKS_FLD; - _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD; + _mxcsr |= (~_m << SSE_MSKS_OFF) & SSE_MSKS_FLD; __ldmxcsr(&_mxcsr); return (_p); } -/* See which sticky exceptions are pending, and reset them */ -static __inline__ fp_except_t +static __inline fp_except_t __fpgetsticky(void) { + unsigned _ex, _mxcsr; unsigned short _sw; - unsigned int _mxcsr; - fp_except_t _ex; __fnstsw(&_sw); - _ex = _sw & FP_STKY_FLD; + _ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF; __stmxcsr(&_mxcsr); - _ex |= _mxcsr & SSE_STKY_FLD; - return (_ex); + _ex |= (_mxcsr & SSE_STKY_FLD) >> SSE_STKY_OFF; + return ((fp_except_t)_ex); } -#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE__ && !__cplusplus */ +#endif /* __GNUCLIKE_ASM */ -#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) \ - && defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE__) +#if !defined(__IEEEFP_NOINLINES__) && defined(__GNUCLIKE_ASM) #define fpgetround() __fpgetround() #define fpsetround(_m) __fpsetround(_m) @@ -265,16 +259,14 @@ /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -#else /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUCLIKE_ASM - && __CC_SUPPORTS___INLINE__ */ +#else /* !(!__IEEEFP_NOINLINES__ && __GNUCLIKE_ASM) */ -/* Augment the userland declarations */ +/* Augment the userland declarations. */ __BEGIN_DECLS -extern fp_prec_t fpgetprec(void); -extern fp_prec_t fpsetprec(fp_prec_t); +fp_prec_t fpgetprec(void); +fp_prec_t fpsetprec(fp_prec_t); __END_DECLS -#endif /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUCLIKE_ASM - && __CC_SUPPORTS___INLINE__ */ +#endif /* !__IEEEFP_NOINLINES__ && __GNUCLIKE_ASM */ #endif /* !_MACHINE_IEEEFP_H_ */ ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.22 2007/12/17 08:17:49 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.23 2008/01/09 08:12:24 kmacy Exp $ ***************************************************************************/ @@ -120,8 +120,8 @@ uint8_t port_id; uint8_t tx_chan; uint8_t txpkt_intf; - uint8_t nqsets; uint8_t first_qset; + uint32_t nqsets; uint8_t hw_addr[ETHER_ADDR_LEN]; struct taskqueue *tq; @@ -284,6 +284,8 @@ uint32_t txq_skipped; uint32_t txq_coalesced; uint32_t txq_enqueued; + uint32_t txq_dump_start; + uint32_t txq_dump_count; unsigned long txq_frees; struct mtx lock; struct sg_ent txq_sgl[TX_MAX_SEGS / 2 + 1]; ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.9 2008/01/07 01:18:16 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.10 2008/01/09 08:01:08 kmacy Exp $ * ***************************************************************************/ @@ -247,6 +247,7 @@ case EXT_NET_DRV: case EXT_MOD_TYPE: case EXT_DISPOSABLE: + case EXT_PACKET: case EXT_EXTREF: mb_free_ext_fast(mi, mi->mi_type, -1); break; ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.16 2008/01/07 01:18:16 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.17 2008/01/09 08:01:42 kmacy Exp $"); #include #include @@ -384,7 +384,7 @@ */ while (dofree == 0) { cnt = *(mi->mi_refcnt); - if (mi->mi_type == EXT_PACKET) { + if (mi->mi_type == EXT_PACKET && cnt == 1) { dofree = 1; break; } ==== //depot/projects/dtrace/src/sys/dev/iir/iir.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.19 2007/06/17 05:55:50 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.20 2008/01/09 20:02:56 scottl Exp $"); #define _IIR_C_ @@ -1160,20 +1160,25 @@ break; case INQUIRY: { - struct scsi_inquiry_data *inq; + struct scsi_inquiry_data inq; + size_t copylen = MIN(sizeof(inq), ccb->csio.dxfer_len); - inq = (struct scsi_inquiry_data *)ccb->csio.data_ptr; - bzero(inq, sizeof(struct scsi_inquiry_data)); - inq->device = (gdt->sc_hdr[t].hd_devtype & 4) ? + bzero(&inq, sizeof(inq)); + inq.device = (gdt->sc_hdr[t].hd_devtype & 4) ? T_CDROM : T_DIRECT; - inq->dev_qual2 = (gdt->sc_hdr[t].hd_devtype & 1) ? 0x80 : 0; - inq->version = SCSI_REV_2; - inq->response_format = 2; - inq->additional_length = 32; - inq->flags = SID_CmdQue | SID_Sync; - strcpy(inq->vendor, gdt->oem_name); - sprintf(inq->product, "Host Drive #%02d", t); - strcpy(inq->revision, " "); + inq.dev_qual2 = (gdt->sc_hdr[t].hd_devtype & 1) ? 0x80 : 0; + inq.version = SCSI_REV_2; + inq.response_format = 2; + inq.additional_length = 32; + inq.flags = SID_CmdQue | SID_Sync; + strncpy(inq.vendor, gdt->oem_name, sizeof(inq.vendor)); + snprintf(inq.product, sizeof(inq.product), + "Host Drive #%02d", t); + strncpy(inq.revision, " ", sizeof(inq.revision)); + bcopy(&inq, ccb->csio.data_ptr, copylen ); + if( ccb->csio.dxfer_len > copylen ) + bzero( ccb->csio.data_ptr+copylen, + ccb->csio.dxfer_len - copylen ); break; } case MODE_SENSE_6: @@ -1182,18 +1187,24 @@ struct scsi_mode_hdr_6 hd; struct scsi_mode_block_descr bd; struct scsi_control_page cp; - } *mpd; + } mpd; + size_t copylen = MIN(sizeof(mpd), ccb->csio.dxfer_len); u_int8_t page; - mpd = (struct mpd_data *)ccb->csio.data_ptr; - bzero(mpd, sizeof(struct mpd_data)); - mpd->hd.datalen = sizeof(struct scsi_mode_hdr_6) + + /*mpd = (struct mpd_data *)ccb->csio.data_ptr;*/ + bzero(&mpd, sizeof(mpd)); + mpd.hd.datalen = sizeof(struct scsi_mode_hdr_6) + sizeof(struct scsi_mode_block_descr); - mpd->hd.dev_specific = (gdt->sc_hdr[t].hd_devtype & 2) ? 0x80 : 0; - mpd->hd.block_descr_len = sizeof(struct scsi_mode_block_descr); - mpd->bd.block_len[0] = (GDT_SECTOR_SIZE & 0x00ff0000) >> 16; - mpd->bd.block_len[1] = (GDT_SECTOR_SIZE & 0x0000ff00) >> 8; - mpd->bd.block_len[2] = (GDT_SECTOR_SIZE & 0x000000ff); + mpd.hd.dev_specific = (gdt->sc_hdr[t].hd_devtype & 2) ? 0x80 : 0; + mpd.hd.block_descr_len = sizeof(struct scsi_mode_block_descr); + mpd.bd.block_len[0] = (GDT_SECTOR_SIZE & 0x00ff0000) >> 16; + mpd.bd.block_len[1] = (GDT_SECTOR_SIZE & 0x0000ff00) >> 8; + mpd.bd.block_len[2] = (GDT_SECTOR_SIZE & 0x000000ff); + + bcopy(&mpd, ccb->csio.data_ptr, copylen ); + if( ccb->csio.dxfer_len > copylen ) + bzero( ccb->csio.data_ptr+copylen, + ccb->csio.dxfer_len - copylen ); page=((struct scsi_mode_sense_6 *)ccb->csio.cdb_io.cdb_bytes)->page; switch (page) { default: @@ -1204,12 +1215,17 @@ } case READ_CAPACITY: { - struct scsi_read_capacity_data *rcd; + struct scsi_read_capacity_data rcd; + size_t copylen = MIN(sizeof(rcd), ccb->csio.dxfer_len); - rcd = (struct scsi_read_capacity_data *)ccb->csio.data_ptr; - bzero(rcd, sizeof(struct scsi_read_capacity_data)); - scsi_ulto4b(gdt->sc_hdr[t].hd_size - 1, rcd->addr); - scsi_ulto4b(GDT_SECTOR_SIZE, rcd->length); + /*rcd = (struct scsi_read_capacity_data *)ccb->csio.data_ptr;*/ + bzero(&rcd, sizeof(rcd)); + scsi_ulto4b(gdt->sc_hdr[t].hd_size - 1, rcd.addr); + scsi_ulto4b(GDT_SECTOR_SIZE, rcd.length); + bcopy(&rcd, ccb->csio.data_ptr, copylen ); + if( ccb->csio.dxfer_len > copylen ) + bzero( ccb->csio.data_ptr+copylen, + ccb->csio.dxfer_len - copylen ); break; } default: ==== //depot/projects/dtrace/src/sys/dev/usb/ehci.c#10 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.56 2007/08/12 18:45:24 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.57 2008/01/08 23:48:30 attilio Exp $"); #include #include @@ -1560,7 +1560,7 @@ } DPRINTFN(2,("ehci_sync_hc: enter\n")); /* get doorbell */ - lockmgr(&sc->sc_doorbell_lock, LK_EXCLUSIVE, NULL, NULL); + lockmgr(&sc->sc_doorbell_lock, LK_EXCLUSIVE, NULL, curthread); s = splhardusb(); /* ask for doorbell */ EOWRITE4(sc, EHCI_USBCMD, EOREAD4(sc, EHCI_USBCMD) | EHCI_CMD_IAAD); @@ -1571,7 +1571,7 @@ EOREAD4(sc, EHCI_USBCMD), EOREAD4(sc, EHCI_USBSTS))); splx(s); /* release doorbell */ - lockmgr(&sc->sc_doorbell_lock, LK_RELEASE, NULL, NULL); + lockmgr(&sc->sc_doorbell_lock, LK_RELEASE, NULL, curthread); #ifdef DIAGNOSTIC if (error) printf("ehci_sync_hc: tsleep() = %d\n", error); ==== //depot/projects/dtrace/src/sys/dev/usb/if_udav.c#7 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.33 2007/07/24 14:44:23 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.34 2008/01/08 23:48:30 attilio Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.33 2007/07/24 14:44:23 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.34 2008/01/08 23:48:30 attilio Exp $"); #include "opt_inet.h" #if defined(__NetBSD__) @@ -1780,7 +1780,7 @@ #if defined(__NetBSD__) lockmgr(&sc->sc_mii_lock, LK_EXCLUSIVE, NULL); #elif defined(__FreeBSD__) - lockmgr(&sc->sc_mii_lock, LK_EXCLUSIVE, NULL, NULL); + lockmgr(&sc->sc_mii_lock, LK_EXCLUSIVE, NULL, curthread); #endif } @@ -1793,7 +1793,7 @@ #if defined(__NetBSD__) lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL); #elif defined(__FreeBSD__) - lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL, NULL); + lockmgr(&sc->sc_mii_lock, LK_RELEASE, NULL, curthread); #endif if (--sc->sc_refcnt < 0) usb_detach_wakeup(sc->sc_dev); ==== //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_subr.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.h,v 1.3 2004/12/06 20:14:20 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.h,v 1.4 2008/01/08 23:48:31 attilio Exp $ */ #define hpfs_bmmarkfree(hpmp, bn,bl) hpfs_bmmark(hpmp, bn, bl, 1) @@ -78,8 +78,10 @@ hpfs_breadstruct(hpmp, lsn, D_BSIZE, D_MAGIC, bpp) #if 0 -#define hpfs_hplock(hp, p) lockmgr(&(hp)->h_intlock, LK_EXCLUSIVE, (p), NULL) -#define hpfs_hpunlock(hp, p) lockmgr(&(hp)->h_intlock, LK_RELEASE, (p), NULL) +#define hpfs_hplock(hp, p) \ + lockmgr(&(hp)->h_intlock, LK_EXCLUSIVE, (p), curthread) +#define hpfs_hpunlock(hp, p) \ + lockmgr(&(hp)->h_intlock, LK_RELEASE, (p), curthread) #endif int hpfs_hpbmap (struct hpfsnode *, daddr_t, daddr_t *, int *); ==== //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_subr.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.42 2006/11/20 19:28:36 le Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.43 2008/01/08 23:48:31 attilio Exp $ */ #include @@ -359,7 +359,7 @@ mtx_lock(&ip->i_interlock); ip->i_usecount++; lockmgr(&ip->i_lock, LK_EXCLUSIVE | LK_INTERLOCK, &ip->i_interlock, - NULL); + curthread); return 0; } @@ -391,7 +391,7 @@ return (0); } } while (lockmgr(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL, NULL, - NULL)); + curthread)); MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE, M_WAITOK | M_ZERO); @@ -413,7 +413,7 @@ ntfs_nthashins(ip); - lockmgr(&ntfs_hashlock, LK_RELEASE, NULL, NULL); + lockmgr(&ntfs_hashlock, LK_RELEASE, NULL, curthread); *ipp = ip; @@ -450,7 +450,7 @@ if (ip->i_usecount > 0) { lockmgr(&ip->i_lock, LK_RELEASE|LK_INTERLOCK, &ip->i_interlock, - NULL); + curthread); return; } @@ -1982,7 +1982,7 @@ struct vnode *vp; /* get exclusive access */ - lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, NULL); + lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, curthread); /* only read the translation data from a file if it hasn't been * read already */ @@ -2005,7 +2005,7 @@ out: ntfs_toupper_usecount++; - lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, NULL); + lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, curthread); return (error); } @@ -2017,7 +2017,7 @@ ntfs_toupper_unuse() { /* get exclusive access */ - lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, NULL); + lockmgr(&ntfs_toupper_lock, LK_EXCLUSIVE, NULL, curthread); ntfs_toupper_usecount--; if (ntfs_toupper_usecount == 0) { @@ -2032,7 +2032,7 @@ #endif /* release the lock */ - lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, NULL); + lockmgr(&ntfs_toupper_lock, LK_RELEASE, NULL, curthread); } int ==== //depot/projects/dtrace/src/sys/kern/kern_lock.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.116 2007/12/28 00:38:13 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.118 2008/01/09 00:02:43 attilio Exp $"); #include "opt_ddb.h" #include "opt_global.h" @@ -105,7 +105,7 @@ panic("lockmgr locks do not support sleep interlocking"); } -#define COUNT(td, x) if ((td)) (td)->td_locks += (x) +#define COUNT(td, x) ((td)->td_locks += (x)) #define LK_ALL (LK_HAVE_EXCL | LK_WANT_EXCL | LK_WANT_UPGRADE | \ LK_SHARE_NONZERO | LK_WAIT_NONZERO) @@ -194,24 +194,18 @@ { int error; - struct thread *thr; int extflags, lockflags; int contested = 0; uint64_t waitstart = 0; /* - * Lock owner can only be curthread or, at least, NULL in order to - * have a deadlock free implementation of the primitive. + * Lock owner can only be curthread in order to have a deadlock + * free implementation of the primitive. */ - KASSERT(td == NULL || td == curthread, - ("lockmgr: owner thread (%p) cannot differ from curthread or NULL", - td)); + KASSERT(td == curthread, + ("lockmgr: owner thread (%p) cannot differ from curthread", td)); error = 0; - if (td == NULL) - thr = LK_KERNPROC; - else - thr = td; if ((flags & LK_INTERNAL) == 0) mtx_lock(lkp->lk_interlock); @@ -260,7 +254,7 @@ * lock requests or upgrade requests ( but not the exclusive * lock itself ). */ - if (lkp->lk_lockholder != thr) { + if (lkp->lk_lockholder != td) { lockflags = LK_HAVE_EXCL; if (td != NULL && !(td->td_pflags & TDP_DEADLKTREAT)) lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE; @@ -286,10 +280,10 @@ /* FALLTHROUGH downgrade */ case LK_DOWNGRADE: - KASSERT(lkp->lk_lockholder == thr && lkp->lk_exclusivecount != 0, + KASSERT(lkp->lk_lockholder == td && lkp->lk_exclusivecount != 0, ("lockmgr: not holding exclusive lock " "(owner thread (%p) != thread (%p), exlcnt (%d) != 0", - lkp->lk_lockholder, thr, lkp->lk_exclusivecount)); + lkp->lk_lockholder, td, lkp->lk_exclusivecount)); sharelock(td, lkp, lkp->lk_exclusivecount); COUNT(td, -lkp->lk_exclusivecount); lkp->lk_exclusivecount = 0; @@ -308,7 +302,7 @@ * after the upgrade). If we return an error, the file * will always be unlocked. */ - if (lkp->lk_lockholder == thr) + if (lkp->lk_lockholder == td) panic("lockmgr: upgrade exclusive lock"); if (lkp->lk_sharecount <= 0) panic("lockmgr: upgrade without shared"); @@ -342,7 +336,7 @@ if (lkp->lk_exclusivecount != 0) panic("lockmgr: non-zero exclusive count"); lkp->lk_flags |= LK_HAVE_EXCL; - lkp->lk_lockholder = thr; + lkp->lk_lockholder = td; lkp->lk_exclusivecount = 1; COUNT(td, 1); lock_profile_obtain_lock_success(&lkp->lk_object, contested, waitstart, file, line); @@ -362,7 +356,7 @@ /* FALLTHROUGH exclusive request */ case LK_EXCLUSIVE: - if (lkp->lk_lockholder == thr && thr != LK_KERNPROC) { + if (lkp->lk_lockholder == td) { /* * Recursive lock. */ @@ -400,7 +394,7 @@ break; } lkp->lk_flags |= LK_HAVE_EXCL; - lkp->lk_lockholder = thr; + lkp->lk_lockholder = td; if (lkp->lk_exclusivecount != 0) panic("lockmgr: non-zero exclusive count"); lkp->lk_exclusivecount = 1; @@ -413,10 +407,10 @@ case LK_RELEASE: if (lkp->lk_exclusivecount != 0) { - if (lkp->lk_lockholder != thr && + if (lkp->lk_lockholder != td && lkp->lk_lockholder != LK_KERNPROC) { panic("lockmgr: thread %p, not %s %p unlocking", - thr, "exclusive lock holder", + td, "exclusive lock holder", lkp->lk_lockholder); } if (lkp->lk_lockholder != LK_KERNPROC) @@ -433,7 +427,7 @@ shareunlock(td, lkp, 1); else { printf("lockmgr: thread %p unlocking unheld lock\n", - thr); + td); kdb_backtrace(); } @@ -448,14 +442,14 @@ * check for holding a shared lock, but at least we can * check for an exclusive one. */ - if (lkp->lk_lockholder == thr) + if (lkp->lk_lockholder == td) panic("lockmgr: draining against myself"); error = acquiredrain(lkp, extflags); if (error) break; lkp->lk_flags |= LK_DRAINING | LK_HAVE_EXCL; - lkp->lk_lockholder = thr; + lkp->lk_lockholder = td; lkp->lk_exclusivecount = 1; COUNT(td, 1); #if defined(DEBUG_LOCKS) @@ -544,6 +538,31 @@ } /* + * Disown the lockmgr. + */ +void +lockmgr_disown(struct lock *lkp) +{ + struct thread *td; + + td = curthread; + KASSERT(lkp->lk_exclusivecount, + ("%s: %p lockmgr must be exclusively locked", __func__, lkp)); + KASSERT(lkp->lk_lockholder == td || lkp->lk_lockholder == LK_KERNPROC, + ("%s: %p lockmgr must be locked by curthread (%p)", __func__, lkp, + td)); + + /* + * Drop the lock reference and switch the owner. This will result + * in an atomic operation like td_lock is only accessed by curthread + * and lk_lockholder only needs one write. + */ + if (lkp->lk_lockholder == td) + td->td_locks--; + lkp->lk_lockholder = LK_KERNPROC; +} + +/* * Determine the status of a lock. */ int ==== //depot/projects/dtrace/src/sys/sys/buf.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/sys/buf.h,v 1.196 2007/03/08 06:44:34 julian Exp $ + * $FreeBSD: src/sys/sys/buf.h,v 1.197 2008/01/08 23:48:31 attilio Exp $ */ #ifndef _SYS_BUF_H_ @@ -340,11 +340,8 @@ static __inline void BUF_KERNPROC(struct buf *bp) { - struct thread *td = curthread; - if (!TD_IS_IDLETHREAD(td) && bp->b_lock.lk_lockholder == td) - td->td_locks--; - bp->b_lock.lk_lockholder = LK_KERNPROC; + lockmgr_disown(&bp->b_lock); } #endif /* ==== //depot/projects/dtrace/src/sys/sys/lockmgr.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/lockmgr.h,v 1.55 2007/12/28 00:38:13 attilio Exp $ + * $FreeBSD: src/sys/sys/lockmgr.h,v 1.56 2008/01/08 23:48:31 attilio Exp $ */ #ifndef _SYS_LOCKMGR_H_ @@ -197,6 +197,7 @@ int _lockmgr(struct lock *, u_int flags, struct mtx *, struct thread *p, char *file, int line); +void lockmgr_disown(struct lock *); void lockmgr_printinfo(struct lock *); int lockstatus(struct lock *, struct thread *); int lockcount(struct lock *); ==== //depot/projects/dtrace/src/sys/sys/mbuf.h#12 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.218 2007/12/25 14:17:16 wkoszek Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.219 2008/01/09 06:29:49 kmacy Exp $ */ #ifndef _SYS_MBUF_H_ @@ -496,8 +496,11 @@ static __inline void m_free_fast(struct mbuf *m) { - KASSERT(SLIST_EMPTY(&m->m_pkthdr.tags), ("doing fast free of mbuf with tags")); - +#ifdef INVARIANTS + if (m->m_flags & M_PKTHDR) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:11:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27AC516A41A; Wed, 9 Jan 2008 21:11:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E184416A417 for ; Wed, 9 Jan 2008 21:11:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D671313C45B for ; Wed, 9 Jan 2008 21:11:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09LBD5R042434 for ; Wed, 9 Jan 2008 21:11:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09LBDWI042431 for perforce@freebsd.org; Wed, 9 Jan 2008 21:11:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 21:11:13 GMT Message-Id: <200801092111.m09LBDWI042431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:11:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=132915 Change 132915 by hselasky@hselasky_laptop001 on 2008/01/09 21:10:53 Correct a comment. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#82 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#82 (text+ko) ==== @@ -2214,7 +2214,7 @@ #ifdef __FreeBSD__ /*------------------------------------------------------------------------* - * usbd_pc_tag_create - allocate a DMA tag + * usbd_dma_tag_create - allocate a DMA tag * * NOTE: If the "align" parameter has a value of 1 the DMA-tag will * allow multi-segment mappings. Else all mappings are single-segment. From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:31:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CA0016A46C; Wed, 9 Jan 2008 21:31:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4ACF16A421 for ; Wed, 9 Jan 2008 21:31:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C909C13C45B for ; Wed, 9 Jan 2008 21:31:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09LVadg045720 for ; Wed, 9 Jan 2008 21:31:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09LVZOB045690 for perforce@freebsd.org; Wed, 9 Jan 2008 21:31:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 21:31:35 GMT Message-Id: <200801092131.m09LVZOB045690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:31:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=132916 Change 132916 by hselasky@hselasky_laptop001 on 2008/01/09 21:31:12 Mark all USB errors as such. Scripted by: sed -e "s/USBD_NORMAL_COMPLETION/USBD_ERR_NORMAL_COMPLETION/g" | sed -e "s/USBD_PENDING_REQUESTS/USBD_ERR_PENDING_REQUESTS/g" | sed -e "s/USBD_NOT_STARTED/USBD_ERR_NOT_STARTED/g" | sed -e "s/USBD_INVAL/USBD_ERR_INVAL/g" | sed -e "s/USBD_NOMEM/USBD_ERR_NOMEM/g" | sed -e "s/USBD_CANCELLED/USBD_ERR_CANCELLED/g" | sed -e "s/USBD_BAD_ADDRESS/USBD_ERR_BAD_ADDRESS/g" | sed -e "s/USBD_BAD_BUFSIZE/USBD_ERR_BAD_BUFSIZE/g" | sed -e "s/USBD_BAD_FLAG/USBD_ERR_BAD_FLAG/g" | sed -e "s/USBD_NO_CALLBACK/USBD_ERR_NO_CALLBACK/g" | sed -e "s/USBD_IN_USE/USBD_ERR_IN_USE/g" | sed -e "s/USBD_NO_ADDR/USBD_ERR_NO_ADDR/g" | sed -e "s/USBD_NO_PIPE/USBD_ERR_NO_PIPE/g" | sed -e "s/USBD_ZERO_NFRAMES/USBD_ERR_ZERO_NFRAMES/g" | sed -e "s/USBD_ZERO_MAXP/USBD_ERR_ZERO_MAXP/g" | sed -e "s/USBD_SET_ADDR_FAILED/USBD_ERR_SET_ADDR_FAILED/g" | sed -e "s/USBD_NO_POWER/USBD_ERR_NO_POWER/g" | sed -e "s/USBD_TOO_DEEP/USBD_ERR_TOO_DEEP/g" | sed -e "s/USBD_IOERROR/USBD_ERR_IOERROR/g" | sed -e "s/USBD_NOT_CONFIGURED/USBD_ERR_NOT_CONFIGURED/g" | sed -e "s/USBD_TIMEOUT/USBD_ERR_TIMEOUT/g" | sed -e "s/USBD_SHORT_XFER/USBD_ERR_SHORT_XFER/g" | sed -e "s/USBD_STALLED/USBD_ERR_STALLED/g" | sed -e "s/USBD_INTERRUPTED/USBD_ERR_INTERRUPTED/g" | sed -e "s/USBD_DMA_LOAD_FAILED/USBD_ERR_DMA_LOAD_FAILED/g" | sed -e "s/USBD_BAD_CONTEXT/USBD_ERR_BAD_CONTEXT/g" | sed -e "s/USBD_NO_ROOT_HUB/USBD_ERR_NO_ROOT_HUB/g" | sed -e "s/USBD_NO_INTR_THREAD/USBD_ERR_NO_INTR_THREAD/g" Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#32 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/README#33 edit .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#69 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#45 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#47 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#51 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#56 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#57 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/usb.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#31 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#83 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#92 edit .. //depot/projects/usb/src/sys/dev/usb/usb_template.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#102 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#36 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#25 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#32 (text) ==== @@ -637,7 +637,7 @@ return; default: /* Error */ - if (xfer->error == USBD_CANCELLED) { + if (xfer->error == USBD_ERR_CANCELLED) { atausb_tr_error(xfer); } else { atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); @@ -691,7 +691,7 @@ return; default: /* Error */ - if (xfer->error == USBD_CANCELLED) { + if (xfer->error == USBD_ERR_CANCELLED) { atausb_tr_error(xfer); } else { atausb_transfer_start(sc, ATAUSB_T_BBB_DATA_WR_CS); @@ -794,7 +794,7 @@ default: tr_error: - if ((xfer->error == USBD_CANCELLED) || + if ((xfer->error == USBD_ERR_CANCELLED) || (sc->status_try)) { atausb_tr_error(xfer); } else { @@ -834,7 +834,7 @@ { struct atausb_softc *sc = xfer->priv_sc; - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { if (atausbdebug) { device_printf(sc->dev, "transfer failed, %s, in state %d " ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#31 (text+ko) ==== @@ -1264,7 +1264,7 @@ return; default: /* Error */ - if (xfer->error == USBD_CANCELLED) { + if (xfer->error == USBD_ERR_CANCELLED) { return; } goto tr_transferred; @@ -1341,7 +1341,7 @@ return; default: /* Error */ - if (xfer->error == USBD_CANCELLED) { + if (xfer->error == USBD_ERR_CANCELLED) { return; } goto tr_transferred; @@ -3312,7 +3312,7 @@ DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ chan->flags |= UMIDI_FLAG_READ_STALL; usbd_transfer_start(chan->xfer[3]); @@ -3558,7 +3558,7 @@ DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ chan->flags |= UMIDI_FLAG_WRITE_STALL; usbd_transfer_start(chan->xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/README#33 (text+ko) ==== @@ -227,7 +227,7 @@ NOTE: this function must be called with "priv_mtx" locked NOTE: if the transfer was in progress, the callback will called with - "xfer->error=USBD_CANCELLED", before this function returns + "xfer->error=USBD_ERR_CANCELLED", before this function returns /*------------------------------------------------------------------------* * struct usbd_config { @@ -321,13 +321,13 @@ has timed out. This flag can be changed during operation. NOTE: If polling is used the "timeout" field should be non-zero! - NOTE: USBD_CANCELLED is returned in case of timeout - instead of USBD_TIMEOUT! + NOTE: USBD_ERR_CANCELLED is returned in case of timeout + instead of USBD_ERR_TIMEOUT! pipe_bof This flag causes a failing USB transfer to remain first in the PIPE queue except in the case of "xfer->error" equal - to "USBD_CANCELLED". No other USB transfers in the affected + to "USBD_ERR_CANCELLED". No other USB transfers in the affected PIPE queue will be started until either: 1) The failing USB transfer is stopped using "usbd_transfer_stop()". @@ -371,7 +371,7 @@ operation. no_pipe_ok - Setting this flag causes the USBD_NO_PIPE error to be + Setting this flag causes the USBD_ERR_NO_PIPE error to be ignored. This flag can not be changed during operation. stall_pipe ==== //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#13 (text+ko) ==== @@ -1059,7 +1059,7 @@ mtx_assert(&sc->sc_bus.mtx, MA_OWNED); /* transfer is transferred */ - at9100_dci_device_done(xfer, USBD_TIMEOUT); + at9100_dci_device_done(xfer, USBD_ERR_TIMEOUT); /* queue callback for execution */ usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); @@ -1198,7 +1198,7 @@ xfer->td_transfer_cache = td; return (error ? - USBD_STALLED : USBD_NORMAL_COMPLETION); + USBD_ERR_STALLED : USBD_ERR_NORMAL_COMPLETION); } static void @@ -1289,7 +1289,7 @@ if (xfer) { /* cancel any ongoing transfers */ - at9100_dci_device_done(xfer, USBD_STALLED); + at9100_dci_device_done(xfer, USBD_ERR_STALLED); } /* set FORCESTALL */ sc = AT9100_DCI_BUS2SC(udev->bus); @@ -1569,7 +1569,7 @@ static void at9100_dci_device_bulk_close(struct usbd_xfer *xfer) { - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -1610,7 +1610,7 @@ static void at9100_dci_device_ctrl_close(struct usbd_xfer *xfer) { - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -1651,7 +1651,7 @@ static void at9100_dci_device_intr_close(struct usbd_xfer *xfer) { - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -1692,7 +1692,7 @@ static void at9100_dci_device_isoc_fs_close(struct usbd_xfer *xfer) { - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -1785,7 +1785,7 @@ if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; } - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2209,7 +2209,7 @@ sc->sc_flags.change_suspend = 0; break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } goto tr_valid; @@ -2234,7 +2234,7 @@ sc->sc_flags.port_powered = 1; break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } goto tr_valid; @@ -2308,7 +2308,7 @@ goto tr_valid; tr_stalled: - std->err = USBD_STALLED; + std->err = USBD_ERR_STALLED; tr_valid: done: return; @@ -2347,7 +2347,7 @@ if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; } - at9100_dci_device_done(xfer, USBD_CANCELLED); + at9100_dci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2451,7 +2451,7 @@ if (pf == NULL) { /* should not happen */ - parm->err = USBD_INVAL; + parm->err = USBD_ERR_INVAL; return; } } else { ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#69 (text+ko) ==== @@ -191,7 +191,7 @@ } if (hcr) { - return (USBD_IOERROR); + return (USBD_ERR_IOERROR); } return (0); } @@ -258,7 +258,7 @@ */ if (EHCI_CMD_FLS(EOREAD4(sc, EHCI_USBCMD)) == 3) { device_printf(sc->sc_bus.bdev, "invalid frame-list-size\n"); - err = USBD_IOERROR; + err = USBD_ERR_IOERROR; goto done; } /* set up the bus struct */ @@ -475,7 +475,7 @@ } if (hcr) { device_printf(sc->sc_bus.bdev, "run timeout\n"); - err = USBD_IOERROR; + err = USBD_ERR_IOERROR; goto done; } done: @@ -1215,7 +1215,7 @@ #endif return ((status & EHCI_QTD_HALTED) ? - USBD_STALLED : USBD_NORMAL_COMPLETION); + USBD_ERR_STALLED : USBD_ERR_NORMAL_COMPLETION); } static void @@ -1303,7 +1303,7 @@ status |= le32toh(td->sitd_status); if (!(status & EHCI_SITD_ACTIVE)) { - ehci_device_done(xfer, USBD_NORMAL_COMPLETION); + ehci_device_done(xfer, USBD_ERR_NORMAL_COMPLETION); goto transferred; } } else if (methods == &ehci_device_isoc_hs_methods) { @@ -1330,7 +1330,7 @@ /* if no transactions are active we continue */ if (!(status & htole32(EHCI_ITD_ACTIVE))) { - ehci_device_done(xfer, USBD_NORMAL_COMPLETION); + ehci_device_done(xfer, USBD_ERR_NORMAL_COMPLETION); goto transferred; } } else { @@ -1518,7 +1518,7 @@ mtx_assert(&sc->sc_bus.mtx, MA_OWNED); /* transfer is transferred */ - ehci_device_done(xfer, USBD_TIMEOUT); + ehci_device_done(xfer, USBD_ERR_TIMEOUT); /* queue callback for execution */ usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); @@ -2158,7 +2158,7 @@ static void ehci_device_bulk_close(struct usbd_xfer *xfer) { - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2208,7 +2208,7 @@ static void ehci_device_ctrl_close(struct usbd_xfer *xfer) { - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2314,7 +2314,7 @@ sc->sc_intr_stat[xfer->qh_pos]--; - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2399,7 +2399,7 @@ static void ehci_device_isoc_fs_close(struct usbd_xfer *xfer) { - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2682,7 +2682,7 @@ static void ehci_device_isoc_hs_close(struct usbd_xfer *xfer) { - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -2939,7 +2939,7 @@ if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; } - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -3119,7 +3119,7 @@ switch (value >> 8) { case UDESC_DEVICE: if ((value & 0xff) != 0) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } std->len = sizeof(ehci_devd); @@ -3132,7 +3132,7 @@ */ case UDESC_DEVICE_QUALIFIER: if ((value & 0xff) != 0) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } std->len = sizeof(ehci_odevd); @@ -3141,7 +3141,7 @@ case UDESC_CONFIG: if ((value & 0xff) != 0) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } std->len = sizeof(ehci_confd); @@ -3173,7 +3173,7 @@ ptr); break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } break; @@ -3192,14 +3192,14 @@ break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): if (value >= USB_MAX_DEVICES) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } sc->sc_addr = value; break; case C(UR_SET_CONFIG, UT_WRITE_DEVICE): if ((value != 0) && (value != 1)) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } sc->sc_conf = value; @@ -3209,7 +3209,7 @@ case C(UR_SET_FEATURE, UT_WRITE_DEVICE): case C(UR_SET_FEATURE, UT_WRITE_INTERFACE): case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT): - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE): break; @@ -3223,7 +3223,7 @@ if ((index < 1) || (index > sc->sc_noport)) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } port = EHCI_PORTSC(index); @@ -3263,7 +3263,7 @@ sc->sc_isreset = 0; break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } #if 0 @@ -3286,7 +3286,7 @@ break; case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE): if ((value & 0xff) != 0) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } v = EOREAD4(sc, EHCI_HCSPARAMS); @@ -3314,7 +3314,7 @@ index)); if ((index < 1) || (index > sc->sc_noport)) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } v = EOREAD4(sc, EHCI_PORTSC(index)); @@ -3346,14 +3346,14 @@ std->len = sizeof(sc->sc_hub_desc.ps); break; case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE): - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; case C(UR_SET_FEATURE, UT_WRITE_CLASS_DEVICE): break; case C(UR_SET_FEATURE, UT_WRITE_CLASS_OTHER): if ((index < 1) || (index > sc->sc_noport)) { - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } port = EHCI_PORTSC(index); @@ -3404,7 +3404,7 @@ if (v & EHCI_PS_PR) { device_printf(sc->sc_bus.bdev, "port reset timeout\n"); - std->err = USBD_TIMEOUT; + std->err = USBD_ERR_TIMEOUT; goto done; } if (!(v & EHCI_PS_PE)) { @@ -3435,7 +3435,7 @@ break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } break; @@ -3445,7 +3445,7 @@ case C(UR_STOP_TT, UT_WRITE_CLASS_OTHER): break; default: - std->err = USBD_IOERROR; + std->err = USBD_ERR_IOERROR; goto done; } done: @@ -3485,7 +3485,7 @@ if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; } - ehci_device_done(xfer, USBD_CANCELLED); + ehci_device_done(xfer, USBD_ERR_CANCELLED); return; } @@ -3671,7 +3671,7 @@ if (usbd_transfer_setup_sub_malloc( parm, &page_info, &pc, sizeof(*td), EHCI_ITD_ALIGN)) { - parm->err = USBD_NOMEM; + parm->err = USBD_ERR_NOMEM; break; } if (parm->buf) { @@ -3696,7 +3696,7 @@ if (usbd_transfer_setup_sub_malloc( parm, &page_info, &pc, sizeof(*td), EHCI_SITD_ALIGN)) { - parm->err = USBD_NOMEM; + parm->err = USBD_ERR_NOMEM; break; } if (parm->buf) { @@ -3721,7 +3721,7 @@ if (usbd_transfer_setup_sub_malloc( parm, &page_info, &pc, sizeof(*qtd), EHCI_QTD_ALIGN)) { - parm->err = USBD_NOMEM; + parm->err = USBD_ERR_NOMEM; break; } if (parm->buf) { @@ -3750,7 +3750,7 @@ if (usbd_transfer_setup_sub_malloc( parm, &page_info, &pc, sizeof(*qh), EHCI_QH_ALIGN)) { - parm->err = USBD_NOMEM; + parm->err = USBD_ERR_NOMEM; break; } if (parm->buf) { ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#43 (text+ko) ==== @@ -1025,7 +1025,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ sc->sc_flags |= AUE_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); @@ -1125,7 +1125,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= AUE_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1228,7 +1228,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= AUE_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#45 (text+ko) ==== @@ -982,7 +982,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ sc->sc_flags |= AXE_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); @@ -1132,7 +1132,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= AXE_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1255,7 +1255,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= AXE_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#47 (text+ko) ==== @@ -443,7 +443,7 @@ UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_ENF, 0 - 1); if ((ue == NULL) || (ue->bLength < sizeof(*ue))) { - error = USBD_INVAL; + error = USBD_ERR_INVAL; } else { error = usbreq_get_string_any (uaa->device, &Giant, eaddr_str, @@ -781,7 +781,7 @@ /* free all previous mbufs */ cdce_free_mq(&(sc->sc_tx_mq)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; @@ -873,7 +873,7 @@ cdce_free_mq(&(sc->sc_tx_mq)); ifp->if_oerrors++; - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; @@ -1248,7 +1248,7 @@ DPRINTF(sc, 0, "error = %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; @@ -1264,7 +1264,7 @@ * * By safe we mean that if "usbd_transfer_stop()" is called, * we will get a callback having the error code - * USBD_CANCELLED. + * USBD_ERR_CANCELLED. */ if (fwd_mq) { cdce_fwd_mq(sc, &(sc->sc_rx_mq)); @@ -1344,7 +1344,7 @@ /* free all mbufs */ cdce_free_mq(&(sc->sc_rx_mq)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ xfer->flags.stall_pipe = 1; goto tr_setup; @@ -1359,7 +1359,7 @@ * * By safe we mean that if "usbd_transfer_stop()" is called, * we will get a callback having the error code - * USBD_CANCELLED. + * USBD_ERR_CANCELLED. */ if (m_rx) { mtx_unlock(&(sc->sc_mtx)); @@ -1437,7 +1437,7 @@ break; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ xfer->flags.stall_pipe = 1; goto tr_setup; @@ -1471,7 +1471,7 @@ break; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ xfer->flags.stall_pipe = 1; goto tr_setup; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#39 (text+ko) ==== @@ -696,7 +696,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= CUE_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -832,7 +832,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= CUE_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#41 (text+ko) ==== @@ -734,7 +734,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= KUE_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -825,7 +825,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= KUE_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#39 (text+ko) ==== @@ -917,7 +917,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ sc->sc_flags |= RUE_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); @@ -1009,7 +1009,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= RUE_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1103,7 +1103,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= RUE_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#26 (text+ko) ==== @@ -1135,7 +1135,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= RUM_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1562,7 +1562,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= RUM_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#41 (text+ko) ==== @@ -952,7 +952,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= UDAV_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); @@ -1056,7 +1056,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= UDAV_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1100,7 +1100,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* start clear stall */ sc->sc_flags |= UDAV_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#51 (text+ko) ==== @@ -1144,7 +1144,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= URAL_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); @@ -1599,7 +1599,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= URAL_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#35 (text+ko) ==== @@ -449,7 +449,7 @@ DPRINTF(sc, 2, "error = %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= ZYD_FLAG_INTR_READ_STALL; usbd_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_RD]); @@ -638,7 +638,7 @@ DPRINTF(sc, 2, "error = %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= ZYD_FLAG_INTR_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[ZYD_TR_INTR_CS_WR]); @@ -979,7 +979,7 @@ default: /* Error */ DPRINTF(sc, 0, "frame error: %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= ZYD_FLAG_BULK_READ_STALL; usbd_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_RD]); @@ -2868,7 +2868,7 @@ DPRINTF(sc, 10, "transfer error, %s\n", usbd_errstr(xfer->error)); - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { /* try to clear stall first */ sc->sc_flags |= ZYD_FLAG_BULK_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_WR]); ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#56 (text+ko) ==== @@ -241,7 +241,7 @@ } if (hcr) { device_printf(sc->sc_bus.bdev, "reset timeout\n"); - return (USBD_IOERROR); + return (USBD_ERR_IOERROR); } #ifdef USB_DEBUG if (ohcidebug > 15) { @@ -305,7 +305,7 @@ ohci_dumpregs(sc); } #endif - return (USBD_NORMAL_COMPLETION); + return (USBD_ERR_NORMAL_COMPLETION); } static struct ohci_ed * @@ -434,12 +434,12 @@ if (ohci_controller_init(sc)) { mtx_unlock(&sc->sc_bus.mtx); - return (USBD_INVAL); + return (USBD_ERR_INVAL); } else { mtx_unlock(&sc->sc_bus.mtx); /* catch any lost interrupts */ ohci_do_poll(&(sc->sc_bus)); - return (USBD_NORMAL_COMPLETION); + return (USBD_ERR_NORMAL_COMPLETION); } } @@ -816,7 +816,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:46:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B78F016A421; Wed, 9 Jan 2008 21:46:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D4FD16A419 for ; Wed, 9 Jan 2008 21:46:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7344C13C45D for ; Wed, 9 Jan 2008 21:46:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09LkrX3047773 for ; Wed, 9 Jan 2008 21:46:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09Lkrqb047770 for perforce@freebsd.org; Wed, 9 Jan 2008 21:46:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 21:46:53 GMT Message-Id: <200801092146.m09Lkrqb047770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132918 Change 132918 by hselasky@hselasky_laptop001 on 2008/01/09 21:46:47 Make "bufsize", "frames" and "interval" mode specific parameters in "struct usbd_config". There will be some follow up commits fixing compilation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#93 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#93 (text+ko) ==== @@ -544,6 +544,10 @@ struct usbd_config_sub { usbd_callback_t *callback; /* USB transfer callback */ + uint32_t bufsize; /* total pipe buffer size in bytes */ + uint32_t frames; /* maximum number of USB frames */ + uint16_t interval; /* interval in milliseconds */ +#define USBD_DEFAULT_INTERVAL 0 uint16_t timeout; /* transfer timeout in milliseconds */ struct usbd_xfer_flags flags; /* transfer flags */ }; @@ -551,10 +555,6 @@ struct usbd_config { struct usbd_config_sub mh; /* parameters for USB_MODE_HOST */ struct usbd_config_sub md; /* parameters for USB_MODE_DEVICE */ - uint32_t bufsize; /* total pipe buffer size in bytes */ - uint32_t frames; /* maximum number of USB frames */ - uint16_t interval; /* interval in milliseconds */ -#define USBD_DEFAULT_INTERVAL 0 uint8_t type; /* pipe type */ uint8_t endpoint; /* pipe number */ uint8_t direction; /* pipe direction */ From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:47:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9CD616A419; Wed, 9 Jan 2008 21:47:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF89F16A417 for ; Wed, 9 Jan 2008 21:47:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5DF513C44B for ; Wed, 9 Jan 2008 21:47:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09LlsV2047796 for ; Wed, 9 Jan 2008 21:47:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09Lls68047793 for perforce@freebsd.org; Wed, 9 Jan 2008 21:47:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 21:47:54 GMT Message-Id: <200801092147.m09Lls68047793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:47:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=132919 Change 132919 by hselasky@hselasky_laptop001 on 2008/01/09 21:47:20 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#94 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#94 (text+ko) ==== @@ -505,8 +505,8 @@ uint8_t ext_buffer:1; /* uses external DMA buffer */ uint8_t manual_status:1; /* non automatic status stage on * control transfers */ - uint8_t no_pipe_ok:1; /* set if "USBD_ERR_NO_PIPE" error can be - * ignored */ + uint8_t no_pipe_ok:1; /* set if "USBD_ERR_NO_PIPE" error can + * be ignored */ uint8_t stall_pipe:1; /* set if the endpoint belonging to * this USB transfer should be stalled * before starting this transfer! */ From owner-p4-projects@FreeBSD.ORG Wed Jan 9 21:58:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C61A16A421; Wed, 9 Jan 2008 21:58:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0218D16A41A for ; Wed, 9 Jan 2008 21:58:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC8F913C4CC for ; Wed, 9 Jan 2008 21:58:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09Lw5og049208 for ; Wed, 9 Jan 2008 21:58:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09Lw5fP049205 for perforce@freebsd.org; Wed, 9 Jan 2008 21:58:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 21:58:05 GMT Message-Id: <200801092158.m09Lw5fP049205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 21:58:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=132920 Change 132920 by hselasky@hselasky_laptop001 on 2008/01/09 21:57:42 Follow up commit - make "bufsize", "frames" and "interval" mode specific. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#103 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#103 (text+ko) ==== @@ -370,7 +370,6 @@ MIN_PKT = 8, }; struct usbd_xfer *xfer = parm->curr_xfer; - const struct usbd_config *setup = parm->curr_setup; const struct usbd_config_sub *setup_sub = parm->curr_setup_sub; usb_endpoint_descriptor_t *edesc; struct usbd_std_packet_size std_size; @@ -393,16 +392,16 @@ type = (edesc->bmAttributes & UE_XFERTYPE); xfer->flags = setup_sub->flags; - xfer->nframes = setup->frames; + xfer->nframes = setup_sub->frames; xfer->timeout = setup_sub->timeout; xfer->callback = setup_sub->callback; - xfer->interval = setup->interval; + xfer->interval = setup_sub->interval; xfer->endpoint = edesc->bEndpointAddress; xfer->max_packet_size = UGETW(edesc->wMaxPacketSize); xfer->max_packet_count = 1; xfer->flags_int.usb_mode = parm->udev->flags.usb_mode; /* make a shadow copy */ - parm->bufsize = setup->bufsize; + parm->bufsize = setup_sub->bufsize; if (parm->speed == USB_SPEED_HIGH) { xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3; @@ -793,7 +792,8 @@ /* sanity checks */ for (setup = setup_start, n = 0; setup != setup_end; setup++, n++) { - if (setup->bufsize == 0xffffffff) { + if ((setup->mh.bufsize == 0xffffffff) || + (setup->md.bufsize == 0xffffffff)) { parm.err = USBD_ERR_BAD_BUFSIZE; PRINTF(("invalid bufsize\n")); } @@ -3480,9 +3480,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control endpoint */ .direction = UE_DIR_ANY, - .bufsize = 1024, /* bytes */ + .mh.bufsize = 1024, /* bytes */ .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, .mh.callback = &usbd_do_request_callback, + .md.bufsize = 1024, /* bytes */ .md.flags = {.proxy_buffer = 1,.short_xfer_ok = 0,}, .md.callback = &usbd_handle_request_callback, }, From owner-p4-projects@FreeBSD.ORG Wed Jan 9 22:05:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF75616A41A; Wed, 9 Jan 2008 22:05:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7420F16A417 for ; Wed, 9 Jan 2008 22:05:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A39C13C448 for ; Wed, 9 Jan 2008 22:05:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09M5DtU051824 for ; Wed, 9 Jan 2008 22:05:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09M5DRl051821 for perforce@freebsd.org; Wed, 9 Jan 2008 22:05:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 22:05:13 GMT Message-Id: <200801092205.m09M5DRl051821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 22:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=132921 Change 132921 by hselasky@hselasky_laptop001 on 2008/01/09 22:04:37 Follow up commit to - make "bufsize", "frames" and "interval" mode specific. CDCE needs special handling, hence it is dual mode, and we need to duplicate the entries for all dual mode endpoints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#48 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#48 (text+ko) ==== @@ -115,14 +115,16 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .frames = CDCE_512X4_FRAGS_MAX + 1, - .bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .if_index = 0, /* Host Mode */ + .mh.frames = CDCE_512X4_FRAGS_MAX + 1, + .mh.bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,}, .mh.callback = &cdce_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ /* Device Mode */ + .md.frames = CDCE_512X4_FRAGS_MAX + 1, + .md.bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .md.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,}, .md.callback = &cdce_bulk_read_callback, .md.timeout = 0, /* no timeout */ @@ -132,14 +134,16 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .frames = CDCE_512X4_FRAGS_MAX + 1, - .bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .if_index = 0, /* Host Mode */ + .mh.frames = CDCE_512X4_FRAGS_MAX + 1, + .mh.bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.ext_buffer = 1,}, .mh.callback = &cdce_bulk_read_callback, .mh.timeout = 0, /* no timeout */ /* Device Mode */ + .md.frames = CDCE_512X4_FRAGS_MAX + 1, + .md.bufsize = (CDCE_512X4_FRAMES_MAX * MCLBYTES) + sizeof(usb_cdc_mf_eth_512x4_header_t), .md.flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,}, .md.callback = &cdce_bulk_write_callback, .md.timeout = 10000, /* 10 seconds */ @@ -149,10 +153,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), - .interval = 50, /* 50ms */ .if_index = 0, /* Host Mode Only */ + .mh.bufsize = sizeof(usb_device_request_t), + .mh.interval = 50, /* 50ms */ .mh.flags = {}, .mh.callback = &cdce_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ @@ -162,10 +166,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), - .interval = 50, /* 50ms */ .if_index = 0, /* Host Mode Only */ + .mh.bufsize = sizeof(usb_device_request_t), + .mh.interval = 50, /* 50ms */ .mh.flags = {}, .mh.callback = &cdce_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ @@ -175,13 +179,14 @@ .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = CDCE_IND_SIZE_MAX, .if_index = 1, /* Host Mode */ + .mh.bufsize = CDCE_IND_SIZE_MAX, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.no_pipe_ok = 1,}, .mh.callback = &cdce_intr_read_callback, .mh.timeout = 0, /* Device Mode */ + .md.bufsize = CDCE_IND_SIZE_MAX, .md.flags = {.pipe_bof = 1,.force_short_xfer = 1,.no_pipe_ok = 1,}, .md.callback = &cdce_intr_write_callback, .md.timeout = 10000, /* 10 seconds */ @@ -191,10 +196,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), - .interval = 50, /* 50ms */ .if_index = 1, /* Host Mode Only */ + .mh.bufsize = sizeof(usb_device_request_t), + .mh.interval = 50, /* 50ms */ .mh.flags = {}, .mh.callback = &cdce_intr_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ From owner-p4-projects@FreeBSD.ORG Wed Jan 9 22:08:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B86216A420; Wed, 9 Jan 2008 22:08:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FC2D16A419 for ; Wed, 9 Jan 2008 22:08:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5233113C447 for ; Wed, 9 Jan 2008 22:08:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m09M8H0a054458 for ; Wed, 9 Jan 2008 22:08:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m09M8GDo054455 for perforce@freebsd.org; Wed, 9 Jan 2008 22:08:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Jan 2008 22:08:16 GMT Message-Id: <200801092208.m09M8GDo054455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2008 22:08:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=132922 Change 132922 by hselasky@hselasky_laptop001 on 2008/01/09 22:07:54 Final follow up commit to - make "bufsize", "frames" and "interval" mode specific. At the moment most USB drivers only support Host Mode so updating them can be done using a "sed" script: [ -f src/$F ] && ( cat src/$F | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)bufsize/&.mh.bufsize/g" | sed -E "s/\.bufsize.mh.bufsize/.mh.bufsize/g" | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)frames/&.mh.frames/g" | sed -E "s/\.frames.mh.frames/.mh.frames/g" | sed -E "s/^[ ]*(\.|cfg...\.|usbd_config...\.)interval/&.mh.interval/g" | sed -E "s/\.interval.mh.interval/.mh.interval/g" > temp.c ) && ( ./src/sys/dev/usb/usb_style.sh `pwd`/temp.c) && ( (diff -du src/$F temp.c > /dev/null) || (cat temp.c > src/$F)) Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#33 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#46 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#52 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#14 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#37 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#26 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#33 (text) ==== @@ -171,40 +171,40 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset1_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 500, /* 500 milliseconds */ + .mh.interval = 500, /* 500 milliseconds */ }, [ATAUSB_T_BBB_RESET2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset2_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 50, /* 50 milliseconds */ + .mh.interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_RESET3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_reset3_callback, .mh.timeout = 5000, /* 5 seconds */ - .interval = 50, /* 50 milliseconds */ + .mh.interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_COMMAND] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = sizeof(struct bbb_cbw), + .mh.bufsize = sizeof(struct bbb_cbw), .mh.flags = {}, .mh.callback = &atausb_t_bbb_command_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -214,7 +214,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = ATAUSB_BULK_SIZE, + .mh.bufsize = ATAUSB_BULK_SIZE, .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, .mh.callback = &atausb_t_bbb_data_read_callback, .mh.timeout = 0, /* overwritten later */ @@ -224,7 +224,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_data_rd_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -234,7 +234,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = ATAUSB_BULK_SIZE, + .mh.bufsize = ATAUSB_BULK_SIZE, .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, .mh.callback = &atausb_t_bbb_data_write_callback, .mh.timeout = 0, /* overwritten later */ @@ -244,7 +244,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &atausb_t_bbb_data_wr_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -254,7 +254,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = sizeof(struct bbb_csw), + .mh.bufsize = sizeof(struct bbb_csw), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &atausb_t_bbb_status_callback, .mh.timeout = 5000, /* ms */ ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#32 (text+ko) ==== @@ -463,8 +463,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -473,8 +473,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -486,8 +486,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -496,8 +496,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -509,8 +509,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -519,8 +519,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = UAUDIO_NFRAMES, + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = UAUDIO_NFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -532,8 +532,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -542,8 +542,8 @@ .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = 0, /* use "wMaxPacketSize * frames" */ - .frames = (UAUDIO_NFRAMES * 8), + .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ + .mh.frames = (UAUDIO_NFRAMES * 8), .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -555,7 +555,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = (sizeof(usb_device_request_t) + 4), + .mh.bufsize = (sizeof(usb_device_request_t) + 4), .mh.callback = &uaudio_mixer_write_cfg_callback, .mh.timeout = 1000, /* 1 second */ }, @@ -587,7 +587,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UMIDI_BULK_SIZE, + .mh.bufsize = UMIDI_BULK_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &umidi_bulk_write_callback, }, @@ -596,7 +596,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UMIDI_BULK_SIZE, + .mh.bufsize = UMIDI_BULK_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &umidi_bulk_read_callback, }, @@ -605,22 +605,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &umidi_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &umidi_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#44 (text+ko) ==== @@ -286,7 +286,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &aue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -296,7 +296,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), + .mh.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &aue_bulk_read_callback, }, @@ -305,22 +305,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -328,7 +328,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &aue_intr_callback, }, @@ -336,11 +336,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &aue_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#46 (text+ko) ==== @@ -234,7 +234,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = AXE_BULK_BUF_SIZE, + .mh.bufsize = AXE_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &axe_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -247,7 +247,7 @@ #if (MCLBYTES < 2048) #error "(MCLBYTES < 2048)" #endif - .bufsize = MCLBYTES, + .mh.bufsize = MCLBYTES, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &axe_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -257,22 +257,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -280,7 +280,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &axe_intr_callback, }, @@ -288,11 +288,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &axe_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#40 (text+ko) ==== @@ -167,7 +167,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,}, .mh.callback = &cue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -177,7 +177,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &cue_bulk_read_callback, }, @@ -186,22 +186,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &cue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &cue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#42 (text+ko) ==== @@ -201,7 +201,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2 + 64), + .mh.bufsize = (MCLBYTES + 2 + 64), .mh.flags = {.pipe_bof = 1,}, .mh.callback = &kue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -211,7 +211,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &kue_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -221,22 +221,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &kue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &kue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#40 (text+ko) ==== @@ -214,7 +214,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = MCLBYTES, + .mh.bufsize = MCLBYTES, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &rue_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -224,7 +224,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 4), + .mh.bufsize = (MCLBYTES + 4), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &rue_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -234,22 +234,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -257,7 +257,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &rue_intr_callback, }, @@ -265,11 +265,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &rue_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#27 (text+ko) ==== @@ -376,7 +376,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8), + .mh.bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &rum_bulk_write_callback, .mh.timeout = 5000, /* ms */ @@ -386,7 +386,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), + .mh.bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &rum_bulk_read_callback, }, @@ -395,20 +395,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &rum_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &rum_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#42 (text+ko) ==== @@ -160,7 +160,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (MCLBYTES + 2), + .mh.bufsize = (MCLBYTES + 2), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &udav_bulk_write_callback, .mh.timeout = 10000, /* 10 seconds */ @@ -170,7 +170,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (MCLBYTES + 3), + .mh.bufsize = (MCLBYTES + 3), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &udav_bulk_read_callback, .mh.timeout = 0, /* no timeout */ @@ -180,22 +180,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -203,7 +203,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &udav_intr_callback, }, @@ -211,11 +211,11 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &udav_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#52 (text+ko) ==== @@ -368,7 +368,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4), + .mh.bufsize = (RAL_FRAME_SIZE + RAL_TX_DESC_SIZE + 4), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &ural_bulk_write_callback, .mh.timeout = 5000, /* ms */ @@ -378,7 +378,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE), + .mh.bufsize = (RAL_FRAME_SIZE + RAL_RX_DESC_SIZE), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &ural_bulk_read_callback, }, @@ -387,20 +387,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ural_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ural_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#36 (text+ko) ==== @@ -227,7 +227,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = ZYD_MAX_TXBUFSZ, + .mh.bufsize = ZYD_MAX_TXBUFSZ, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &zyd_bulk_write_callback, .ep_index = 0, @@ -238,7 +238,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = ZYX_MAX_RXBUFSZ, + .mh.bufsize = ZYX_MAX_RXBUFSZ, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &zyd_bulk_read_callback, .ep_index = 0, @@ -248,29 +248,29 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_BULK_CS_RD] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_INTR_DT_WR] = { .type = UE_BULK_INTR, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = sizeof(struct zyd_cmd), + .mh.bufsize = sizeof(struct zyd_cmd), .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &zyd_intr_write_callback, .mh.timeout = 1000, /* 1 second */ @@ -281,7 +281,7 @@ .type = UE_BULK_INTR, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = sizeof(struct zyd_cmd), + .mh.bufsize = sizeof(struct zyd_cmd), .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &zyd_intr_read_callback, .ep_index = 1, @@ -291,22 +291,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_intr_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [ZYD_TR_INTR_CS_RD] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &zyd_intr_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#14 (text+ko) ==== @@ -1143,7 +1143,7 @@ void (*cfg_init_hw) (struct zyd_softc *, struct zyd_rf *); void (*cfg_switch_radio) (struct zyd_softc *, uint8_t on); void (*cfg_set_channel) (struct zyd_softc *, struct zyd_rf *, uint8_t); - uint8_t width; + uint8_t width; }; enum { ==== //depot/projects/usb/src/sys/dev/usb/uark.c#20 (text+ko) ==== @@ -106,7 +106,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UARK_BUF_SIZE, + .mh.bufsize = UARK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &uark_bulk_write_callback, }, @@ -115,7 +115,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UARK_BUF_SIZE, + .mh.bufsize = UARK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &uark_bulk_read_callback, }, @@ -124,22 +124,22 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &uark_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.flags = {}, .mh.callback = &uark_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#37 (text+ko) ==== @@ -193,7 +193,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UBSA_BSIZE, /* bytes */ + .mh.bufsize = UBSA_BSIZE, /* bytes */ .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &ubsa_write_callback, }, @@ -202,7 +202,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UBSA_BSIZE, /* bytes */ + .mh.bufsize = UBSA_BSIZE, /* bytes */ .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &ubsa_read_callback, }, @@ -211,20 +211,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -232,7 +232,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &ubsa_intr_callback, }, @@ -240,10 +240,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &ubsa_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#29 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 10 01:47:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A08716A41A; Thu, 10 Jan 2008 01:47:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CEAD16A418 for ; Thu, 10 Jan 2008 01:47:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF69A13C457 for ; Thu, 10 Jan 2008 01:47:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A1lbXm005932 for ; Thu, 10 Jan 2008 01:47:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A1lbTY005929 for perforce@freebsd.org; Thu, 10 Jan 2008 01:47:37 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 01:47:37 GMT Message-Id: <200801100147.m0A1lbTY005929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 01:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=132935 Change 132935 by jb@jb_freebsd1 on 2008/01/10 01:47:25 Set the lowest toxic range. We need to add toxic ranges for I/O memory mapped bu devices. How do we do that? XXX Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#8 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include extern uintptr_t kernelbase; extern uintptr_t dtrace_in_probe_addr; @@ -120,7 +121,7 @@ (*func)((uintptr_t)vaddr, (uintptr_t)vaddr + len); } #endif - (*func)(0, kernelbase); + (*func)(0, (uintptr_t) addr_PTmap); } void From owner-p4-projects@FreeBSD.ORG Thu Jan 10 01:49:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DB7C16A46C; Thu, 10 Jan 2008 01:49:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4343016A420 for ; Thu, 10 Jan 2008 01:49:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A77013C469 for ; Thu, 10 Jan 2008 01:49:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A1neBG005997 for ; Thu, 10 Jan 2008 01:49:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A1nelP005994 for perforce@freebsd.org; Thu, 10 Jan 2008 01:49:40 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 01:49:40 GMT Message-Id: <200801100149.m0A1nelP005994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 01:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=132936 Change 132936 by jb@jb_freebsd1 on 2008/01/10 01:49:17 Enable the toxic range additions. Now that we have a DTrace probe safe printf() call (enabled if built with DEBUG mode enabled), lets log attempts to write to toxic addresses. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#15 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#15 (text) ==== @@ -481,6 +481,7 @@ \ if (addr + size <= dtrace_toxrange[i].dtt_base) \ continue; \ +dtrace_debug_printf("%s: 0x%lx <= addr 0x%lx <= 0x%lx\n", __func__,(u_long) dtrace_toxrange[i].dtt_base,(u_long) addr,(u_long) dtrace_toxrange[i].dtt_limit); \ \ /* \ * This address falls within a toxic region; return 0. \ @@ -14559,8 +14560,6 @@ static void dtrace_toxrange_add(uintptr_t base, uintptr_t limit) { -printf("%s(%d): DOODAD\n",__func__,__LINE__); -#ifdef DOODAD if (dtrace_toxranges >= dtrace_toxranges_max) { int osize, nsize; dtrace_toxrange_t *range; @@ -14593,7 +14592,6 @@ dtrace_toxrange[dtrace_toxranges].dtt_base = base; dtrace_toxrange[dtrace_toxranges].dtt_limit = limit; dtrace_toxranges++; -#endif } /* From owner-p4-projects@FreeBSD.ORG Thu Jan 10 02:19:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3531E16A421; Thu, 10 Jan 2008 02:19:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBD1A16A41A for ; Thu, 10 Jan 2008 02:19:29 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE70713C442 for ; Thu, 10 Jan 2008 02:19:29 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A2JTjW011557 for ; Thu, 10 Jan 2008 02:19:29 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A2Iu6f011539 for perforce@freebsd.org; Thu, 10 Jan 2008 02:18:56 GMT (envelope-from qingli@freebsd.org) Date: Thu, 10 Jan 2008 02:18:56 GMT Message-Id: <200801100218.m0A2Iu6f011539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 132937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 02:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=132937 Change 132937 by qingli@FreeBSD-newarp on 2008/01/10 02:18:46 Integrating changelist 132913 from //depot/vendor/freebsd. Performed minimum testing including ping, ping6, arp, ndp etc. Affected files ... .. //depot/projects/arp-v2/src/COPYRIGHT#2 integrate .. //depot/projects/arp-v2/src/Makefile#2 integrate .. //depot/projects/arp-v2/src/bin/cp/cp.c#2 integrate .. //depot/projects/arp-v2/src/bin/mv/mv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/arp-v2/src/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/NEWS#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/config.guess#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/config.sub#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/configure.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/headers#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/form/modules#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/headers#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/mkinstalldirs#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ncurses/tack/COPYING#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/HISTORY#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/Makefile.in#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/README#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/ansi.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/charset.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/color.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/control.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/crum.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/edit.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/fun.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/init.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/menu.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/modes.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/modules#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/output.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/pad.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/scan.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/sync.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/sysdep.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/tack.1#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/tack.c#2 delete .. //depot/projects/arp-v2/src/contrib/ncurses/tack/tack.h#2 delete .. //depot/projects/arp-v2/src/contrib/openpam/CREDITS#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/HISTORY#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/INSTALL#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/LICENSE#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/MANIFEST#2 delete .. //depot/projects/arp-v2/src/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/README#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/compile#1 branch .. //depot/projects/arp-v2/src/contrib/openpam/config.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/configure.ac#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/configure.in#2 delete .. //depot/projects/arp-v2/src/contrib/openpam/depcomp#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/arp-v2/src/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/ltconfig#2 delete .. //depot/projects/arp-v2/src/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/missing#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/arp-v2/src/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/arp-v2/src/contrib/top/top.c#2 integrate .. //depot/projects/arp-v2/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/arp-v2/src/include/complex.h#2 integrate .. //depot/projects/arp-v2/src/include/nsswitch.h#2 integrate .. //depot/projects/arp-v2/src/include/pthread_np.h#2 integrate .. //depot/projects/arp-v2/src/lib/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/README#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/main.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/Versions.def#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gd_qnan.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/arm/gd_qnan.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/arp-v2/src/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/shm_open.3#2 delete .. //depot/projects/arp-v2/src/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gd_qnan.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/ia64/gd_qnan.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sparc64/gd_qnan.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/strtok.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/strtok.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/arp-v2/src/lib/libfetch/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/common.c#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/common.h#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/fetch.c#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/file.c#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libfetch/http.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/arp-v2/src/lib/libkvm/kvm_file.c#2 integrate .. //depot/projects/arp-v2/src/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/arp-v2/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/arp-v2/src/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/arp-v2/src/lib/libufs/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libufs/block.c#2 integrate .. //depot/projects/arp-v2/src/lib/libufs/bread.3#2 integrate .. //depot/projects/arp-v2/src/lib/libufs/libufs.h#2 integrate .. //depot/projects/arp-v2/src/lib/libutil/pty.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/msun/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/msun/amd64/s_logbl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/msun/i387/s_logbl.S#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld128/s_nanl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/ld80/s_nanl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/man/atan2.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/csqrt.3#1 branch .. //depot/projects/arp-v2/src/lib/msun/man/hypot.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/ilogb.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/math.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/man/nan.3#1 branch .. //depot/projects/arp-v2/src/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/math.h#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/math_private.h#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_carg.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_csqrt.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_csqrtf.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/arp-v2/src/lib/msun/src/s_logbl.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/s_nan.c#1 branch .. //depot/projects/arp-v2/src/lib/msun/src/w_cabs.c#2 integrate .. //depot/projects/arp-v2/src/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/arp-v2/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/arp-v2/src/sbin/Makefile#2 integrate .. //depot/projects/arp-v2/src/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/arp-v2/src/sbin/ddb/Makefile#1 branch .. //depot/projects/arp-v2/src/sbin/ddb/ddb.8#1 branch .. //depot/projects/arp-v2/src/sbin/ddb/ddb.c#1 branch .. //depot/projects/arp-v2/src/sbin/ddb/ddb.h#1 branch .. //depot/projects/arp-v2/src/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/arp-v2/src/sbin/devd/devd.hh#2 integrate .. //depot/projects/arp-v2/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/arp-v2/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/arp-v2/src/sbin/natd/natd.8#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.8#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.c#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.h#2 integrate .. //depot/projects/arp-v2/src/sbin/savecore/savecore.8#2 integrate .. //depot/projects/arp-v2/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/arp-v2/src/share/colldef/Makefile#2 integrate .. //depot/projects/arp-v2/src/share/colldef/README#2 integrate .. //depot/projects/arp-v2/src/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/arp-v2/src/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/arp-v2/src/share/man/man3/tgmath.3#2 integrate .. //depot/projects/arp-v2/src/share/man/man3/tree.3#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/Makefile#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/bge.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/ddb.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/ed.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/edsc.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/arp-v2/src/share/man/man4/ipmi.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/ng_car.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/pci.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/pcib.4#1 branch .. //depot/projects/arp-v2/src/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/syncache.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/textdump.4#1 branch .. //depot/projects/arp-v2/src/share/man/man5/boot.config.5#2 integrate .. //depot/projects/arp-v2/src/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/arp-v2/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/arp-v2/src/share/man/man7/bsd.snmpmod.mk.7#2 integrate .. //depot/projects/arp-v2/src/share/man/man7/build.7#2 integrate .. //depot/projects/arp-v2/src/share/man/man7/ports.7#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/lock.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/sf_buf.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/style.9#2 integrate .. //depot/projects/arp-v2/src/share/misc/Makefile#2 integrate .. //depot/projects/arp-v2/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/arp-v2/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/arp-v2/src/share/mk/bsd.own.mk#2 integrate .. //depot/projects/arp-v2/src/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/arp-v2/src/share/mklocale/Makefile#2 integrate .. //depot/projects/arp-v2/src/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/arp-v2/src/share/termcap/termcap.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/am_ET.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/be_BY.CP1131.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/be_BY.CP1251.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/be_BY.ISO8859-5.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/be_BY.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/bg_BG.CP1251.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/bg_BG.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ca_ES.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ca_ES.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/cs_CZ.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/cs_CZ.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/da_DK.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/da_DK.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/de_AT.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/de_AT.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/de_DE.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/de_DE.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/el_GR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/en_GB.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/en_US.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/es_ES.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/es_ES.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/et_EE.ISO8859-15.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/et_EE.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/eu_ES.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/fi_FI.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/fi_FI.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/fr_FR.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/fr_FR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/he_IL.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hr_HR.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hr_HR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hu_HU.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hu_HU.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hy_AM.ARMSCII-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/hy_AM.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/is_IS.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/is_IS.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/it_IT.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/it_IT.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/kk_KZ.PT154.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/kk_KZ.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ko_KR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ko_KR.eucKR.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/la_LN.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/lt_LT.ISO8859-13.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/lt_LT.ISO8859-4.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/lt_LT.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/mn_MN.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/nl_NL.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/no_NO.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/no_NO.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pl_PL.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pl_PL.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pt_BR.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pt_BR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pt_PT.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/pt_PT.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ro_RO.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ru_RU.CP1251.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ru_RU.CP866.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/ru_RU.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sk_SK.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sk_SK.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sl_SI.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sl_SI.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sr_YU.ISO8859-2.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sr_YU.ISO8859-5.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sr_YU.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/sv_SE.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/uk_UA.CP1251.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/uk_UA.ISO8859-5.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/uk_UA.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_CN.GB18030.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_CN.GB2312.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_CN.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_CN.eucCN.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_TW.Big5.src#2 integrate .. //depot/projects/arp-v2/src/share/timedef/zh_TW.UTF-8.src#2 integrate .. //depot/projects/arp-v2/src/share/zoneinfo/backward#2 integrate .. //depot/projects/arp-v2/src/share/zoneinfo/europe#2 integrate .. //depot/projects/arp-v2/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/arp-v2/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/arp-v2/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/arp-v2/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/arp-v2/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/arp-v2/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/arp-v2/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/arp-v2/src/sys/conf/NOTES#2 integrate .. //depot/projects/arp-v2/src/sys/conf/files#3 integrate .. //depot/projects/arp-v2/src/sys/conf/files.amd64#2 integrate .. //depot/projects/arp-v2/src/sys/conf/files.i386#2 integrate .. //depot/projects/arp-v2/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/arp-v2/src/sys/conf/options#2 integrate .. //depot/projects/arp-v2/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/arp-v2/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/arp-v2/src/sys/ddb/db_script.c#1 branch .. //depot/projects/arp-v2/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/arp-v2/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/splash_bmp.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/le/am7990.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/le/am79900.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/syscons/logo/logo_saver.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 10 02:48:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BED916A46B; Thu, 10 Jan 2008 02:48:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51A0916A468 for ; Thu, 10 Jan 2008 02:48:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D2B413C46E for ; Thu, 10 Jan 2008 02:48:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A2lxkC016598 for ; Thu, 10 Jan 2008 02:47:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A2lxGE016595 for perforce@freebsd.org; Thu, 10 Jan 2008 02:47:59 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 02:47:59 GMT Message-Id: <200801100247.m0A2lxGE016595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 02:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=132938 Change 132938 by jb@jb_freebsd1 on 2008/01/10 02:47:41 Remove Solaris-specif makefiles. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 10 02:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E03C16A477; Thu, 10 Jan 2008 02:50:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60A3216A46E for ; Thu, 10 Jan 2008 02:50:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 394C013C47E for ; Thu, 10 Jan 2008 02:50:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A2o2Yc016697 for ; Thu, 10 Jan 2008 02:50:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A2o2So016694 for perforce@freebsd.org; Thu, 10 Jan 2008 02:50:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 02:50:02 GMT Message-Id: <200801100250.m0A2o2So016694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 02:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=132939 Change 132939 by jb@jb_freebsd1 on 2008/01/10 02:49:32 Remove Solaris-specific makefiles. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 10 05:59:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6787316A419; Thu, 10 Jan 2008 05:59:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BE0A16A417 for ; Thu, 10 Jan 2008 05:59:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DFC213C44B for ; Thu, 10 Jan 2008 05:59:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A5xKGN060711 for ; Thu, 10 Jan 2008 05:59:20 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A5xJHc060708 for perforce@freebsd.org; Thu, 10 Jan 2008 05:59:19 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 10 Jan 2008 05:59:19 GMT Message-Id: <200801100559.m0A5xJHc060708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 132944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 05:59:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132944 Change 132944 by pgj@disznohal on 2008/01/10 05:59:00 Add initial Hungarian translation of Chapter 23: The Cutting Edge. Affected files ... .. //depot/projects/docproj_hu/books/handbook/cutting-edge/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -4,21 +4,25 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.227 2007/06/27 14:59:53 remko Exp $ --> - + + + Jim Mock - Restructured, reorganized, and parts updated by + Újjászervezte, átrendezte + és egyes részeit frissítette: - Jordan Hubbard - Original work by + Eredetileg írta: Poul-Henning @@ -33,369 +37,538 @@ Clayton - - The Cutting Edge + Az élvonal - Synopsis + Áttekintés - &os; is under constant development between releases. For - people who want to be on the cutting edge, there are several easy - mechanisms for keeping your system in sync with the latest - developments. Be warned—the cutting edge is not for everyone! - This chapter will help you decide if you want to track the - development system, or stick with one of the released - versions. + A &os; a kiadások közt is állandó + fejlõdésben van. A legfrissebb fejlesztések + elérésének számos egyszerû + eszköze áll rendelkezésre mindazok + számára, akik az élvonalban + kívánnak lenni. Azonban vigyázzunk — + ez az élvonal nem való ám mindenkinek! Ebben + a fejezetben segítünk dönteni a fejlesztõi + változat és a kiadások használata + között. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - The difference between the two development - branches: &os.stable; and &os.current;. + + a két fejlesztõi ág, a &os.stable; + és a &os.current; közti + különbséget - How to keep your system up to date with + + hogyan tartsuk naprakészen rendszerünket a CVSup, - CVS, or - CTM. + CVS, vagy + CTM + használatával - How to rebuild and reinstall the entire base - system with make buildworld (etc). + + a make buildworld (stb.) + segítségével hogyan fordítsuk + és telepítsük újra az egész + alaprendszert - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Properly set up your network connection (). + + a hálózati kapcsolatunk helyes + beállítása () - Know how to install additional third-party - software (). + + a külsõs szoftverek + telepítésének ismerete () - + - &os.current; vs. &os.stable; + &os.current; kontra &os.stable; -CURRENT -STABLE - There are two development branches to FreeBSD: &os.current; and - &os.stable;. This section will explain a bit about each and describe - how to keep your system up-to-date with each respective tree. - &os.current; will be discussed first, then &os.stable;. + A &os;-nek két fejlesztési ága van: a + &os;.current és a &os.stable;. Ebben a szakaszban + mindegyikükrõl monduk pár szót, és + megmutatjuk, miként lehet az adott ághoz + igazítani a rendszerünk + frissítését. Elõször a + &os.current;, majd a &os.stable; változata kerül + tárgyalásra. - Staying Current with &os; + A &os; friss változatának + használata - As you read this, keep in mind that &os.current; is the - bleeding edge of &os; development. - &os.current; users are expected to have a high degree of - technical skill, and should be capable of solving difficult - system problems on their own. If you are new to &os;, think - twice before installing it. + Ahogy arról már az imént is szó + esett, nem szabad elfelejtenünk, hogy a &os.current; a &os; + fejlesztésének frontvonala. Emiatt + a &os.current; használóinak szakmailag + jólképzetteknek kell lenniük, és sosem + szabad visszariadniuk a használat közben + felmerülõ rendszerszintû problémák + önálló megoldásától. Ha + korábban még nem foglalkoztunk &os;-vel, + kétszer is gondoljuk meg a + telepítését! - What Is &os.current;? - snapshot + Mi a &os.current;? + pillanatkép - &os.current; is the latest working sources for &os;. - This includes work in progress, experimental changes, and - transitional mechanisms that might or might not be present - in the next official release of the software. While many - &os; developers compile the &os.current; source code daily, - there are periods of time when the sources are not - buildable. These problems are resolved as expeditiously as - possible, but whether or not &os.current; brings disaster or - greatly desired functionality can be a matter of which exact - moment you grabbed the source code in! + A &os.current; a &os; mögött álló + legfrissebb forráskódot képviseli. Itt + találkozhatunk különféle olyan + fejlesztés alatt álló részekkel, + kísérletezésekkel és + átmeneti megoldásokkal, amelyek nem + feltétlenül kerülnek bele a szoftver + következõ hivatalos kiadásába. Noha a + &os; fejlesztõi a &os.current; + forráskódját naponta + fordítják, adódhatnak olyan + idõszakok, amikor a források mégsem + fordíthatóak le maradéktalanul. Az ilyen + gondokat általában a lehetõ leggyorsabban + igyekeznek megoldani, azonban attól függõen, + hogy éppen a forráskód melyik + verzióját sikerült kifogni, a &os.current; + használata kész katasztrófa vagy + akár a fejlõdésben igazi + továbblépés is lehet. - Who Needs &os.current;? + Kinek van szüksége a &os.current;-re? - &os.current; is made available for 3 primary - interest groups: + A &os.current; használata elsõsorban az + alábbi 3 csoportot érinti: - Members of the &os; community who are actively working - on some part of the source tree and for whom keeping - current is an absolute - requirement. + A &os; közösség azon tagjait, akik + aktívan dolgoznak a forrásfa valamelyik + részén, és mindazokat, akik + számára a legfrissebb + verzió használata feltétlen + elvárás. - Members of the &os; community who are active testers, - willing to spend time solving problems in order to - ensure that &os.current; remains as sane as possible. - These are also people who wish to make topical - suggestions on changes and the general direction of - &os;, and submit patches to implement them. + A &os; közösség azon tagjait, akik + aktívan tesztelnek, és a &os.current; + kordában tartásához hajlandóak + idõt áldozni a menetközben + felbukkanó problémák + megoldására. Vannak olyanok is, akik a &os; + változásaival és fejlesztési + irányával kapcsolatban + kívánnak javaslatokat tenni, melyeket + javítások és + módosítások formájában + tesznek közzé. - Those who merely wish to keep an eye on things, or - to use the current sources for reference purposes - (e.g. for reading, not running). - These people also make the occasional comment or - contribute code. + Mindazokat, akik pusztán + kíváncsiak a fejlesztésben zajló + eseményekre, vagy hivatkozási + szándékkal töltik le a legfrissebb + forrásokat (pl. csak + nézegetik, de nem + futtatják). Az ilyen emberek esetenként + megjegyzéseket fûznek a fejlesztéshez + vagy kódot küldenek be. - What Is &os.current; <emphasis>Not</emphasis>? + Mi <emphasis>nem</emphasis> a &os.current;? - A fast-track to getting pre-release bits because you - heard there is some cool new feature in there and you - want to be the first on your block to have it. Being - the first on the block to get the new feature means that - you are the first on the block to get the new - bugs. + Az olyan kiadás elõtt álló + funkciók kipróbálásának + egyszerû módja, amikrõl hallottunk, hogy + milyen remek újdonságokat hoznak és + mi akarunk lenni az elsõk, akik ezt használni + is fogják. Ne feledjük azonban, hogy amikor + mindenki elõtt kezdünk el használni egy + újítást, mi leszünk egyben az + elsõk is, akik szembesülnek a benne rejlõ + hibákkal. - A quick way of getting bug fixes. Any given version - of &os.current; is just as likely to introduce new bugs - as to fix existing ones. + A gyors hibajavítások eszköze. A + &os.current; szinte bármelyik változata + pontosan ugyanakkora + valószínûséggel hoz + magával új hibákat, mint ahogy + eltûnteti a régieket. - In any way officially supported. We - do our best to help people genuinely in one of the 3 - legitimate &os.current; groups, but we - simply do not have the time to - provide tech support. This is not because we are mean - and nasty people who do not like helping people out (we - would not even be doing &os; if we were). We simply - cannot answer hundreds messages a day - and work on FreeBSD! Given the - choice between improving &os; and answering lots of - questions on experimental code, the developers opt for - the former. + Akármilyen módon is hivatalosan + támogatott. + Képességeinktõl függõen + õszintén igyekszünk a lehetõ + legtöbbet megtenni a 3 + törvényes &os.current; + csoportba tartozó emberekért, azonban + egyszerûen nincs idõnk + komolyabb segítségnyújtást + adni. Ez viszont nem azt jelenti, hogy komisz és + fukar emberek vagyunk, akik utálnak segíteni + a másiknak (de máskülönben nem + tudna fejlõdni a &os;). Csupáncsak a &os; + fejlesztése közben + fizikailag képtelenek vagyunk a naponta + érkezõ ezernyi üzenetet rendre + megválaszolni! A &os; + elõremozdítása és a + kísérleti stádiumban + álló kóddal kapcsolatos + kérdések megválaszolása + közül a fejlesztõk általában + az elsõt részesítik + elõnyben. - Using &os.current; - + A &os.current; használata + -CURRENT - using + használata - Join the &a.current.name; and the &a.cvsall.name; lists. This is not - just a good idea, it is essential. If - you are not on the &a.current.name; list, - you will not see the comments that people are - making about the current state of the system and thus will - probably end up stumbling over a lot of problems that others - have already found and solved. Even more importantly, you - will miss out on important bulletins which may be critical - to your system's continued health. + Iratkozzunk fel az &a.current.name; és + &a.cvsall.name; listákra. Ez nem egyszerûen + hasznos, hanem elengedhetetlen. Ha + nem vagyunk a &a.current.name; + listán, akkor nem fogjuk látni a rendszer + aktuális állapotára vonatkozó + megjegyzéseket, és így esetleg + feleslegesen öljük az idõnket olyan + problémák megoldásába, amiket + mások már korábban megoldottak. De + ami ennél is fontosabb, hogy így + elszalasztjuk a rendszerünk folyamatos + életbentartására vonatkozó + létfontosságú + bejelentéseket. - The &a.cvsall.name; list will allow you to see the - commit log entry for each change as it is made along with - any pertinent information on possible side-effects. + A &a.cvsall.name; listán láthatjuk az + egyes a forráskód egyes + változtatásaihoz tartozó + naplóbejegyzéseket, a hozzájuk + tartozó esetleges mellékhatások + ismertetésével együtt. - To join these lists, or one of the others available - go to &a.mailman.lists.link; and click on the list that - you wish to subscribe to. Instructions on the rest of - the procedure are available there. + A listákra vagy a &a.mailman.lists.link; + oldalon található többi lista + valamelyikére úgy tudunk feliratkozni, ha + rákattintunk a nevére. A további + lépésekrõl ezt követõen itt + kapunk értesítést. - Grab the sources from a &os; mirror - site. You can do this in one of two ways: + A tükrözések + egyikérõl töltsük le a &os; + forrását. Erre két mód is + kínálkozik: - - cvsup - - - cron - - + + cvsup + + + cron + + -CURRENT - Syncing with CVSup + frissítés + CVSup-pal - Use the cvsup program - with the supfile named standard-supfile - available from /usr/share/examples/cvsup. - This is the most recommended - method, since it allows you to grab the entire - collection once and then only what has changed from then - on. Many people run cvsup from - cron and keep their - sources up-to-date automatically. You have to - customize the sample supfile above, and configure - cvsup for your environment. + Használjuk a cvsup programot a + /usr/share/examples/cvsup + könyvtárban található + standard-supfile + állománnyal. Ez a leginkább + ajánlott módszer, hiszen így csak + egyszer kell letölteni az egész + gyûjteményt, majd ezután már + csak a változásokat. Sokan a + cvsup parancsot a + cron-on keresztül adják + ki, és ezzel mindig automatikusan + frissítik a forrásaikat. A cvsup + mûködését a fentebb + említett minta supfile + állomány megfelelõ + módosításával tudjuk a + saját környezetünkhöz + igazítani. - - -CURRENT - Syncing with CTM + + -CURRENT + frissítés CTM-mel - Use the CTM facility. If you - have very bad connectivity (high price connections or - only email access) CTM is an option. - However, it is a lot of hassle and can give you broken files. - This leads to it being rarely used, which again increases - the chance of it not working for fairly long periods of - time. We recommend using - CVSup - for anybody with a 9600 bps modem or faster connection. - + Használjuk a CTM + alkalmazás nyújtotta + lehetõségeket. Amennyiben nagyon rossz + netkapcsolattal rendelkezünk (drága vagy + csak levelezésre használható) a + CTM is megoldást + jelenthet számunkra. Azonban legyünk + tekintettel arra, hogy helyenként + zûrös lehet a használata és + néha hibás állományokat + gyárt. Emiatt viszont csak ritkán + használják, így + elõfordulhat, hogy hosszabb ideig nem is + mûködik. A 9600 bps vagy annál + nagyobb sebességû kapcsolatok + esetén ezért inkább a + CVSup + használatát javasoljuk. - If you are grabbing the sources to run, and not just - look at, then grab all of &os.current;, not - just selected portions. The reason for this is that various - parts of the source depend on updates elsewhere, and trying - to compile just a subset is almost guaranteed to get you - into trouble. + Ha nem csak böngészésre, hanem + fordításra is szedjük a + forrásokat, mindig töltsük le a + &os.current; egészét, + ne csak egyes részeit. Ez azzal + magyarázandó, hogy a forráskód + bizonyos részei más helyeken + található részektõl is + függenek, és ezért az + önálló fordításuk szinte + garantáltan gondot fog okozni. -CURRENT - compiling + fordítása - Before compiling &os.current;, read the - Makefile in /usr/src - carefully. You should at least install a new kernel and rebuild the world the first time through - as part of the upgrading process. Reading the &a.current; - and /usr/src/UPDATING will keep you up-to-date on other bootstrapping procedures - that sometimes become necessary as we move toward the next - release. + A &os.current; lefordítása elõtt + figyelmesen olvassuk át a + /usr/src könyvtárban + található Makefile + állományt. A frissítési + folyamat részeként elõször + mindenképpen érdemes telepíteni egy új + rendszermagot és újrafordítani az + alaprendszert. Olvassuk el a &a.current; + üzeneteit és a + /usr/src/UPDATING + állományt, ahol megtalálhatjuk az + ezzel kapcsolatos legújabb + információkat, melyek egy-egy újabb + kiadás közeledtével egyre + fontosabbá válnak. - + - Be active! If you are running &os.current;, we want - to know what you have to say about it, especially if you - have suggestions for enhancements or bug fixes. Suggestions - with accompanying code are received most - enthusiastically! + Foglalkozzunk vele! Ha már a &os.current; + változatát használjuk, ne legyünk + restek véleményt formálni + róla, különösen abban az esetben, ha + továbbfejlesztésekrõl vagy + hibákra van szó. Leginkább a + forráskóddal együtt érkezõ + javaslatoknak szoktak örülni a + fejlesztõk! - + - Staying Stable with &os; + A &os; stabil változatának + használata - What Is &os.stable;? + Mi a &os.stable;? -STABLE - &os.stable; is our development branch from which major releases - are made. Changes go into this branch at a different pace, and - with the general assumption that they have first gone into - &os.current; for testing. This is still - a development branch, however, and this means that at any given time, - the sources for &os.stable; may or may not be suitable for any - particular purpose. It is simply another engineering development - track, not a resource for end-users. + A &os.stable; az a fejlesztési ág, ahonnan + az egyes kiadások származnak. Ebbe az ágba + már más ütemben kerülnek a + változások, mivel általánosan + elfogadott, hogy ide a korábban már + kipróbált módosítások + vándorolnak át a &os.current; + ágból. Ez azonban még + mindig csak egy fejlesztési ág, ami + arra utal, hogy a &os.stable; által adott pillanatban + képviselt források nem feltétlenül + felelnek meg bizonyos célokra. Ez csupán egy + újabb fejlesztési nyomvonal, nem pedig a + végfelhasználók kenyere. - Who Needs &os.stable;? + Kinek van szüksége a &os.stable;-re? - If you are interested in tracking or contributing to the - FreeBSD development process, especially as it relates to the - next point release of FreeBSD, then you should - consider following &os.stable;. + Ha szeretnénk figyelemmel kísérni + vagy valamilyen módon kiegészíteni a &os; + fejlesztési folyamatát, különösen + a &os; következõ nagyobb + kiadását illetõen, akkor érdemes + követnünk a &os.stable; forrásait. - While it is true that security fixes also go into the - &os.stable; branch, you do not need to - track &os.stable; to do this. Every security advisory for - FreeBSD explains how to fix the problem for the releases it - affects - That is not quite true. We can not continue to - support old releases of FreeBSD forever, although we do - support them for many years. For a complete description - of the current security policy for old releases of - FreeBSD, please see http://www.FreeBSD.org/security/. + Habár a &os.stable; ágba is bekerülnek + a biztonsági jellegû javítások, + ettõl még nem kell feltétlenül ezt + követnünk. A &os;-hez kiadott biztonsági + figyelmeztetések mindig leírják, hogyan + kell javítani a hibát az érintett + kiadásokban + + Ez azért nem teljesen igaz. A régebbi + &os; kiadásokat ugyan nem támogathatjuk a + végtelenségig, de általában + így is több évig foglalkozunk + velük. A &os; régebbi kiadásaival + kapcsolatos jelenleg érvényes + biztonsági házirend részletes + bemutatása a http://www.FreeBSD.org/security/ + oldalon olvasható (angolul). - , and tracking an entire development branch just - for security reasons is likely to bring in a lot of unwanted - changes as well. + , azonban az egész fejlesztési ágat + felesleges csak biztonsági okból + kifolyólag követni, mivel így olyan + változások is kerülhetnek a rendszerbe, + amire nincs szükségünk. - Although we endeavor to ensure that the &os.stable; branch - compiles and runs at all times, this cannot be guaranteed. In - addition, while code is developed in &os.current; before including - it in &os.stable;, more people run &os.stable; than &os.current;, so - it is inevitable that bugs and corner cases will sometimes be found - in &os.stable; that were not apparent in &os.current;. + Habár igyekszünk gondoskodni a &os.stable; + ágban található források + lefordíthatóságáról + és + mûködõképességérõl, + nem minden esetben szavatolható. + Ráadásul mivel a &os.stable; ágba + kerülõ kódokat elõször a + &os.current; ágban fejlesztik ki, és mivel a + &os.stable; felhasználói többen vannak a + &os.current; változaténál, ezért + szinte elkerülhetetlen, hogy ilyenkor a &os.stable; + változatban bizonyos hibák és + szélsõséges esetek be ne + következzenek, amik a &os.current; használata + során még nem buktak ki. - For these reasons, we do not recommend that - you blindly track &os.stable;, and it is particularly important that - you do not update any production servers to &os.stable; without - first thoroughly testing the code in your development - environment. + Ezért a &os.stable; ág vakon + követését senkinek sem + ajánljuk, és különösen fontos, + hogy éles szervereken elõzetes + kimerítõ tesztelések nélkül ne + futassunk &os.stable; rendszert. - If you do not have the resources to do this then we recommend - that you run the most recent release of FreeBSD, and use the binary - update mechanism to move from release to release. + Ha ehhez nem rendelkezünk elegendõ + erõforrással, akkor egyszerûen + használjuk a &os; legfrissebb kiadását, + és az egyes kiadások között pedig + bináris frissítéssel + közlekedjünk. - Using &os.stable; - + A &os.stable; használata + -STABLE - using + használata - Join the &a.stable.name; list. This will keep you informed of - build-dependencies that may appear in &os.stable; - or any other issues requiring - special attention. Developers will also make announcements - in this mailing list when they are contemplating some - controversial fix or update, giving the users a chance to - respond if they have any issues to raise concerning the - proposed change. + Iratkozzunk fel a &a.stable.name; listára. + Ezen keresztül értesülhetünk a + &os.stable; használata során + felmerülõ fordítási + függõségekrõl vagy más, + külön figyelmet igénylõ + problémákról. Gyakran ezen a + levelezési listán elmélkednek a + fejlesztõk a vitatott + javításokról vagy + frissítésekrõl, amibe a + felhasználók is beleszólhatnak, ha a + szóbanforgó változtatással + kapcsolatban bármilyen problémájuk + vagy ötletünk van. - The &a.cvsall.name; list will allow you to see the - commit log entry for each change as it is made along with - any pertinent information on possible side-effects. + A &a.cvsall.name; lista + segítségével elolvashatjuk az egyes + változtatásokhoz tartozó + naplóbejegyzéseket, a rájuk + vonatkozó esetleges mellékhatások + ismertetésével együtt. - To join these lists, or one of the others available - go to &a.mailman.lists.link; and click on the list that - you wish to subscribe to. Instructions on the rest of - the procedure are available there. + Ezekre, valamint a &a.mailman.lists.link; címen + elérhetõ listák valamelyikére + úgy tudunk feliratkozni, ha a nevükre + kattintunk. A további teendõk ezután + itt jelennek meg. - If you are going to install a new system and want it - to run monthly snapshot built from &os.stable;, please - check the - Snapshots web page for more information. - Alternatively, it is possible to - install the most recent &os.stable; release from the - mirror sites and follow - the instructions below to upgrade your system to the - most up to date &os.stable; source code. + Amennyiben egy új rendszert akarunk + telepíteni és a &os.stable; havonta + készült pillanatképeit akarjuk rajta + futtatni, akkor errõl bõvebb + felvilágosítást a Pillanatképek + honlapján találhatunk (angolul). Emellett a + legfrissebb &os.stable; kiadást + telepíthetjük a tükrözések + valamelyikérõl is, majd innen a lentebb + található utasítások szerint + tudunk hozzáférni a &os.stable; + forráskódjának legfrissebb + változatához. - If you are already running a previous release of &os; - and wish to upgrade via sources then you can easily do so - from &os; mirror site. This can - be done in one of two ways: + Ha már fut a gépünkön a &os; + egy korábbi kiadása, és ezt akarjuk + forráson keresztül frissíteni, akkor + ezt a &os; tükrözéseivel + könnyedén megtehetjük. Két + módon is: @@ -406,59 +579,83 @@ -STABLE - syncing with CVSup + frissítés + CVSup-pal - Use the cvsup program - with the supfile named stable-supfile - from the directory - /usr/share/examples/cvsup. - This is the most recommended - method, since it allows you to grab the entire - collection once and then only what has changed from then - on. Many people run cvsup from - cron to keep their - sources up-to-date automatically. You have to - customize the sample supfile above, - and configure cvsup for your - environment. + Használjuk a cvsup programot a + /usr/share/examples/cvsup + könyvtárból származó + stable-supfile + állománnyal. Ez a leginkább + ajánlott módszer, mivel így csak + egyszer kell letölteni a teljes + gyûjteményt, utána már csak + a hozzátartozó + változtatásokra van + szükségünk. A + cvsup parancsot sokan a + cron + segítségével futtatják, + és ezzel automatikusan frissülnek a + forrásainak. A cvsup + mûködését + környezetünkhöz az elõbb + említett minta supfile + megfelelõ + módosításával tudjuk + behangolni. -STABLE - syncing with CTM + frissítés CTM-mel - Use the CTM facility. If - you do not have a fast and inexpensive connection to - the Internet, this is the method you should consider - using. - + Használjuk a CTM programot. Ha + nincs olcsó vagy gyors internetkapcsolatunk, + akkor érdemes ezt a módszert + választani. - Essentially, if you need rapid on-demand access to the - source and communications bandwidth is not a consideration, - use cvsup or ftp. - Otherwise, use CTM. + Alapvetõen azonban ha gyorsan szeretnénk + hozzájutni a forrásokhoz és a + sávszélesség nem + meghatározó tényezõ, akkor + helyette válasszuk a cvsup vagy + az ftp használatát, + és csak minden más esetben + CTM-et. -STABLE - compiling + fordítása - Before compiling &os.stable;, read the - Makefile in /usr/src - carefully. You should at least install a new kernel and rebuild the world the first time through - as part of the upgrading process. Reading the &a.stable; and /usr/src/UPDATING will - keep you up-to-date on other bootstrapping procedures that - sometimes become necessary as we move toward the next - release. + Mielõtt lefordítanánk a &os.stable; + változatát, figyelmesen olvassuk át a + /usr/src könyvtárban + levõ Makefile + állományt. Az átállási + folyamat részeként elõször minden + bizonnyal telepítenünk kell egy + új rendszermagot és újra kell + fordítanunk az alaprendszert. A &a.stable; + valamint a /usr/src/UPDATING + elolvasásából + értesülhetünk azokról az + egyéb, gyakran nagyon fontos + változásokról, melyek + elengedhetetlenek lesznek a következõ + kiadás használatához. @@ -466,150 +663,237 @@ - Synchronizing Your Source - - There are various ways of using an Internet (or email) - connection to stay up-to-date with any given area of the &os; - project sources, or all areas, depending on what interests you. The - primary services we offer are Anonymous - CVS, CVSup, and CTM. + A forrás szinkronizálása + + Az internet (vagy elektronikus levelek) + használatán keresztül számos mód + kínálkozik az &os; projekthez tartozó + források frissen tartásához egy adott, vagy + éppen az összes területen attól + függõen, hogy mik érdekelnek minket. Ehhez + elsõsorban az Anonim CVS, + CVSup és CTM szolgáltatásokat + ajánljuk fel. - While it is possible to update only parts of your source tree, - the only supported update procedure is to update the entire tree - and recompile both userland (i.e., all the programs that run in - user space, such as those in /bin and - /sbin) and kernel sources. Updating only part - of your source tree, only the kernel, or only userland will often - result in problems. These problems may range from compile errors - to kernel panics or data corruption. + Habár lehetséges csupán a + forrásfa egyes részeit letölteni, a + támogatott frissítési eljárás + során azonban szükségünk lesz az + egész fa szinkronizálására és + a rendszerhez tartozó felhasználói + programok (vagyis minden olyan program, amely a + felhasználói térben fut, ilyeneket + találhatunk többek közt a + /bin és /sbin + könyvtárakban) valamint rendszermag + újrafordítására is. Ha csak a + felhasználói programok forrásait, vagy csak + a rendszermagot, esetleg csupán a forrásfa egyes + részeit frissítjük, akkor az gondokat + okozhat. Az itt elõforduló problémák + fordítási hibáktól kezdve + rendszerösszeomlásokon keresztül akár + adatvesztésbe is torkollhatnak. CVS - anonymous + anonim - Anonymous CVS and - CVSup use the pull >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 10 06:07:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 687BB16A468; Thu, 10 Jan 2008 06:07:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D02916A420 for ; Thu, 10 Jan 2008 06:07:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FCBF13C458 for ; Thu, 10 Jan 2008 06:07:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A67SK9063431 for ; Thu, 10 Jan 2008 06:07:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A67S2A063428 for perforce@freebsd.org; Thu, 10 Jan 2008 06:07:28 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 06:07:28 GMT Message-Id: <200801100607.m0A67S2A063428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 06:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=132947 Change 132947 by jb@jb_freebsd1 on 2008/01/10 06:06:40 Add another variable (rootvp) that exists in the Solaris kernel. Type define vnode_t so that the DTrace test suite can use that too. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include /* * These are variables that the DTrace test suite references in the @@ -40,6 +41,10 @@ */ int kmem_flags; +typedef struct vnode vnode_t; +vnode_t dummy; +vnode_t *rootvp = &dummy; + static int dtrace_test_modevent(module_t mod, int type, void *data) { From owner-p4-projects@FreeBSD.ORG Thu Jan 10 07:04:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A056716A41A; Thu, 10 Jan 2008 07:04:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6684F16A418 for ; Thu, 10 Jan 2008 07:04:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2794013C43E for ; Thu, 10 Jan 2008 07:04:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A74a5c090433 for ; Thu, 10 Jan 2008 07:04:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A74ZOn090430 for perforce@freebsd.org; Thu, 10 Jan 2008 07:04:35 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 10 Jan 2008 07:04:35 GMT Message-Id: <200801100704.m0A74ZOn090430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 07:04:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132954 Change 132954 by kmacy@pandemonium:kmacy:xen31 on 2008/01/10 07:03:35 use giant until this driver can be properly locked Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#9 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#9 (text+ko) ==== @@ -170,7 +170,7 @@ xb_diskinfo[sc->xb_unit].device, sc->xb_unit, sc->xb_disk->d_mediasize); #endif - sc->xb_disk->d_flags = 0; + sc->xb_disk->d_flags = DISKFLAG_NEEDSGIANT; disk_create(sc->xb_disk, DISK_VERSION_00); bioq_init(&sc->xb_bioq); From owner-p4-projects@FreeBSD.ORG Thu Jan 10 07:31:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FA2F16A420; Thu, 10 Jan 2008 07:31:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C904C16A418 for ; Thu, 10 Jan 2008 07:31:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E97913C44B for ; Thu, 10 Jan 2008 07:31:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A7V4FF094413 for ; Thu, 10 Jan 2008 07:31:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A7V44v094409 for perforce@freebsd.org; Thu, 10 Jan 2008 07:31:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 10 Jan 2008 07:31:04 GMT Message-Id: <200801100731.m0A7V44v094409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 132955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 07:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=132955 Change 132955 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/10 07:30:46 style modication and error removing for sysvmsq test Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvmsg/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvmsg/00.t#2 (text+ko) ==== @@ -1,76 +1,75 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/sysvmsg/00.t,v 1.2 2007/01/25 20:50:02 zhouzhouyi Exp $ +# $FreeBSD$ -desc="manipulate sysv share memory" +desc="manipulate sysv msg" dir=`dirname $0` . ${dir}/../misc.sh -echo "1..4" +case "${os}" in +FreeBSD) -#turn off all the switches -for i in `sysctl security.mac | grep "\.enabled"| - sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 -done + mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` + mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` + mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` -mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` -mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` -mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && + [ "${mac_test_support}" != "" ]; then +#turn off all the switches + for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do + sysctl ${i}=0 >/dev/null + done -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] && - [ "${mac_test_support}" != "" ] ; then + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} - + echo "1..4" - if [ -f ${mactest_conf} ]; then - rm ${mactest_conf} - fi - touch ${mactest_conf} - ############################################################# - t=`sysctl security.mac.mls.enabled=1` - echo "enforcing mac/mls!" - t=`sysctl security.mac.biba.enabled=1` - echo "enforcing mac/biba!" - t=`sysctl security.mac.mls.revocation_enabled=1` - t=`sysctl security.mac.biba.revocation_enabled=1` - echo "enabling revoking" -#option -c creator's label, option -s sender's label -#option -r receiver's label, option -t ipc stat label -#options -e ipc set label + sysctl security.mac.mls.enabled=1 >/dev/null + sysctl security.mac.biba.enabled=1 > /dev/null #case 1: check mls no read high - echo -n "pid = -2 mac_test_check_sysv_msqget:" > ${mactest_conf} - echo "biba/high(low-high),mls/4(low-high) biba/high,mls/5" >> ${mactest_conf} - bizarretestexpect ${msgtest} "msgtest:.receiver:.msgget:.Permission.denied"\ - "" -c "mls/5" -s "mls/5" \ - -r "mls/4" -t "mls/5" -e "mls/5" -f ${mactest_conf} + echo -n "pid = -2 sysvmsq_check_msqget:" > ${mactest_conf} + echo "biba/high,mls/5 biba/high(low-high),mls/4(low-high)" >> ${mactest_conf} + bizarretestexpect ${msgtest} "*receiver:.msgget*"\ + "" -c "mls/5" -s "mls/5" \ + -r "mls/4" -t "mls/5" -e "mls/5" -f ${mactest_conf} + #case 2: check biba no read low - truncate -s 0 ${mactest_conf} - bizarretestexpect ${msgtest} "msgtest:.receiver:.msgget:.Permission.denied"\ - "" -c "biba/5" -s "biba/5" \ - -r "biba/9" -t "biba/5" -e "biba/5" -f ${mactest_conf} + truncate -s 0 ${mactest_conf} + bizarretestexpect ${msgtest} "receiver:.msgget"\ + "" -c "biba/5" -s "biba/5" \ + -r "biba/9" -t "biba/5" -e "biba/5" -f ${mactest_conf} + #case 3: check biba no send high - echo -n "pid = -2 mac_test_check_sysv_msqget:" > ${mactest_conf} - echo "biba/4(low-high),mls/low(low-high) biba/5,mls/low" >> ${mactest_conf} - bizarretestexpect ${msgtest} "msgtest:.sender:.msgsnd.1:.Permission.denied"\ - "" -c "biba/5" -s "biba/4" \ - -r "biba/5" -t "biba/5" -e "biba/5" -f ${mactest_conf} + echo -n "pid = -2 sysvmsq_check_msqget:" > ${mactest_conf} + echo "biba/5,mls/low biba/4(low-high),mls/low(low-high)" >> ${mactest_conf} + bizarretestexpect ${msgtest} "sender:.msgsnd"\ + "" -c "biba/5" -s "biba/4" \ + -r "biba/5" -t "biba/5" -e "biba/5" -f ${mactest_conf} + #case 4: check mls no send low - echo -n "pid = -2 mac_test_check_sysv_msqsnd:" > ${mactest_conf} - echo "biba/high(low-high),mls/9(low-high) biba/high,mls/5" >> ${mactest_conf} - bizarretestexpect ${msgtest} "msgtest:.sender:.msgsnd.1:.Permission.denied"\ - "" -c "mls/5" -s "mls/9" \ - -r "mls/5" -t "mls/5" -e "mls/5" -f ${mactest_conf} + echo -n "pid = -2 sysvmsq_check_msqsnd:" > ${mactest_conf} + echo "biba/high,mls/5 biba/high(low-high),mls/9(low-high)" >> ${mactest_conf} + bizarretestexpect ${msgtest} "sender:.msgsnd"\ + "" -c "mls/5" -s "mls/9" \ + -r "mls/5" -t "mls/5" -e "mls/5" -f ${mactest_conf} #cleanup: - t=`sysctl security.mac.mls.enabled=0` - echo "disabling mac/mls!" - t=`sysctl security.mac.biba.enabled=0` - echo "disabling mac/biba!" + sysctl security.mac.mls.enabled=0 >/dev/null + sysctl security.mac.biba.enabled=0 > /dev/null + rm ${mactest_conf} + fi + ;; +*) + quick_exit + ;; +esac - rm ${mactest_conf} -fi From owner-p4-projects@FreeBSD.ORG Thu Jan 10 07:32:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 550F216A41B; Thu, 10 Jan 2008 07:32:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A99116A41A for ; Thu, 10 Jan 2008 07:32:06 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E29B213C45A for ; Thu, 10 Jan 2008 07:32:05 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0A7W5Wj094869 for ; Thu, 10 Jan 2008 07:32:05 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0A7W5lt094866 for perforce@freebsd.org; Thu, 10 Jan 2008 07:32:05 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 10 Jan 2008 07:32:05 GMT Message-Id: <200801100732.m0A7W5lt094866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 132956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 07:32:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=132956 Change 132956 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/10 07:31:43 removing some bugs in sysvmsq checking Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/msgtest.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvmsg/00.t#3 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/msgtest.c#4 (text+ko) ==== @@ -67,6 +67,8 @@ void receiver (void); void usage (void); + +#define ALRMTIME 2 #define MESSAGE_TEXT_LEN 255 /* @@ -95,7 +97,42 @@ const char *macconf_file = NULL; const char *creator_label = NULL; +void +stoprunning(sig) + int sig __unused; +{ + if (child_pid != 0) { + int error; + if (creator_label) { + mac_t label; + if (mac_from_text(&label, "mls/equal,biba/equal") == -1) { + exit(-1); + } + + if (mac_set_proc(label) == -1) + error = errno; + else + error = 0; + if (error){ + printf("error relabelling proc!\n"); + close(logfd); + exit(1); + } + mac_free(label); + } + kill(child_pid, SIGKILL); + if ((sender_msqid = msgget(msgkey, 0)) == -1) + fprintf(stderr, "cleanup: msgget"); + if (msgctl(sender_msqid, IPC_RMID, NULL) == -1) + warn("msgctl IPC_RMID"); + close(logfd); + machookmatch(macconf_file, getpid()); + } + exit(0); +} + + int main(int argc, char *argv[]) { @@ -146,17 +183,19 @@ sigemptyset(&sa.sa_mask); sa.sa_flags = 0; if (sigaction(SIGSYS, &sa, NULL) == -1) - err(1, "sigaction SIGSYS"); + fprintf(stderr, "sigaction SIGSYS"); + msgkey = ftok(argv[0], 4160); if ((sender_msqid = msgget(msgkey, IPC_CREAT | 0640)) == -1) - err(1, "msgget"); + fprintf(stderr, "msgget"); if (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1) - err(1, "msgctl IPC_STAT"); + fprintf(stderr, "msgctl IPC_STAT"); if (msgctl(sender_msqid, IPC_RMID, NULL) == -1) warn("msgctl IPC_RMID"); + /* * Initialize child_pid to ourselves to that the cleanup function * works before we create the receiver. @@ -168,7 +207,7 @@ * removed. */ if (atexit(cleanup) == -1) - err(1, "atexit"); + fprintf(stderr, "atexit"); logfd = open("/dev/mactest", O_RDWR); ioctl(logfd, BEGINLOG, NULL); @@ -176,7 +215,7 @@ /*create the msg */ switch ((child_pid = fork())) { case -1: - err(1, "fork"); + fprintf(stderr, "fork"); /* NOTREACHED */ case 0: @@ -198,20 +237,20 @@ mac_free(label); } if ((sender_msqid = msgget(msgkey, IPC_CREAT | 0640)) == -1) - err(1, "msgget"); + fprintf(stderr, "msgget"); exit(0); default: break; } if (waitpid(child_pid, 0, 0) == -1) - err(1, "error create"); + fprintf(stderr, "error create"); + - /*check for ipcstat */ switch ((child_pid = fork())) { case -1: - err(1, "fork"); + fprintf(stderr, "fork"); /* NOTREACHED */ case 0: @@ -233,9 +272,10 @@ mac_free(label); } if ((sender_msqid = msgget(msgkey, 0)) == -1) - err(1, "receiver: msgget"); + fprintf(stderr, "receiver: msgget"); if (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1) - err(1, "msgctl IPC_STAT"); + fprintf(stderr, "msgctl IPC_STAT"); + close(logfd); exit(0); default: break; @@ -243,13 +283,13 @@ if (waitpid(child_pid, 0, 0) == -1) - err(1, "error stat"); + fprintf(stderr, "error stat"); /*check for ipc_set */ switch ((child_pid = fork())) { case -1: - err(1, "fork"); + fprintf(stderr, "fork"); /* NOTREACHED */ case 0: @@ -272,9 +312,10 @@ } // memset(&m_ds, 0, sizeof m_ds); if ((sender_msqid = msgget(msgkey, 0)) == -1) - err(1, "ipcset: msgget"); + fprintf(stderr, "ipcset: msgget"); if (msgctl(sender_msqid, IPC_SET, &m_ds) == -1) - err(1, "msgctl IPC_SET"); + fprintf(stderr, "msgctl IPC_SET"); + close(logfd); exit(0); default: break; @@ -282,7 +323,7 @@ if (waitpid(child_pid, 0, 0) == -1) - err(1, "error set"); + fprintf(stderr, "error set"); @@ -296,12 +337,12 @@ sigemptyset(&sa.sa_mask); sa.sa_flags = 0; if (sigaction(SIGCHLD, &sa, NULL) == -1) - err(1, "sigaction SIGCHLD"); + fprintf(stderr, "sigaction SIGCHLD"); switch ((child_pid = fork())) { case -1: - err(1, "fork"); + fprintf(stderr, "fork"); /* NOTREACHED */ case 0: @@ -350,16 +391,28 @@ } m.mtype = MTYPE_1; strcpy(m.mtext, m1_str); + + alarm(ALRMTIME); + sa.sa_handler = stoprunning; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGALRM, &sa, NULL) == -1) + fprintf(stderr, "sigaction SIGALRM\n"); + + if ((sender_msqid = msgget(msgkey, 0)) == -1) - err(1, "ipcset: msgget"); + fprintf(stderr, "ipcset: msgget\n"); + if (msgsnd(sender_msqid, &m, strlen(m1_str) + 1, 0) == -1) - err(1, "sender: msgsnd 1"); + fprintf(stderr, "sender: msgsnd\n"); /* * Suspend forever; when we get SIGCHLD, the handler will exit. */ + + sigemptyset(&sigmask); (void) sigsuspend(&sigmask); @@ -381,7 +434,7 @@ { struct msqid_ds m_ds; int cstatus; - + close(logfd); exit(0); } @@ -390,13 +443,14 @@ { int error; - if (child_pid != 0 /*&& sender_msqid != -1*/) { + if (child_pid != 0) { if (creator_label) { mac_t label; - - if (mac_from_text(&label, creator_label) == -1) { + + if (mac_from_text(&label, "mls/equal,biba/equal") == -1) { exit(-1); } + if (mac_set_proc(label) == -1) error = errno; else @@ -409,7 +463,7 @@ mac_free(label); } if ((sender_msqid = msgget(msgkey, 0)) == -1) - err(1, "cleanup: msgget"); + fprintf(stderr, "cleanup: msgget"); if (msgctl(sender_msqid, IPC_RMID, NULL) == -1) warn("msgctl IPC_RMID"); close(logfd); @@ -433,7 +487,7 @@ int msqid; if ((msqid = msgget(msgkey, 0)) == -1) - err(1, "receiver: msgget"); + fprintf(stderr, "receiver: msgget\n"); /* * Receive the first message, print it, and send an ACK. @@ -441,14 +495,6 @@ if (msgrcv(msqid, &m, sizeof(m.mtext), MTYPE_1, 0) != strlen(m1_str) + 1); -/* err(1, "receiver: msgrcv 1");*/ /*comment out the receiver error - report for parsing the sender error*/ - -/* if (strcmp(m.mtext, m1_str) != 0){ - err(1, "receiver: message 1 data isn't correct"); - } -*/ -/*comment out the receiver error report for parsing the sender error */ exit(0); } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/sysvmsg/00.t#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jan 10 16:26:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 510F016A46B; Thu, 10 Jan 2008 16:26:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FECE16A419 for ; Thu, 10 Jan 2008 16:26:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05FB713C4D3 for ; Thu, 10 Jan 2008 16:26:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGQ3NK030051 for ; Thu, 10 Jan 2008 16:26:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGOiMT029940 for perforce@freebsd.org; Thu, 10 Jan 2008 16:24:44 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Jan 2008 16:24:44 GMT Message-Id: <200801101624.m0AGOiMT029940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 132968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 16:26:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=132968 Change 132968 by jhb@jhb_zion on 2008/01/10 16:24:43 IFC @132964 - revive this branch so I can work on some auto power management stuff. Affected files ... .. //depot/projects/power/sys/Makefile#4 integrate .. //depot/projects/power/sys/alpha/Makefile#2 delete .. //depot/projects/power/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/power/sys/alpha/alpha/api_up1000.c#2 delete .. //depot/projects/power/sys/alpha/alpha/atomic.s#2 delete .. //depot/projects/power/sys/alpha/alpha/autoconf.c#2 delete .. //depot/projects/power/sys/alpha/alpha/busdma_machdep.c#3 delete .. //depot/projects/power/sys/alpha/alpha/busspace.c#2 delete .. //depot/projects/power/sys/alpha/alpha/clock.c#4 delete .. //depot/projects/power/sys/alpha/alpha/clock_if.m#2 delete .. //depot/projects/power/sys/alpha/alpha/cpuconf.c#2 delete .. //depot/projects/power/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/power/sys/alpha/alpha/db_disasm.c#2 delete .. //depot/projects/power/sys/alpha/alpha/db_instruction.h#3 delete .. //depot/projects/power/sys/alpha/alpha/db_interface.c#2 delete .. //depot/projects/power/sys/alpha/alpha/db_trace.c#5 delete .. //depot/projects/power/sys/alpha/alpha/dec_1000a.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_2100_a50.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_2100_a500.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_3000_300.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_3000_500.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_axppci_33.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_eb164.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_eb64plus.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_kn20aa.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_kn300.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_kn8ae.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_st550.c#2 delete .. //depot/projects/power/sys/alpha/alpha/dec_st6600.c#2 delete .. //depot/projects/power/sys/alpha/alpha/divrem.m4#2 delete .. //depot/projects/power/sys/alpha/alpha/dump_machdep.c#3 delete .. //depot/projects/power/sys/alpha/alpha/elf_machdep.c#5 delete .. //depot/projects/power/sys/alpha/alpha/exception.s#2 delete .. //depot/projects/power/sys/alpha/alpha/fp_emulate.c#3 delete .. //depot/projects/power/sys/alpha/alpha/genassym.c#3 delete .. //depot/projects/power/sys/alpha/alpha/ieee_float.c#3 delete .. //depot/projects/power/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/power/sys/alpha/alpha/in_cksum.c#2 delete .. //depot/projects/power/sys/alpha/alpha/interrupt.c#5 delete .. //depot/projects/power/sys/alpha/alpha/locore.s#2 delete .. //depot/projects/power/sys/alpha/alpha/machdep.c#7 delete .. //depot/projects/power/sys/alpha/alpha/mem.c#4 delete .. //depot/projects/power/sys/alpha/alpha/mp_machdep.c#5 delete .. //depot/projects/power/sys/alpha/alpha/pal.s#2 delete .. //depot/projects/power/sys/alpha/alpha/pmap.c#8 delete .. //depot/projects/power/sys/alpha/alpha/prom.c#2 delete .. //depot/projects/power/sys/alpha/alpha/prom_disp.s#2 delete .. //depot/projects/power/sys/alpha/alpha/promcons.c#4 delete .. //depot/projects/power/sys/alpha/alpha/sgmap.c#2 delete .. //depot/projects/power/sys/alpha/alpha/support.s#3 delete .. //depot/projects/power/sys/alpha/alpha/swtch.s#2 delete .. //depot/projects/power/sys/alpha/alpha/sys_machdep.c#3 delete .. //depot/projects/power/sys/alpha/alpha/timerreg.h#3 delete .. //depot/projects/power/sys/alpha/alpha/trap.c#3 delete .. //depot/projects/power/sys/alpha/alpha/uio_machdep.c#3 delete .. //depot/projects/power/sys/alpha/alpha/vm_machdep.c#7 delete .. //depot/projects/power/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/power/sys/alpha/conf/GENERIC#7 delete .. //depot/projects/power/sys/alpha/conf/GENERIC.hints#3 delete .. //depot/projects/power/sys/alpha/conf/Makefile#2 delete .. //depot/projects/power/sys/alpha/conf/NOTES#2 delete .. //depot/projects/power/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/power/sys/alpha/include/_inttypes.h#2 delete .. //depot/projects/power/sys/alpha/include/_limits.h#3 delete .. //depot/projects/power/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/power/sys/alpha/include/_types.h#3 delete .. //depot/projects/power/sys/alpha/include/alpha_cpu.h#2 delete .. //depot/projects/power/sys/alpha/include/asm.h#2 delete .. //depot/projects/power/sys/alpha/include/atomic.h#2 delete .. //depot/projects/power/sys/alpha/include/bootinfo.h#2 delete .. //depot/projects/power/sys/alpha/include/bus.h#4 delete .. //depot/projects/power/sys/alpha/include/bus_memio.h#2 delete .. //depot/projects/power/sys/alpha/include/bus_pio.h#2 delete .. //depot/projects/power/sys/alpha/include/bwx.h#2 delete .. //depot/projects/power/sys/alpha/include/chipset.h#2 delete .. //depot/projects/power/sys/alpha/include/clock.h#2 delete .. //depot/projects/power/sys/alpha/include/clockvar.h#2 delete .. //depot/projects/power/sys/alpha/include/cpu.h#3 delete .. //depot/projects/power/sys/alpha/include/cpuconf.h#2 delete .. //depot/projects/power/sys/alpha/include/cpufunc.h#2 delete .. //depot/projects/power/sys/alpha/include/critical.h#3 delete .. //depot/projects/power/sys/alpha/include/db_machdep.h#2 delete .. //depot/projects/power/sys/alpha/include/elf.h#3 delete .. //depot/projects/power/sys/alpha/include/endian.h#3 delete .. //depot/projects/power/sys/alpha/include/exec.h#2 delete .. //depot/projects/power/sys/alpha/include/float.h#4 delete .. //depot/projects/power/sys/alpha/include/floatingpoint.h#2 delete .. //depot/projects/power/sys/alpha/include/fpu.h#3 delete .. //depot/projects/power/sys/alpha/include/frame.h#2 delete .. //depot/projects/power/sys/alpha/include/ieee.h#3 delete .. //depot/projects/power/sys/alpha/include/ieeefp.h#2 delete .. //depot/projects/power/sys/alpha/include/in_cksum.h#3 delete .. //depot/projects/power/sys/alpha/include/inst.h#2 delete .. //depot/projects/power/sys/alpha/include/intr.h#3 delete .. //depot/projects/power/sys/alpha/include/intrcnt.h#2 delete .. //depot/projects/power/sys/alpha/include/ioctl_bt848.h#3 delete .. //depot/projects/power/sys/alpha/include/limits.h#3 delete .. //depot/projects/power/sys/alpha/include/md_var.h#2 delete .. //depot/projects/power/sys/alpha/include/mutex.h#2 delete .. //depot/projects/power/sys/alpha/include/pal.h#2 delete .. //depot/projects/power/sys/alpha/include/param.h#3 delete .. //depot/projects/power/sys/alpha/include/pc/bios.h#2 delete .. //depot/projects/power/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/power/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/power/sys/alpha/include/pc/vesa.h#2 delete .. //depot/projects/power/sys/alpha/include/pcb.h#2 delete .. //depot/projects/power/sys/alpha/include/pcpu.h#2 delete .. //depot/projects/power/sys/alpha/include/pmap.h#6 delete .. //depot/projects/power/sys/alpha/include/proc.h#2 delete .. //depot/projects/power/sys/alpha/include/profile.h#3 delete .. //depot/projects/power/sys/alpha/include/prom.h#2 delete .. //depot/projects/power/sys/alpha/include/pte.h#2 delete .. //depot/projects/power/sys/alpha/include/ptrace.h#3 delete .. //depot/projects/power/sys/alpha/include/reg.h#2 delete .. //depot/projects/power/sys/alpha/include/reloc.h#2 delete .. //depot/projects/power/sys/alpha/include/resource.h#2 delete .. //depot/projects/power/sys/alpha/include/rpb.h#2 delete .. //depot/projects/power/sys/alpha/include/runq.h#2 delete .. //depot/projects/power/sys/alpha/include/setjmp.h#2 delete .. //depot/projects/power/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/power/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/power/sys/alpha/include/sigframe.h#2 delete .. //depot/projects/power/sys/alpha/include/signal.h#2 delete .. //depot/projects/power/sys/alpha/include/smp.h#2 delete .. //depot/projects/power/sys/alpha/include/stdarg.h#2 delete .. //depot/projects/power/sys/alpha/include/swiz.h#2 delete .. //depot/projects/power/sys/alpha/include/sysarch.h#4 delete .. //depot/projects/power/sys/alpha/include/ucontext.h#2 delete .. //depot/projects/power/sys/alpha/include/varargs.h#2 delete .. //depot/projects/power/sys/alpha/include/vmparam.h#3 delete .. //depot/projects/power/sys/alpha/isa/isa.c#4 delete .. //depot/projects/power/sys/alpha/isa/isa_dma.c#3 delete .. //depot/projects/power/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/power/sys/alpha/isa/mcclock_isa.c#2 delete .. //depot/projects/power/sys/alpha/linux/Makefile#2 delete .. //depot/projects/power/sys/alpha/linux/linux.h#2 delete .. //depot/projects/power/sys/alpha/linux/linux_dummy.c#3 delete .. //depot/projects/power/sys/alpha/linux/linux_genassym.c#2 delete .. //depot/projects/power/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/power/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/power/sys/alpha/linux/linux_machdep.c#3 delete .. //depot/projects/power/sys/alpha/linux/linux_proto.h#5 delete .. //depot/projects/power/sys/alpha/linux/linux_syscall.h#5 delete .. //depot/projects/power/sys/alpha/linux/linux_sysent.c#5 delete .. //depot/projects/power/sys/alpha/linux/linux_sysvec.c#4 delete .. //depot/projects/power/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/power/sys/alpha/linux/syscalls.master#5 delete .. //depot/projects/power/sys/alpha/mcbus/mcbus.c#2 delete .. //depot/projects/power/sys/alpha/mcbus/mcbusreg.h#2 delete .. //depot/projects/power/sys/alpha/mcbus/mcbusvar.h#2 delete .. //depot/projects/power/sys/alpha/mcbus/mcmem.c#2 delete .. //depot/projects/power/sys/alpha/mcbus/mcpcia.c#3 delete .. //depot/projects/power/sys/alpha/mcbus/mcpciareg.h#2 delete .. //depot/projects/power/sys/alpha/mcbus/mcpciavar.h#2 delete .. //depot/projects/power/sys/alpha/osf1/Makefile#2 delete .. //depot/projects/power/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/power/sys/alpha/osf1/exec_ecoff.h#2 delete .. //depot/projects/power/sys/alpha/osf1/imgact_osf1.c#2 delete .. //depot/projects/power/sys/alpha/osf1/osf1.h#2 delete .. //depot/projects/power/sys/alpha/osf1/osf1_ioctl.c#3 delete .. //depot/projects/power/sys/alpha/osf1/osf1_misc.c#3 delete .. //depot/projects/power/sys/alpha/osf1/osf1_mount.c#3 delete .. //depot/projects/power/sys/alpha/osf1/osf1_proto.h#5 delete .. //depot/projects/power/sys/alpha/osf1/osf1_signal.c#3 delete .. //depot/projects/power/sys/alpha/osf1/osf1_signal.h#2 delete .. //depot/projects/power/sys/alpha/osf1/osf1_syscall.h#5 delete .. //depot/projects/power/sys/alpha/osf1/osf1_sysent.c#5 delete .. //depot/projects/power/sys/alpha/osf1/osf1_sysvec.c#3 delete .. //depot/projects/power/sys/alpha/osf1/osf1_util.h#2 delete .. //depot/projects/power/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/power/sys/alpha/osf1/syscalls.master#5 delete .. //depot/projects/power/sys/alpha/pci/alphapci_if.m#2 delete .. //depot/projects/power/sys/alpha/pci/apecs.c#4 delete .. //depot/projects/power/sys/alpha/pci/apecs_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/apecsreg.h#2 delete .. //depot/projects/power/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/power/sys/alpha/pci/bwx.c#2 delete .. //depot/projects/power/sys/alpha/pci/cia.c#3 delete .. //depot/projects/power/sys/alpha/pci/cia_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/ciareg.h#2 delete .. //depot/projects/power/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/power/sys/alpha/pci/irongate.c#2 delete .. //depot/projects/power/sys/alpha/pci/irongate_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/power/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/power/sys/alpha/pci/lca.c#2 delete .. //depot/projects/power/sys/alpha/pci/lca_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/lcareg.h#2 delete .. //depot/projects/power/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/power/sys/alpha/pci/pci_eb164_intr.s#2 delete .. //depot/projects/power/sys/alpha/pci/pci_eb64plus_intr.s#2 delete .. //depot/projects/power/sys/alpha/pci/pcibus.c#2 delete .. //depot/projects/power/sys/alpha/pci/pcibus.h#2 delete .. //depot/projects/power/sys/alpha/pci/swiz.c#2 delete .. //depot/projects/power/sys/alpha/pci/t2.c#3 delete .. //depot/projects/power/sys/alpha/pci/t2_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/t2reg.h#2 delete .. //depot/projects/power/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/power/sys/alpha/pci/tsunami.c#3 delete .. //depot/projects/power/sys/alpha/pci/tsunami_pci.c#2 delete .. //depot/projects/power/sys/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/power/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/dwlpx.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/dwlpxreg.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/dwlpxvar.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/gbus.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/kftxx.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/kftxxreg.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/mcclock_tlsb.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/tlsb.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/tlsbcpu.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/tlsbmem.c#2 delete .. //depot/projects/power/sys/alpha/tlsb/tlsbreg.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/tlsbvar.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/zs_tlsb.c#4 delete .. //depot/projects/power/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/power/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/power/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/power/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/power/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/power/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/amd64-gdbstub.c#3 delete .. //depot/projects/power/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/power/sys/amd64/amd64/autoconf.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/power/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/power/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/power/sys/amd64/amd64/critical.c#4 delete .. //depot/projects/power/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/db_interface.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/power/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/power/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/power/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/io.c#1 branch .. //depot/projects/power/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/power/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/power/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/power/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/power/sys/amd64/amd64/mpboot.S#3 integrate .. //depot/projects/power/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/power/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/power/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/power/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/power/sys/amd64/amd64/support.S#9 integrate .. //depot/projects/power/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/power/sys/amd64/amd64/tsc.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/power/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/power/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/power/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/power/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/power/sys/amd64/conf/MAC#1 branch .. //depot/projects/power/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/power/sys/amd64/conf/gethints.awk#3 delete .. //depot/projects/power/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/power/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/power/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/power/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/power/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/power/sys/amd64/include/_bus.h#1 branch .. //depot/projects/power/sys/amd64/include/_limits.h#4 integrate .. //depot/projects/power/sys/amd64/include/_types.h#3 integrate .. //depot/projects/power/sys/amd64/include/acpica_machdep.h#5 integrate .. //depot/projects/power/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/power/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/power/sys/amd64/include/asm.h#3 integrate .. //depot/projects/power/sys/amd64/include/asmacros.h#5 integrate .. //depot/projects/power/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/power/sys/amd64/include/bus.h#2 integrate .. //depot/projects/power/sys/amd64/include/bus_amd64.h#3 delete .. //depot/projects/power/sys/amd64/include/bus_dma.h#4 integrate .. //depot/projects/power/sys/amd64/include/bus_memio.h#2 delete .. //depot/projects/power/sys/amd64/include/bus_pio.h#2 delete .. //depot/projects/power/sys/amd64/include/clock.h#4 integrate .. //depot/projects/power/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/power/sys/amd64/include/cpufunc.h#7 integrate .. //depot/projects/power/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/power/sys/amd64/include/critical.h#4 delete .. //depot/projects/power/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/power/sys/amd64/include/elf.h#3 integrate .. //depot/projects/power/sys/amd64/include/endian.h#4 integrate .. //depot/projects/power/sys/amd64/include/exec.h#3 integrate .. //depot/projects/power/sys/amd64/include/float.h#4 integrate .. //depot/projects/power/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/power/sys/amd64/include/frame.h#5 integrate .. //depot/projects/power/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/power/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/power/sys/amd64/include/in_cksum.h#3 integrate .. //depot/projects/power/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/power/sys/amd64/include/iodev.h#1 branch .. //depot/projects/power/sys/amd64/include/kdb.h#1 branch .. //depot/projects/power/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/power/sys/amd64/include/limits.h#4 integrate .. //depot/projects/power/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/power/sys/amd64/include/memdev.h#1 branch .. //depot/projects/power/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/power/sys/amd64/include/minidump.h#1 branch .. //depot/projects/power/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/power/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/power/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/power/sys/amd64/include/param.h#4 integrate .. //depot/projects/power/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/power/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/power/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/power/sys/amd64/include/pci_cfgreg.h#4 integrate .. //depot/projects/power/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/power/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/power/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/power/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/power/sys/amd64/include/proc.h#4 integrate .. //depot/projects/power/sys/amd64/include/profile.h#5 integrate .. //depot/projects/power/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/power/sys/amd64/include/reg.h#5 integrate .. //depot/projects/power/sys/amd64/include/resource.h#2 integrate .. //depot/projects/power/sys/amd64/include/runq.h#3 integrate .. //depot/projects/power/sys/amd64/include/segments.h#5 integrate .. //depot/projects/power/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/power/sys/amd64/include/sf_buf.h#3 integrate .. //depot/projects/power/sys/amd64/include/signal.h#5 integrate .. //depot/projects/power/sys/amd64/include/smp.h#5 integrate .. //depot/projects/power/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/power/sys/amd64/include/stack.h#1 branch .. //depot/projects/power/sys/amd64/include/stdarg.h#3 integrate .. //depot/projects/power/sys/amd64/include/sysarch.h#5 integrate .. //depot/projects/power/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/power/sys/amd64/include/trap.h#3 integrate .. //depot/projects/power/sys/amd64/include/tss.h#4 integrate .. //depot/projects/power/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/power/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/power/sys/amd64/isa/atpic.c#6 integrate .. //depot/projects/power/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/power/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/power/sys/amd64/isa/elcr.c#2 integrate .. //depot/projects/power/sys/amd64/isa/icu.h#6 integrate .. //depot/projects/power/sys/amd64/isa/isa.c#4 integrate .. //depot/projects/power/sys/amd64/isa/isa.h#3 integrate .. //depot/projects/power/sys/amd64/isa/isa_dma.c#5 integrate .. //depot/projects/power/sys/amd64/isa/isa_dma.h#3 delete .. //depot/projects/power/sys/amd64/isa/timerreg.h#3 delete .. //depot/projects/power/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/power/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/power/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/power/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/power/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/power/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/power/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/power/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/power/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/power/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/power/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/power/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/power/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/power/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/power/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/power/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm3.S#2 delete .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm67.S#2 delete .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/power/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/power/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/power/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/power/sys/arm/arm/critical.c#2 delete .. //depot/projects/power/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/power/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/power/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/power/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/power/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/power/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/power/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/power/sys/arm/arm/exception.S#2 integrate .. //depot/projects/power/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/power/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/power/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/power/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/power/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/power/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/power/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/power/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/power/sys/arm/arm/inckern.S#1 branch .. //depot/projects/power/sys/arm/arm/intr.c#2 integrate .. //depot/projects/power/sys/arm/arm/irq_dispatch.S#2 integrate .. //depot/projects/power/sys/arm/arm/locore.S#2 integrate .. //depot/projects/power/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/power/sys/arm/arm/mem.c#1 branch .. //depot/projects/power/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/power/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/power/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/power/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/power/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/power/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/power/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/power/sys/arm/arm/support.S#3 integrate .. //depot/projects/power/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/power/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/power/sys/arm/arm/trap.c#2 integrate .. //depot/projects/power/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/power/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/power/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/power/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/power/sys/arm/at91/at91.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/power/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/power/sys/arm/at91/at91var.h#1 branch .. //depot/projects/power/sys/arm/at91/files.at91#1 branch .. //depot/projects/power/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/power/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/power/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/power/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/power/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/power/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/power/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/power/sys/arm/at91/std.at91#1 branch .. //depot/projects/power/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/power/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/power/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/power/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/power/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/power/sys/arm/conf/AVILA#1 branch .. //depot/projects/power/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/power/sys/arm/conf/BWCT#1 branch .. //depot/projects/power/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/power/sys/arm/conf/CRB#1 branch .. //depot/projects/power/sys/arm/conf/EP80219#1 branch .. //depot/projects/power/sys/arm/conf/HL200#1 branch .. //depot/projects/power/sys/arm/conf/IQ31244#1 branch .. //depot/projects/power/sys/arm/conf/KB920X#1 branch .. //depot/projects/power/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/power/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/power/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/power/sys/arm/include/_bus.h#1 branch .. //depot/projects/power/sys/arm/include/_limits.h#3 integrate .. //depot/projects/power/sys/arm/include/_types.h#4 integrate .. //depot/projects/power/sys/arm/include/armreg.h#2 integrate .. //depot/projects/power/sys/arm/include/asm.h#2 integrate .. //depot/projects/power/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/power/sys/arm/include/atomic.h#2 integrate .. //depot/projects/power/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/power/sys/arm/include/bus.h#2 integrate .. //depot/projects/power/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/power/sys/arm/include/clock.h#2 integrate .. //depot/projects/power/sys/arm/include/cpu.h#2 integrate .. //depot/projects/power/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/power/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/power/sys/arm/include/critical.h#2 delete .. //depot/projects/power/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/power/sys/arm/include/disassem.h#2 integrate .. //depot/projects/power/sys/arm/include/elf.h#4 integrate .. //depot/projects/power/sys/arm/include/endian.h#3 integrate .. //depot/projects/power/sys/arm/include/exec.h#2 integrate .. //depot/projects/power/sys/arm/include/fiq.h#2 integrate .. //depot/projects/power/sys/arm/include/float.h#2 integrate .. //depot/projects/power/sys/arm/include/fp.h#2 integrate .. //depot/projects/power/sys/arm/include/frame.h#2 integrate .. //depot/projects/power/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/power/sys/arm/include/ieee.h#2 integrate .. //depot/projects/power/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/power/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/power/sys/arm/include/intr.h#2 integrate .. //depot/projects/power/sys/arm/include/katelib.h#2 integrate .. //depot/projects/power/sys/arm/include/kdb.h#1 branch .. //depot/projects/power/sys/arm/include/limits.h#3 integrate .. //depot/projects/power/sys/arm/include/machdep.h#2 integrate .. //depot/projects/power/sys/arm/include/md_var.h#2 integrate .. //depot/projects/power/sys/arm/include/memdev.h#1 branch .. //depot/projects/power/sys/arm/include/metadata.h#2 integrate .. //depot/projects/power/sys/arm/include/param.h#3 integrate .. //depot/projects/power/sys/arm/include/pcb.h#2 integrate .. //depot/projects/power/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/power/sys/arm/include/pmap.h#2 integrate .. //depot/projects/power/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/power/sys/arm/include/proc.h#2 integrate .. //depot/projects/power/sys/arm/include/profile.h#3 integrate .. //depot/projects/power/sys/arm/include/psl.h#2 integrate .. //depot/projects/power/sys/arm/include/pte.h#2 integrate .. //depot/projects/power/sys/arm/include/reg.h#2 integrate .. //depot/projects/power/sys/arm/include/resource.h#2 integrate .. //depot/projects/power/sys/arm/include/runq.h#2 integrate .. //depot/projects/power/sys/arm/include/setjmp.h#2 integrate .. //depot/projects/power/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/power/sys/arm/include/signal.h#4 integrate .. //depot/projects/power/sys/arm/include/stack.h#1 branch .. //depot/projects/power/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/power/sys/arm/include/swi.h#2 integrate .. //depot/projects/power/sys/arm/include/sysarch.h#1 branch .. //depot/projects/power/sys/arm/include/trap.h#2 integrate .. //depot/projects/power/sys/arm/include/undefined.h#2 integrate .. //depot/projects/power/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/power/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/power/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/power/sys/arm/sa11x0/std.sa11x0#2 integrate .. //depot/projects/power/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/power/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/power/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/power/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/power/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/power/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/power/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/power/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/power/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/power/sys/boot/Makefile#6 integrate .. //depot/projects/power/sys/boot/README#2 integrate .. //depot/projects/power/sys/boot/alpha/Makefile#2 delete .. //depot/projects/power/sys/boot/alpha/Makefile.inc#3 delete .. //depot/projects/power/sys/boot/alpha/boot1/Makefile#3 delete .. //depot/projects/power/sys/boot/alpha/boot1/boot1.c#2 delete .. //depot/projects/power/sys/boot/alpha/cdboot/Makefile#3 delete .. //depot/projects/power/sys/boot/alpha/cdboot/version#2 delete .. //depot/projects/power/sys/boot/alpha/common/Makefile.common#3 delete .. //depot/projects/power/sys/boot/alpha/common/conf.c#4 delete .. //depot/projects/power/sys/boot/alpha/common/help.alpha#2 delete .. //depot/projects/power/sys/boot/alpha/common/main.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/Makefile#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/bootinfo.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/delay.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/devicename.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/elf_freebsd.c#4 delete .. //depot/projects/power/sys/boot/alpha/libalpha/getsecs.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/libalpha.h#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/srmdisk.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/power/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/power/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/power/sys/boot/alpha/loader/Makefile#3 delete .. //depot/projects/power/sys/boot/alpha/loader/version#2 delete .. //depot/projects/power/sys/boot/alpha/netboot/Makefile#3 delete .. //depot/projects/power/sys/boot/alpha/netboot/version#2 delete .. //depot/projects/power/sys/boot/arc/Makefile#2 delete .. //depot/projects/power/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/power/sys/boot/arc/include/arcfuncs.h#3 delete .. //depot/projects/power/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/power/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/power/sys/boot/arc/lib/Makefile#2 delete .. //depot/projects/power/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/arcdisk.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/power/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/power/sys/boot/arc/lib/bootinfo.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/devicename.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/elf_freebsd.c#4 delete .. //depot/projects/power/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/power/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/power/sys/boot/arc/loader/Makefile#2 delete .. //depot/projects/power/sys/boot/arc/loader/conf.c#3 delete .. //depot/projects/power/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/power/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/power/sys/boot/arc/loader/version#2 delete .. //depot/projects/power/sys/boot/arm/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/power/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/power/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/power/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/power/sys/boot/common/bcache.c#2 integrate .. //depot/projects/power/sys/boot/common/boot.c#2 integrate .. //depot/projects/power/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/power/sys/boot/common/commands.c#2 integrate .. //depot/projects/power/sys/boot/common/console.c#2 integrate .. //depot/projects/power/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/power/sys/boot/common/devopen.c#2 integrate .. //depot/projects/power/sys/boot/common/help.common#3 integrate .. //depot/projects/power/sys/boot/common/load.c#2 integrate .. //depot/projects/power/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/power/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/power/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/power/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/power/sys/boot/common/loader.8#5 integrate .. //depot/projects/power/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/power/sys/boot/common/misc.c#2 integrate .. //depot/projects/power/sys/boot/common/module.c#2 integrate .. //depot/projects/power/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/power/sys/boot/common/panic.c#2 integrate .. //depot/projects/power/sys/boot/common/pnp.c#2 integrate .. //depot/projects/power/sys/boot/common/pnpdata#2 delete .. //depot/projects/power/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/power/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/power/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/power/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/power/sys/boot/efi/Makefile#2 integrate .. //depot/projects/power/sys/boot/efi/include/README#2 integrate .. //depot/projects/power/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efiapi.h#3 integrate .. //depot/projects/power/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/power/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/power/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 delete .. //depot/projects/power/sys/boot/efi/libefi/arch/ia64/start.S#2 delete .. //depot/projects/power/sys/boot/efi/libefi/bootinfo.c#3 delete .. //depot/projects/power/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/power/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/power/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/power/sys/boot/efi/libefi/efifpswa.c#3 delete .. //depot/projects/power/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/efinet.c#3 integrate .. //depot/projects/power/sys/boot/efi/libefi/elf_freebsd.c#4 delete .. //depot/projects/power/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/power/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/power/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/power/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/power/sys/boot/efi/loader/Makefile#3 delete .. //depot/projects/power/sys/boot/efi/loader/conf.c#2 delete .. //depot/projects/power/sys/boot/efi/loader/main.c#2 delete .. //depot/projects/power/sys/boot/efi/loader/version#2 delete .. //depot/projects/power/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/power/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/power/sys/boot/ficl/alpha/sysdep.h#2 delete .. //depot/projects/power/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/power/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/power/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/power/sys/boot/ficl/float.c#2 integrate .. //depot/projects/power/sys/boot/ficl/loader.c#3 integrate .. //depot/projects/power/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/power/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/power/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/power/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/power/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/power/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/power/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/power/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/power/sys/boot/ficl/words.c#2 integrate .. //depot/projects/power/sys/boot/forth/beastie.4th#5 integrate .. //depot/projects/power/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/power/sys/boot/forth/loader.4th.8#2 integrate .. //depot/projects/power/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/power/sys/boot/forth/loader.conf.5#4 integrate .. //depot/projects/power/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/power/sys/boot/forth/support.4th#2 integrate .. //depot/projects/power/sys/boot/i386/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/power/sys/boot/i386/boot0/Makefile#7 integrate .. //depot/projects/power/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/power/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/power/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/power/sys/boot/i386/boot2/lib.h#2 integrate .. //depot/projects/power/sys/boot/i386/boot2/sio.S#4 integrate .. //depot/projects/power/sys/boot/i386/btx/btx/Makefile#5 integrate .. //depot/projects/power/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#5 integrate .. //depot/projects/power/sys/boot/i386/btx/lib/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/btx/lib/btxcsu.s#2 integrate .. //depot/projects/power/sys/boot/i386/cdboot/Makefile#5 integrate .. //depot/projects/power/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/power/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/power/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/power/sys/boot/i386/kgzldr/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/power/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/power/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/power/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/power/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/power/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/power/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/power/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/comconsole.c#3 integrate .. //depot/projects/power/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/power/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/power/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/power/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/power/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/power/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/power/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/power/sys/boot/i386/mbr/Makefile#5 integrate .. //depot/projects/power/sys/boot/i386/mbr/mbr.s#2 integrate .. //depot/projects/power/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/power/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/power/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/power/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/power/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/power/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/power/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/power/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/power/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/power/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/power/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/power/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/power/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/power/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/power/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/power/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/power/sys/boot/ia64/efi/version#1 branch .. //depot/projects/power/sys/boot/ia64/libski/Makefile#3 delete .. //depot/projects/power/sys/boot/ia64/libski/acpi_stub.c#3 delete .. //depot/projects/power/sys/boot/ia64/libski/bootinfo.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/copy.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/delay.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/devicename.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/efi_stub.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/elf_freebsd.c#3 delete .. //depot/projects/power/sys/boot/ia64/libski/exit.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/libski.h#2 delete .. //depot/projects/power/sys/boot/ia64/libski/module.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/pal_stub.S#3 delete .. //depot/projects/power/sys/boot/ia64/libski/sal_stub.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/skiconsole.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/skifs.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/ssc.c#2 delete .. //depot/projects/power/sys/boot/ia64/libski/time.c#2 delete .. //depot/projects/power/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/power/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/power/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/power/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/power/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/power/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/power/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/power/sys/boot/ia64/ski/version#1 branch .. //depot/projects/power/sys/boot/ia64/skiload/Makefile#4 delete .. //depot/projects/power/sys/boot/ia64/skiload/conf.c#2 delete .. //depot/projects/power/sys/boot/ia64/skiload/ldscript.ia64#2 delete .. //depot/projects/power/sys/boot/ia64/skiload/main.c#2 delete .. //depot/projects/power/sys/boot/ia64/skiload/skiload.cmd#2 delete .. //depot/projects/power/sys/boot/ia64/skiload/start.S#2 delete .. //depot/projects/power/sys/boot/ia64/skiload/version#2 delete .. //depot/projects/power/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/power/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/power/sys/boot/ofw/libofw/devicename.c#4 integrate .. //depot/projects/power/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/power/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/power/sys/boot/ofw/libofw/ofw_console.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 10 16:45:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2160616A420; Thu, 10 Jan 2008 16:45:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D61DA16A41A for ; Thu, 10 Jan 2008 16:45:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0FA413C447 for ; Thu, 10 Jan 2008 16:45:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGjOLl033072 for ; Thu, 10 Jan 2008 16:45:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGjOKW033069 for perforce@freebsd.org; Thu, 10 Jan 2008 16:45:24 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Jan 2008 16:45:24 GMT Message-Id: <200801101645.m0AGjOKW033069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 132971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 16:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=132971 Change 132971 by jhb@jhb_zion on 2008/01/10 16:45:02 IFC @132967 Affected files ... .. //depot/projects/power/sys/alpha/include/ioctl_meteor.h#3 delete .. //depot/projects/power/sys/boot/i386/loader/loader.rc#3 integrate .. //depot/projects/power/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/power/sys/dev/lmc/if_lmc.c#3 branch .. //depot/projects/power/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/power/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/power/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/power/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/power/sys/modules/pflog/Makefile#3 integrate Differences ... ==== //depot/projects/power/sys/boot/i386/loader/loader.rc#3 (text+ko) ==== ==== //depot/projects/power/sys/dev/coretemp/coretemp.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $ + * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $ * */ @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $"); #include #include @@ -143,6 +143,11 @@ cpu_model += ((cpu_id >> 16) & 0xf) << 4; cpu_mask = cpu_id & 15; +#if 0 /* + * XXXrpaulo: I have this CPU model and when it returns from C3 + * coretemp continues to function properly. + */ + /* * Check for errata AE18. * "Processor Digital Thermal Sensor (DTS) Readout stops @@ -159,6 +164,7 @@ return (ENXIO); } } +#endif /* * On some Core 2 CPUs, there's an undocumented MSR that * can tell us if Tj(max) is 100 or 85. ==== //depot/projects/power/sys/dev/sound/midi/midi.c#3 (text+ko) ==== @@ -1,1054 +1,1528 @@ -/* - * Main midi driver for FreeBSD. This file provides the main - * entry points for probe/attach and all i/o demultiplexing, including - * default routines for generic devices. - * - * (C) 1999 Seigo Tanimura - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: +/*- + * Copyright (c) 2003 Mathew Kanner + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (augustss@netbsd.org). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS - * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + /* + * Parts of this file started out as NetBSD: midi.c 1.31 + * They are mostly gone. Still the most obvious will be the state + * machine midi_in + */ + +#include +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.24 2007/04/02 06:03:47 ariff Exp $"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include "mpu_if.h" + +#include +#include "synth_if.h" +MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); + + +#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f)) +#define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c) + +#define MIDI_DEV_RAW 2 +#define MIDI_DEV_MIDICTL 12 + +enum midi_states { + MIDI_IN_START, MIDI_IN_SYSEX, MIDI_IN_DATA +}; + +/* + * The MPU interface current has init() uninit() inqsize(( outqsize() + * callback() : fiddle with the tx|rx status. + */ + +#include "mpu_if.h" + +/* + * /dev/rmidi Structure definitions + */ + +#define MIDI_NAMELEN 16 +struct snd_midi { + KOBJ_FIELDS; + struct mtx lock; /* Protects all but queues */ + void *cookie; + + int unit; /* Should only be used in midistat */ + int channel; /* Should only be used in midistat */ + + int busy; + int flags; /* File flags */ + char name[MIDI_NAMELEN]; + struct mtx qlock; /* Protects inq, outq and flags */ + MIDIQ_HEAD(, char) inq, outq; + int rchan, wchan; + struct selinfo rsel, wsel; + int hiwat; /* QLEN(outq)>High-water -> disable + * writes from userland */ + enum midi_states inq_state; + int inq_status, inq_left; /* Variables for the state machine in + * Midi_in, this is to provide that + * signals only get issued only + * complete command packets. */ + struct proc *async; + struct cdev *dev; + struct synth_midi *synth; + int synth_flags; + TAILQ_ENTRY(snd_midi) link; +}; + +struct synth_midi { + KOBJ_FIELDS; + struct snd_midi *m; +}; + +static synth_open_t midisynth_open; +static synth_close_t midisynth_close; +static synth_writeraw_t midisynth_writeraw; +static synth_killnote_t midisynth_killnote; +static synth_startnote_t midisynth_startnote; +static synth_setinstr_t midisynth_setinstr; +static synth_alloc_t midisynth_alloc; +static synth_controller_t midisynth_controller; +static synth_bender_t midisynth_bender; + + +static kobj_method_t midisynth_methods[] = { + KOBJMETHOD(synth_open, midisynth_open), + KOBJMETHOD(synth_close, midisynth_close), + KOBJMETHOD(synth_writeraw, midisynth_writeraw), + KOBJMETHOD(synth_setinstr, midisynth_setinstr), + KOBJMETHOD(synth_startnote, midisynth_startnote), + KOBJMETHOD(synth_killnote, midisynth_killnote), + KOBJMETHOD(synth_alloc, midisynth_alloc), + KOBJMETHOD(synth_controller, midisynth_controller), + KOBJMETHOD(synth_bender, midisynth_bender), + {0, 0} +}; + +DEFINE_CLASS(midisynth, midisynth_methods, 0); + +/* + * Module Exports & Interface * + * struct midi_chan *midi_init(MPU_CLASS cls, int unit, int chan) int + * midi_uninit(struct snd_midi *) 0 == no error EBUSY or other error int + * Midi_in(struct midi_chan *, char *buf, int count) int Midi_out(struct + * midi_chan *, char *buf, int count) * - * For each card type a template "mididev_info" structure contains - * all the relevant parameters, both for configuration and runtime. + * midi_{in,out} return actual size transfered * - * In this file we build tables of pointers to the descriptors for - * the various supported cards. The generic probe routine scans - * the table(s) looking for a matching entry, then invokes the - * board-specific probe routine. If successful, a pointer to the - * correct mididev_info is stored in mididev_last_probed, for subsequent - * use in the attach routine. The generic attach routine copies - * the template to a permanent descriptor (midi_info and - * friends), initializes all generic parameters, and calls the - * board-specific attach routine. - * - * On device calls, the generic routines do the checks on unit and - * device parameters, then call the board-specific routines if - * available, or try to perform the task using the default code. - * - * $FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.14 2004/02/21 21:10:47 phk Exp $ - * + */ + + +/* + * midi_devs tailq, holder of all rmidi instances protected by midistat_lock */ -#include +TAILQ_HEAD(, snd_midi) midi_devs; + +/* + * /dev/midistat variables and declarations, protected by midistat_lock + */ -static devclass_t midi_devclass; +static struct mtx midistat_lock; +static int midistat_isopen = 0; +static struct sbuf midistat_sbuf; +static int midistat_bufptr; +static struct cdev *midistat_dev; -static d_open_t midiopen; -static d_close_t midiclose; -static d_ioctl_t midiioctl; -static d_read_t midiread; -static d_write_t midiwrite; -static d_poll_t midipoll; +/* + * /dev/midistat dev_t declarations + */ -/* These functions are local. */ static d_open_t midistat_open; static d_close_t midistat_close; static d_read_t midistat_read; -static int midi_initstatus(char *buf, int size); -static int midi_readstatus(char *buf, int *ptr, struct uio *uio); + +static struct cdevsw midistat_cdevsw = { + .d_version = D_VERSION, + .d_open = midistat_open, + .d_close = midistat_close, + .d_read = midistat_read, + .d_name = "midistat", +}; + + +/* + * /dev/rmidi dev_t declarations, struct variable access is protected by + * locks contained within the structure. + */ + +static d_open_t midi_open; +static d_close_t midi_close; +static d_ioctl_t midi_ioctl; +static d_read_t midi_read; +static d_write_t midi_write; +static d_poll_t midi_poll; -#define CDEV_MAJOR MIDI_CDEV_MAJOR static struct cdevsw midi_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = midiopen, - .d_close = midiclose, - .d_read = midiread, - .d_write = midiwrite, - .d_ioctl = midiioctl, - .d_poll = midipoll, - .d_name = "midi", - .d_maj = CDEV_MAJOR, + .d_version = D_VERSION, + .d_open = midi_open, + .d_close = midi_close, + .d_read = midi_read, + .d_write = midi_write, + .d_ioctl = midi_ioctl, + .d_poll = midi_poll, + .d_name = "rmidi", }; /* - * descriptors for active devices. also used as the public softc - * of a device. + * Prototypes of library functions */ -static TAILQ_HEAD(,_mididev_info) midi_info; -static int nmidi, nsynth; -/* Mutex to protect midi_info, nmidi and nsynth. */ -static struct mtx midiinfo_mtx; -static int midiinfo_mtx_init; -/* These make the buffer for /dev/midistat */ -static int midistatbusy; -static char midistatbuf[4096]; -static int midistatptr; +static int midi_destroy(struct snd_midi *, int); +static int midistat_prepare(struct sbuf * s); +static int midi_load(void); +static int midi_unload(void); +/* + * Misc declr. + */ SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD, 0, "Midi driver"); +SYSCTL_NODE(_hw_midi, OID_AUTO, stat, CTLFLAG_RD, 0, "Status device"); -int midi_debug; +int midi_debug; +/* XXX: should this be moved into debug.midi? */ SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); -midi_cmdtab cmdtab_midiioctl[] = { - {SNDCTL_MIDI_PRETIME, "SNDCTL_MIDI_PRETIME"}, - {SNDCTL_MIDI_MPUMODE, "SNDCTL_MIDI_MPUMODE"}, - {SNDCTL_MIDI_MPUCMD, "SNDCTL_MIDI_MPUCMD"}, - {SNDCTL_SYNTH_INFO, "SNDCTL_SYNTH_INFO"}, - {SNDCTL_MIDI_INFO, "SNDCTL_MIDI_INFO"}, - {SNDCTL_SYNTH_MEMAVL, "SNDCTL_SYNTH_MEMAVL"}, - {SNDCTL_FM_LOAD_INSTR, "SNDCTL_FM_LOAD_INSTR"}, - {SNDCTL_FM_4OP_ENABLE, "SNDCTL_FM_4OP_ENABLE"}, - {MIOSPASSTHRU, "MIOSPASSTHRU"}, - {MIOGPASSTHRU, "MIOGPASSTHRU"}, - {AIONWRITE, "AIONWRITE"}, - {AIOGSIZE, "AIOGSIZE"}, - {AIOSSIZE, "AIOSSIZE"}, - {AIOGFMT, "AIOGFMT"}, - {AIOSFMT, "AIOSFMT"}, - {AIOGMIX, "AIOGMIX"}, - {AIOSMIX, "AIOSMIX"}, - {AIOSTOP, "AIOSTOP"}, - {AIOSYNC, "AIOSYNC"}, - {AIOGCAP, "AIOGCAP"}, - {-1, NULL}, -}; +int midi_dumpraw; +SYSCTL_INT(_hw_midi, OID_AUTO, dumpraw, CTLFLAG_RW, &midi_dumpraw, 0, ""); + +int midi_instroff; +SYSCTL_INT(_hw_midi, OID_AUTO, instroff, CTLFLAG_RW, &midi_instroff, 0, ""); + +int midistat_verbose; +SYSCTL_INT(_hw_midi_stat, OID_AUTO, verbose, CTLFLAG_RW, + &midistat_verbose, 0, ""); + +#define MIDI_DEBUG(l,a) if(midi_debug>=l) a +/* + * CODE START + */ /* - * This is the generic init routine. - * Must be called after device-specific init. + * Register a new rmidi device. cls midi_if interface unit == 0 means + * auto-assign new unit number unit != 0 already assigned a unit number, eg. + * not the first channel provided by this device. channel, sub-unit + * cookie is passed back on MPU calls Typical device drivers will call with + * unit=0, channel=1..(number of channels) and cookie=soft_c and won't care + * what unit number is used. + * + * It is an error to call midi_init with an already used unit/channel combo. + * + * Returns NULL on error + * */ -int -midiinit(mididev_info *d, device_t dev) +struct snd_midi * +midi_init(kobj_class_t cls, int unit, int channel, void *cookie) { - int unit; + struct snd_midi *m; + int i; + int inqsize, outqsize; + MIDI_TYPE *buf; + MIDI_DEBUG(1, printf("midiinit: unit %d/%d.\n", unit, channel)); + mtx_lock(&midistat_lock); /* - * initialize standard parameters for the device. This can be - * overridden by device-specific configurations but better do - * here the generic things. + * Protect against call with existing unit/channel or auto-allocate a + * new unit number. */ + i = -1; + TAILQ_FOREACH(m, &midi_devs, link) { + mtx_lock(&m->lock); + if (unit != 0) { + if (m->unit == unit && m->channel == channel) { + mtx_unlock(&m->lock); + goto err0; + } + } else { + /* + * Find a better unit number + */ + if (m->unit > i) + i = m->unit; + } + mtx_unlock(&m->lock); + } + + if (unit == 0) + unit = i + 1; + + MIDI_DEBUG(1, printf("midiinit #2: unit %d/%d.\n", unit, channel)); + m = malloc(sizeof(*m), M_MIDI, M_NOWAIT | M_ZERO); + if (m == NULL) + goto err0; + + m->synth = malloc(sizeof(*m->synth), M_MIDI, M_NOWAIT | M_ZERO); + kobj_init((kobj_t)m->synth, &midisynth_class); + m->synth->m = m; + kobj_init((kobj_t)m, cls); + inqsize = MPU_INQSIZE(m, cookie); + outqsize = MPU_OUTQSIZE(m, cookie); + + MIDI_DEBUG(1, printf("midiinit queues %d/%d.\n", inqsize, outqsize)); + if (!inqsize && !outqsize) + goto err1; + + mtx_init(&m->lock, "raw midi", NULL, 0); + mtx_init(&m->qlock, "q raw midi", NULL, 0); + + mtx_lock(&m->lock); + mtx_lock(&m->qlock); + + if (inqsize) + buf = malloc(sizeof(MIDI_TYPE) * inqsize, M_MIDI, M_NOWAIT); + else + buf = NULL; + + MIDIQ_INIT(m->inq, buf, inqsize); + + if (outqsize) + buf = malloc(sizeof(MIDI_TYPE) * outqsize, M_MIDI, M_NOWAIT); + else + buf = NULL; + m->hiwat = outqsize / 2; - MIDI_DEBUG(printf("midiinit: unit %d.\n", d->unit)); + MIDIQ_INIT(m->outq, buf, outqsize); + + if ((inqsize && !MIDIQ_BUF(m->inq)) || + (outqsize && !MIDIQ_BUF(m->outq))) + goto err2; + + + m->busy = 0; + m->flags = 0; + m->unit = unit; + m->channel = channel; + m->cookie = cookie; + + if (MPU_INIT(m, cookie)) + goto err2; + + mtx_unlock(&m->lock); + mtx_unlock(&m->qlock); + + TAILQ_INSERT_TAIL(&midi_devs, m, link); + + mtx_unlock(&midistat_lock); - unit = d->unit; - d->softc = device_get_softc(dev); - d->dev = dev; - d->magic = MAGIC(d->unit); /* debugging... */ - d->flags = 0; - d->fflags = 0; - d->midi_dbuf_in.unit_size = 1; - d->midi_dbuf_out.unit_size = 1; - d->midi_dbuf_passthru.unit_size = 1; + m->dev = make_dev(&midi_cdevsw, + MIDIMKMINOR(unit, MIDI_DEV_RAW, channel), + UID_ROOT, GID_WHEEL, 0666, "midi%d.%d", unit, channel); + m->dev->si_drv1 = m; - mtx_unlock(&d->flagqueue_mtx); + return m; - if (midi_devclass == NULL) { - midi_devclass = device_get_devclass(dev); - make_dev(&midi_cdevsw, MIDIMKMINOR(0, MIDI_DEV_STATUS), - UID_ROOT, GID_WHEEL, 0444, "midistat"); - } - make_dev(&midi_cdevsw, MIDIMKMINOR(unit, MIDI_DEV_MIDIN), - UID_ROOT, GID_WHEEL, 0666, "midi%d", unit); +err2: mtx_destroy(&m->qlock); + mtx_destroy(&m->lock); - return 0 ; + if (MIDIQ_BUF(m->inq)) + free(MIDIQ_BUF(m->inq), M_MIDI); + if (MIDIQ_BUF(m->outq)) + free(MIDIQ_BUF(m->outq), M_MIDI); +err1: free(m, M_MIDI); +err0: mtx_unlock(&midistat_lock); + MIDI_DEBUG(1, printf("midi_init ended in error\n")); + return NULL; } /* - * a small utility function which, given a device number, returns - * a pointer to the associated mididev_info struct, and sets the unit - * number. + * midi_uninit does not call MIDI_UNINIT, as since this is the implementors + * entry point. midi_unint if fact, does not send any methods. A call to + * midi_uninit is a defacto promise that you won't manipulate ch anymore + * */ -mididev_info * -get_mididev_info(dev_t i_dev, int *unit) + +int +midi_uninit(struct snd_midi *m) { - int u; + int err; + + err = ENXIO; + mtx_lock(&midistat_lock); + mtx_lock(&m->lock); + if (m->busy) { + if (!(m->rchan || m->wchan)) + goto err; - if (MIDIDEV(i_dev) != MIDI_DEV_MIDIN) - return NULL; - u = MIDIUNIT(i_dev); - if (unit) - *unit = u; + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; + } + if (m->wchan) { + wakeup(&m->wchan); + m->wchan = 0; + } + } + err = midi_destroy(m, 0); + if (!err) + goto exit; - return get_mididev_info_unit(u); +err: mtx_unlock(&m->lock); +exit: mtx_unlock(&midistat_lock); + return err; } /* - * a small utility function which, given a unit number, returns - * a pointer to the associated mididev_info struct. + * midi_in: process all data until the queue is full, then discards the rest. + * Since midi_in is a state machine, data discards can cause it to get out of + * whack. Process as much as possible. It calls, wakeup, selnotify and + * psignal at most once. */ -mididev_info * -get_mididev_info_unit(int unit) + +#ifdef notdef +static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; + +#endif /* notdef */ +/* Number of bytes in a MIDI command */ +#define MIDI_LENGTH(d) (midi_lengths[((d) >> 4) & 7]) +#define MIDI_ACK 0xfe +#define MIDI_IS_STATUS(d) ((d) >= 0x80) +#define MIDI_IS_COMMON(d) ((d) >= 0xf0) + +#define MIDI_SYSEX_START 0xF0 +#define MIDI_SYSEX_END 0xF7 + + +int +midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) { - mididev_info *md; + /* int i, sig, enq; */ + int used; + + /* MIDI_TYPE data; */ + MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); + +/* + * XXX: locking flub + */ + if (!(m->flags & M_RX)) + return size; + + used = 0; + + mtx_lock(&m->qlock); +#if 0 + /* + * Don't bother queuing if not in read mode. Discard everything and + * return size so the caller doesn't freak out. + */ + + if (!(m->flags & M_RX)) + return size; + + for (i = sig = 0; i < size; i++) { + + data = buf[i]; + enq = 0; + if (data == MIDI_ACK) + continue; - /* XXX */ - if (!midiinfo_mtx_init) { - midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); - TAILQ_INIT(&midi_info); - } + switch (m->inq_state) { + case MIDI_IN_START: + if (MIDI_IS_STATUS(data)) { + switch (data) { + case 0xf0: /* Sysex */ + m->inq_state = MIDI_IN_SYSEX; + break; + case 0xf1: /* MTC quarter frame */ + case 0xf3: /* Song select */ + m->inq_state = MIDI_IN_DATA; + enq = 1; + m->inq_left = 1; + break; + case 0xf2: /* Song position pointer */ + m->inq_state = MIDI_IN_DATA; + enq = 1; + m->inq_left = 2; + break; + default: + if (MIDI_IS_COMMON(data)) { + enq = 1; + sig = 1; + } else { + m->inq_state = MIDI_IN_DATA; + enq = 1; + m->inq_status = data; + m->inq_left = MIDI_LENGTH(data); + } + break; + } + } else if (MIDI_IS_STATUS(m->inq_status)) { + m->inq_state = MIDI_IN_DATA; + if (!MIDIQ_FULL(m->inq)) { + used++; + MIDIQ_ENQ(m->inq, &m->inq_status, 1); + } + enq = 1; + m->inq_left = MIDI_LENGTH(m->inq_status) - 1; + } + break; + /* + * End of case MIDI_IN_START: + */ - mtx_lock(&midiinfo_mtx); - TAILQ_FOREACH(md, &midi_info, md_link) { - if (md->unit == unit) + case MIDI_IN_DATA: + enq = 1; + if (--m->inq_left <= 0) + sig = 1;/* deliver data */ + break; + case MIDI_IN_SYSEX: + if (data == MIDI_SYSEX_END) + m->inq_state = MIDI_IN_START; break; + } + + if (enq) + if (!MIDIQ_FULL(m->inq)) { + MIDIQ_ENQ(m->inq, &data, 1); + used++; + } + /* + * End of the state machines main "for loop" + */ + } + if (sig) { +#endif + MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", + (intmax_t)MIDIQ_LEN(m->inq), + (intmax_t)MIDIQ_AVAIL(m->inq))); + if (MIDIQ_AVAIL(m->inq) > size) { + used = size; + MIDIQ_ENQ(m->inq, buf, size); + } else { + MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); + mtx_unlock(&m->qlock); + return 0; + } + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; + } + selwakeup(&m->rsel); + if (m->async) { + PROC_LOCK(m->async); + psignal(m->async, SIGIO); + PROC_UNLOCK(m->async); + } +#if 0 } - mtx_unlock(&midiinfo_mtx); - - return md; +#endif + mtx_unlock(&m->qlock); + return used; } /* - * a small utility function which, given a unit number, returns - * a pointer to the associated mididev_info struct with MDT_MIDI. + * midi_out: The only clearer of the M_TXEN flag. */ -mididev_info * -get_mididev_midi_unit(int unit) +int +midi_out(struct snd_midi *m, MIDI_TYPE *buf, int size) { - mididev_info *md; + int used; + +/* + * XXX: locking flub + */ + if (!(m->flags & M_TXEN)) + return 0; - /* XXX */ - if (!midiinfo_mtx_init) { - midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); - TAILQ_INIT(&midi_info); + MIDI_DEBUG(2, printf("midi_out: %p\n", m)); + mtx_lock(&m->qlock); + used = MIN(size, MIDIQ_LEN(m->outq)); + MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); + if (used) + MIDIQ_DEQ(m->outq, buf, used); + if (MIDIQ_EMPTY(m->outq)) { + m->flags &= ~M_TXEN; + MPU_CALLBACKP(m, m->cookie, m->flags); } - - mtx_lock(&midiinfo_mtx); - TAILQ_FOREACH(md, &midi_info, md_link) { - if (md->midiunit == unit) - break; + if (used && MIDIQ_AVAIL(m->outq) > m->hiwat) { + if (m->wchan) { + wakeup(&m->wchan); + m->wchan = 0; + } + selwakeup(&m->wsel); + if (m->async) { + PROC_LOCK(m->async); + psignal(m->async, SIGIO); + PROC_UNLOCK(m->async); + } } - mtx_unlock(&midiinfo_mtx); + mtx_unlock(&m->qlock); + return used; +} - return md; -} /* - * a small utility function which, given a unit number, returns - * a pointer to the associated mididev_info struct with MDT_SYNTH. + * /dev/rmidi#.# device access functions */ -mididev_info * -get_mididev_synth_unit(int unit) +int +midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) { - mididev_info *md; + struct snd_midi *m = i_dev->si_drv1; + int retval; + + MIDI_DEBUG(1, printf("midiopen %p %s %s\n", td, + flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); + if (m == NULL) + return ENXIO; + + mtx_lock(&m->lock); + mtx_lock(&m->qlock); + + retval = 0; - /* XXX */ - if (!midiinfo_mtx_init) { - midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); - TAILQ_INIT(&midi_info); + if (flags & FREAD) { + if (MIDIQ_SIZE(m->inq) == 0) + retval = ENXIO; + else if (m->flags & M_RX) + retval = EBUSY; + if (retval) + goto err; + } + if (flags & FWRITE) { + if (MIDIQ_SIZE(m->outq) == 0) + retval = ENXIO; + else if (m->flags & M_TX) + retval = EBUSY; + if (retval) + goto err; } + m->busy++; + + m->rchan = 0; + m->wchan = 0; + m->async = 0; - mtx_lock(&midiinfo_mtx); - TAILQ_FOREACH(md, &midi_info, md_link) { - if (md->synthunit == unit) - break; - } - mtx_unlock(&midiinfo_mtx); + if (flags & FREAD) { + m->flags |= M_RX | M_RXEN; + /* + * Only clear the inq, the outq might still have data to drain + * from a previous session + */ + MIDIQ_CLEAR(m->inq); + }; + + if (flags & FWRITE) + m->flags |= M_TX; + + MPU_CALLBACK(m, m->cookie, m->flags); + + MIDI_DEBUG(2, printf("midi_open: opened.\n")); - return md; +err: mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); + return retval; } -/* Create a new midi device info structure. */ -/* TODO: lock md, then exit. */ -mididev_info * -create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf) +int +midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) { - int unit; - mididev_info *md, *mdnew; + struct snd_midi *m = i_dev->si_drv1; + int retval; + int oldflags; - /* XXX */ - if (!midiinfo_mtx_init) { - midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); - TAILQ_INIT(&midi_info); - } + MIDI_DEBUG(1, printf("midi_close %p %s %s\n", td, + flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); - /* As malloc(9) might block, allocate mididev_info now. */ - mdnew = malloc(sizeof(mididev_info), M_DEVBUF, M_WAITOK | M_ZERO); - if (mdnew == NULL) - return NULL; - bcopy(mdinf, mdnew, sizeof(mididev_info)); - bcopy(syninf, &mdnew->synth, sizeof(synthdev_info)); - midibuf_init(&mdnew->midi_dbuf_in); - midibuf_init(&mdnew->midi_dbuf_out); - midibuf_init(&mdnew->midi_dbuf_passthru); - mtx_init(&mdnew->flagqueue_mtx, "midflq", NULL, MTX_DEF); - mtx_init(&mdnew->synth.vc_mtx, "synsvc", NULL, MTX_DEF); - mtx_init(&mdnew->synth.status_mtx, "synsst", NULL, MTX_DEF); + if (m == NULL) + return ENXIO; - mtx_lock(&midiinfo_mtx); + mtx_lock(&m->lock); + mtx_lock(&m->qlock); - switch (type) { - case MDT_MIDI: - mdnew->midiunit = nmidi; - mdnew->synthunit = nmidi; - nmidi++; - break; - case MDT_SYNTH: - mdnew->midiunit = -1; - mdnew->synthunit = nsynth; - nsynth++; - break; - default: - mtx_unlock(&midiinfo_mtx); - midibuf_destroy(&mdnew->midi_dbuf_in); - midibuf_destroy(&mdnew->midi_dbuf_out); - midibuf_destroy(&mdnew->midi_dbuf_passthru); - mtx_destroy(&mdnew->flagqueue_mtx); - mtx_destroy(&mdnew->synth.vc_mtx); - mtx_destroy(&mdnew->synth.status_mtx); - free(mdnew, M_DEVBUF); - panic("unsupported device type"); - return NULL; + if ((flags & FREAD && !(m->flags & M_RX)) || + (flags & FWRITE && !(m->flags & M_TX))) { + retval = ENXIO; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 10 16:46:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69D5E16A41B; Thu, 10 Jan 2008 16:46:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FBE916A419 for ; Thu, 10 Jan 2008 16:46:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14A5513C455 for ; Thu, 10 Jan 2008 16:46:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGkPm4033096 for ; Thu, 10 Jan 2008 16:46:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGkPAj033093 for perforce@freebsd.org; Thu, 10 Jan 2008 16:46:25 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Jan 2008 16:46:25 GMT Message-Id: <200801101646.m0AGkPAj033093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 132972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 16:46:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132972 Change 132972 by jhb@jhb_zion on 2008/01/10 16:45:40 IFC @132970 Affected files ... .. //depot/projects/power/sys/boot/i386/loader/loader.rc#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 10 16:48:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A01C216A469; Thu, 10 Jan 2008 16:48:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6609016A420 for ; Thu, 10 Jan 2008 16:48:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6313413C44B for ; Thu, 10 Jan 2008 16:48:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGmSKF042064 for ; Thu, 10 Jan 2008 16:48:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGmSV5042061 for perforce@freebsd.org; Thu, 10 Jan 2008 16:48:28 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Jan 2008 16:48:28 GMT Message-Id: <200801101648.m0AGmSV5042061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 132973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 16:48:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132973 Change 132973 by jhb@jhb_zion on 2008/01/10 16:47:48 Drop some local diffs. Affected files ... .. //depot/projects/power/sys/dev/fxp/if_fxp.c#10 edit .. //depot/projects/power/sys/dev/fxp/if_fxpvar.h#5 edit .. //depot/projects/power/sys/pci/if_ste.c#13 edit Differences ... ==== //depot/projects/power/sys/dev/fxp/if_fxp.c#10 (text+ko) ==== @@ -1496,9 +1496,6 @@ struct ifnet *ifp = sc->ifp; uint8_t statack; - if (sc->gone) - return; - FXP_LOCK(sc); if (sc->suspended) { FXP_UNLOCK(sc); ==== //depot/projects/power/sys/dev/fxp/if_fxpvar.h#5 (text+ko) ==== @@ -179,7 +179,6 @@ int flags; uint8_t rfa_size; uint32_t tx_cmd; - int gone; }; #define FXP_FLAG_MWI_ENABLE 0x0001 /* MWI enable */ ==== //depot/projects/power/sys/pci/if_ste.c#13 (text+ko) ==== @@ -1001,9 +1001,6 @@ sc = device_get_softc(dev); sc->ste_dev = dev; - mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_DEF | MTX_RECURSE); - /* * Only use one PHY since this chip reports multiple * Note on the DFE-550 the PHY is at 1 on the DFE-580 From owner-p4-projects@FreeBSD.ORG Thu Jan 10 16:55:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7957616A46C; Thu, 10 Jan 2008 16:55:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E89616A419 for ; Thu, 10 Jan 2008 16:55:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BC2E13C459 for ; Thu, 10 Jan 2008 16:55:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGtZAh043427 for ; Thu, 10 Jan 2008 16:55:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGtZqn043424 for perforce@freebsd.org; Thu, 10 Jan 2008 16:55:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 10 Jan 2008 16:55:35 GMT Message-Id: <200801101655.m0AGtZqn043424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 132974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 16:55:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132974 Change 132974 by jhb@jhb_zion on 2008/01/10 16:54:55 Update. Affected files ... .. //depot/projects/power/notes#12 edit Differences ... ==== //depot/projects/power/notes#12 (text+ko) ==== @@ -69,3 +69,15 @@ The second stage will be to make the powering off of devices more automated. This is still in early design stage. It may involve a powerd, it may involve intelligence in the kernel. + +Other stuff: + +- Make the DPMS support in acpi_video a separate driver that attaches to + vgapci0 +- Automated idle device power management + - Basic idea is that when a device is idle for a specified amount of time, + it should power down into D1 or D2. For example, NICs can power down + when they have no link until they get link. Audio controllers can power + down when they aren't open, etc. + - Want to avoid having lots of scaffolding in device drivers. So we need + to come up with some models for some frameworks. From owner-p4-projects@FreeBSD.ORG Thu Jan 10 21:04:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A527716A474; Thu, 10 Jan 2008 21:04:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A92616A418 for ; Thu, 10 Jan 2008 21:04:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F23E13C44B for ; Thu, 10 Jan 2008 21:04:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AL40GJ005613 for ; Thu, 10 Jan 2008 21:04:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AL40YV005610 for perforce@freebsd.org; Thu, 10 Jan 2008 21:04:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 10 Jan 2008 21:04:00 GMT Message-Id: <200801102104.m0AL40YV005610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 21:04:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=132982 Change 132982 by jb@jb_freebsd1 on 2008/01/10 21:03:58 Add a 'D' library script matching the one on Solaris. Install this in /usr/lib/dtrace (which contains the set of D scripts that DTrace loads by default when parsing D scripts). Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#18 edit .. //depot/projects/dtrace/src/cddl/lib/libdtrace/unistd.d#1 add Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#18 (text+ko) ==== @@ -46,8 +46,7 @@ dt_xlator.c \ gmatch.c -DSRCS= errno.d \ - psinfo.d +DSRCS= unistd.d .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common @@ -88,11 +87,11 @@ beforedepend: dt_errtags.c dt_names.c -#beforeinstall: -#.if exists(${DESTDIR}/usr/lib/dtrace) -#.for file in ${DSRCS} -# ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace -#.endfor -#.endif +beforeinstall: +.if exists(${DESTDIR}/usr/lib/dtrace) +.for file in ${DSRCS} + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace +.endfor +.endif .include From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:04:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BEDE16A418; Thu, 10 Jan 2008 23:04:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5B5B16A420 for ; Thu, 10 Jan 2008 23:04:00 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E829013C465 for ; Thu, 10 Jan 2008 23:04:00 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AN40O9028056 for ; Thu, 10 Jan 2008 23:04:00 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AN40Bi028053 for perforce@freebsd.org; Thu, 10 Jan 2008 23:04:00 GMT (envelope-from swise@FreeBSD.org) Date: Thu, 10 Jan 2008 23:04:00 GMT Message-Id: <200801102304.m0AN40Bi028053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=132993 Change 132993 by swise@swise:vic10:iwarp on 2008/01/10 23:03:05 Fixed cxgbtol memdump command. Affected files ... .. //depot/projects/iwarp/usr.sbin/cxgbtool/cxgbtool.c#4 edit Differences ... ==== //depot/projects/iwarp/usr.sbin/cxgbtool/cxgbtool.c#4 (text+ko) ==== @@ -650,6 +650,7 @@ int vers; struct ifconf_regs regs; + regs.len = REGDUMP_SIZE; if ((regs.data = malloc(REGDUMP_SIZE)) == NULL) err(1, "can't malloc"); @@ -1397,7 +1398,7 @@ if (doit(iff_name, CHELSIO_GET_MEM, &mem) < 0) err(1, "memory dump"); - hexdump_8b(mem.addr, (uint64_t *)mem.buf, mem.len >> 3); + hexdump_8b(mem.addr, (uint64_t *)mem.buf, len >> 3); free(mem.buf); return 0; } From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:09:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD24A16A41B; Thu, 10 Jan 2008 23:09:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 919CD16A418 for ; Thu, 10 Jan 2008 23:09:06 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9517E13C465 for ; Thu, 10 Jan 2008 23:09:06 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AN96VC028373 for ; Thu, 10 Jan 2008 23:09:06 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AN96Mc028370 for perforce@freebsd.org; Thu, 10 Jan 2008 23:09:06 GMT (envelope-from swise@FreeBSD.org) Date: Thu, 10 Jan 2008 23:09:06 GMT Message-Id: <200801102309.m0AN96Mc028370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=132994 Change 132994 by swise@swise:vic10:iwarp on 2008/01/10 23:08:37 cleaned up the output of reading /dev/krping - formatting - make stats 32b to save columns Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#3 edit .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping_dev.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#3 (text+ko) ==== @@ -6,14 +6,14 @@ */ struct krping_stats { - unsigned long long send_bytes; - unsigned long long send_msgs; - unsigned long long recv_bytes; - unsigned long long recv_msgs; - unsigned long long write_bytes; - unsigned long long write_msgs; - unsigned long long read_bytes; - unsigned long long read_msgs; + unsigned send_bytes; + unsigned send_msgs; + unsigned recv_bytes; + unsigned recv_msgs; + unsigned write_bytes; + unsigned write_msgs; + unsigned read_bytes; + unsigned read_msgs; }; #define htonll(x) cpu_to_be64((x)) ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping_dev.c#3 (text+ko) ==== @@ -102,10 +102,13 @@ struct krping_cb *cb; int num=1; + uprintf("krping: %4s %10s %10s %10s %10s %10s %10s %10s %10s %10s\n", + "num", "device", "snd bytes", "snd msgs", "rcv bytes", "rcv msgs", + "wr bytes", "wr msgs", "rd bytes", "rd msgs"); mtx_lock(&krping_mutex); TAILQ_FOREACH(cb, &krping_cbs, list) { if (cb->pd) { - uprintf("krping: %d-%s %lld %lld %lld %lld %lld %lld %lld %lld\n", + uprintf("krping: %4d %10s %10u %10u %10u %10u %10u %10u %10u %10u\n", num++, cb->pd->device->name, cb->stats.send_bytes, cb->stats.send_msgs, cb->stats.recv_bytes, cb->stats.recv_msgs, cb->stats.write_bytes, From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:11:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A81F16A468; Thu, 10 Jan 2008 23:11:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0777F16A417 for ; Thu, 10 Jan 2008 23:11:09 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B0C213C45D for ; Thu, 10 Jan 2008 23:11:09 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ANB8gJ028908 for ; Thu, 10 Jan 2008 23:11:08 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ANB8u7028904 for perforce@freebsd.org; Thu, 10 Jan 2008 23:11:08 GMT (envelope-from swise@FreeBSD.org) Date: Thu, 10 Jan 2008 23:11:08 GMT Message-Id: <200801102311.m0ANB8u7028904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:11:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=132995 Change 132995 by swise@swise:vic10:iwarp on 2008/01/10 23:10:49 sge register lock needs to be a spin lock. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#10 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#11 edit .. //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#8 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#10 (text+ko) ==== @@ -471,7 +471,7 @@ snprintf(sc->elmerlockbuf, ADAPTER_LOCK_NAME_LEN, "cxgb elmer lock %d", device_get_unit(dev)); - MTX_INIT(&sc->sge.reg_lock, sc->reglockbuf, NULL, MTX_DEF); + MTX_INIT(&sc->sge.reg_lock, sc->reglockbuf, NULL, MTX_SPIN); MTX_INIT(&sc->mdio_lock, sc->mdiolockbuf, NULL, MTX_DEF); MTX_INIT(&sc->elmer_lock, sc->elmerlockbuf, NULL, MTX_DEF); @@ -2362,7 +2362,7 @@ } case CHELSIO_GET_SGE_CONTEXT: { struct ch_cntxt *ecntxt = (struct ch_cntxt *)data; - mtx_lock(&sc->sge.reg_lock); + mtx_lock_spin(&sc->sge.reg_lock); switch (ecntxt->cntxt_type) { case CNTXT_TYPE_EGRESS: error = t3_sge_read_ecntxt(sc, ecntxt->cntxt_id, @@ -2384,7 +2384,7 @@ error = EINVAL; break; } - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); break; } case CHELSIO_GET_SGE_DESC: { ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_offload.c#11 (text+ko) ==== @@ -313,10 +313,10 @@ struct rdma_cq_op *req = data; /* may be called in any context */ - mtx_lock(&adapter->sge.reg_lock); + mtx_lock_spin(&adapter->sge.reg_lock); ret = t3_sge_cqcntxt_op(adapter, req->id, req->op, req->credits); - mtx_unlock(&adapter->sge.reg_lock); + mtx_unlock_spin(&adapter->sge.reg_lock); break; } case RDMA_GET_MEM: { @@ -342,28 +342,28 @@ case RDMA_CQ_SETUP: { struct rdma_cq_setup *req = data; - mtx_lock(&adapter->sge.reg_lock); + mtx_lock_spin(&adapter->sge.reg_lock); ret = t3_sge_init_cqcntxt(adapter, req->id, req->base_addr, req->size, ASYNC_NOTIF_RSPQ, req->ovfl_mode, req->credits, req->credit_thres); - mtx_unlock(&adapter->sge.reg_lock); + mtx_unlock_spin(&adapter->sge.reg_lock); break; } case RDMA_CQ_DISABLE: - mtx_lock(&adapter->sge.reg_lock); + mtx_lock_spin(&adapter->sge.reg_lock); ret = t3_sge_disable_cqcntxt(adapter, *(unsigned int *)data); - mtx_unlock(&adapter->sge.reg_lock); + mtx_unlock_spin(&adapter->sge.reg_lock); break; case RDMA_CTRL_QP_SETUP: { struct rdma_ctrlqp_setup *req = data; - mtx_lock(&adapter->sge.reg_lock); + mtx_lock_spin(&adapter->sge.reg_lock); ret = t3_sge_init_ecntxt(adapter, FW_RI_SGEEC_START, 0, SGE_CNTXT_RDMA, ASYNC_NOTIF_RSPQ, req->base_addr, req->size, FW_RI_TID_START, 1, 0); - mtx_unlock(&adapter->sge.reg_lock); + mtx_unlock_spin(&adapter->sge.reg_lock); break; } default: ==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_sge.c#8 (text+ko) ==== @@ -1689,9 +1689,9 @@ } for (i = 0; i < SGE_RXQ_PER_SET; ++i) { if (q->fl[i].desc) { - mtx_lock(&sc->sge.reg_lock); + mtx_lock_spin(&sc->sge.reg_lock); t3_sge_disable_fl(sc, q->fl[i].cntxt_id); - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); bus_dmamap_unload(q->fl[i].desc_tag, q->fl[i].desc_map); bus_dmamem_free(q->fl[i].desc_tag, q->fl[i].desc, q->fl[i].desc_map); @@ -1706,9 +1706,9 @@ for (i = 0; i < SGE_TXQ_PER_SET; i++) { if (q->txq[i].desc) { - mtx_lock(&sc->sge.reg_lock); + mtx_lock_spin(&sc->sge.reg_lock); t3_sge_enable_ecntxt(sc, q->txq[i].cntxt_id, 0); - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); bus_dmamap_unload(q->txq[i].desc_tag, q->txq[i].desc_map); bus_dmamem_free(q->txq[i].desc_tag, q->txq[i].desc, @@ -1723,9 +1723,9 @@ } if (q->rspq.desc) { - mtx_lock(&sc->sge.reg_lock); + mtx_lock_spin(&sc->sge.reg_lock); t3_sge_disable_rspcntxt(sc, q->rspq.cntxt_id); - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); bus_dmamap_unload(q->rspq.desc_tag, q->rspq.desc_map); bus_dmamem_free(q->rspq.desc_tag, q->rspq.desc, @@ -2331,7 +2331,7 @@ #endif q->lro.enabled = lro_default; - mtx_lock(&sc->sge.reg_lock); + mtx_lock_spin(&sc->sge.reg_lock); ret = -t3_sge_init_rspcntxt(sc, q->rspq.cntxt_id, irq_vec_idx, q->rspq.phys_addr, q->rspq.size, q->fl[0].buf_size, 1, 0); @@ -2387,7 +2387,7 @@ device_get_unit(sc->dev), irq_vec_idx); MTX_INIT(&q->rspq.lock, q->rspq.lockbuf, NULL, MTX_DEF); - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); t3_update_qset_coalesce(q, p); q->port = pi; @@ -2401,7 +2401,7 @@ return (0); err_unlock: - mtx_unlock(&sc->sge.reg_lock); + mtx_unlock_spin(&sc->sge.reg_lock); err: t3_free_qset(sc, q); From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:12:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF69A16A421; Thu, 10 Jan 2008 23:12:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4DBB16A417 for ; Thu, 10 Jan 2008 23:12:10 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FC0113C43E for ; Thu, 10 Jan 2008 23:12:10 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ANCAdA029304 for ; Thu, 10 Jan 2008 23:12:10 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ANCAuW029301 for perforce@freebsd.org; Thu, 10 Jan 2008 23:12:10 GMT (envelope-from swise@FreeBSD.org) Date: Thu, 10 Jan 2008 23:12:10 GMT Message-Id: <200801102312.m0ANCAuW029301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 132996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=132996 Change 132996 by swise@swise:vic10:iwarp on 2008/01/10 23:11:18 Fixed another idr bug. Affected files ... .. //depot/projects/iwarp/sys/sys/linux_compat.h#11 edit Differences ... ==== //depot/projects/iwarp/sys/sys/linux_compat.h#11 (text+ko) ==== @@ -112,8 +112,9 @@ struct idr *i; for (i=idp->next;i;i=i->next) - if (i->key > newid) - newid = i->key; + if (i->key == newid) + return -EEXIST; + i=malloc(sizeof(struct idr),M_TEMP,M_WAITOK); i->key=newid; i->value=ptr; From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:45:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8743416A46E; Thu, 10 Jan 2008 23:45:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CE0516A46B for ; Thu, 10 Jan 2008 23:45:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5650813C4DD for ; Thu, 10 Jan 2008 23:45:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ANjjw1039200 for ; Thu, 10 Jan 2008 23:45:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ANjjJ7039197 for perforce@freebsd.org; Thu, 10 Jan 2008 23:45:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 10 Jan 2008 23:45:45 GMT Message-Id: <200801102345.m0ANjjJ7039197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132998 Change 132998 by hselasky@hselasky_laptop001 on 2008/01/10 23:45:24 To be able to fully support the BUS-DMA system on NetBSD we need to make some small changes which are about returning "struct usbd_dma_tag *" instead of "bus_dma_tag_t" so that we get access to the elements of "struct usbd_dma_tag" and can store some temporary stuff there. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#84 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#95 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#84 (text+ko) ==== @@ -2219,8 +2219,9 @@ * NOTE: If the "align" parameter has a value of 1 the DMA-tag will * allow multi-segment mappings. Else all mappings are single-segment. *------------------------------------------------------------------------*/ -bus_dma_tag_t -usbd_dma_tag_create(bus_dma_tag_t tag_parent, uint32_t size, uint32_t align) +void +usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, + uint32_t size, uint32_t align) { bus_dma_tag_t tag; @@ -2242,16 +2243,17 @@ &tag)) { tag = NULL; } - return (tag); + udt->tag = tag; + return; } /*------------------------------------------------------------------------* * usbd_dma_tag_free - free a DMA tag *------------------------------------------------------------------------*/ void -usbd_dma_tag_destroy(bus_dma_tag_t tag) +usbd_dma_tag_destroy(struct usbd_dma_tag *udt) { - bus_dma_tag_destroy(tag); + bus_dma_tag_destroy(udt->tag); return; } @@ -2345,10 +2347,13 @@ } } /* get the correct DMA tag */ - tag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); - if (tag == NULL) { + utag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); + if (utag == NULL) { goto error; } + /* get the DMA tag */ + tag = utag->tag; + /* allocate memory */ if (bus_dmamem_alloc (tag, &ptr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT), &map)) { @@ -2466,6 +2471,7 @@ usbd_pc_dmamap_create(struct usbd_page_cache *pc, uint32_t size) { struct usbd_memory_info *info; + struct usbd_dma_tag *utag; bus_dma_tag_t tag; /* sanity check */ @@ -2475,11 +2481,15 @@ info = pc->xfer->usb_root; tag = pc->xfer->udev->bus->dma_tag_parent; - tag = usbd_dma_tag_setup(tag, info->dma_tag_p, + utag = usbd_dma_tag_setup(tag, info->dma_tag_p, size, 1, info->dma_tag_max); - if (tag == NULL) { + if (utag == NULL) { goto error; } + /* get the DMA tag */ + tag = utag->tag; + + /* create DMA map */ if (bus_dmamap_create(tag, 0, &(pc->map))) { goto error; } @@ -3145,7 +3155,7 @@ /*------------------------------------------------------------------------* * usbd_bus_tag_setup - factored out code *------------------------------------------------------------------------*/ -bus_dma_tag_t +struct usbd_dma_tag * usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align, uint8_t nudt) { @@ -3155,17 +3165,16 @@ while (nudt--) { if (udt->align == 0) { - udt->tag = - usbd_dma_tag_create(tag_parent, size, align); + usbd_dma_tag_create(tag_parent, udt, size, align); if (udt->tag == NULL) { return (NULL); } udt->align = align; udt->size = size; - return (udt->tag); + return (udt); } if ((udt->align == align) && (udt->size == size)) { - return (udt->tag); + return (udt); } udt++; } @@ -3181,7 +3190,7 @@ while (nudt--) { if (udt->align) { - usbd_dma_tag_destroy(udt->tag); + usbd_dma_tag_destroy(udt); udt->align = 0; } udt++; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#95 (text+ko) ==== @@ -248,16 +248,17 @@ bus_dma_tag_t tag; bus_dmamap_t map; #endif - #ifdef __NetBSD__ - bus_dma_segment_t seg; bus_dma_tag_t tag; bus_dmamap_t map; - int32_t seg_count; + bus_dma_segment_t *p_seg; #endif struct usbd_page *page_start; struct usbd_xfer *xfer; /* if set, backpointer to USB transfer */ void *buffer; /* virtual buffer pointer */ +#ifdef __NetBSD__ + int n_seg; +#endif uint32_t page_offset_buf; uint32_t page_offset_end; uint8_t isread:1; @@ -323,9 +324,15 @@ }; struct usbd_dma_tag { +#ifdef __NetBSD__ + bus_dma_segment_t *p_seg; +#endif bus_dma_tag_t tag; uint32_t align; uint32_t size; +#ifdef __NetBSD__ + uint32_t n_seg; +#endif }; /* USB BUS explore commands */ @@ -856,8 +863,8 @@ int usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len); void usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len); -bus_dma_tag_t usbd_dma_tag_create(bus_dma_tag_t tag_parent, uint32_t size, uint32_t align); -void usbd_dma_tag_destroy(bus_dma_tag_t tag); +void usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align); +void usbd_dma_tag_destroy(struct usbd_dma_tag *udt); uint8_t usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, uint32_t align, uint8_t utag_max); void usbd_pc_free_mem(struct usbd_page_cache *pc); void usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size); @@ -877,7 +884,7 @@ struct mbuf *usbd_ether_get_mbuf(void); int32_t device_delete_all_children(device_t dev); uint16_t usbd_isoc_time_expand(struct usbd_bus *bus, uint16_t isoc_time_curr); -bus_dma_tag_t usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align, uint8_t nudt); +struct usbd_dma_tag *usbd_dma_tag_setup(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, uint32_t size, uint32_t align, uint8_t nudt); void usbd_dma_tag_unsetup(struct usbd_dma_tag *udt, uint8_t nudt); void usbd_bus_mem_flush_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); uint8_t usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); From owner-p4-projects@FreeBSD.ORG Thu Jan 10 23:55:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F7A116A420; Thu, 10 Jan 2008 23:55:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D90C616A41A for ; Thu, 10 Jan 2008 23:55:56 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E53EB13C45B for ; Thu, 10 Jan 2008 23:55:56 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ANtuep040669 for ; Thu, 10 Jan 2008 23:55:56 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ANtuAJ040666 for perforce@freebsd.org; Thu, 10 Jan 2008 23:55:56 GMT (envelope-from swise@FreeBSD.org) Date: Thu, 10 Jan 2008 23:55:56 GMT Message-Id: <200801102355.m0ANtuAJ040666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2008 23:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=133000 Change 133000 by swise@swise:vic10:iwarp on 2008/01/10 23:55:35 Fixed genpoll allocator. It wasn't correctly computing the address to return. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#7 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#7 (text+ko) ==== @@ -255,7 +255,7 @@ if (blkno == SWAPBLK_NONE) return (0); - return (gp->gen_base + blkno); + return (gp->gen_base + ((1 << gp->gen_chunk_shift) * blkno)); } #define cxio_wait(ctx, lockp, cond) \ @@ -281,7 +281,7 @@ daddr_t blkno; chunks = size >> gp->gen_chunk_shift; - blkno = address - gp->gen_base; + blkno = (address - gp->gen_base) / (1 << gp->gen_chunk_shift); blist_free(gp->gen_list, blkno, chunks); } From owner-p4-projects@FreeBSD.ORG Fri Jan 11 00:45:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FB1B16A4CA; Fri, 11 Jan 2008 00:45:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 890FF16A46D for ; Fri, 11 Jan 2008 00:45:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B03413C46B for ; Fri, 11 Jan 2008 00:45:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B0jtDa049298 for ; Fri, 11 Jan 2008 00:45:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B0jt5Y049295 for perforce@freebsd.org; Fri, 11 Jan 2008 00:45:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 11 Jan 2008 00:45:55 GMT Message-Id: <200801110045.m0B0jt5Y049295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 133006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 00:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=133006 Change 133006 by hselasky@hselasky_laptop001 on 2008/01/11 00:45:51 This commit only affects code that compiles on NetBSD platforms. Update BUS-DMA code for NetBSD. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#85 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#85 (text+ko) ==== @@ -2522,97 +2522,260 @@ #ifdef __NetBSD__ -bus_dma_tag_t -usbd_dma_tag_alloc(bus_dma_tag_t parent, uint32_t seg_size, - uint32_t alignment, uint32_t max_size, uint8_t single_seg) +/*------------------------------------------------------------------------* + * usbd_dma_tag_create - allocate a DMA tag + * + * NOTE: If the "align" parameter has a value of 1 the DMA-tag will + * allow multi-segment mappings. Else all mappings are single-segment. + *------------------------------------------------------------------------*/ +void +usbd_dma_tag_create(bus_dma_tag_t tag_parent, struct usbd_dma_tag *udt, + uint32_t size, uint32_t align) { - /* FreeBSD specific */ - return (parent); + uint32_t nseg; + + if (align == 1) { + nseg = (2 + (size / USB_PAGE_SIZE)); + } else { + nseg = 1; + } + + udt->p_seg = malloc(nseg * sizeof(*(udt->p_seg)), + M_USB, M_WAITOK | M_ZERO); + + if (udt->p_seg == NULL) { + return; + } + udt->tag = tag_parent; + udt->n_seg = nseg; + return; } +/*------------------------------------------------------------------------* + * usbd_dma_tag_free - free a DMA tag + *------------------------------------------------------------------------*/ void -usbd_dma_tag_free(bus_dma_tag_t tag) +usbd_dma_tag_destroy(struct usbd_dma_tag *udt) +{ + free(udt->p_seg, M_USB); + return; +} + +/*------------------------------------------------------------------------* + * usbd_pc_alloc_mem_cb + *------------------------------------------------------------------------*/ +static void +usbd_pc_alloc_mem_cb(struct usbd_page_cache *pc, bus_dma_segment_t *segs, + int nseg, int error) { - /* FreeBSD specific */ + struct usbd_xfer *xfer; + struct usbd_page *pg; + uint32_t rem; + uint8_t owned; + + xfer = pc->xfer; + + /* + * XXX There is sometimes recursive locking here. + * XXX We should try to find a better solution. + * XXX Until further the "owned" variable does + * XXX the trick. + */ + + if (error) { + if (xfer) { + owned = mtx_owned(xfer->priv_mtx); + if (!owned) + mtx_lock(xfer->priv_mtx); + xfer->usb_root->dma_error = 1; + usbd_bdma_done_event(xfer->usb_root); + if (!owned) + mtx_unlock(xfer->priv_mtx); + } + return; + } + pg = pc->page_start; + pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); + rem = segs->ds_addr & (USB_PAGE_SIZE - 1); + pc->page_offset_buf = rem; + pc->page_offset_end += rem; + nseg--; + + while (nseg > 0) { + nseg--; + segs++; + pg++; + pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); + } + + if (xfer) { + owned = mtx_owned(xfer->priv_mtx); + if (!owned) + mtx_lock(xfer->priv_mtx); + usbd_bdma_done_event(xfer->usb_root); + if (!owned) + mtx_unlock(xfer->priv_mtx); + } return; } -void * -usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, - uint32_t size, uint32_t alignment) +/*------------------------------------------------------------------------* + * usbd_pc_alloc_mem - allocate DMA'able memory + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +uint8_t +usbd_pc_alloc_mem(bus_dma_tag_t parent_tag, struct usbd_dma_tag *utag, + struct usbd_page_cache *pc, struct usbd_page *pg, uint32_t size, + uint32_t align, uint8_t utag_max) { caddr_t ptr = NULL; + bus_dma_tag_t tag; + bus_dmamap_t map; + int seg_count; - page->tag = tag; - page->seg_count = 1; + if (align != 1) { + /* + * The alignment must be greater or equal to the + * "size" else the object can be split between two + * memory pages and we get a problem! + */ + while (align < size) { + align *= 2; + if (align == 0) { + goto done_5; + } + } + } + /* get the correct DMA tag */ + utag = usbd_dma_tag_setup(parent_tag, utag, size, align, utag_max); + if (utag == NULL) { + goto done_5; + } + /* get the DMA tag */ + tag = utag->tag; - if (bus_dmamem_alloc(page->tag, size, alignment, 0, - &page->seg, 1, - &page->seg_count, BUS_DMA_WAITOK)) { + if (bus_dmamem_alloc(tag, size, align, 0, utag->p_seg, + utag->n_seg, &seg_count, BUS_DMA_WAITOK)) { goto done_4; } - if (bus_dmamem_map(page->tag, &page->seg, page->seg_count, size, + if (bus_dmamem_map(tag, utag->p_seg, seg_count, size, &ptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT)) { goto done_3; } - if (bus_dmamap_create(page->tag, size, 1, size, - 0, BUS_DMA_WAITOK, &page->map)) { + if (bus_dmamap_create(tag, size, utag->n_seg, USB_PAGE_SIZE, + 0, BUS_DMA_WAITOK, &map)) { goto done_2; } - if (bus_dmamap_load(page->tag, page->map, ptr, size, NULL, + if (bus_dmamap_load(tag, map, ptr, size, NULL, BUS_DMA_WAITOK)) { goto done_1; } - page->physaddr = page->map->dm_segs[0].ds_addr; - page->buffer = ptr; - page->length = size; + pc->p_seg = malloc(seg_count * sizeof(*(pc->p_seg)), + M_USB, M_WAITOK | M_ZERO); + if (pc->p_seg == NULL) { + goto done_0; + } + /* store number if actual segments used */ + pc->n_seg = seg_count; + + /* make a copy of the segments */ + bcopy(utag->p_seg, pc->p_seg, + seg_count * sizeof(*(pc->p_seg))); + + /* setup page cache */ + pc->buffer = ptr; + pc->page_start = pg; + pc->page_offset_buf = 0; + pc->page_offset_end = size; + pc->map = map; + pc->tag = tag; + + usbd_pc_alloc_mem_cb(pc, utag->p_seg, seg_count, 0); - usbd_page_cpu_invalidate(page); bzero(ptr, size); - usbd_page_cpu_flush(page); + + usbd_pc_cpu_flush(pc); -#ifdef USB_DEBUG - if (usbdebug > 14) { - printf("%s: %p, %d bytes, phys=%p\n", - __FUNCTION__, ptr, size, - ((char *)0) + page->physaddr); - } -#endif - return (ptr); + return (0); +done_0: + bus_dmamap_unload(tag, map); done_1: - bus_dmamap_destroy(page->tag, page->map); - + bus_dmamap_destroy(tag, map); done_2: - bus_dmamem_unmap(page->tag, ptr, size); - + bus_dmamem_unmap(tag, ptr, size); done_3: - bus_dmamem_free(page->tag, &page->seg, page->seg_count); + bus_dmamem_free(tag, utag->p_seg, seg_count); +done_4: + /* utag is destroyed later */ +done_5: + /* reset most of the page cache */ + pc->buffer = NULL; + pc->page_start = NULL; + pc->page_offset_buf = 0; + pc->page_offset_end = 0; + pc->map = NULL; + pc->tag = NULL; + pc->n_seg = 0; + pc->p_seg = NULL; + return (1); +} -done_4: - return (NULL); +/*------------------------------------------------------------------------* + * usbd_pc_free_mem - free DMA memory + * + * This function is NULL safe. + *------------------------------------------------------------------------*/ +void +usbd_pc_free_mem(struct usbd_page_cache *pc) +{ + if (pc && pc->buffer) { + bus_dmamap_unload(pc->tag, pc->map); + bus_dmamap_destroy(pc->tag, pc->map); + bus_dmamem_unmap(pc->tag, pc->buffer, + pc->page_offset_end - pc->page_offset_buf); + bus_dmamem_free(pc->tag, pc->p_seg, pc->n_seg); + free(pc->p_seg, M_USB); + pc->buffer = NULL; + } + return; } +/*------------------------------------------------------------------------* + * usbd_pc_load_mem - load virtual memory into DMA + *------------------------------------------------------------------------*/ void -usbd_mem_free_sub(struct usbd_page *page) +usbd_pc_load_mem(struct usbd_page_cache *pc, uint32_t size) { - /* - * NOTE: make a copy of "tag", "map", and "buffer" in case "page" is - * part of the allocated memory: - */ - struct usbd_page temp = *page; + int error; + + /* sanity check */ + if (pc->xfer == NULL) { + panic("This page cache is not loadable!\n"); + return; + } + /* setup page cache */ + pc->page_offset_buf = 0; + pc->page_offset_end = size; + + if (size > 0) { + + pc->xfer->usb_root->dma_refcount++; - bus_dmamap_unload(temp.tag, temp.map); - bus_dmamap_destroy(temp.tag, temp.map); - bus_dmamem_unmap(temp.tag, temp.buffer, temp.length); - bus_dmamem_free(temp.tag, &temp.seg, temp.seg_count); + /* try to load memory into DMA */ + if (bus_dmamap_load(pc->tag, pc->map, pc->buffer, + size, NULL, BUS_DMA_NOWAIT)) { + error = ENOMEM; + } else { + error = 0; + } -#ifdef USB_DEBUG - if (usbdebug > 14) { - printf("%s: %p\n", - __FUNCTION__, temp.buffer); + usbd_pc_alloc_mem_cb(pc, pc->map->dm_segs, + pc->map->dm_nsegs, error); } -#endif return; } @@ -2641,11 +2804,70 @@ len = pc->page_offset_end - pc->page_offset_buf; - bus_dmamap_sync(page->tag, page->map, 0, len, + bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return; } +/*------------------------------------------------------------------------* + * usbd_pc_dmamap_create + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +uint8_t +usbd_pc_dmamap_create(struct usbd_page_cache *pc, uint32_t size) +{ + struct usbd_memory_info *info; + struct usbd_dma_tag *utag; + bus_dma_tag_t tag; + + /* sanity check */ + if (pc->xfer == NULL) { + goto error; + } + info = pc->xfer->usb_root; + tag = pc->xfer->udev->bus->dma_tag_parent; + + utag = usbd_dma_tag_setup(tag, info->dma_tag_p, + size, 1, info->dma_tag_max); + if (utag == NULL) { + goto error; + } + if (bus_dmamap_create(utag->tag, size, utag->n_seg, + USB_PAGE_SIZE, 0, BUS_DMA_WAITOK, &(pc->map))) { + goto error; + } + pc->tag = utag->tag; + pc->p_seg = utag->p_seg; + pc->n_seg = utag->n_seg; + return 0; /* success */ + +error: + pc->map = NULL; + pc->tag = NULL; + pc->p_seg = NULL; + pc->n_seg = 0; + return 1; /* failure */ +} + +/*------------------------------------------------------------------------* + * usbd_pc_dmamap_destroy + * + * This function is NULL safe. + *------------------------------------------------------------------------*/ +void +usbd_pc_dmamap_destroy(struct usbd_page_cache *pc) +{ + if (pc && pc->tag) { + bus_dmamap_destroy(pc->tag, pc->map); + pc->tag = NULL; + pc->map = NULL; + } + return; +} + #endif /*------------------------------------------------------------------------* From owner-p4-projects@FreeBSD.ORG Fri Jan 11 01:47:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2965A16A421; Fri, 11 Jan 2008 01:47:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCD2A16A41A for ; Fri, 11 Jan 2008 01:47:05 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0003113C4CC for ; Fri, 11 Jan 2008 01:47:05 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B1l5VR068050 for ; Fri, 11 Jan 2008 01:47:05 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B1l5Ok068042 for perforce@freebsd.org; Fri, 11 Jan 2008 01:47:05 GMT (envelope-from andre@freebsd.org) Date: Fri, 11 Jan 2008 01:47:05 GMT Message-Id: <200801110147.m0B1l5Ok068042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 01:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=133007 Change 133007 by andre@andre_flirtbox on 2008/01/11 01:47:04 Initial branch and import of new TCP reassembly queue. It's primarily a code dump. It compiles, doesn't crash and almost works as advertized. Finish will come tomorrow. Description is at the top of the file. Lots of comments inline. It seems TAILQ_LAST() doesn't work as described in its man page. Won't return NULL when queue is empty but instead crashes on NULL pointer dereferencing. I can't really really believe I'm the first one to trip over this. Must have done something wrong. Affected files ... .. //depot/projects/tcp_reass/sys/Makefile#1 branch .. //depot/projects/tcp_reass/sys/amd64/Makefile#1 branch .. //depot/projects/tcp_reass/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/io.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/support.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/MAC#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/Makefile#1 branch .. //depot/projects/tcp_reass/sys/amd64/conf/NOTES#1 branch .. //depot/projects/tcp_reass/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/_bus.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/_limits.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/_types.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/asm.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/atomic.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/bus.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/clock.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/cpu.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/elf.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/endian.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/exec.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/float.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/fpu.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/frame.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/iodev.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/kdb.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/limits.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/md_var.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/memdev.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/metadata.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/minidump.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/mptable.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/mutex.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/param.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pcb.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pmap.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/proc.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/profile.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/psl.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/reg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/reloc.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/resource.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/runq.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/segments.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/signal.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/smp.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/stack.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/trap.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/tss.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/varargs.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/clock.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/icu.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/isa.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/isa.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/tcp_reass/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/tcp_reass/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/tcp_reass/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/blockio.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/copystr.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/disassem.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/exception.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/fiq.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/fusu.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/genassym.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/inckern.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/intr.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/locore.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/mem.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/nexus.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/pmap.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/setstack.s#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/support.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/swtch.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/trap.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/undefined.c#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/vectors.S#1 branch .. //depot/projects/tcp_reass/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/at91var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/files.at91#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/std.at91#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/tcp_reass/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/tcp_reass/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/AVILA#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/BWCT#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/CRB#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/EP80219#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/HL200#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/IQ31244#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/KB920X#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/SIMICS#1 branch .. //depot/projects/tcp_reass/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/tcp_reass/sys/arm/include/_bus.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/_limits.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/_stdint.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/_types.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/armreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/asm.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/asmacros.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/atomic.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/blockio.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/bus.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/clock.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/cpu.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/disassem.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/elf.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/endian.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/exec.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/fiq.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/float.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/fp.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/frame.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/ieee.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/intr.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/katelib.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/kdb.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/limits.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/machdep.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/md_var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/memdev.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/metadata.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/mutex.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/param.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/pcb.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/pcpu.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/pmap.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/proc.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/profile.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/psl.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/pte.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/ptrace.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/reloc.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/resource.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/runq.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/setjmp.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/sigframe.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/signal.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/smp.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/stack.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/stdarg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/swi.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/sysarch.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/trap.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/ucontext.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/undefined.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/utrap.h#1 branch .. //depot/projects/tcp_reass/sys/arm/include/vmparam.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/tcp_reass/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/tcp_reass/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/tcp_reass/sys/boot/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/README#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/tcp_reass/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/tcp_reass/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/common/bcache.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/boot.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/tcp_reass/sys/boot/common/commands.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/console.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/dev_net.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/dev_net.h#1 branch .. //depot/projects/tcp_reass/sys/boot/common/devopen.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/help.common#1 branch .. //depot/projects/tcp_reass/sys/boot/common/interp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/isapnp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/isapnp.h#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/loader.8#1 branch .. //depot/projects/tcp_reass/sys/boot/common/ls.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/tcp_reass/sys/boot/common/misc.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/module.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/newvers.sh#1 branch .. //depot/projects/tcp_reass/sys/boot/common/panic.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/pnp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/tcp_reass/sys/boot/common/ufsread.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/README#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/tcp_reass/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/dict.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/float.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/loader.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/math64.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/math64.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/search.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/stack.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/tools.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/unix.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/vm.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ficl/words.c#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/frames.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/loader.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/loader.conf#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/loader.rc#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/screen.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/forth/support.4th#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/loader/version#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/tcp_reass/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/efi/version#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ia64/ski/version#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/tcp_reass/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/tcp_reass/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/tcp_reass/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/tcp_reass/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/tcp_reass/sys/bsm/audit.h#1 branch .. //depot/projects/tcp_reass/sys/bsm/audit_internal.h#1 branch .. //depot/projects/tcp_reass/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/tcp_reass/sys/bsm/audit_record.h#1 branch .. //depot/projects/tcp_reass/sys/cam/README.quirks#1 branch .. //depot/projects/tcp_reass/sys/cam/cam.c#1 branch .. //depot/projects/tcp_reass/sys/cam/cam.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_ccb.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_debug.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_periph.c#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_periph.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_queue.c#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_queue.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_sim.c#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_sim.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_xpt.c#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_xpt.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/tcp_reass/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/tcp_reass/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/tcp_reass/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/tcp_reass/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/tcp_reass/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/tcp_reass/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/tcp_reass/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/tcp_reass/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/tcp_reass/sys/compat/opensolaris/sys/dirent.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 02:16:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ACF416A420; Fri, 11 Jan 2008 02:16:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE3C16A419 for ; Fri, 11 Jan 2008 02:16:36 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id AC4CD13C457 for ; Fri, 11 Jan 2008 02:16:35 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 56540 invoked from network); 11 Jan 2008 01:40:19 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 11 Jan 2008 01:40:19 -0000 Message-ID: <4786D187.9000600@freebsd.org> Date: Fri, 11 Jan 2008 03:16:39 +0100 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.14 (Windows/20071210) MIME-Version: 1.0 To: perforce@freebsd.org References: <200801110147.m0B1l5Ok068042@repoman.freebsd.org> In-Reply-To: <200801110147.m0B1l5Ok068042@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: Re: PERFORCE change 133007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 02:16:36 -0000 Andre Oppermann wrote: > http://perforce.freebsd.org/chv.cgi?CH=133007 > > Change 133007 by andre@andre_flirtbox on 2008/01/11 01:47:04 > > Initial branch and import of new TCP reassembly queue. > > It's primarily a code dump. It compiles, doesn't crash and > almost works as advertized. Finish will come tomorrow. > > Description is at the top of the file. Lots of comments > inline. > > It seems TAILQ_LAST() doesn't work as described in its > man page. Won't return NULL when queue is empty but instead > crashes on NULL pointer dereferencing. I can't really really > believe I'm the first one to trip over this. Must have done > something wrong. > > Affected files ... Damn, didn't know I'd have to do a p4 submit to actually create the branch. Now my changes are already mixed into the branch changeset. Modified files are: netinet/tcp_reass.c netinet/tcp_input.c netinet/tcp_subr.c netinet/tcp_var.h netinet/tcp_usrreq.c sys/queue.h netinet/ip_fw.h netinet/ip_fw2.h netinet/src-usr-sbin-ipfw-ipfw2.c.diff The latter is a new function to ipfw that truncates tcp segments. Currently it only truncates from the tail and doesn't update the checksum. That doesn't matter for packets that go to a local socket but won't work for packets transiting through the box. Truncation from the head is planned too. Already now it makes a good tool for testing of the reassembly queue, SACK and other code that must deal with weird segments. Testing with truncated segments exercises much more code than simply dropping packets. Now it's already 3am here and I'm very tired. More code and fixes tomorrow. -- Andre From owner-p4-projects@FreeBSD.ORG Fri Jan 11 02:23:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 546F416A419; Fri, 11 Jan 2008 02:23:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1780416A420 for ; Fri, 11 Jan 2008 02:23:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17DED13C442 for ; Fri, 11 Jan 2008 02:23:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B2Niit080840 for ; Fri, 11 Jan 2008 02:23:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B2NiDU080837 for perforce@freebsd.org; Fri, 11 Jan 2008 02:23:44 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 02:23:44 GMT Message-Id: <200801110223.m0B2NiDU080837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 02:23:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=133008 Change 133008 by jb@jb_freebsd1 on 2008/01/11 02:23:36 Re-hash the design of this test system. DTrace tests are added to the test suit by Solaris developers when they solve problems which require a regression test. Our integration procedure sucks in the entire test suite tree, so new tests appears as added files to FreeBSD. We need to use those automatically rather than expecting to add them to our test Makefile manually. The new design of this Makefile attempts to determine the tests to run by searching for them at runtime. We assume that the layout is maintained, with each group of tests in a directory below the 'common' one. (We'll deal with the arch-specific tests later). New groups of tests can be added in Solaris and we'll discover them automatically here. Since the Solaris tests have the prefix "tst." fot tests that are supposed to complete without error; and "err." for tests that are expected to return an error; we can find them pretty easily. The problem comes when some tests can't work on FreeBSD by design. For these we may choose to edit the Solaris source into a FreeBSD compatible test, or we may need to flag the test as IGNOREd on FreeBSD. At the moment there are a lot of tests that just don't work on FreeBSD, so they are listed as IGNORE. I've added specific comments to some that just won't work, as opposed to those that should be made to work, but don't "yet". Affected files ... .. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#9 edit Differences ... ==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#9 (text+ko) ==== @@ -3,1398 +3,455 @@ TESTSRCDIR= ${.CURDIR}/../../../contrib/opensolaris/cmd/dtrace/test DTEST= ${TESTSRCDIR}/cmd/scripts/dtest.pl -# Tests that should work: - -TESTAGGS= \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_FUNC.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_MDIM.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_NULL.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_REDEF.redef.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_CLEAR_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_FUNC_IDENT.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey1.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey2.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MATCHBASE.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MATCHLIM.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d \ - ${TESTSRCDIR}/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.allquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.avg.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clear.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearavg.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearavg2.d \ +IGNORE= \ + ${TESTSRCDIR}/tst/common/aggs/err.D_KEY_TYPE.badkey4.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.allquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.avg.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clear.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearavg.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearavg2.d \ ${TESTSRCDIR}/tst/common/aggs/tst.cleardenormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearlquantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.clearnormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.count.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.count2.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.count3.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.denormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.denormalizeonly.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.fmtnormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.forms.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.goodkey.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.keysort.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantnormal.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantrange.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.lquantround.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.max.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.min.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs1.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs2.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs3.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.multinormalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negtrunc.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.negtruncquant.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.normalize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.order.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantize.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantmany.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.quantround.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.sum.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.trunc.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.trunc0.d \ - ${TESTSRCDIR}/tst/common/aggs/tst.truncquant.d + ${TESTSRCDIR}/tst/common/aggs/tst.clearlquantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.clearnormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.count.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.count2.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.denormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.denormalizeonly.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.fmtnormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.forms.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.keysort.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantnormal.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantrange.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantround.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.lquantzero.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.max.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.min.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs2.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multiaggs3.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.multinormalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.neglquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negorder.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negtrunc.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.negtruncquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.normalize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.order.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantize.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantmany.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantround.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.quantzero.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.signedkeys.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.signedkeyspos.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.subr.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.sum.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.trunc.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.trunc0.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.truncquant.d \ + ${TESTSRCDIR}/tst/common/aggs/tst.valsortkeypos.d \ + ${TESTSRCDIR}/tst/common/arrays/tst.uregsarray.d \ + ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ + ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ + ${TESTSRCDIR}/tst/common/assocs/tst.orthogonality.d \ + ${TESTSRCDIR}/tst/common/buffering/err.end.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize1.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize2.d \ + ${TESTSRCDIR}/tst/common/buffering/err.resize3.d \ + ${TESTSRCDIR}/tst/common/buffering/err.zerobuf.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.alignring.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.dynvarsize.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.fill1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize2.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.resize3.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring1.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring2.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.ring3.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.smallring.d \ + ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.hpriority.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.lwpsinfo1.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.psinfo1.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DBLERROR.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPEC.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d \ + ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \ + ${TESTSRCDIR}/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoofew.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.motoomany.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d \ + ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoa6badaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntoabadaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadaddr.d \ + ${TESTSRCDIR}/tst/common/funcs/err.inet_ntopbadarg.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.bcopy.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.copyin.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.copyinto.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.ddi_pathname.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.hton.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntoa6.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.inet_ntop.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owned.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_owner.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.mutex_type_adaptive.d \ + ${TESTSRCDIR}/tst/common/funcs/tst.progenyof.d \ + ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineDataAssign.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineExpression.d \ + ${TESTSRCDIR}/tst/common/inline/tst.InlineTypedef.d \ + ${TESTSRCDIR}/tst/common/io/tst.fds.d \ + ${TESTSRCDIR}/tst/common/java_api/manifest/test.jar-manifest \ + ${TESTSRCDIR}/tst/common/java_api/src/TestAbort.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestBean.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestClose.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestDrop.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestEnable.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestFunctionLookup.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestMaxConsumers.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestMultiAggPrinta.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestProbeData.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestProbeDescription.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestStateMachine.java \ + ${TESTSRCDIR}/tst/common/java_api/src/TestStopLock.java \ + ${TESTSRCDIR}/tst/common/java_api/tst.printa.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_CHR_NL.char.d \ + ${TESTSRCDIR}/tst/common/lexer/err.D_STR_NL.string.d \ + ${TESTSRCDIR}/tst/common/misc/tst.dynopt.d \ + ${TESTSRCDIR}/tst/common/misc/tst.roch.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.many.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.same.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.sort.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.sortpos.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.tuplecompat.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.zero.d \ + ${TESTSRCDIR}/tst/common/multiaggs/tst.zero2.d \ + ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badlib.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PDESC_ZERO.badproc1.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_BADPID.badproc2.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_CREATEFAIL.many.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_FUNC.badfunc.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_FUNC.badfunc.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_LIB.libdash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_LIB.libdash.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.alldash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.alldash.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.badname.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.badname.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.globdash.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_NAME.globdash.exe \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_OFF.toobig.d \ + ${TESTSRCDIR}/tst/common/pid/err.D_PROC_OFF.toobig.exe \ + ${TESTSRCDIR}/tst/common/pid/tst.args1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.coverage.d \ + ${TESTSRCDIR}/tst/common/pid/tst.coverage.exe \ + ${TESTSRCDIR}/tst/common/pid/tst.emptystack.d \ + ${TESTSRCDIR}/tst/common/pid/tst.emptystack.exe \ + ${TESTSRCDIR}/tst/common/pid/tst.float.d \ + ${TESTSRCDIR}/tst/common/pid/tst.fork.d \ + ${TESTSRCDIR}/tst/common/pid/tst.gcc.d \ + ${TESTSRCDIR}/tst/common/pid/tst.ret1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.ret2.d \ + ${TESTSRCDIR}/tst/common/pid/tst.vfork.d \ + ${TESTSRCDIR}/tst/common/pid/tst.weak1.d \ + ${TESTSRCDIR}/tst/common/pid/tst.weak2.d \ + ${TESTSRCDIR}/tst/common/plockstat/tst.available.d \ + ${TESTSRCDIR}/tst/common/plockstat/tst.available.exe \ + ${TESTSRCDIR}/tst/common/plockstat/tst.libmap.d \ + ${TESTSRCDIR}/tst/common/plockstat/tst.libmap.exe \ + ${TESTSRCDIR}/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.GlobalVar.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic1.d \ + ${TESTSRCDIR}/tst/common/pointers/tst.basic2.d \ + ${TESTSRCDIR}/tst/common/predicates/tst.argsnotcached.d \ + ${TESTSRCDIR}/tst/common/printa/tst.basics.d \ + ${TESTSRCDIR}/tst/common/printa/tst.def.d \ + ${TESTSRCDIR}/tst/common/printa/tst.dynwidth.d \ + ${TESTSRCDIR}/tst/common/printa/tst.fmt.d \ + ${TESTSRCDIR}/tst/common/printa/tst.many.d \ + ${TESTSRCDIR}/tst/common/printa/tst.manyval.d \ + ${TESTSRCDIR}/tst/common/printa/tst.stack.d \ + ${TESTSRCDIR}/tst/common/printa/tst.tuple.d \ + ${TESTSRCDIR}/tst/common/printf/tst.basics.d \ + ${TESTSRCDIR}/tst/common/printf/tst.str.d \ + ${TESTSRCDIR}/tst/common/printf/tst.sym.d \ + ${TESTSRCDIR}/tst/common/proc/tst.sigwait.d \ + ${TESTSRCDIR}/tst/common/raise/tst.raise1.d \ + ${TESTSRCDIR}/tst/common/raise/tst.raise2.d \ + ${TESTSRCDIR}/tst/common/raise/tst.raise3.d \ + ${TESTSRCDIR}/tst/common/rates/tst.aggrate.d \ + ${TESTSRCDIR}/tst/common/rates/tst.statusrate.d \ + ${TESTSRCDIR}/tst/common/rates/tst.switchrate.d \ + ${TESTSRCDIR}/tst/common/safety/tst.basename.d \ + ${TESTSRCDIR}/tst/common/safety/tst.caller.d \ + ${TESTSRCDIR}/tst/common/safety/tst.cleanpath.d \ + ${TESTSRCDIR}/tst/common/safety/tst.copyin.d \ + ${TESTSRCDIR}/tst/common/safety/tst.copyin2.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ddi_pathname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.dirname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.errno.d \ + ${TESTSRCDIR}/tst/common/safety/tst.execname.d \ + ${TESTSRCDIR}/tst/common/safety/tst.gid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.hton.d \ + ${TESTSRCDIR}/tst/common/safety/tst.index.d \ + ${TESTSRCDIR}/tst/common/safety/tst.msgdsize.d \ + ${TESTSRCDIR}/tst/common/safety/tst.msgsize.d \ + ${TESTSRCDIR}/tst/common/safety/tst.null.d \ + ${TESTSRCDIR}/tst/common/safety/tst.pid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.progenyof.d \ + ${TESTSRCDIR}/tst/common/safety/tst.random.d \ + ${TESTSRCDIR}/tst/common/safety/tst.rw.d \ + ${TESTSRCDIR}/tst/common/safety/tst.shortstr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.stack.d \ + ${TESTSRCDIR}/tst/common/safety/tst.stackdepth.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strchr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strjoin.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strstr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.strtok.d \ + ${TESTSRCDIR}/tst/common/safety/tst.substr.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ucaller.d \ + ${TESTSRCDIR}/tst/common/safety/tst.uid.d \ + ${TESTSRCDIR}/tst/common/safety/tst.unalign.d \ + ${TESTSRCDIR}/tst/common/safety/tst.uregs.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ustack.d \ + ${TESTSRCDIR}/tst/common/safety/tst.ustackdepth.d \ + ${TESTSRCDIR}/tst/common/safety/tst.vahole.d \ + ${TESTSRCDIR}/tst/common/safety/tst.zonename.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ + ${TESTSRCDIR}/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ + ${TESTSRCDIR}/tst/common/scalars/tst.misc.d \ + ${TESTSRCDIR}/tst/common/scalars/tst.selfarray2.d \ + ${TESTSRCDIR}/tst/common/sched/tst.enqueue.d \ + ${TESTSRCDIR}/tst/common/sched/tst.oncpu.d \ + ${TESTSRCDIR}/tst/common/sched/tst.stackdepth.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_MACRO_UNDEF.invalidargs.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_OP_LVAL.rdonly.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_OP_WRITE.usepidmacro.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.concat.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.desc.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.inval.d \ + ${TESTSRCDIR}/tst/common/scripting/err.D_SYNTAX.pid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.arg0.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.assign.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.basic.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.egid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.euid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.gid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.pgid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.pid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.projid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.quite.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.sid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.taskid.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.trace.d \ + ${TESTSRCDIR}/tst/common/scripting/tst.uid.d \ + ${TESTSRCDIR}/tst/common/speculation/bug.1001148.SpecSizeVariations.d \ + ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/err.BufSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithChill.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOut.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithCopyOutStr.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithPanic.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_COMM.AggAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithAvg.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithCount.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithLquant.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMax.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMin.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithQuant.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithSum.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_COMM_DREC.CommitAftDataRec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_DREC_COMM.ExitAfterCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_EXIT_SPEC.ExitAftSpec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_MALFORM.NspecExpr.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.HugeNspecValue.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.InvalidSpecSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PRAGMA_OPTSET.NegSpecSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_PROTO_LEN.SpecNoId.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_COMM.SpecAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_DREC.SpecAftDataRec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.D_SPEC_SPEC.SpecAftSpec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeBufSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeNspec.d \ + ${TESTSRCDIR}/tst/common/speculation/err.NegativeSpecSize.d \ + ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/err.SpecSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.CommitAfterDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.CommitWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DataRecAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDataRec.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.DiscardWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.ExitAftDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.NoSpecBuffer.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations1.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations2.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpecSizeVariations3.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculateWithRandom.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationCommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationDiscard.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationID.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.SpeculationWithZero.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.TwoSpecBuffers.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.negcommit.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.negspec.d \ + ${TESTSRCDIR}/tst/common/speculation/tst.zerosize.d \ + ${TESTSRCDIR}/tst/common/stability/err.D_ATTR_MIN.MinAttributes.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_STACK_PROTO.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_STACK_SIZE.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_FRAMES.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_PROTO.bad.d \ + ${TESTSRCDIR}/tst/common/stack/err.D_USTACK_STRSIZE.bad.d \ + ${TESTSRCDIR}/tst/common/stack/tst.default.d \ + ${TESTSRCDIR}/tst/common/stackdepth/tst.default.d \ + ${TESTSRCDIR}/tst/common/stop/tst.stop1.d \ + ${TESTSRCDIR}/tst/common/stop/tst.stop2.d \ + ${TESTSRCDIR}/tst/common/syscall/tst.args.d \ + ${TESTSRCDIR}/tst/common/sysevent/tst.post.d \ + ${TESTSRCDIR}/tst/common/sysevent/tst.post_chan.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_ARG.badsize.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toofew.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_PROTO_LEN.toomany.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_ADDR.badaddr.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_SIZE.negsize.d \ + ${TESTSRCDIR}/tst/common/tracemem/err.D_TRACEMEM_SIZE.zerosize.d \ + ${TESTSRCDIR}/tst/common/tracemem/tst.rootvp.d \ + ${TESTSRCDIR}/tst/common/translators/tst.ProcModelTrans.d \ + ${TESTSRCDIR}/tst/common/types/err.D_CG_DYN.ResultDynType.d \ + ${TESTSRCDIR}/tst/common/types/err.D_XLATE_REDECL.ResultDynType.d \ + ${TESTSRCDIR}/tst/common/types/tst.complex.d \ + ${TESTSRCDIR}/tst/common/types/tst.ptrops.d \ + ${TESTSRCDIR}/tst/common/types/tst.struct.d \ + ${TESTSRCDIR}/tst/common/types/tst.typedef.d \ + ${TESTSRCDIR}/tst/common/usdt/argmap.d \ + ${TESTSRCDIR}/tst/common/usdt/args.d \ + ${TESTSRCDIR}/tst/common/usdt/forker.d \ + ${TESTSRCDIR}/tst/common/usdt/tst.argmap.d \ + ${TESTSRCDIR}/tst/common/usdt/tst.args.d \ + ${TESTSRCDIR}/tst/common/ustack/tst.bigstack.d \ + ${TESTSRCDIR}/tst/common/vars/tst.gid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.ppid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.uid.d \ + ${TESTSRCDIR}/tst/common/vars/tst.walltimestamp.d \ -TESTARITHMETIC= \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_SYNTAX.addmin.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_SYNTAX.divmin.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_SYNTAX.muladd.d \ - ${TESTSRCDIR}/tst/common/arithmetic/err.D_SYNTAX.muldiv.d \ - ${TESTSRCDIR}/tst/common/arithmetic/tst.basics.d \ - ${TESTSRCDIR}/tst/common/arithmetic/tst.complex.d +# -------------------------------------------------------------------------------- +# Tests that currently hang the system: -TESTARRAYS= \ - ${TESTSRCDIR}/tst/common/arrays/err.D_ARR_BADREF.bad.d \ - ${TESTSRCDIR}/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d \ - ${TESTSRCDIR}/tst/common/arrays/err.D_DECL_ARRNULL.bad.d \ - ${TESTSRCDIR}/tst/common/arrays/err.D_DECL_ARRSUB.bad.d \ - ${TESTSRCDIR}/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d \ - ${TESTSRCDIR}/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic1.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic2.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic3.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic4.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic5.d \ - ${TESTSRCDIR}/tst/common/arrays/tst.basic6.d +IGNORE+= \ + ${TESTSRCDIR}/tst/common/fbtprovider/tst.basic.d \ + ${TESTSRCDIR}/tst/common/fbtprovider/tst.return.d \ + ${TESTSRCDIR}/tst/common/grammar/tst.stmts.d \ -TESTASSOCS= \ - ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_OP_INCOMPAT.this.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_PROTO_ARG.badsig.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_PROTO_LEN.toofew.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_PROTO_LEN.toomany.d \ - ${TESTSRCDIR}/tst/common/assocs/err.D_SYNTAX.errassign.d \ - ${TESTSRCDIR}/tst/common/assocs/err.tupoflow.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.cpyarray.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.diffprofile.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.initialize.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.misc.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.orthogonality.d \ - ${TESTSRCDIR}/tst/common/assocs/tst.this.d -TESTBEGIN= \ - ${TESTSRCDIR}/tst/common/begin/err.D_PDESC_ZERO.begin.d \ - ${TESTSRCDIR}/tst/common/begin/err.D_PDESC_ZERO.tick.d \ - ${TESTSRCDIR}/tst/common/begin/tst.begin.d \ - ${TESTSRCDIR}/tst/common/begin/tst.multibegin.d +# -------------------------------------------------------------------------------- +# Interrupt priority isn't relevant on FreeBSD. -TESTBITFIELDS= \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d \ - ${TESTSRCDIR}/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d \ - ${TESTSRCDIR}/tst/common/bitfields/tst.BitFieldPromotion.d \ - ${TESTSRCDIR}/tst/common/bitfields/tst.SizeofBitField.d +IGNORE+= ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl.d \ + ${TESTSRCDIR}/tst/common/builtinvar/tst.ipl1.d -TESTBUFFERING= \ - ${TESTSRCDIR}/tst/common/buffering/err.end.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize1.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize2.d \ - ${TESTSRCDIR}/tst/common/buffering/err.resize3.d \ - ${TESTSRCDIR}/tst/common/buffering/err.zerobuf.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.dynvarsize.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.fill1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize2.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.resize3.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring1.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring2.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.ring3.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.smallring.d \ - ${TESTSRCDIR}/tst/common/buffering/tst.switch1.d +# -------------------------------------------------------------------------------- +# This test relies on the Solaris ping behaviour of exiting after a number of +# pings. On FreeBSD ping doesn't do that. -TESTBUILTINVAR= \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.arg0clause.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1to8.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.arg1to8clause.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.caller.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.caller1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.epid.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.epid1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.errno.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.errno1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.execname.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.tid.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.tid1.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.timestamp.d \ - ${TESTSRCDIR}/tst/common/builtinvar/tst.vtimestamp.d - -TESTCLAUSES= \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.body.d \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.both.d \ - ${TESTSRCDIR}/tst/common/clauses/err.D_IDENT_UNDEF.pred.d \ - ${TESTSRCDIR}/tst/common/clauses/tst.nopred.d \ - ${TESTSRCDIR}/tst/common/clauses/tst.pred.d \ - ${TESTSRCDIR}/tst/common/clauses/tst.predfirst.d \ - ${TESTSRCDIR}/tst/common/clauses/tst.predlast.d - -TESTDECLS= \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d \ - ${TESTSRCDIR}/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d \ - ${TESTSRCDIR}/tst/common/decls/tst.arrays.d \ - ${TESTSRCDIR}/tst/common/decls/tst.funcs.d \ - ${TESTSRCDIR}/tst/common/decls/tst.pointers.d \ - ${TESTSRCDIR}/tst/common/decls/tst.varargsfuncs.d - -TESTDROPS= \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DBLERROR.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPEC.d \ - ${TESTSRCDIR}/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d - -TESTDTRACEUTIL= \ - ${TESTSRCDIR}/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DataModel32.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidId1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidId2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidId3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.QuietMode.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.TestCompile.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh \ - ${TESTSRCDIR}/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh +IGNORE+= ${TESTSRCDIR}/tst/common/funcs/tst.system.d -TESTEND= \ - ${TESTSRCDIR}/tst/common/end/err.D_IDENT_UNDEF.timespent.d \ - ${TESTSRCDIR}/tst/common/end/tst.end.d \ - ${TESTSRCDIR}/tst/common/end/tst.endwithoutbegin.d \ - ${TESTSRCDIR}/tst/common/end/tst.multibeginend.d \ - ${TESTSRCDIR}/tst/common/end/tst.multiend.d - -TESTENUM= \ - ${TESTSRCDIR}/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d \ - ${TESTSRCDIR}/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d \ - ${TESTSRCDIR}/tst/common/enum/tst.EnumEquality.d \ - ${TESTSRCDIR}/tst/common/enum/tst.EnumSameValue.d \ - ${TESTSRCDIR}/tst/common/enum/tst.EnumValAssign.d - -TESTERROR= \ - ${TESTSRCDIR}/tst/common/error/tst.DTRACEFLT_DIVZERO.d \ - ${TESTSRCDIR}/tst/common/error/tst.error.d \ - ${TESTSRCDIR}/tst/common/error/tst.errorend.d - -TESTEXIT= \ - ${TESTSRCDIR}/tst/common/exit/err.D_PROTO_LEN.noarg.d \ - ${TESTSRCDIR}/tst/common/exit/err.exitarg1.d \ - ${TESTSRCDIR}/tst/common/exit/tst.basic1.d - -TESTFBTPROVIDER= \ - ${TESTSRCDIR}/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.functionentry.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.functionreturnvalue.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.ioctlargs.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.offset.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.offsetzero.d \ - ${TESTSRCDIR}/tst/common/fbtprovider/tst.return0.d - -TESTFUNCS= \ - ${TESTSRCDIR}/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_OP_VFPTR.badop.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d \ - ${TESTSRCDIR}/tst/common/funcs/err.D_VAR_UNDEF.badvar.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badalloca.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy1.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy2.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy3.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy4.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy5.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badbcopy6.d \ - ${TESTSRCDIR}/tst/common/funcs/err.badchill.d \ - ${TESTSRCDIR}/tst/common/funcs/err.chillbadarg.ksh \ - ${TESTSRCDIR}/tst/common/funcs/err.copyout.d \ - ${TESTSRCDIR}/tst/common/funcs/err.copyoutbadaddr.ksh \ - ${TESTSRCDIR}/tst/common/funcs/err.copyoutstrbadaddr.ksh \ - ${TESTSRCDIR}/tst/common/funcs/tst.badfreopen.ksh \ - ${TESTSRCDIR}/tst/common/funcs/tst.basename.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.bcopy.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.chill.ksh \ - ${TESTSRCDIR}/tst/common/funcs/tst.cleanpath.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.default.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.ftruncate.ksh \ - ${TESTSRCDIR}/tst/common/funcs/tst.index.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.lltostr.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.progenyof.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.rand.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.strchr.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.strjoin.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.strstr.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.strtok.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.substr.d \ - ${TESTSRCDIR}/tst/common/funcs/tst.system.d - -TESTGRAMMAR= \ - ${TESTSRCDIR}/tst/common/grammar/err.D_ADDROF_LVAL.d \ - ${TESTSRCDIR}/tst/common/grammar/err.D_EMPTY.empty.d \ - ${TESTSRCDIR}/tst/common/grammar/tst.clauses.d - -TESTINLINE= \ - ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef1.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_DECL_IDRED.redef2.d \ - ${TESTSRCDIR}/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d \ - ${TESTSRCDIR}/tst/common/inline/tst.InlineWritableAssign.d - -TESTLEXER= \ - ${TESTSRCDIR}/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_INT_OFLOW.BigInt.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace1.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brace2.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack1.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack2.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.brack3.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren1.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren2.d \ - ${TESTSRCDIR}/tst/common/lexer/err.D_SYNTAX.paren3.d - -TESTMISC= \ - ${TESTSRCDIR}/tst/common/misc/err.D_PRAGMA_OPTSET.d \ - ${TESTSRCDIR}/tst/common/misc/tst.badopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.boolopt.d \ - ${TESTSRCDIR}/tst/common/misc/tst.haslam.d - -TESTMULTIAGGS= \ - ${TESTSRCDIR}/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d \ - ${TESTSRCDIR}/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.many.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.same.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.sort.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.sortpos.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.tuplecompat.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.zero.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.zero2.d \ - ${TESTSRCDIR}/tst/common/multiaggs/tst.zero3.d - -TESTOFFSETOF= \ - ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d \ - ${TESTSRCDIR}/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d \ - ${TESTSRCDIR}/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d \ - ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofAlias.d \ - ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofArith.d \ - ${TESTSRCDIR}/tst/common/offsetof/tst.OffsetofUnion.d \ - ${TESTSRCDIR}/tst/common/offsetof/tst.struct.d \ - ${TESTSRCDIR}/tst/common/offsetof/tst.union.d - -TESTOPERATORS= \ - ${TESTSRCDIR}/tst/common/operators/tst.ternary.d - -TESTPOINTERS= \ - ${TESTSRCDIR}/tst/common/pointers/err.BadAlign.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_ADDROF_VAR.agg.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_PTR.badpointer.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d \ - ${TESTSRCDIR}/tst/common/pointers/err.D_OP_SOU.badpointer.d \ - ${TESTSRCDIR}/tst/common/pointers/err.InvalidAddress1.d \ - ${TESTSRCDIR}/tst/common/pointers/err.InvalidAddress2.d \ - ${TESTSRCDIR}/tst/common/pointers/err.InvalidAddress3.d \ - ${TESTSRCDIR}/tst/common/pointers/err.InvalidAddress4.d \ - ${TESTSRCDIR}/tst/common/pointers/err.InvalidAddress5.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer2.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.ArrayPointer3.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.IntegerArithmetic1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.PointerArithmetic1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.PointerArithmetic2.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.PointerArithmetic3.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.PointerAssignment.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.ValidPointer1.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.ValidPointer2.d \ - ${TESTSRCDIR}/tst/common/pointers/tst.VoidCast.d - -TESTPRAGMA= \ - ${TESTSRCDIR}/tst/common/pragma/err.D_PRAGERR.d \ - ${TESTSRCDIR}/tst/common/pragma/err.D_PRAGMA_INVAL.d \ - ${TESTSRCDIR}/tst/common/pragma/err.D_PRAGMA_MALFORM.d \ - ${TESTSRCDIR}/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d - -TESTPREDICATES= \ - ${TESTSRCDIR}/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d \ - ${TESTSRCDIR}/tst/common/predicates/err.D_SYNTAX.invalid.d \ - ${TESTSRCDIR}/tst/common/predicates/err.D_SYNTAX.operr.d \ - ${TESTSRCDIR}/tst/common/predicates/tst.basics.d \ - ${TESTSRCDIR}/tst/common/predicates/tst.complex.d - -TESTPREPROCESSOR= \ - ${TESTSRCDIR}/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.defincomp.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.ifdefelsenotendif.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.ifdefincomp.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.ifdefnotendif.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.incompelse.d \ - ${TESTSRCDIR}/tst/common/preprocessor/err.mulelse.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.ifdef.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.ifndef.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.ifnotdef.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.logicaland.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.logicalandor.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.logicalor.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.muland.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.mulor.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.precondi.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.predicatedeclare.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.preexp.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.preexpelse.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.preexpif.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.preexpifelse.d \ - ${TESTSRCDIR}/tst/common/preprocessor/tst.withinprobe.d - -TESTPRINTA= \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTA_AGGARG.badval.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTA_PROTO.bad.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d \ - ${TESTSRCDIR}/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d \ - ${TESTSRCDIR}/tst/common/printa/tst.basics.d \ - ${TESTSRCDIR}/tst/common/printa/tst.def.d \ - ${TESTSRCDIR}/tst/common/printa/tst.dynwidth.d \ - ${TESTSRCDIR}/tst/common/printa/tst.fmt.d \ - ${TESTSRCDIR}/tst/common/printa/tst.many.d \ - ${TESTSRCDIR}/tst/common/printa/tst.manyval.d \ - ${TESTSRCDIR}/tst/common/printa/tst.tuple.d - -TESTPRINTF= \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_PROTO_LEN.toofew.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_SYNTAX.badconv1.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_SYNTAX.badconv2.d \ - ${TESTSRCDIR}/tst/common/printf/err.D_SYNTAX.badconv3.d \ - ${TESTSRCDIR}/tst/common/printf/tst.flags.d \ - ${TESTSRCDIR}/tst/common/printf/tst.hello.d \ - ${TESTSRCDIR}/tst/common/printf/tst.ints.d \ - ${TESTSRCDIR}/tst/common/printf/tst.precs.d \ - ${TESTSRCDIR}/tst/common/printf/tst.print-f.d \ - ${TESTSRCDIR}/tst/common/printf/tst.printcont.d \ - ${TESTSRCDIR}/tst/common/printf/tst.printeE.d \ - ${TESTSRCDIR}/tst/common/printf/tst.printgG.d \ - ${TESTSRCDIR}/tst/common/printf/tst.rawfmt.d \ - ${TESTSRCDIR}/tst/common/printf/tst.uints.d \ - ${TESTSRCDIR}/tst/common/printf/tst.widths.d \ - ${TESTSRCDIR}/tst/common/printf/tst.widths1.d \ - ${TESTSRCDIR}/tst/common/printf/tst.wp.d - -TESTPROBES= \ - ${TESTSRCDIR}/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_PDESC_ZERO.probestar.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_PDESC_ZERO.tickstar.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.assign.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.declare.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.declarein.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.lbraces.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.probespec.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.rbraces.d \ - ${TESTSRCDIR}/tst/common/probes/err.D_SYNTAX.recdec.d \ - ${TESTSRCDIR}/tst/common/probes/tst.basic1.d \ - ${TESTSRCDIR}/tst/common/probes/tst.check.d \ - ${TESTSRCDIR}/tst/common/probes/tst.declare.d \ - ${TESTSRCDIR}/tst/common/probes/tst.declareafter.d \ - ${TESTSRCDIR}/tst/common/probes/tst.emptyprobe.d \ - ${TESTSRCDIR}/tst/common/probes/tst.pragma.d \ - ${TESTSRCDIR}/tst/common/probes/tst.pragmaaftertab.d \ - ${TESTSRCDIR}/tst/common/probes/tst.pragmainside.d \ - ${TESTSRCDIR}/tst/common/probes/tst.pragmaoutside.d - -TESTPROFILE= \ - ${TESTSRCDIR}/tst/common/profile-n/err.D_PDESC_ZERO.profile.d \ - ${TESTSRCDIR}/tst/common/profile-n/err.D_PDESC_ZEROonens.d \ - ${TESTSRCDIR}/tst/common/profile-n/err.D_PDESC_ZEROonensec.d \ - ${TESTSRCDIR}/tst/common/profile-n/err.D_PDESC_ZEROoneus.d \ - ${TESTSRCDIR}/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.basic.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.profilehz.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.profilems.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.profilemsec.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.profilenhz.d \ - ${TESTSRCDIR}/tst/common/profile-n/tst.profilens.d \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 03:03:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E976116A41B; Fri, 11 Jan 2008 03:03:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94E6416A418 for ; Fri, 11 Jan 2008 03:03:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8AC3213C45B for ; Fri, 11 Jan 2008 03:03:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B33T4F089403 for ; Fri, 11 Jan 2008 03:03:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B33QHx089400 for perforce@freebsd.org; Fri, 11 Jan 2008 03:03:26 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 03:03:26 GMT Message-Id: <200801110303.m0B33QHx089400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 03:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133010 Change 133010 by jb@jb_freebsd1 on 2008/01/11 03:02:55 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#58 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/src/contrib/openpam/configure.in#5 delete .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#29 integrate .. //depot/projects/dtrace/src/include/unistd.h#8 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#11 integrate .. //depot/projects/dtrace/src/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/dtrace/src/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#5 integrate .. //depot/projects/dtrace/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/dtrace/src/share/misc/committers-src.dot#6 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#8 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/md/md.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/fs.h#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#5 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#6 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_gzip.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/kern_alq.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#14 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#31 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#30 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#10 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_extattr.c#6 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#17 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_kern.c#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#18 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#11 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/route.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat.c#7 integrate .. //depot/projects/dtrace/www/en/copyright/freebsd-doc-license.sgml#4 integrate .. //depot/projects/dtrace/www/en/copyright/freebsd-license.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/Makefile#6 integrate .. //depot/projects/dtrace/www/en/gnome/rss2.xsl#1 branch .. //depot/projects/dtrace/www/en/index.xsl#15 integrate .. //depot/projects/dtrace/www/en/security/Makefile#3 integrate .. //depot/projects/dtrace/www/en/security/security-rss.xsl#1 branch .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#58 (text+ko) ==== @@ -1,4 +1,4 @@ - + 2005 2006 2007 + 2008 FreeBSD баримтжуулах төсөл 2006 2007 + 2008 FreeBSD-г Монголоор баримтжуулах төсөл ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -972,12 +972,12 @@ KMyMoney - KMyMoney нь KDE-д зориулсан - хувийн санхүүгийн менежер юм. KMyMoney нь арилжааны зорилгоор + KMyMoney нь KDE-д зориулсан + хувийн санхүүгийн менежер юм. KMyMoney нь арилжааны зорилгоор хийгдсэн хувийн санхүүгийн менежер програмуудад байдаг бүх л чухал боломжуудыг өөртөө агуулсан байдаг. Бас ашиглахад хялбар, дахин оруулах зөв бүртгэлийн систем зэрэг боломжуудыг нь - дурдаж болох юм. KMyMoney нь стандарт Quicken Interchange + дурдаж болох юм. KMyMoney нь стандарт Quicken Interchange Format (QIF) бүхий файлуудаас импорт хийж чаддагаас гадна хөрөнгө оруулалтыг хянах, олон төрлийн мөнгөн тэмдэгтүүдтэй ажиллаж чаддаг бөгөөд баялаг тайлангуудыг гаргаж чаддаг. ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -2525,6 +2525,24 @@ + RELENG_7 + + + FreeBSD-7.X-д зориулсан хөгжүүлэлтийн шугам, бас + FreeBSD 7-STABLE гэгддэг + + + + + RELENG_7_0 + + + FreeBSD-7.0-д зориулсан хувилбарын салбар, аюулгүй байдлын зөвлөгөөнүүд болон бусад + чухал засваруудад зориулж зөвхөн ашиглагддаг. + + + + RELENG_6 @@ -2534,6 +2552,15 @@ + RELENG_6_3 + + + FreeBSD-6.3-д зориулсан хувилбарын салбар, аюулгүй байдлын зөвлөгөөнүүд болон бусад + чухал засваруудад зориулж зөвхөн ашиглагддаг. + + + + RELENG_6_2 @@ -2753,6 +2780,22 @@ + RELENG_7_0_0_RELEASE + + + FreeBSD 7.0 + + + + + RELENG_6_3_0_RELEASE + + + FreeBSD 6.3 + + + + RELENG_6_2_0_RELEASE ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -411,8 +411,16 @@ X11-н тохиргоо - X11-г тохируулах нь олон үе шаттай явц билээ. Хамгийн эхний - алхам бол анхдагч тохируулгын файлыг бэлдэх билээ. + 7.3 хувилбараас эхлэн &xorg; нь + ямар нэгэн тохиргооны файлгүйгээр тушаал хүлээх мөрөн дээр доор + дурдсаныг бичин ихэвчлэн ажиллах боломжтой байдаг: + + &prompt.user; startx + + Хэрэв энэ нь ажиллахгүй, эсвэл анхдагч тохиргоог хүлээн + авах боломжгүй бол X11-ийг гараар тохируулах шаардлагатай. + X11-г тохируулах нь олон үе шаттай явц билээ. Хамгийн эхний + алхам бол анхдагч тохируулгын файлыг бэлдэх билээ. Супер хэрэглэгчийн эрхээр ердөө л дараах тушаалыг өгнө: &prompt.root; Xorg -configure ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#29 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.254 2007/12/28 17:57:25 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $ % ======================================================================= || || @@ -45342,6 +45342,9 @@ compassion. -- Saul Alinsky % +The fall of the USSR proves you wrong. + -- Aryeh M. Friedman +% The famous politician was trying to save both his faces. % The farther you go, the less you know. ==== //depot/projects/dtrace/src/include/unistd.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $ + * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $ */ #ifndef _UNISTD_H_ @@ -480,6 +480,7 @@ void endusershell(void); int exect(const char *, char * const *, char * const *); int execvP(const char *, const char *, char * const *); +int feature_present(const char *); char *fflagstostr(u_long); int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); ==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.129 2008/01/08 21:58:13 jhb Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -10,7 +10,7 @@ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \ - exec.c fmtcheck.c fmtmsg.c fnmatch.c \ + exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \ fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ @@ -45,7 +45,8 @@ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \ dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ - err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ + err.3 exec.3 \ + feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ ftok.3 fts.3 ftw.3 \ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ ==== //depot/projects/dtrace/src/share/man/man9/VOP_LOCK.9#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.19 2007/12/28 00:38:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.21 2008/01/10 19:11:37 brueffer Exp $ .\" -.Dd December 27, 2007 +.Dd January 10, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -48,7 +48,7 @@ .Ft int .Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" .Ft int -.Fn vn_lock "struct vnode *vp" "int flags" "struct thread *td" +.Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION These calls are used to serialize access to the file system, such as to prevent two writes to the same file from happening at the @@ -110,6 +110,9 @@ to lock a vnode rather than calling .Fn VOP_LOCK directly. +.Fn vn_lock +also does not want a thread specified as argument but it +assumes curthread to be used. .Sh RETURN VALUES Zero is returned on success, otherwise an error is returned. .Sh PSEUDOCODE ==== //depot/projects/dtrace/src/share/misc/committers-ports.dot#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.64 2007/11/01 16:08:25 brix Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.65 2008/01/10 01:25:40 edwin Exp $ # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. @@ -95,9 +95,11 @@ lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] +lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] @@ -171,6 +173,8 @@ edwin -> cperciva edwin -> erwin +edwin -> linimon +edwin -> lx ehaupt -> db ==== //depot/projects/dtrace/src/share/misc/committers-src.dot#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.68 2008/01/01 10:25:01 weongyo Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.70 2008/01/10 01:25:40 edwin Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -79,6 +79,7 @@ dhartmei [label="Daniel Hartmeier\ndhartmei@FreeBSD.org\n2004/04/06"] dmlb [label="Duncan Barclay\ndmlb@FreeBSD.org\n2001/12/14"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] +edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] eik [label="Oliver Eikemeier\neik@FreeBSD.org\n2004/05/20"] emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"] emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"] @@ -233,6 +234,7 @@ gnn -> jinmei gnn -> rrs +grog -> edwin grog -> le imp -> akiyama ==== //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.117 2007/11/29 06:34:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.118 2008/01/10 01:10:41 attilio Exp $"); #include #include @@ -933,7 +933,7 @@ if (vp) { vn_fullpath(td, vp, &name, &freename); locked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_SHARED | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY); VOP_GETATTR(vp, &vat, td->td_ucred, td); ino = vat.va_fileid; vput(vp); ==== //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.107 2007/12/29 14:28:01 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.108 2008/01/10 01:10:41 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -452,7 +452,7 @@ buflen = max(LINUX_DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); again: aiov.iov_base = buf; ==== //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.28 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.29 2008/01/10 01:10:42 attilio Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -325,7 +325,7 @@ * uvp is either NULL, or locked and held. */ - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) panic("vn_lock LK_RETRY returned error %d", error); if (bufp) @@ -378,7 +378,7 @@ goto out; } VREF(lvp); - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY); if (error != 0) panic("vn_lock LK_RETRY returned %d", error); } ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.5 2008/01/10 01:10:42 attilio Exp $"); #include #include @@ -123,7 +123,7 @@ struct vattr va; int error; - vn_lock(vp, LK_SHARED | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_GETATTR(vp, &va, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); if (error == 0) @@ -176,7 +176,7 @@ auio.uio_resid = size; auio.uio_td = td; - vn_lock(vp, LK_SHARED | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_READ(vp, &auio, IO_UNIT | IO_SYNC, td->td_ucred); VOP_UNLOCK(vp, 0, td); return (error != 0 ? -1 : size - auio.uio_resid); ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.7 2007/11/01 08:58:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.8 2008/01/10 01:10:42 attilio Exp $"); #include #include @@ -192,7 +192,7 @@ /* * Allocate and initialize the filesystem. */ - vn_lock(vp, LK_SHARED | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY); mp = vfs_mount_alloc(vp, vfsp, fspath, td); VOP_UNLOCK(vp, 0, td); @@ -238,7 +238,7 @@ * mnt_optnew. */ mp->mnt_optnew = NULL; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); /* * Put the new filesystem on the mount list after root. */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.3 2007/05/31 11:51:49 kib Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.4 2008/01/10 01:10:42 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_VNODE_H_ @@ -222,7 +222,7 @@ vfslocked = VFS_LOCK_GIANT(vp->v_mount); if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto drop; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = VOP_FSYNC(vp, MNT_WAIT, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); ==== //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.41 2007/11/05 11:36:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.42 2008/01/10 01:10:42 attilio Exp $"); #include #include @@ -598,7 +598,7 @@ error = exec_pecoff_coff_makecmds(imgp, fp, peofs); fail: free(fp, M_TEMP); - vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); return error; } ==== //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.26 2007/11/05 11:36:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.27 2008/01/10 01:10:42 attilio Exp $"); #include #include @@ -231,7 +231,7 @@ imgp->proc->p_sysent = &svr4_sysvec; fail: - vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY); return (error); } ==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.41 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.42 2008/01/10 01:10:42 attilio Exp $"); #include "opt_mac.h" @@ -270,7 +270,7 @@ } #ifdef MAC - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = mac_vnode_check_revoke(td->td_ucred, vp); VOP_UNLOCK(vp, 0, td); if (error) ==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.98 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.99 2008/01/10 01:10:43 attilio Exp $"); #include "opt_mac.h" @@ -278,7 +278,7 @@ buflen = max(DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); again: aiov.iov_base = buf; aiov.iov_len = buflen; @@ -447,7 +447,7 @@ buflen = min(MAXBSIZE, uap->nbytes); buf = malloc(buflen, M_TEMP, M_WAITOK); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); off = fp->f_offset; again: aiov.iov_base = buf; @@ -620,7 +620,7 @@ VREF(vp); fdrop(fp, td); vfslocked = VFS_LOCK_GIANT(vp->v_mount); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); error = change_dir(vp, td); if (error) goto fail; ==== //depot/projects/dtrace/src/sys/ddb/db_textdump.c#2 (text+ko) ==== @@ -25,12 +25,12 @@ */ /*- - * Kernel text-dump support: allow a series of text files to be written to - * the dump partition for later recovery, including captured DDB output, the - * kernel configuration, message buffer, panic message, etc. This allows for - * a more compact representation of critical debugging information than - * traditional binary dumps, as well as allowing dump information to be used - * without access to kernel symbols, source code, etc. + * Kernel text-dump support: write a series of text files to the dump + * partition for later recovery, including captured DDB output, kernel + * configuration, message buffer, and panic message. This allows for a more + * compact representation of critical debugging information than traditional + * binary dumps, as well as allowing dump information to be used without + * access to kernel symbols, source code, etc. * * Storage Layout * -------------- @@ -46,9 +46,8 @@ * know to reverse the order of the blocks in order to produce a readable * file. * - * Data is written out in the 'tar' file format, as it provides the facility - * to write data incrementally as a stream without reference to previous - * files. + * Data is written out in the ustar file format so that we can write data + * incrementally as a stream without reference to previous files. * * TODO * ---- @@ -58,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.1 2007/12/26 11:32:32 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.2 2008/01/10 00:26:47 rwatson Exp $"); #include "opt_config.h" @@ -201,7 +200,7 @@ } /* - * Calculate and fill in the checksum for a tar header. + * Calculate and fill in the checksum for a ustar header. */ static void ustar_checksum(struct ustar_header *uhp) @@ -269,6 +268,9 @@ * Interfaces to save and restore the dump offset, so that printers can go * back to rewrite a header if required, while avoiding their knowing about * the global layout of the blocks. + * + * If we ever want to support writing textdumps to tape or other + * stream-oriented target, we'll need to remove this. */ void textdump_saveoff(off_t *offsetp) ==== //depot/projects/dtrace/src/sys/dev/coretemp/coretemp.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $ + * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $ * */ @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.4 2007/10/15 20:00:21 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $"); #include #include @@ -143,6 +143,11 @@ cpu_model += ((cpu_id >> 16) & 0xf) << 4; cpu_mask = cpu_id & 15; +#if 0 /* + * XXXrpaulo: I have this CPU model and when it returns from C3 + * coretemp continues to function properly. + */ + /* * Check for errata AE18. * "Processor Digital Thermal Sensor (DTS) Readout stops @@ -159,6 +164,7 @@ return (ENXIO); } } +#endif /* * On some Core 2 CPUs, there's an undocumented MSR that * can tell us if Tj(max) is 100 or 85. ==== //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.5 2007/12/17 08:17:50 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.6 2008/01/10 00:55:42 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H @@ -306,6 +306,7 @@ #define S_WR_GEN 31 #define V_WR_GEN(x) ((x) << S_WR_GEN) #define F_WR_GEN V_WR_GEN(1U) +#define G_WR_GEN(x) ((x) >> S_WR_GEN) # define WR_HDR struct work_request_hdr wr # define RSS_HDR ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.23 2008/01/09 08:12:24 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.25 2008/01/11 02:26:54 kmacy Exp $ ***************************************************************************/ @@ -196,12 +196,7 @@ uint32_t holdoff_tmr; uint32_t next_holdoff; uint32_t imm_data; - struct rsp_desc *desc; uint32_t cntxt_id; - struct mtx lock; - struct mbuf *rx_head; /* offload packet receive queue head */ - struct mbuf *rx_tail; /* offload packet receive queue tail */ - uint32_t offload_pkts; uint32_t offload_bundles; uint32_t pure_rsps; @@ -212,9 +207,12 @@ bus_dmamap_t desc_map; struct t3_mbuf_hdr rspq_mh; + struct rsp_desc *desc; + struct mtx lock; #define RSPQ_NAME_LEN 32 char lockbuf[RSPQ_NAME_LEN]; - + uint32_t rspq_dump_start; + uint32_t rspq_dump_count; }; #ifndef DISABLE_MBUF_IOVEC @@ -231,8 +229,6 @@ uint32_t cidx; uint32_t pidx; uint32_t gen; - struct rx_desc *desc; - struct rx_sw_desc *sdesc; bus_addr_t phys_addr; uint32_t cntxt_id; uint64_t empty; @@ -240,6 +236,8 @@ bus_dmamap_t desc_map; bus_dma_tag_t entry_tag; uma_zone_t zone; + struct rx_desc *desc; + struct rx_sw_desc *sdesc; int type; }; @@ -551,6 +549,7 @@ int t3_encap(struct sge_qset *, struct mbuf **, int); int t3_sge_init_adapter(adapter_t *); +int t3_sge_reset_adapter(adapter_t *); int t3_sge_init_port(struct port_info *); void t3_sge_deinit_sw(adapter_t *); void t3_free_tx_desc(struct sge_txq *q, int n); @@ -620,5 +619,5 @@ int cxgb_dequeue_packet(struct ifnet *, struct sge_txq *, struct mbuf **); void cxgb_start(struct ifnet *ifp); void refill_fl_service(adapter_t *adap, struct sge_fl *fl); - +int reclaim_completed_tx(struct sge_txq *q, int reclaim_min); #endif ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.41 2007/12/17 23:39:28 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.43 2008/01/11 02:26:54 kmacy Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 04:55:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA87216A421; Fri, 11 Jan 2008 04:55:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9481B16A41B for ; Fri, 11 Jan 2008 04:55:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8DA5713C457 for ; Fri, 11 Jan 2008 04:55:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B4tQfX016068 for ; Fri, 11 Jan 2008 04:55:26 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B4tQbg016065 for perforce@freebsd.org; Fri, 11 Jan 2008 04:55:26 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 11 Jan 2008 04:55:26 GMT Message-Id: <200801110455.m0B4tQbg016065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 04:55:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=133014 Change 133014 by peter@peter_overcee on 2008/01/11 04:55:13 Move these out of my tree. It blows out my hammer.diff file to 44MB Affected files ... .. //depot/projects/hammer/contrib/apr-util/CHANGES#2 delete .. //depot/projects/hammer/contrib/apr-util/LICENSE#2 delete .. //depot/projects/hammer/contrib/apr-util/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr-util/Makefile.win#2 delete .. //depot/projects/hammer/contrib/apr-util/NOTICE#2 delete .. //depot/projects/hammer/contrib/apr-util/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/README.MySQL#2 delete .. //depot/projects/hammer/contrib/apr-util/apr-util.pc.in#2 delete .. //depot/projects/hammer/contrib/apr-util/apr-util.spec#2 delete .. //depot/projects/hammer/contrib/apr-util/aprutil.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/aprutil.dsw#2 delete .. //depot/projects/hammer/contrib/apr-util/apu-config.in#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_brigade.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_alloc.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_eos.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_file.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_flush.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_heap.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_mmap.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_pipe.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_pool.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_refcount.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_simple.c#2 delete .. //depot/projects/hammer/contrib/apr-util/buckets/apr_buckets_socket.c#2 delete .. //depot/projects/hammer/contrib/apr-util/build-outputs.mk#2 delete .. //depot/projects/hammer/contrib/apr-util/build.conf#2 delete .. //depot/projects/hammer/contrib/apr-util/build/apr_common.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/apu-conf.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/apu-hints.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/apu-iconv.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/config.guess#2 delete .. //depot/projects/hammer/contrib/apr-util/build/config.sub#2 delete .. //depot/projects/hammer/contrib/apr-util/build/dbd.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/dbm.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/find_apr.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/find_apu.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/build/get-version.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/build/install.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/build/mkdir.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/build/pkg/README#2 delete .. //depot/projects/hammer/contrib/apr-util/build/pkg/buildpkg.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/build/pkg/pkginfo.in#2 delete .. //depot/projects/hammer/contrib/apr-util/build/rpm/apr-util.spec.in#2 delete .. //depot/projects/hammer/contrib/apr-util/build/w32locatedb.pl#2 delete .. //depot/projects/hammer/contrib/apr-util/buildconf#2 delete .. //depot/projects/hammer/contrib/apr-util/config.layout#2 delete .. //depot/projects/hammer/contrib/apr-util/configure#2 delete .. //depot/projects/hammer/contrib/apr-util/configure.in#2 delete .. //depot/projects/hammer/contrib/apr-util/crypto/apr_md4.c#2 delete .. //depot/projects/hammer/contrib/apr-util/crypto/apr_md5.c#2 delete .. //depot/projects/hammer/contrib/apr-util/crypto/apr_sha1.c#2 delete .. //depot/projects/hammer/contrib/apr-util/crypto/getuuid.c#2 delete .. //depot/projects/hammer/contrib/apr-util/crypto/uuid.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/NWGNUdbdmysql#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/NWGNUdbdpgsql#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/NWGNUdbdsqli2#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/NWGNUdbdsqli3#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/apr_dbd.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/apr_dbd_mysql.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/apr_dbd_pgsql.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/apr_dbd_sqlite2.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbd/apr_dbd_sqlite3.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/apr_dbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/apr_dbm_berkeleydb.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/apr_dbm_gdbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/apr_dbm_ndbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/apr_dbm_sdbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_hash.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_lock.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_pair.c#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_pair.h#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_private.h#2 delete .. //depot/projects/hammer/contrib/apr-util/dbm/sdbm/sdbm_tune.h#2 delete .. //depot/projects/hammer/contrib/apr-util/docs/doxygen.conf#2 delete .. //depot/projects/hammer/contrib/apr-util/encoding/apr_base64.c#2 delete .. //depot/projects/hammer/contrib/apr-util/export_vars.sh.in#2 delete .. //depot/projects/hammer/contrib/apr-util/hooks/apr_hooks.c#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_anylock.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_base64.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_buckets.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_date.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_dbd.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_dbm.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_hooks.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap.hw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap_init.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap_option.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_ldap_url.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_md4.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_md5.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_optional.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_optional_hooks.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_queue.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_reslist.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_rmm.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_sdbm.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_sha1.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_strmatch.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_uri.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_uuid.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_xlate.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apr_xml.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu.hw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu_version.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu_want.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu_want.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/apu_want.hw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apr_dbd_internal.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apr_dbm_private.h#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_config.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_config.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_config.hw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_select_dbm.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_select_dbm.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/include/private/apu_select_dbm.hw#2 delete .. //depot/projects/hammer/contrib/apr-util/ldap/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/ldap/apr_ldap_init.c#2 delete .. //depot/projects/hammer/contrib/apr-util/ldap/apr_ldap_option.c#2 delete .. //depot/projects/hammer/contrib/apr-util/ldap/apr_ldap_url.c#2 delete .. //depot/projects/hammer/contrib/apr-util/libaprutil.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/libaprutil.rc#2 delete .. //depot/projects/hammer/contrib/apr-util/misc/apr_date.c#2 delete .. //depot/projects/hammer/contrib/apr-util/misc/apr_queue.c#2 delete .. //depot/projects/hammer/contrib/apr-util/misc/apr_reslist.c#2 delete .. //depot/projects/hammer/contrib/apr-util/misc/apr_rmm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/misc/apu_version.c#2 delete .. //depot/projects/hammer/contrib/apr-util/renames_pending#2 delete .. //depot/projects/hammer/contrib/apr-util/strmatch/apr_strmatch.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr-util/test/Makefile.win#2 delete .. //depot/projects/hammer/contrib/apr-util/test/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/test/abts.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/abts.h#2 delete .. //depot/projects/hammer/contrib/apr-util/test/abts_tests.h#2 delete .. //depot/projects/hammer/contrib/apr-util/test/dbd.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/nw_misc.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/nwgnuaputest#2 delete .. //depot/projects/hammer/contrib/apr-util/test/test_apu.h#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testall.dsw#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testbuckets.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testdate.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testdbd.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testdbm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testldap.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testmd4.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testmd5.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testpass.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testqueue.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testreslist.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testrmm.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/teststrmatch.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testuri.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testutil.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testutil.h#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testutildll.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testutillib.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testuuid.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testxlate.c#2 delete .. //depot/projects/hammer/contrib/apr-util/test/testxml.c#2 delete .. //depot/projects/hammer/contrib/apr-util/uri/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/uri/apr_uri.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xlate/xlate.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/apr_xml.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/COPYING#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/README#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/acconfig.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/aclocal.m4#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/buildconf.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/config.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/configure#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/configure.in#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/PrintPath#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/config.guess#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/config.sub#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/install-sh#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/ltmain.sh#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/missing#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/conftools/mkinstalldirs#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/ascii.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/asciitab.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/config.hnw#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/expat.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/expat.h.in#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/iasciitab.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/latin1tab.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/map_osd_ebcdic_df04_1.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/nametab.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/osd_ebcdic_df04_1.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/utf8tab.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/winconfig.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xml.dsp#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmlparse.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmlrole.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmlrole.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmltok.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmltok.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmltok_impl.c#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmltok_impl.h#2 delete .. //depot/projects/hammer/contrib/apr-util/xml/expat/lib/xmltok_ns.c#2 delete .. //depot/projects/hammer/contrib/apr/CHANGES#2 delete .. //depot/projects/hammer/contrib/apr/LICENSE#2 delete .. //depot/projects/hammer/contrib/apr/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr/Makefile.win#2 delete .. //depot/projects/hammer/contrib/apr/NOTICE#2 delete .. //depot/projects/hammer/contrib/apr/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr/README.dev#2 delete .. //depot/projects/hammer/contrib/apr/apr-config.in#2 delete .. //depot/projects/hammer/contrib/apr/apr.dsp#2 delete .. //depot/projects/hammer/contrib/apr/apr.dsw#2 delete .. //depot/projects/hammer/contrib/apr/apr.pc.in#2 delete .. //depot/projects/hammer/contrib/apr/apr.spec#2 delete .. //depot/projects/hammer/contrib/apr/atomic/netware/apr_atomic.c#2 delete .. //depot/projects/hammer/contrib/apr/atomic/os390/atomic.c#2 delete .. //depot/projects/hammer/contrib/apr/atomic/unix/apr_atomic.c#2 delete .. //depot/projects/hammer/contrib/apr/atomic/win32/apr_atomic.c#2 delete .. //depot/projects/hammer/contrib/apr/build-outputs.mk#2 delete .. //depot/projects/hammer/contrib/apr/build.conf#2 delete .. //depot/projects/hammer/contrib/apr/build/MakeEtags#2 delete .. //depot/projects/hammer/contrib/apr/build/NWGNUenvironment.inc#2 delete .. //depot/projects/hammer/contrib/apr/build/NWGNUhead.inc#2 delete .. //depot/projects/hammer/contrib/apr/build/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr/build/NWGNUtail.inc#2 delete .. //depot/projects/hammer/contrib/apr/build/PrintPath#2 delete .. //depot/projects/hammer/contrib/apr/build/aplibtool.c#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_app.dsp#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_common.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_hints.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_network.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_rules.mk.in#2 delete .. //depot/projects/hammer/contrib/apr/build/apr_threads.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/buildcheck.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/config.guess#2 delete .. //depot/projects/hammer/contrib/apr/build/config.sub#2 delete .. //depot/projects/hammer/contrib/apr/build/cvtdsp.pl#2 delete .. //depot/projects/hammer/contrib/apr/build/find_apr.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/fixwin32mak.pl#2 delete .. //depot/projects/hammer/contrib/apr/build/gen-build.py#2 delete .. //depot/projects/hammer/contrib/apr/build/get-version.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/install.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/jlibtool.c#2 delete .. //depot/projects/hammer/contrib/apr/build/libapr_app.dsp#2 delete .. //depot/projects/hammer/contrib/apr/build/libtool.m4#2 delete .. //depot/projects/hammer/contrib/apr/build/lineends.pl#2 delete .. //depot/projects/hammer/contrib/apr/build/ltmain.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/make_exports.awk#2 delete .. //depot/projects/hammer/contrib/apr/build/make_nw_export.awk#2 delete .. //depot/projects/hammer/contrib/apr/build/make_var_export.awk#2 delete .. //depot/projects/hammer/contrib/apr/build/mkdir.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/nw_export.inc#2 delete .. //depot/projects/hammer/contrib/apr/build/nw_ver.awk#2 delete .. //depot/projects/hammer/contrib/apr/build/pkg/README#2 delete .. //depot/projects/hammer/contrib/apr/build/pkg/buildpkg.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/pkg/pkginfo.in#2 delete .. //depot/projects/hammer/contrib/apr/build/prebuildNW.bat#2 delete .. //depot/projects/hammer/contrib/apr/build/rpm/apr.spec.in#2 delete .. //depot/projects/hammer/contrib/apr/build/run-gcov.sh#2 delete .. //depot/projects/hammer/contrib/apr/build/win32ver.awk#2 delete .. //depot/projects/hammer/contrib/apr/buildconf#2 delete .. //depot/projects/hammer/contrib/apr/config.layout#2 delete .. //depot/projects/hammer/contrib/apr/configure#2 delete .. //depot/projects/hammer/contrib/apr/configure.in#2 delete .. //depot/projects/hammer/contrib/apr/docs/APRDesign.html#2 delete .. //depot/projects/hammer/contrib/apr/docs/canonical_filenames.html#2 delete .. //depot/projects/hammer/contrib/apr/docs/doxygen.conf#2 delete .. //depot/projects/hammer/contrib/apr/docs/incomplete_types#2 delete .. //depot/projects/hammer/contrib/apr/docs/non_apr_programs#2 delete .. //depot/projects/hammer/contrib/apr/docs/pool-design.html#2 delete .. //depot/projects/hammer/contrib/apr/docs/win32_builds.html#2 delete .. //depot/projects/hammer/contrib/apr/dso/aix/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/beos/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/netware/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/os2/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/os390/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/unix/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/dso/win32/dso.c#2 delete .. //depot/projects/hammer/contrib/apr/emacs-mode#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/filepath.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/filestat.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/filesys.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/flock.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/mktemp.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/netware/pipe.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/copy.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/dir.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/dir_make_recurse.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/fileacc.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/filedup.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/filepath.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/filepath_util.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/filestat.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/filesys.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/flock.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/fullrw.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/maperrorcode.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/mktemp.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/open.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/pipe.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/readwrite.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/seek.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/os2/tempdir.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/copy.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/dir.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/fileacc.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/filedup.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/filepath.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/filepath_util.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/filestat.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/flock.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/fullrw.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/mktemp.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/open.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/pipe.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/readwrite.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/seek.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/unix/tempdir.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/dir.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/filedup.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/filepath.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/filestat.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/filesys.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/flock.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/open.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/pipe.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/readwrite.c#2 delete .. //depot/projects/hammer/contrib/apr/file_io/win32/seek.c#2 delete .. //depot/projects/hammer/contrib/apr/images/ScanDocBig.jpg#2 delete .. //depot/projects/hammer/contrib/apr/images/ScanDocSmall.jpg#2 delete .. //depot/projects/hammer/contrib/apr/images/ball1.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/ball1.png#2 delete .. //depot/projects/hammer/contrib/apr/images/ball2.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/ball2.png#2 delete .. //depot/projects/hammer/contrib/apr/images/bug.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/bug.png#2 delete .. //depot/projects/hammer/contrib/apr/images/caution.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/caution.png#2 delete .. //depot/projects/hammer/contrib/apr/images/master.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/master.png#2 delete .. //depot/projects/hammer/contrib/apr/images/tip.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/tip.png#2 delete .. //depot/projects/hammer/contrib/apr/images/warning.gif#2 delete .. //depot/projects/hammer/contrib/apr/images/warning.png#2 delete .. //depot/projects/hammer/contrib/apr/include/apr.h.in#2 delete .. //depot/projects/hammer/contrib/apr/include/apr.hnw#2 delete .. //depot/projects/hammer/contrib/apr/include/apr.hw#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_allocator.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_atomic.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_env.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_errno.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_file_info.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_file_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_fnmatch.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_general.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_getopt.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_global_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_hash.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_inherit.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_lib.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_mmap.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_network_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_poll.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_pools.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_portable.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_random.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_ring.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_shm.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_signal.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_strings.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_support.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_tables.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_thread_proc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_time.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_user.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_version.h#2 delete .. //depot/projects/hammer/contrib/apr/include/apr_want.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/aix/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/apr_private_common.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/beos/apr_arch_threadproc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_file_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_global_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_internal_time.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_networkio.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_pre_nw.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_arch_threadproc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/netware/apr_private.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_file_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_networkio.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_os2calls.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os2/apr_arch_threadproc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/os390/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_file_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_global_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_inherit.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_internal_time.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_misc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_networkio.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_poll_private.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_shm.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_arch_threadproc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/unix/apr_private.h.in#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_atime.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_dso.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_file_io.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_inherit.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_misc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_networkio.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_proc_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_thread_cond.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_thread_mutex.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_thread_rwlock.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_threadproc.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_arch_utf8.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_dbg_win32_handles.h#2 delete .. //depot/projects/hammer/contrib/apr/include/arch/win32/apr_private.h#2 delete .. //depot/projects/hammer/contrib/apr/libapr.dsp#2 delete .. //depot/projects/hammer/contrib/apr/libapr.rc#2 delete .. //depot/projects/hammer/contrib/apr/libaprnw.mcp.zip#2 delete .. //depot/projects/hammer/contrib/apr/locks/beos/proc_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/beos/thread_cond.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/beos/thread_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/beos/thread_rwlock.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/netware/proc_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/netware/thread_cond.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/netware/thread_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/netware/thread_rwlock.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/os2/proc_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/os2/thread_cond.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/os2/thread_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/os2/thread_rwlock.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/unix/global_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/unix/proc_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/unix/thread_cond.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/unix/thread_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/unix/thread_rwlock.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/win32/proc_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/win32/thread_cond.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/win32/thread_mutex.c#2 delete .. //depot/projects/hammer/contrib/apr/locks/win32/thread_rwlock.c#2 delete .. //depot/projects/hammer/contrib/apr/memory/unix/apr_pools.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/apr.xdc#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/aprlib.def#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/charset.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/libprews.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/rand.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/netware/start.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/charset.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/env.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/errorcodes.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/getopt.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/otherchild.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/rand.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/randbyte_os2.inc#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/start.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/unix/version.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/apr_app.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/charset.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/env.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/internal.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/misc.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/rand.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/start.c#2 delete .. //depot/projects/hammer/contrib/apr/misc/win32/utf8.c#2 delete .. //depot/projects/hammer/contrib/apr/mmap/unix/common.c#2 delete .. //depot/projects/hammer/contrib/apr/mmap/unix/mmap.c#2 delete .. //depot/projects/hammer/contrib/apr/mmap/win32/mmap.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/beos/sendrecv.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/beos/socketcommon.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/inet_ntop.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/inet_pton.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/os2calls.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/sendrecv.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/sendrecv_udp.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/sockaddr.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/sockets.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/os2/sockopt.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/inet_ntop.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/inet_pton.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/multicast.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/sendrecv.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/sockaddr.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/sockets.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/unix/sockopt.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/win32/sendrecv.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/win32/sockets.c#2 delete .. //depot/projects/hammer/contrib/apr/network_io/win32/sockopt.c#2 delete .. //depot/projects/hammer/contrib/apr/passwd/apr_getpass.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/os2/poll.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/os2/pollset.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/unix/epoll.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/unix/kqueue.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/unix/poll.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/unix/port.c#2 delete .. //depot/projects/hammer/contrib/apr/poll/unix/select.c#2 delete .. //depot/projects/hammer/contrib/apr/random/unix/apr_random.c#2 delete .. //depot/projects/hammer/contrib/apr/random/unix/sha2.c#2 delete .. //depot/projects/hammer/contrib/apr/random/unix/sha2.h#2 delete .. //depot/projects/hammer/contrib/apr/random/unix/sha2_glue.c#2 delete .. //depot/projects/hammer/contrib/apr/shmem/beos/shm.c#2 delete .. //depot/projects/hammer/contrib/apr/shmem/os2/shm.c#2 delete .. //depot/projects/hammer/contrib/apr/shmem/unix/shm.c#2 delete .. //depot/projects/hammer/contrib/apr/shmem/win32/shm.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_cpystrn.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_fnmatch.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_snprintf.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_strings.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_strnatcmp.c#2 delete .. //depot/projects/hammer/contrib/apr/strings/apr_strtok.c#2 delete .. //depot/projects/hammer/contrib/apr/support/unix/waitio.c#2 delete .. //depot/projects/hammer/contrib/apr/tables/apr_hash.c#2 delete .. //depot/projects/hammer/contrib/apr/tables/apr_tables.c#2 delete .. //depot/projects/hammer/contrib/apr/test/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr/test/Makefile.win#2 delete .. //depot/projects/hammer/contrib/apr/test/NWGNUmakefile#2 delete .. //depot/projects/hammer/contrib/apr/test/README#2 delete .. //depot/projects/hammer/contrib/apr/test/abts.c#2 delete .. //depot/projects/hammer/contrib/apr/test/abts.h#2 delete .. //depot/projects/hammer/contrib/apr/test/abts_tests.h#2 delete .. //depot/projects/hammer/contrib/apr/test/data/file_datafile.txt#2 delete .. //depot/projects/hammer/contrib/apr/test/data/mmap_datafile.txt#2 delete .. //depot/projects/hammer/contrib/apr/test/globalmutexchild.c#2 delete .. //depot/projects/hammer/contrib/apr/test/internal/Makefile.in#2 delete .. //depot/projects/hammer/contrib/apr/test/internal/Makefile.win#2 delete .. //depot/projects/hammer/contrib/apr/test/internal/testregex.c#2 delete .. //depot/projects/hammer/contrib/apr/test/internal/testucs.c#2 delete .. //depot/projects/hammer/contrib/apr/test/mod_test.c#2 delete .. //depot/projects/hammer/contrib/apr/test/nw_misc.c#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnuaprtest#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnuglobalmutexchild#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnumod_test#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnuproc_child#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnureadchild#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnusockchild#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnutestatmc#2 delete .. //depot/projects/hammer/contrib/apr/test/nwgnutryread#2 delete .. //depot/projects/hammer/contrib/apr/test/occhild.c#2 delete .. //depot/projects/hammer/contrib/apr/test/proc_child.c#2 delete .. //depot/projects/hammer/contrib/apr/test/readchild.c#2 delete .. //depot/projects/hammer/contrib/apr/test/sendfile.c#2 delete .. //depot/projects/hammer/contrib/apr/test/sockchild.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testall.dsw#2 delete .. //depot/projects/hammer/contrib/apr/test/testapp.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testargs.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testatomic.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testdir.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testdll.dsp#2 delete .. //depot/projects/hammer/contrib/apr/test/testdso.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testdup.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testenv.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testfile.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testfilecopy.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testfileinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testflock.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testflock.h#2 delete .. //depot/projects/hammer/contrib/apr/test/testfmt.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testfnmatch.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testglobalmutex.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testglobalmutex.h#2 delete .. //depot/projects/hammer/contrib/apr/test/testhash.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testipsub.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testlfs.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testlib.dsp#2 delete .. //depot/projects/hammer/contrib/apr/test/testlock.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testlockperf.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testmmap.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testmutexscope.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testnames.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testoc.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testpath.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testpipe.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testpoll.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testpools.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testproc.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testprocmutex.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testrand.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testrand2.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testshm.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testshm.h#2 delete .. //depot/projects/hammer/contrib/apr/test/testshmconsumer.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testshmproducer.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testsleep.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testsock.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testsock.h#2 delete .. //depot/projects/hammer/contrib/apr/test/testsockets.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testsockopt.c#2 delete .. //depot/projects/hammer/contrib/apr/test/teststr.c#2 delete .. //depot/projects/hammer/contrib/apr/test/teststrnatcmp.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testtable.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testtemp.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testthread.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testtime.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testud.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testuser.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testutil.c#2 delete .. //depot/projects/hammer/contrib/apr/test/testutil.h#2 delete .. //depot/projects/hammer/contrib/apr/test/testvsn.c#2 delete .. //depot/projects/hammer/contrib/apr/test/tryread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/beos/apr_proc_stub.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/beos/proc.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/beos/thread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/beos/threadpriv.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/beos/threadproc_common.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/netware/proc.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/netware/procsup.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/netware/signals.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/netware/thread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/netware/threadpriv.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/os2/proc.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/os2/signals.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/os2/thread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/os2/threadpriv.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/unix/proc.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/unix/procsup.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/unix/signals.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/unix/thread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/unix/threadpriv.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/win32/proc.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/win32/signals.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/win32/thread.c#2 delete .. //depot/projects/hammer/contrib/apr/threadproc/win32/threadpriv.c#2 delete .. //depot/projects/hammer/contrib/apr/time/unix/time.c#2 delete .. //depot/projects/hammer/contrib/apr/time/unix/timestr.c#2 delete .. //depot/projects/hammer/contrib/apr/time/win32/access.c#2 delete .. //depot/projects/hammer/contrib/apr/time/win32/time.c#2 delete .. //depot/projects/hammer/contrib/apr/time/win32/timestr.c#2 delete .. //depot/projects/hammer/contrib/apr/user/netware/groupinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/user/netware/userinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/user/unix/groupinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/user/unix/userinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/user/win32/groupinfo.c#2 delete .. //depot/projects/hammer/contrib/apr/user/win32/userinfo.c#2 delete .. //depot/projects/hammer/contrib/neon/.package#2 delete .. //depot/projects/hammer/contrib/neon/.release.sh#2 delete .. //depot/projects/hammer/contrib/neon/.version#2 delete .. //depot/projects/hammer/contrib/neon/AUTHORS#2 delete .. //depot/projects/hammer/contrib/neon/BUGS#2 delete .. //depot/projects/hammer/contrib/neon/ChangeLog#2 delete .. //depot/projects/hammer/contrib/neon/ChangeLog.CVS#2 delete .. //depot/projects/hammer/contrib/neon/INSTALL.win32#2 delete .. //depot/projects/hammer/contrib/neon/Makefile.in#2 delete .. //depot/projects/hammer/contrib/neon/NEWS#2 delete .. //depot/projects/hammer/contrib/neon/README#2 delete .. //depot/projects/hammer/contrib/neon/THANKS#2 delete .. //depot/projects/hammer/contrib/neon/TODO#2 delete .. //depot/projects/hammer/contrib/neon/aclocal.m4#2 delete .. //depot/projects/hammer/contrib/neon/autogen.sh#2 delete .. //depot/projects/hammer/contrib/neon/config.guess#2 delete .. //depot/projects/hammer/contrib/neon/config.h.in#2 delete .. //depot/projects/hammer/contrib/neon/config.hw#2 delete .. //depot/projects/hammer/contrib/neon/config.hw.in#2 delete .. //depot/projects/hammer/contrib/neon/config.sub#2 delete .. //depot/projects/hammer/contrib/neon/configure#2 delete .. //depot/projects/hammer/contrib/neon/configure.in#2 delete .. //depot/projects/hammer/contrib/neon/doc/TODO#2 delete .. //depot/projects/hammer/contrib/neon/doc/biblio.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/date.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/feat.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/html.xsl#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/api.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/biblio.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/compliance.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/features.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/index.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/intro.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/ref.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refalloc.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refauth.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refbuf.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refbufapp.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refbufcr.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refbufdest.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refbufutil.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refcert.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refclicert.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refconfig.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/referr.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/reffeat.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refgetst.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refi18n.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refiaddr.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refneon.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refopts.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refreq.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refreqbody.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refreqhdr.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refreqopts.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refresolve.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refresphdr.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsess.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refshave.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsockinit.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsslca.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsslcert2.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsslcertio.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refssldname.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refsslvfy.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refstatus.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/reftok.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refvers.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/refxml.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/using.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/html/xml.html#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_add_request_header.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_destroy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_error.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_first.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_next.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_resolve.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_addr_result.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_altered.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_append.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_clear.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_concat.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_create.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_destroy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_finish.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_grow.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_ncreate.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_buffer_zappend.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_calloc.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_close_connection.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_forget_auth.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_get_error.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_get_response_header.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_get_scheme.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_get_server_hostport.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_get_status.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_has_support.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_i18n_init.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_iaddr_cmp.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_iaddr_free.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_iaddr_make.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_iaddr_print.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_iaddr_typeof.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_malloc.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_oom_callback.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_print_request_header.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_qtoken.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_realloc.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_request_create.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_request_destroy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_request_dispatch.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_response_header_iterate.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_session_create.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_session_destroy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_session_proxy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_error.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_persist.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_proxy_auth.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_read_timeout.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_request_body_buffer.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_request_body_fd.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_request_body_fd64.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_request_expect100.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_server_auth.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_set_useragent.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_shave.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_sock_exit.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_sock_init.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_cmp.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_export.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_free.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_identity.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_import.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_issuer.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_read.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_signedby.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_subject.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_cert_write.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_decrypt.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_encrypted.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_free.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_name.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_owner.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_clicert_read.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_dname_cmp.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_readable_dname.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_set_verify.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_trust_cert.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_ssl_trust_default_ca.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_status.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_strdup.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_strndup.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_token.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_version_match.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_version_string.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_xml_create.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/ne_xml_destroy.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/neon-config.1#2 delete .. //depot/projects/hammer/contrib/neon/doc/man/neon.3#2 delete .. //depot/projects/hammer/contrib/neon/doc/manual.css#2 delete .. //depot/projects/hammer/contrib/neon/doc/manual.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/parsing-xml.txt#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/alloc.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/auth.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/buf.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/bufapp.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/bufcr.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/bufdest.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/bufutil.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/clicert.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/config.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/err.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/feat.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/getst.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/i18n.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/iaddr.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/init.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/neon.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/opts.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/req.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/reqbody.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/reqhdr.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/reqopts.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/resolve.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/resphdr.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sess.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/shave.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sslca.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sslcert.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sslcert2.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sslcertio.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/ssldname.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/ssltrust.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/sslvfy.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/status.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/tok.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/vers.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ref/xml.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/refentry.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/ssl.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/using-neon.txt#2 delete .. //depot/projects/hammer/contrib/neon/doc/using.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/version.xml#2 delete .. //depot/projects/hammer/contrib/neon/doc/xml.xml#2 delete .. //depot/projects/hammer/contrib/neon/install-sh#2 delete .. //depot/projects/hammer/contrib/neon/ltmain.sh#2 delete .. //depot/projects/hammer/contrib/neon/macros/ChangeLog#2 delete .. //depot/projects/hammer/contrib/neon/macros/neon-test.m4#2 delete .. //depot/projects/hammer/contrib/neon/macros/neon-xml-parser.m4#2 delete .. //depot/projects/hammer/contrib/neon/macros/neon.m4#2 delete .. //depot/projects/hammer/contrib/neon/macros/socklen-arg-type.m4#2 delete .. //depot/projects/hammer/contrib/neon/neon-config.in#2 delete .. //depot/projects/hammer/contrib/neon/neon.mak#2 delete .. //depot/projects/hammer/contrib/neon/neon.pc.in#2 delete .. //depot/projects/hammer/contrib/neon/po/cs.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/cs.po#2 delete .. //depot/projects/hammer/contrib/neon/po/de.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/de.po#2 delete .. //depot/projects/hammer/contrib/neon/po/fr.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/fr.po#2 delete .. //depot/projects/hammer/contrib/neon/po/ja.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/ja.po#2 delete .. //depot/projects/hammer/contrib/neon/po/neon.pot#2 delete .. //depot/projects/hammer/contrib/neon/po/nn.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/nn.po#2 delete .. //depot/projects/hammer/contrib/neon/po/ru.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/ru.po#2 delete .. //depot/projects/hammer/contrib/neon/po/tr.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/tr.po#2 delete .. //depot/projects/hammer/contrib/neon/po/zh.gmo#2 delete .. //depot/projects/hammer/contrib/neon/po/zh.po#2 delete .. //depot/projects/hammer/contrib/neon/src/COPYING.LIB#2 delete .. //depot/projects/hammer/contrib/neon/src/ChangeLog#2 delete .. //depot/projects/hammer/contrib/neon/src/Makefile.in#2 delete .. //depot/projects/hammer/contrib/neon/src/README#2 delete .. //depot/projects/hammer/contrib/neon/src/memleak.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_207.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_207.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_acl.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_acl.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_alloc.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_alloc.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_auth.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_auth.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_basic.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_basic.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_compress.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_compress.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_dates.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_dates.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_defs.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_gnutls.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_i18n.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_i18n.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_internal.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_locks.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_locks.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_md5.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_md5.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_openssl.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_private.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_privssl.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_props.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_props.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_redirect.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_redirect.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_request.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_request.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_session.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_session.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_socket.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_socket.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_ssl.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_sspi.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_sspi.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_string.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_string.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_stubssl.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_uri.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_uri.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_utils.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_utils.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_xml.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_xml.h#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_xmlreq.c#2 delete .. //depot/projects/hammer/contrib/neon/src/ne_xmlreq.h#2 delete .. //depot/projects/hammer/contrib/neon/test/COPYING#2 delete .. //depot/projects/hammer/contrib/neon/test/ChangeLog#2 delete .. //depot/projects/hammer/contrib/neon/test/Makefile.in#2 delete .. //depot/projects/hammer/contrib/neon/test/README#2 delete .. //depot/projects/hammer/contrib/neon/test/STATUS#2 delete .. //depot/projects/hammer/contrib/neon/test/acl.c#2 delete .. //depot/projects/hammer/contrib/neon/test/auth.c#2 delete .. //depot/projects/hammer/contrib/neon/test/basic.c#2 delete .. //depot/projects/hammer/contrib/neon/test/common/ChangeLog#2 delete .. //depot/projects/hammer/contrib/neon/test/common/README#2 delete .. //depot/projects/hammer/contrib/neon/test/common/child.c#2 delete .. //depot/projects/hammer/contrib/neon/test/common/child.h#2 delete .. //depot/projects/hammer/contrib/neon/test/common/run.sh#2 delete .. //depot/projects/hammer/contrib/neon/test/common/tests.c#2 delete .. //depot/projects/hammer/contrib/neon/test/common/tests.h#2 delete .. //depot/projects/hammer/contrib/neon/test/compress.c#2 delete .. //depot/projects/hammer/contrib/neon/test/expired.pem#2 delete .. //depot/projects/hammer/contrib/neon/test/htdocs/plain#2 delete .. //depot/projects/hammer/contrib/neon/test/largefile.c#2 delete .. //depot/projects/hammer/contrib/neon/test/lock.c#2 delete .. //depot/projects/hammer/contrib/neon/test/makekeys.sh#2 delete .. //depot/projects/hammer/contrib/neon/test/notvalid.pem#2 delete .. //depot/projects/hammer/contrib/neon/test/openssl.conf#2 delete .. //depot/projects/hammer/contrib/neon/test/props.c#2 delete .. //depot/projects/hammer/contrib/neon/test/redirect.c#2 delete .. //depot/projects/hammer/contrib/neon/test/request.c#2 delete .. //depot/projects/hammer/contrib/neon/test/resolve.c#2 delete .. //depot/projects/hammer/contrib/neon/test/run-tests.sh#2 delete .. //depot/projects/hammer/contrib/neon/test/run.sh#2 delete .. //depot/projects/hammer/contrib/neon/test/server.key#2 delete .. //depot/projects/hammer/contrib/neon/test/session.c#2 delete .. //depot/projects/hammer/contrib/neon/test/skeleton.c#2 delete .. //depot/projects/hammer/contrib/neon/test/socket.c#2 delete .. //depot/projects/hammer/contrib/neon/test/ssl.c#2 delete .. //depot/projects/hammer/contrib/neon/test/string-tests.c#2 delete .. //depot/projects/hammer/contrib/neon/test/stubs.c#2 delete .. //depot/projects/hammer/contrib/neon/test/uri-tests.c#2 delete .. //depot/projects/hammer/contrib/neon/test/util-tests.c#2 delete .. //depot/projects/hammer/contrib/neon/test/utils.c#2 delete .. //depot/projects/hammer/contrib/neon/test/utils.h#2 delete .. //depot/projects/hammer/contrib/neon/test/xml.c#2 delete .. //depot/projects/hammer/contrib/neon/test/xmlreq.c#2 delete .. //depot/projects/hammer/contrib/subversion/BUGS#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 05:00:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF63816A419; Fri, 11 Jan 2008 05:00:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5870916A420 for ; Fri, 11 Jan 2008 05:00:33 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 54FC113C500 for ; Fri, 11 Jan 2008 05:00:33 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B50WMo016518 for ; Fri, 11 Jan 2008 05:00:32 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B50WIM016515 for perforce@freebsd.org; Fri, 11 Jan 2008 05:00:32 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 11 Jan 2008 05:00:32 GMT Message-Id: <200801110500.m0B50WIM016515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 05:00:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=133016 Change 133016 by peter@peter_overcee on 2008/01/11 05:00:14 Move svn bmake glue to its own branch. Affected files ... .. //depot/projects/hammer/usr.bin/svn/Makefile#2 delete .. //depot/projects/hammer/usr.bin/svn/Makefile.inc#2 delete .. //depot/projects/hammer/usr.bin/svn/expat.h#2 delete .. //depot/projects/hammer/usr.bin/svn/lib/Makefile#2 delete .. //depot/projects/hammer/usr.bin/svn/lib/Makefile.inc#2 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#4 delete .. //depot/projects/hammer/usr.bin/svn/svn/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svn_private_config.h#2 delete .. //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#5 delete .. //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 11 05:35:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38F6B16A481; Fri, 11 Jan 2008 05:35:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA7F016A420 for ; Fri, 11 Jan 2008 05:35:07 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D81AF13C4D5 for ; Fri, 11 Jan 2008 05:35:07 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B5Z7YD023096 for ; Fri, 11 Jan 2008 05:35:07 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B5Z7bE023093 for perforce@freebsd.org; Fri, 11 Jan 2008 05:35:07 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 11 Jan 2008 05:35:07 GMT Message-Id: <200801110535.m0B5Z7bE023093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 05:35:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=133018 Change 133018 by peter@peter_overcee on 2008/01/11 05:35:03 Move bmake glue to //depot/users/peter/bsvn/... Affected files ... .. //depot/projects/hammer/gnu/lib/libneon/Makefile#3 delete .. //depot/projects/hammer/gnu/lib/libneon/config.h#3 delete .. //depot/projects/hammer/gnu/lib/libneon/expat.h#2 delete .. //depot/projects/hammer/gnu/lib/libneon/libbsddav.3#2 delete .. //depot/projects/hammer/lib/libapr-util/Makefile#3 delete .. //depot/projects/hammer/lib/libapr-util/apr_ldap.h#2 delete .. //depot/projects/hammer/lib/libapr-util/apu.h#2 delete .. //depot/projects/hammer/lib/libapr-util/apu_config.h#2 delete .. //depot/projects/hammer/lib/libapr-util/apu_select_dbm.h#2 delete .. //depot/projects/hammer/lib/libapr-util/apu_want.h#2 delete .. //depot/projects/hammer/lib/libapr-util/expat.h#2 delete .. //depot/projects/hammer/lib/libapr/Makefile#2 delete .. //depot/projects/hammer/lib/libapr/apr.h#3 delete .. //depot/projects/hammer/lib/libapr/apr_private.h#3 delete .. //depot/projects/hammer/lib/libapr/libbsdapr.3#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 11 06:23:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E75516A41B; Fri, 11 Jan 2008 06:23:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1417116A419 for ; Fri, 11 Jan 2008 06:23:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EECEF13C45D for ; Fri, 11 Jan 2008 06:23:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B6N48g031184 for ; Fri, 11 Jan 2008 06:23:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B6N4P2031181 for perforce@freebsd.org; Fri, 11 Jan 2008 06:23:04 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 06:23:04 GMT Message-Id: <200801110623.m0B6N4P2031181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 06:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=133022 Change 133022 by jb@jb_freebsd1 on 2008/01/11 06:22:36 Add the amd64 unwind section type. We actually need the ia64 one which has the same number. Take a punt on the data type. I'm not sure where that is defined. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#9 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_data.c#9 (text+ko) ==== @@ -78,6 +78,8 @@ case SHT_SUNW_syminfo: return (ELF_T_SYMINFO); #endif + case SHT_AMD64_UNWIND: /* == SHT_IA_64_UNWIND */ + return (ELF_T_BYTE); default: return (-1); } From owner-p4-projects@FreeBSD.ORG Fri Jan 11 06:27:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18DB016A41A; Fri, 11 Jan 2008 06:27:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D21B816A469 for ; Fri, 11 Jan 2008 06:27:09 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0B7E13C459 for ; Fri, 11 Jan 2008 06:27:09 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B6R94R035145 for ; Fri, 11 Jan 2008 06:27:09 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B6R9L9035106 for perforce@freebsd.org; Fri, 11 Jan 2008 06:27:09 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 11 Jan 2008 06:27:09 GMT Message-Id: <200801110627.m0B6R9L9035106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 06:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133024 Change 133024 by peter@peter_overcee on 2008/01/11 06:27:05 Purge old svn hooks. move to different tree, depot/user/peter/bsvn/... Affected files ... .. //depot/projects/hammer/Makefile.inc1#131 edit .. //depot/projects/hammer/etc/mtree/BSD.include.dist#51 edit .. //depot/projects/hammer/gnu/lib/Makefile#7 edit .. //depot/projects/hammer/lib/Makefile#69 edit .. //depot/projects/hammer/share/mk/bsd.libnames.mk#38 edit .. //depot/projects/hammer/share/mk/bsd.own.mk#23 edit .. //depot/projects/hammer/usr.bin/Makefile#58 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#131 (text+ko) ==== @@ -1082,7 +1082,7 @@ .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} \ - usr.bin/lex/lib ${_svn_lib} + usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L @@ -1090,10 +1090,6 @@ _cddl_lib= cddl/lib .endif -.if ${MK_SVN} != "no" -_svn_lib= usr.bin/svn/lib -.endif - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" _secure_lib_libcrypto= secure/lib/libcrypto ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#51 (text+ko) ==== @@ -9,14 +9,6 @@ .. arpa .. - bsdapr - apr - .. - .. - bsddav - neon - .. - .. bsm .. bsnmp ==== //depot/projects/hammer/gnu/lib/Makefile#7 (text+ko) ==== @@ -2,7 +2,7 @@ .include -SUBDIR= csu libgcc libgcov libdialog libgomp libneon libregex libreadline +SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. ==== //depot/projects/hammer/lib/Makefile#69 (text+ko) ==== @@ -37,8 +37,7 @@ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \ - libapr libapr-util + libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf ==== //depot/projects/hammer/share/mk/bsd.libnames.mk#38 (text+ko) ==== @@ -150,26 +150,3 @@ LIBZ?= ${DESTDIR}${LIBDIR}/libz.a LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a - -LIBBSDAPR?= ${DESTDIR}${LIBDIR}/libbsdapr.a -LIBBSDAPR-UTIL?= ${DESTDIR}${LIBDIR}/libbsdapr-util.a -LIBBSDDAV?= ${DESTDIR}${LIBDIR}/libbsddav.a - -LIBBSDSVN_CLIENT?= ${DESTDIR}${LIBDIR}/libbsdsvn_client.a -LIBBSDSVN_DELTA?= ${DESTDIR}${LIBDIR}/libbsdsvn_delta.a -LIBBSDSVN_DIFF?= ${DESTDIR}${LIBDIR}/libbsdsvn_diff.a -LIBBSDSVN_FS?= ${DESTDIR}${LIBDIR}/libbsdsvn_fs.a -LIBBSDSVN_FS_FS?= ${DESTDIR}${LIBDIR}/libbsdsvn_fs_fs.a -LIBBSDSVN_RA?= ${DESTDIR}${LIBDIR}/libbsdsvn_ra.a -LIBBSDSVN_CLIENT?= ${DESTDIR}${LIBDIR}/libbsdsvn_client.a -LIBBSDSVN_DELTA?= ${DESTDIR}${LIBDIR}/libbsdsvn_delta.a -LIBBSDSVN_DIFF?= ${DESTDIR}${LIBDIR}/libbsdsvn_diff.a -LIBBSDSVN_FS?= ${DESTDIR}${LIBDIR}/libbsdsvn_fs.a -LIBBSDSVN_FS_FS?= ${DESTDIR}${LIBDIR}/libbsdsvn_fs_fs.a -LIBBSDSVN_RA?= ${DESTDIR}${LIBDIR}/libbsdsvn_ra.a -LIBBSDSVN_RA_DAV?= ${DESTDIR}${LIBDIR}/libbsdsvn_ra_dav.a -LIBBSDSVN_RA_LOCAL?= ${DESTDIR}${LIBDIR}/libbsdsvn_ra_local.a -LIBBSDSVN_RA_SVN?= ${DESTDIR}${LIBDIR}/libbsdsvn_ra_svn.a -LIBBSDSVN_REPOS?= ${DESTDIR}${LIBDIR}/libbsdsvn_repos.a -LIBBSDSVN_SUBR?= ${DESTDIR}${LIBDIR}/libbsdsvn_subr.a -LIBBSDSVN_WC?= ${DESTDIR}${LIBDIR}/libbsdsvn_wc.a ==== //depot/projects/hammer/share/mk/bsd.own.mk#23 (text+ko) ==== @@ -355,7 +355,6 @@ SETUID_LOGIN \ SHAREDOCS \ SSP \ - SVN \ SYMVER \ SYSCONS \ TCSH \ ==== //depot/projects/hammer/usr.bin/Makefile#58 (text+ko) ==== @@ -173,7 +173,6 @@ split \ stat \ su \ - ${_svn} \ systat \ tabs \ tail \ @@ -291,10 +290,6 @@ _vacation= vacation .endif -.if ${MK_SVN} != "no" -_svn= svn -.endif - .if ${MK_TOOLCHAIN} != "no" _c89= c89 _c99= c99 From owner-p4-projects@FreeBSD.ORG Fri Jan 11 06:42:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBB316A41B; Fri, 11 Jan 2008 06:42:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10DCE16A419 for ; Fri, 11 Jan 2008 06:42:30 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DC6A13C447 for ; Fri, 11 Jan 2008 06:42:30 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B6gTMJ067416 for ; Fri, 11 Jan 2008 06:42:29 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B6gPXY067412 for perforce@freebsd.org; Fri, 11 Jan 2008 06:42:25 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 11 Jan 2008 06:42:25 GMT Message-Id: <200801110642.m0B6gPXY067412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 133025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 06:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133025 Change 133025 by peter@peter_overcee on 2008/01/11 06:41:47 IFC @133011 Affected files ... .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#7 integrate .. //depot/projects/hammer/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/hammer/contrib/top/top.c#11 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#23 integrate .. //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#6 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#76 integrate .. //depot/projects/hammer/games/fortune/datfiles/limerick#10 integrate .. //depot/projects/hammer/include/unistd.h#19 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#31 integrate .. //depot/projects/hammer/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/hammer/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/hammer/lib/libc/gen/posixshm.c#2 delete .. //depot/projects/hammer/lib/libc/gen/shm_open.3#5 delete .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#30 integrate .. //depot/projects/hammer/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#8 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/hammer/share/man/man4/ipmi.4#6 integrate .. //depot/projects/hammer/share/man/man4/lagg.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#14 integrate .. //depot/projects/hammer/share/man/man4/pci.4#10 integrate .. //depot/projects/hammer/share/man/man4/pcib.4#2 integrate .. //depot/projects/hammer/share/man/man4/textdump.4#2 integrate .. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#3 integrate .. //depot/projects/hammer/share/man/man9/VOP_LOCK.9#8 integrate .. //depot/projects/hammer/share/man/man9/lock.9#10 integrate .. //depot/projects/hammer/share/man/man9/style.9#26 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#8 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#8 integrate .. //depot/projects/hammer/share/mk/bsd.snmpmod.mk#2 integrate .. //depot/projects/hammer/share/termcap/termcap.src#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#171 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#103 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#65 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#50 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#47 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#47 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#47 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#52 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#40 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#26 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#31 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#17 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#10 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#13 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#30 integrate .. //depot/projects/hammer/sys/conf/NOTES#136 integrate .. //depot/projects/hammer/sys/conf/files#171 integrate .. //depot/projects/hammer/sys/conf/options#121 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/hammer/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#13 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#21 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#13 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#7 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#17 integrate .. //depot/projects/hammer/sys/dev/md/md.c#63 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/hammer/sys/dev/streams/streams.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#93 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#19 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#55 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#41 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#49 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#34 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#16 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#34 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#18 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#26 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#16 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#18 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.c#10 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#26 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#20 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#23 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#29 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#38 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#26 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#23 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#34 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#15 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#3 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#61 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#106 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#19 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#15 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#34 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#14 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#18 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#45 integrate .. //depot/projects/hammer/sys/kern/imgact_gzip.c#11 integrate .. //depot/projects/hammer/sys/kern/init_main.c#52 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#73 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#77 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#65 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#85 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#64 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#11 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#38 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#39 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#22 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#61 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#63 integrate .. //depot/projects/hammer/sys/kern/systrace_args.c#7 integrate .. //depot/projects/hammer/sys/kern/tty.c#56 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_shm.c#1 branch .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#68 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#53 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#82 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#87 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#121 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#76 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#51 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#13 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#32 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#34 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#25 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#34 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#47 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#22 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#36 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#25 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#33 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#34 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#27 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#43 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#55 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#37 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#29 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#26 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#48 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#36 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_shm.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_process.c#13 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#5 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#28 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#47 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#57 integrate .. //depot/projects/hammer/sys/sys/buf.h#32 integrate .. //depot/projects/hammer/sys/sys/fcntl.h#5 integrate .. //depot/projects/hammer/sys/sys/file.h#18 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#15 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#64 integrate .. //depot/projects/hammer/sys/sys/mman.h#9 integrate .. //depot/projects/hammer/sys/sys/param.h#102 integrate .. //depot/projects/hammer/sys/sys/proc.h#113 integrate .. //depot/projects/hammer/sys/sys/syscall.h#60 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#60 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#29 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#61 integrate .. //depot/projects/hammer/sys/sys/vnode.h#73 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#50 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#47 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#69 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#24 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#19 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#26 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#51 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#56 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#49 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#72 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#43 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#22 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#14 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#22 integrate .. //depot/projects/hammer/usr.bin/unzip/Makefile#1 branch .. //depot/projects/hammer/usr.bin/unzip/unzip.1#1 branch .. //depot/projects/hammer/usr.bin/unzip/unzip.c#1 branch .. //depot/projects/hammer/usr.sbin/arp/arp.c#17 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#17 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#18 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#15 integrate Differences ... ==== //depot/projects/hammer/contrib/cvs/src/parseinfo.c#7 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.4 2008/01/07 07:47:21 peter Exp $ */ #include "cvs.h" ==== //depot/projects/hammer/contrib/top/top.c#11 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $ */ /* @@ -459,7 +459,7 @@ } /* initialize the kernel memory interface */ - if (machine_init(&statics) == -1) + if (machine_init(&statics, do_unames) == -1) { exit(1); } ==== //depot/projects/hammer/etc/defaults/periodic.conf#23 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.46 2007/12/20 20:37:22 dougb Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.47 2008/01/08 07:22:43 dds Exp $ # # What files override these defaults ? @@ -127,6 +127,7 @@ # 460.status-mail-rejects daily_status_mail_rejects_enable="YES" # Check mail rejects daily_status_mail_rejects_logs=3 # How many logs to check +daily_status_mail_rejects_shorten="NO" # Shorten output # 470.status-named daily_status_named_enable="YES" ==== //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.21 2008/01/08 07:22:43 dds Exp $ # # If there is a global system configuration file, suck it in. @@ -11,6 +11,13 @@ source_periodic_confs fi +case "$daily_status_mail_rejects_shorten" in +[Yy][Ee][Ss]) + sed_output='\4 \3...';; +*) + sed_output='\2 (\3... \4)';; +esac + case "$daily_status_mail_rejects_enable" in [Yy][Ee][Ss]) if [ ! -d /etc/mail ] @@ -51,7 +58,7 @@ done cat /var/log/maillog } | - sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' | + sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/'"$sed_output"'/p' | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) [ $rc -gt 0 ] && rc=1 fi;; ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#76 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.254 2007/12/28 17:57:25 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $ % ======================================================================= || || @@ -45342,6 +45342,9 @@ compassion. -- Saul Alinsky % +The fall of the USSR proves you wrong. + -- Aryeh M. Friedman +% The famous politician was trying to save both his faces. % The farther you go, the less you know. ==== //depot/projects/hammer/games/fortune/datfiles/limerick#10 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.14 2007/12/07 22:41:39 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.15 2008/01/07 10:31:17 schweikh Exp $ % A bad little girl in Madrid, A most reprehensible kid, @@ -4421,7 +4421,7 @@ There was an old man of St. Bees, Who was stung in the arm by a wasp. When asked, "Does it hurt?" - He relied, "No, it doesn't. + He replied, "No, it doesn't. I'm so glad that it wasn't a hornet." -- W.S. Gilbert % ==== //depot/projects/hammer/include/unistd.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $ + * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $ */ #ifndef _UNISTD_H_ @@ -480,6 +480,7 @@ void endusershell(void); int exect(const char *, char * const *, char * const *); int execvP(const char *, const char *, char * const *); +int feature_present(const char *); char *fflagstostr(u_long); int getdomainname(char *, int); int getgrouplist(const char *, gid_t, gid_t *, int *); ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#31 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -10,7 +10,7 @@ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \ - exec.c fmtcheck.c fmtmsg.c fnmatch.c \ + exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \ fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ @@ -21,7 +21,7 @@ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pmadvise.c popen.c posixshm.c pselect.c \ + pause.c pmadvise.c popen.c pselect.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ @@ -45,7 +45,8 @@ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \ dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \ - err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ + err.3 exec.3 \ + feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \ ftok.3 fts.3 ftw.3 \ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ @@ -59,7 +60,7 @@ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_wait.3 \ - setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ + setjmp.3 setmode.3 setproctitle.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ @@ -133,7 +134,6 @@ setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \ setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3 MLINKS+=setmode.3 getmode.3 -MLINKS+=shm_open.3 shm_unlink.3 MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \ sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \ sigsetops.3 sigismember.3 ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#30 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.128 2008/01/08 21:58:14 jhb Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -83,7 +83,7 @@ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \ setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \ - setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \ + setuid.2 shmat.2 shmctl.2 shmget.2 shm_open.2 shutdown.2 \ sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ @@ -154,6 +154,7 @@ MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2 MLINKS+=shmat.2 shmdt.2 +MLINKS+=shm_open.2 shm_unlink.2 MLINKS+=sigwaitinfo.2 sigtimedwait.2 MLINKS+=stat.2 fstat.2 stat.2 lstat.2 MLINKS+=statfs.2 fstatfs.2 ==== //depot/projects/hammer/lib/libthr/thread/thr_sem.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.12 2007/11/23 05:42:52 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.13 2008/01/07 02:26:29 davidxu Exp $ */ #include "namespace.h" @@ -282,8 +282,8 @@ if ((*sem)->nwaiters) { retval = _thr_umtx_wake(&(*sem)->count, 1); - if (retval > 0) - retval = 0; + if (retval != 0) + retval = -1; } return (retval); } ==== //depot/projects/hammer/lib/msun/src/s_csqrt.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.1 2007/12/15 08:38:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.2 2008/01/11 04:18:25 das Exp $"); #include #include @@ -41,17 +41,20 @@ */ #pragma STDC CX_LIMITED_RANGE on -/* We risk spurious overflow for components >= DBL_MAX/(1+sqrt(2)) */ -#define THRESH 0x1.a827999fcef32p+1022 +/* We risk spurious overflow for components >= DBL_MAX / (1 + sqrt(2)). */ +#define THRESH 0x1.a827999fcef32p+1022 double complex csqrt(double complex z) { - double a = creal(z), b = cimag(z); + double complex result; + double a, b; double t; - double complex result; int scale; + a = creal(z); + b = cimag(z); + /* Handle special cases. */ if (z == 0) return (cpack(0, b)); @@ -59,13 +62,13 @@ return (cpack(INFINITY, b)); if (isnan(a)) { t = (b - b) / (b - b); /* raise invalid if b is not a NaN */ - return (cpack(t, t)); /* return NaN + NaN i */ + return (cpack(a, t)); /* return NaN + NaN i */ } if (isinf(a)) { /* - * csqrt(inf + nan i) = inf + nan i + * csqrt(inf + NaN i) = inf + NaN i * csqrt(inf + y i) = inf + 0 i - * csqrt(-inf + nan i) = nan +- inf i + * csqrt(-inf + NaN i) = NaN +- inf i * csqrt(-inf + y i) = 0 + inf i */ if (signbit(a)) @@ -79,15 +82,15 @@ */ /* Scale to avoid overflow. */ - if (a >= THRESH || b >= THRESH) { - a *= 0.25; - b *= 0.25; - scale = 1; + if (fabs(a) >= THRESH || fabs(b) >= THRESH) { + a *= 0.25; + b *= 0.25; + scale = 1; } else { - scale = 0; + scale = 0; } - /* Algorithm 312, CACM vol 10, Oct 1967 */ + /* Algorithm 312, CACM vol 10, Oct 1967. */ if (a >= 0) { t = sqrt((a + hypot(a, b)) * 0.5); result = cpack(t, b / (2 * t)); @@ -96,9 +99,9 @@ result = cpack(fabs(b) / (2 * t), copysign(t, b)); } - /* Rescale */ + /* Rescale. */ if (scale) - return (result * 2); + return (result * 2); else - return (result); + return (result); } ==== //depot/projects/hammer/lib/msun/src/s_csqrtf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.1 2007/12/15 08:38:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.2 2008/01/11 04:18:25 das Exp $"); #include #include @@ -54,13 +54,13 @@ return (cpackf(INFINITY, b)); if (isnan(a)) { t = (b - b) / (b - b); /* raise invalid if b is not a NaN */ - return (cpackf(t, t)); /* return NaN + NaN i */ + return (cpackf(a, t)); /* return NaN + NaN i */ } if (isinf(a)) { /* - * csqrtf(inf + nan i) = inf + nan i + * csqrtf(inf + NaN i) = inf + NaN i * csqrtf(inf + y i) = inf + 0 i - * csqrtf(-inf + nan i) = nan +- inf i + * csqrtf(-inf + NaN i) = NaN +- inf i * csqrtf(-inf + y i) = 0 + inf i */ if (signbit(a)) ==== //depot/projects/hammer/share/man/man4/ipmi.4#6 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.9 2008/01/04 12:55:23 gabor Exp $ +.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.11 2008/01/07 14:55:20 gabor Exp $ .\" .Dd July 10, 2007 .Dt IPMI 4 @@ -186,7 +186,7 @@ The .Nm driver first appeared in -.Fx 6.3 . +.Fx 6.2 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/hammer/share/man/man4/lagg.4#3 (text+ko) ==== @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.4 2007/07/30 20:17:21 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.5 2008/01/08 15:36:06 gabor Exp $ .\" .Dd April 17, 2007 .Dt LAGG 4 @@ -154,7 +154,7 @@ The .Nm device first appeared in -.Fx 7.0 . +.Fx 6.3 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/hammer/share/man/man4/ng_pppoe.4#14 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.40 2007/12/29 19:59:58 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.41 2008/01/05 23:41:15 brueffer Exp $ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd October 22, 2006 +.Dd December 27, 2007 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -104,9 +104,10 @@ the state machine as a client. It must be newly created and a service name can be given as an argument. It is legal to specify a zero-length service name, this is common -on some DSL setups. It is possible to request connection to specific -access concentrator by it's name using "AC-Name\\Service-Name" syntax. -A session request packet will be broadcast on the Ethernet. +on some DSL setups. +It is possible to request a connection to a specific +access concentrator by its name using the "AC-Name\\Service-Name" syntax. +A session request packet will be broadcasted on the Ethernet. This command uses the .Dv ngpppoe_init_data structure shown below. ==== //depot/projects/hammer/share/man/man4/pci.4#10 (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/man4/pci.4,v 1.20 2008/01/04 08:19:52 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pci.4,v 1.21 2008/01/05 23:21:32 brueffer Exp $ .\" .Dd January 3, 2008 .Dt PCI 4 @@ -57,18 +57,30 @@ .Pp The .Nm -driver implements the pci bus in the kernel. -It enumerates and devices on the pci bus and gives pci client drivers the -chance to attach to them. -It assigns resources to children, when the BIOS doesn't. +driver implements the +.Tn PCI +bus in the kernel. +It enumerates any devices on the +.Tn PCI +bus and gives +.Tn PCI +client drivers the chance to attach to them. +It assigns resources to children, when the BIOS does not. It takes care of routing interrupts when necessary. -It reprobes the unattached pci children when pci client drivers are dynamically +It reprobes the unattached +.Tn PCI +children when +.Tn PCI +client drivers are dynamically loaded at runtime. .Sh KERNEL CONFIGURATION The .Nm device is included in the kernel as described in the SYNOPSIS section. -The pci driver cannot be built as a kld. +The +.Nm +driver cannot be built as a +.Xr kld 4 . .Sh IOCTLS The following .Xr ioctl 2 ==== //depot/projects/hammer/share/man/man4/pcib.4#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/share/man/man4/pcib.4,v 1.1 2008/01/04 08:26:22 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.2 2008/01/05 23:27:59 brueffer Exp $ .\" .Dd January 4, 2008 .Dt PCIB 4 @@ -31,11 +31,19 @@ .Nm pcib .Nd PCI bridge driver .Sh SYNOPSIS -.Cd device pcib +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pcib" +.Ed .Sh DESCRIPTION The .Nm -driver provides for host and pci bridges in a pci system. +driver provides for host and +.Tn PCI +bridges in a +.Tn PCI +system. .Sh BUGS This man page is too short. - ==== //depot/projects/hammer/share/man/man4/textdump.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.2 2007/12/26 12:18:21 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $ .\" -.Dd 26 December, 2007 +.Dd December 26, 2007 .Dt textdump 4 .Os .Sh NAME @@ -93,7 +93,7 @@ .It Pa version.txt Kernel version string. My be disabled by clearing the -.Dv dbeug.ddb.textdump.do_panic +.Dv debug.ddb.textdump.do_version sysctl. .El .Pp ==== //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2005 +.\" Copyright (c) 2005,2008 .\" Hartmut Brandt. .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.4 2005/11/18 12:01:14 ru Exp $ +.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.5 2008/01/08 12:55:56 harti Exp $ .\" -.Dd November 10, 2005 +.Dd January 8, 2008 .Dt BSD.SNMPMOD.MK 7 .Os .Sh NAME @@ -66,6 +66,21 @@ A list of extra MIB definition files for .Xr gensnmptree 1 . This is optional. +This file list is given to both calls to +.Xr gensnmptree 1 \(em +the one that extracts the symbols in +.Va XSYM +from the MIB definitions and the one that +generates the table with OIDs served by this module. +.It Va EXTRAMIBSYMS +A list of extra MIB definition files for +.Xr gensnmptree 1 . +This is optional. +This file list is given only to the call to +.Xr gensnmptree 1 +that extracts symbols from MIB definition files. +It is useful if there are dependencies on other MIBs or for extracting global +definitions for enumeration constants. .It Va XSYM A list of symbols to be extracted from the MIB definition files by .Xr gensnmptree 1 . ==== //depot/projects/hammer/share/man/man9/VOP_LOCK.9#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.19 2007/12/28 00:38:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.21 2008/01/10 19:11:37 brueffer Exp $ .\" -.Dd December 27, 2007 +.Dd January 10, 2008 .Os .Dt VOP_LOCK 9 .Sh NAME @@ -48,7 +48,7 @@ .Ft int .Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td" .Ft int -.Fn vn_lock "struct vnode *vp" "int flags" "struct thread *td" +.Fn vn_lock "struct vnode *vp" "int flags" .Sh DESCRIPTION These calls are used to serialize access to the file system, such as to prevent two writes to the same file from happening at the @@ -110,6 +110,9 @@ to lock a vnode rather than calling .Fn VOP_LOCK directly. +.Fn vn_lock +also does not want a thread specified as argument but it +assumes curthread to be used. .Sh RETURN VALUES Zero is returned on success, otherwise an error is returned. .Sh PSEUDOCODE ==== //depot/projects/hammer/share/man/man9/lock.9#10 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.18 2007/12/28 00:38:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.20 2008/01/09 08:08:56 brueffer Exp $ .\" -.Dd December 27, 2007 +.Dd January 9, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nm lockcount , .Nm lockmgr , .Nm lockstatus , +.Nm lockmgr_disown , .Nm lockmgr_printinfo .Nd "lockmgr family of functions" .Sh SYNOPSIS @@ -51,6 +52,8 @@ .Ft int .Fn lockstatus "struct lock *lkp" "struct thread *td" .Ft void +.Fn lockmgr_disown "struct lock *lkp" +.Ft void .Fn lockmgr_printinfo "struct lock *lkp" .Sh DESCRIPTION The @@ -187,6 +190,12 @@ will be returned. .Pp The +.Fn lockmgr_disown +function switches the owner from curthread to be +.Dv LK_KERNPROC, +if the lock is already held. +.Pp +The .Fn lockmgr_printinfo function prints debugging information about the lock. It is used primarily by ==== //depot/projects/hammer/share/man/man9/style.9#26 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ */ /* @@ -68,7 +68,7 @@ * Copyright (c) 1984-2025 John Q. Public * All rights reserved. * - * Long, boring license goes here, but redacted for brevity + * Long, boring license goes here, but trimmed for brevity */ .Ed .Pp @@ -111,7 +111,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $"); .Ed .Pp Leave another blank line before the header files. ==== //depot/projects/hammer/share/misc/committers-ports.dot#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-ports.dot,v 1.64 2007/11/01 16:08:25 brix Exp $ +# $FreeBSD: src/share/misc/committers-ports.dot,v 1.65 2008/01/10 01:25:40 edwin Exp $ # This file is meant to list all FreeBSD ports committers and describe the # mentor-mentee relationships between them. @@ -95,9 +95,11 @@ lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"] lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"] +linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"] lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"] lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] +lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] @@ -171,6 +173,8 @@ edwin -> cperciva edwin -> erwin +edwin -> linimon +edwin -> lx ehaupt -> db >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 07:31:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8735F16A420; Fri, 11 Jan 2008 07:31:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34E3A16A41A for ; Fri, 11 Jan 2008 07:31:21 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 339BA13C455 for ; Fri, 11 Jan 2008 07:31:21 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B7VLZt075929 for ; Fri, 11 Jan 2008 07:31:21 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B7VK7R075926 for perforce@freebsd.org; Fri, 11 Jan 2008 07:31:20 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 11 Jan 2008 07:31:20 GMT Message-Id: <200801110731.m0B7VK7R075926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 133026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 07:31:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133026 Change 133026 by zhouzhouyi@zhouzhouyi_mactest on 2008/01/11 07:30:47 Style Modification Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/00.t#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/01.t#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/00.t#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/signal/00.t,v 1.1 2007/06/04 01:42:08 zhouzhouyi Exp $ +# $FreeBSD$ desc="sending signal to a process" @@ -9,31 +9,32 @@ #turn off all the switches for i in `sysctl security.mac | grep "\.enabled"| sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 +sysctl ${i}=0 > /dev/null done mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` #following test case is to show, when subject's effective mls level does not dominate #object's effective mls level, a ESRCH is returned when signaling if [ "${mac_mls_support}" != "" ] ; then + echo "1..6" maccmdnotexpectanyerror "mls/3(2-7)" ${macproc} -w 20 -f "${pid_file}" getmacprocpid - t=`sysctl security.mac.mls.enabled=1` + sysctl security.mac.mls.enabled=1 > /dev/null maccmdexpect "No such process" "mls/low" kill ${pid} maccmdnotexpectanyerror "mls/3(2-7)" kill ${pid} - t=`sysctl security.mac.mls.enabled=0` + sysctl security.mac.mls.enabled=0 > /dev/null rm ${pid_file} rm ${tmp_file} #following test case is to show, when object's effective mls level does not dominate #subject's effective mls level, a EACCES is returned when signaling - t=`sysctl security.mac.mls.enabled=0` + sysctl security.mac.mls.enabled=0 > /dev/null maccmdnotexpectanyerror "mls/low(low-high)" ${macproc} -w 20 -f "${pid_file}" getmacprocpid - t=`sysctl security.mac.mls.enabled=1` + sysctl security.mac.mls.enabled=1 > /dev/null maccmdexpect "Permission denied" "mls/3(2-7)" kill ${pid} maccmdnotexpectanyerror "mls/low(low-high)" kill ${pid} - t=`sysctl security.mac.mls.enabled=0` + sysctl security.mac.mls.enabled=0 > /dev/null rm ${pid_file} rm ${tmp_file} fi ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/01.t#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/tools/regression/mactest/tests/signal/01.t,v 1.1 2007/06/04 01:42:08 zhouzhouyi Exp $ +# $FreeBSD$ desc="sending signal to a process, check whether mac_test_check_proc_signal is got called \ properly" @@ -12,17 +12,29 @@ #turn off all the switches for i in `sysctl security.mac | grep "\.enabled"| sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do -sysctl ${i}=0 +sysctl ${i}=0 > /dev/null done mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` mac_biba_support=`sysctl -n security.mac.biba.enabled 2>/dev/null` +mac_test_support=`sysctl -n security.mac.test.pseudoinit 2>/dev/null` + +if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] \ + && [ "${mac_test_support}" != "" ]; then + + if [ -f ${mactest_conf} ]; then + rm ${mactest_conf} + fi + touch ${mactest_conf} + setfmac "mls/equal,biba/equal" ${mactest_conf} + + echo "1..2" -if [ "${mac_mls_support}" != "" ] && [ "${mac_biba_support}" != "" ] ; then maccmdnotexpectanyerror "mls/3(2-7)" ${macproc} -w 100 -f "${pid_file}" getmacprocpid - echo "pid = -1 mac_test_check_proc_signal with cr_label and proc label: biba/high(low-high),mls/9(low-high) mls/3(2-7),biba/high(low-high)" > ${mactest_conf} + echo -n "pid = -1 proc_check_signal:" > ${mactest_conf} + echo "biba/high(low-high),mls/9(low-high) mls/3(2-7),biba/high(low-high)" >> ${mactest_conf} mactestexpect "" 0 -m "mls/9" -f ${mactest_conf} kill ${pid} 9 From owner-p4-projects@FreeBSD.ORG Fri Jan 11 08:00:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7890216A41B; Fri, 11 Jan 2008 08:00:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D52016A417 for ; Fri, 11 Jan 2008 08:00:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B63F13C448 for ; Fri, 11 Jan 2008 08:00:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B80qRA079852 for ; Fri, 11 Jan 2008 08:00:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B80qM0079840 for perforce@freebsd.org; Fri, 11 Jan 2008 08:00:52 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 08:00:52 GMT Message-Id: <200801110800.m0B80qM0079840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 08:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133027 Change 133027 by jb@jb_freebsd1 on 2008/01/11 08:00:34 Scrap this CDDL'd code. We'll have our own BSD licensed version of libproc and just map DTrace to use it's (different) API. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#10 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#4 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.c#3 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.h#2 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/Psymtab.c#3 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/Putil.c#3 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/Putil.h#2 delete .. //depot/projects/dtrace/src/cddl/lib/libproc/libproc.h#3 delete Differences ... ==== //depot/projects/dtrace/src/cddl/lib/Makefile#10 (text+ko) ==== @@ -6,7 +6,6 @@ libctf \ libdtrace \ libnvpair \ - libproc \ libumem \ libuutil \ ${_libzfs} \ From owner-p4-projects@FreeBSD.ORG Fri Jan 11 08:51:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66F3E16A41B; Fri, 11 Jan 2008 08:51:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AD9716A41A for ; Fri, 11 Jan 2008 08:51:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A35013C459 for ; Fri, 11 Jan 2008 08:51:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0B8plw6097348 for ; Fri, 11 Jan 2008 08:51:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0B8pla1097329 for perforce@freebsd.org; Fri, 11 Jan 2008 08:51:47 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 08:51:47 GMT Message-Id: <200801110851.m0B8pla1097329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 08:51:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=133028 Change 133028 by jb@jb_freebsd1 on 2008/01/11 08:51:22 Bye-bye CDDL'd libproc. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/P32ton.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/P32ton.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcontrol.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcontrol.h#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcore.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pgcore.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pidle.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pisadep.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pisprocdir.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Plwpregs.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pscantext.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pservice.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pstack.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pstack.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Psymtab.c#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Psyscall.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Putil.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Putil.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/libproc.h#6 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_door.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_exit.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_fcntl.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getitimer.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getrctl.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getrlimit.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_getsockname.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_ioctl.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_lseek.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_memcntl.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_meminfo.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_mmap.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_open.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_pbind.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_rename.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_sigaction.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_stat.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_statvfs.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_tasksys.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/pr_waitid.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_arg.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_get_info.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_names.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_set.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/proc_stdio.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/xx/libproc.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 11 17:24:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E43C16A421; Fri, 11 Jan 2008 17:24:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFCDE16A41B for ; Fri, 11 Jan 2008 17:24:06 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6C0313C45D for ; Fri, 11 Jan 2008 17:24:06 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BHO6ST016136 for ; Fri, 11 Jan 2008 17:24:06 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BHO6e7016133 for perforce@freebsd.org; Fri, 11 Jan 2008 17:24:06 GMT (envelope-from swise@FreeBSD.org) Date: Fri, 11 Jan 2008 17:24:06 GMT Message-Id: <200801111724.m0BHO6e7016133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 17:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=133054 Change 133054 by swise@swise:vic10:iwarp on 2008/01/11 17:23:36 Always call low level send function via cxgb3_ofld_send() Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#9 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#9 (text+ko) ==== @@ -190,7 +190,7 @@ req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, hwtid)); m_set_priority(m, CPL_PRIORITY_SETUP); - tdev->send(tdev, m); + cxgb_ofld_send(tdev, m); return; } @@ -213,7 +213,7 @@ req->val = cpu_to_be64(1 << S_TCB_RX_QUIESCE); m_set_priority(m, CPL_PRIORITY_DATA); - ep->com.tdev->send(ep->com.tdev, m); + cxgb_ofld_send(ep->com.tdev, m); return 0; } @@ -236,7 +236,7 @@ req->val = 0; m_set_priority(m, CPL_PRIORITY_DATA); - ep->com.tdev->send(ep->com.tdev, m); + cxgb_ofld_send(ep->com.tdev, m); return 0; } @@ -847,7 +847,7 @@ OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, ep->hwtid)); req->credit_dack = htonl(V_RX_CREDITS(credits) | V_RX_FORCE_ACK(1)); m_set_priority(m, CPL_PRIORITY_ACK); - ep->com.tdev->send(ep->com.tdev, m); + cxgb_ofld_send(ep->com.tdev, m); return credits; } @@ -1225,7 +1225,7 @@ req->opt1 = htonl(V_CONN_POLICY(CPL_CONN_POLICY_ASK)); m_set_priority(m, 1); - ep->com.tdev->send(ep->com.tdev, m); + cxgb_ofld_send(ep->com.tdev, m); return 0; } @@ -1259,7 +1259,7 @@ req->cpu_idx = 0; OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, ep->stid)); m_set_priority(m, 1); - ep->com.tdev->send(ep->com.tdev, m); + cxgb_ofld_send(ep->com.tdev, m); return 0; } @@ -1335,7 +1335,7 @@ rpl->opt0l_status = htonl(CPL_PASS_OPEN_REJECT); rpl->opt2 = 0; rpl->rsvd = rpl->opt2; - tdev->send(tdev, m); + cxgb_ofld_send(tdev, m); } } @@ -1630,7 +1630,7 @@ rpl->wr.wr_lo = htonl(V_WR_TID(ep->hwtid)); OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, ep->hwtid)); rpl->cmd = CPL_ABORT_NO_RST; - ep->com.tdev->send(ep->com.tdev, rpl_mbuf); + cxgb_ofld_send(ep->com.tdev, rpl_mbuf); if (state != ABORTING) { state_set(&ep->com, DEAD); release_ep_resources(ep); From owner-p4-projects@FreeBSD.ORG Fri Jan 11 17:29:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71C1C16A47F; Fri, 11 Jan 2008 17:29:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 359E616A47D for ; Fri, 11 Jan 2008 17:29:12 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C5B513C457 for ; Fri, 11 Jan 2008 17:29:12 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BHTCmg016370 for ; Fri, 11 Jan 2008 17:29:12 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BHTCd8016367 for perforce@freebsd.org; Fri, 11 Jan 2008 17:29:12 GMT (envelope-from swise@FreeBSD.org) Date: Fri, 11 Jan 2008 17:29:12 GMT Message-Id: <200801111729.m0BHTCd8016367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 17:29:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=133055 Change 133055 by swise@swise:vic10:iwarp on 2008/01/11 17:28:31 TERMINATE WRs can hang the tx ofld queue Don't set the gen bits nor length bits in the terminate WR. This is done by the LLD driver. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#3 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#3 (text+ko) ==== @@ -680,9 +680,10 @@ /* immediate data starts here. */ term = (struct terminate_message *)wqe->send.sgl; build_term_codes(rsp_msg, &term->layer_etype, &term->ecode); - build_fw_riwrh((void *)wqe, T3_WR_SEND, - T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 1, - qhp->ep->hwtid, 5); + wqe->send.wrh.op_seop_flags = cpu_to_be32(V_FW_RIWR_OP(T3_WR_SEND) | + V_FW_RIWR_FLAGS(T3_COMPLETION_FLAG | T3_NOTIFY_FLAG)); + wqe->send.wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(qhp->ep->hwtid)); + m_set_priority(m, CPL_PRIORITY_DATA); return cxgb_ofld_send(qhp->rhp->rdev.t3cdev_p, m); } From owner-p4-projects@FreeBSD.ORG Fri Jan 11 17:32:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB2A416A419; Fri, 11 Jan 2008 17:32:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7059E16A417 for ; Fri, 11 Jan 2008 17:32:15 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57B7B13C458 for ; Fri, 11 Jan 2008 17:32:15 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BHWFuX017590 for ; Fri, 11 Jan 2008 17:32:15 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BHWFnD017587 for perforce@freebsd.org; Fri, 11 Jan 2008 17:32:15 GMT (envelope-from swise@FreeBSD.org) Date: Fri, 11 Jan 2008 17:32:15 GMT Message-Id: <200801111732.m0BHWFnD017587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 17:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133056 Change 133056 by swise@swise:vic10:iwarp on 2008/01/11 17:31:23 Don't count neg_adv abort_req_rss messages as real aborts Negative advice messages should _not_ count toward the 2 abort requests needed to indicate an abort request. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#10 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#10 (text+ko) ==== @@ -1546,6 +1546,13 @@ int ret; int state; + if (is_neg_adv_abort(req->status)) { + PDBG("%s neg_adv_abort ep %p tid %d\n", __FUNCTION__, ep, + ep->hwtid); + t3_l2t_send_event(ep->com.tdev, ep->l2t); + return CPL_RET_BUF_DONE; + } + /* * We get 2 peer aborts from the HW. The first one must * be ignored except for scribbling that we need one more. @@ -1555,13 +1562,6 @@ return CPL_RET_BUF_DONE; } - if (is_neg_adv_abort(req->status)) { - PDBG("%s neg_adv_abort ep %p tid %d\n", __FUNCTION__, ep, - ep->hwtid); - t3_l2t_send_event(ep->com.tdev, ep->l2t); - return CPL_RET_BUF_DONE; - } - state = state_read(&ep->com); PDBG("%s ep %p state %u\n", __FUNCTION__, ep, state); switch (state) { From owner-p4-projects@FreeBSD.ORG Fri Jan 11 17:44:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 205FC16A4DD; Fri, 11 Jan 2008 17:44:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1D2116A4C5 for ; Fri, 11 Jan 2008 17:44:29 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9E1213C448 for ; Fri, 11 Jan 2008 17:44:29 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BHiTcH019115 for ; Fri, 11 Jan 2008 17:44:29 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BHiTYx019112 for perforce@freebsd.org; Fri, 11 Jan 2008 17:44:29 GMT (envelope-from swise@FreeBSD.org) Date: Fri, 11 Jan 2008 17:44:29 GMT Message-Id: <200801111744.m0BHiTYx019112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 17:44:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133057 Change 133057 by swise@swise:vic10:iwarp on 2008/01/11 17:43:32 Don't post TID_RELEASE message The LLD does this for us in cxgb3_remove_tid(). Also fixed active open failure cases where we also shouldn't be releasing the TID. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#11 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#11 (text+ko) ==== @@ -309,8 +309,6 @@ cxgb_remove_tid(ep->com.tdev, (void *)ep, ep->hwtid); RTFREE(ep->dst); l2t_release(L2DATA(ep->com.tdev), ep->l2t); - if (ep->com.tdev->type == T3B) - release_tid(ep->com.tdev, ep->hwtid, NULL); put_ep(&ep->com); } @@ -1181,6 +1179,16 @@ return CPL_RET_BUF_DONE; } +/* + * Return whether a failed active open has allocated a TID + */ +static inline int act_open_has_tid(int status) +{ + return status != CPL_ERR_TCAM_FULL && status != CPL_ERR_CONN_EXIST && + status != CPL_ERR_ARP_MISS; +} + + static int act_open_rpl(struct t3cdev *tdev, struct mbuf *m, void *ctx) { @@ -1191,7 +1199,7 @@ status2errno(rpl->status)); connect_reply_upcall(ep, status2errno(rpl->status)); state_set(&ep->com, DEAD); - if (ep->com.tdev->type == T3B) + if (ep->com.tdev->type == T3B && act_open_has_tid(rpl->status)) release_tid(ep->com.tdev, GET_TID(rpl), NULL); cxgb_free_atid(ep->com.tdev, ep->atid); RTFREE(ep->dst); From owner-p4-projects@FreeBSD.ORG Fri Jan 11 17:47:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4847B16A479; Fri, 11 Jan 2008 17:47:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BD3716A46B for ; Fri, 11 Jan 2008 17:47:33 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E799F13C47E for ; Fri, 11 Jan 2008 17:47:32 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BHlWQW019257 for ; Fri, 11 Jan 2008 17:47:32 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BHlWbl019254 for perforce@freebsd.org; Fri, 11 Jan 2008 17:47:32 GMT (envelope-from swise@FreeBSD.org) Date: Fri, 11 Jan 2008 17:47:32 GMT Message-Id: <200801111747.m0BHlWbl019254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 133058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 17:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=133058 Change 133058 by swise@swise:vic10:iwarp on 2008/01/11 17:47:09 Set the max_qp_init_rd_atom attribute in query_device The device attribute max_qp_init_rd_atom is not getting set in cxgb3's query_device method. Version 1.0.4 of librdmacm now validates the user's requested initiator and responder resources against the max supported by the device. Since iw_cxgb3 wasn't setting this attribute (and it defaulted to 0), all rdma_connect()s fail if there are initiator resources requested by the app. Fix this by setting the correct value in iwch_query_device(). Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#5 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#5 (text+ko) ==== @@ -1053,6 +1053,7 @@ props->max_sge = dev->attr.max_sge_per_wr; props->max_sge_rd = 1; props->max_qp_rd_atom = dev->attr.max_rdma_reads_per_qp; + props->max_qp_init_rd_atom = dev->attr.max_rdma_reads_per_qp; props->max_cq = dev->attr.max_cqs; props->max_cqe = dev->attr.max_cqes_per_cq; props->max_mr = dev->attr.max_mem_regs; From owner-p4-projects@FreeBSD.ORG Fri Jan 11 20:40:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845D716A468; Fri, 11 Jan 2008 20:40:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49FE416A420 for ; Fri, 11 Jan 2008 20:40:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D51313C459 for ; Fri, 11 Jan 2008 20:40:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BKeb5K068241 for ; Fri, 11 Jan 2008 20:40:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BKebfM068238 for perforce@freebsd.org; Fri, 11 Jan 2008 20:40:37 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Jan 2008 20:40:37 GMT Message-Id: <200801112040.m0BKebfM068238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 20:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=133063 Change 133063 by sam@sam_ebb on 2008/01/11 20:40:31 add local mac address to vap create Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#18 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#18 (text+ko) ==== @@ -293,7 +293,8 @@ int ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { #define IEEE80211_C_OPMODE \ (IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \ @@ -389,7 +390,7 @@ */ vap->iv_reset = default_reset; - IEEE80211_ADDR_COPY(vap->iv_myaddr, ic->ic_myaddr); + IEEE80211_ADDR_COPY(vap->iv_myaddr, macaddr); ieee80211_sysctl_vattach(vap); ieee80211_crypto_vattach(vap); ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#22 (text+ko) ==== @@ -191,7 +191,8 @@ struct ieee80211vap* (*ic_vap_create)(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]); + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t macaddr[IEEE80211_ADDR_LEN]); void (*ic_vap_delete)(struct ieee80211vap *); /* operating mode attachment */ ieee80211vap_attach ic_vattach[IEEE80211_OPMODE_MAX]; @@ -521,7 +522,8 @@ void ieee80211_ifdetach(struct ieee80211com *); int ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]); + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t macaddr[IEEE80211_ADDR_LEN]); int ieee80211_vap_attach(struct ieee80211vap *, ifm_change_cb_t, ifm_stat_cb_t); void ieee80211_vap_detach(struct ieee80211vap *); From owner-p4-projects@FreeBSD.ORG Fri Jan 11 20:41:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5FA216A420; Fri, 11 Jan 2008 20:41:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AEE716A418 for ; Fri, 11 Jan 2008 20:41:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E5F313C4CC for ; Fri, 11 Jan 2008 20:41:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BKfcVk069111 for ; Fri, 11 Jan 2008 20:41:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BKfc1M069105 for perforce@freebsd.org; Fri, 11 Jan 2008 20:41:38 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Jan 2008 20:41:38 GMT Message-Id: <200801112041.m0BKfc1M069105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 20:41:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=133064 Change 133064 by sam@sam_ebb on 2008/01/11 20:40:49 add wlan clone support; compile-tested only Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#15 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#15 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -60,6 +61,39 @@ SYSCTL_INT(_net_wlan, OID_AUTO, recv_bar, CTLFLAG_RW, &ieee80211_recv_bar_ena, 0, "BAR frame processing (ena/dis)"); +static int +wlan_clone_create(struct if_clone *ifc, int unit, caddr_t params) +{ + struct ieee80211_clone_params cp; + struct ieee80211vap *vap; + struct ieee80211com *ic; + struct ifnet *ifp; + int error; + + error = copyin(params, &cp, sizeof(cp)); + if (error) + return error; + ifp = ifunit(cp.icp_parent); + if (ifp == NULL) + return ENXIO; + ic = ifp->if_softc; /* XXX forces ic at front of softc */ + vap = ic->ic_vap_create(ic, ifc->ifc_name, unit, + cp.icp_opmode, cp.icp_flags, cp.icp_bssid, + cp.icp_flags & IEEE80211_CLONE_MACADDR ? + cp.icp_macaddr : ic->ic_myaddr); + return (vap == NULL ? EIO : 0); +} + +static void +wlan_clone_destroy(struct ifnet *ifp) +{ + struct ieee80211vap *vap = ifp->if_softc; + struct ieee80211com *ic = vap->iv_ic; + + ic->ic_vap_delete(vap); +} +IFC_SIMPLE_DECLARE(wlan, 0); + #ifdef IEEE80211_AMPDU_AGE static int ieee80211_sysctl_ampdu_age(SYSCTL_HANDLER_ARGS) From owner-p4-projects@FreeBSD.ORG Fri Jan 11 20:47:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2FFD16A46C; Fri, 11 Jan 2008 20:47:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6774B16A419 for ; Fri, 11 Jan 2008 20:47:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AD3013C447 for ; Fri, 11 Jan 2008 20:47:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BKljYI078321 for ; Fri, 11 Jan 2008 20:47:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BKljFH078318 for perforce@freebsd.org; Fri, 11 Jan 2008 20:47:45 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Jan 2008 20:47:45 GMT Message-Id: <200801112047.m0BKljFH078318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 20:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=133065 Change 133065 by sam@sam_ebb on 2008/01/11 20:46:50 update for vap create api change Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#6 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#10 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#4 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#4 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#4 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#6 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#4 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#4 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#6 (text+ko) ==== @@ -109,7 +109,8 @@ static struct ieee80211vap *ipw_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]); + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void ipw_vap_delete(struct ieee80211vap *); static int ipw_dma_alloc(struct ipw_softc *); static void ipw_release(struct ipw_softc *); @@ -433,7 +434,8 @@ static struct ieee80211vap * ipw_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct ipw_vap *ivp; struct ieee80211vap *vap; @@ -445,7 +447,7 @@ if (ivp == NULL) return NULL; vap = &ivp->vap; - ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); /* override with driver methods */ ivp->newstate = vap->iv_newstate; vap->iv_newstate = ipw_newstate; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#10 (text+ko) ==== @@ -123,7 +123,8 @@ static struct ieee80211vap *iwi_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]); + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void iwi_vap_delete(struct ieee80211vap *); static void iwi_dma_map_addr(void *, bus_dma_segment_t *, int, int); static int iwi_alloc_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *, @@ -498,7 +499,8 @@ static struct ieee80211vap * iwi_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct iwi_vap *ivp; struct ieee80211vap *vap; @@ -510,7 +512,7 @@ if (ivp == NULL) return NULL; vap = &ivp->iwi_vap; - ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); vap->iv_bmissthreshold = 10; /* override default */ /* override with driver methods */ ivp->iwi_newstate = vap->iv_newstate; ==== //depot/projects/vap/sys/dev/ral/rt2560.c#4 (text) ==== @@ -80,7 +80,8 @@ static struct ieee80211vap *rt2560_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void rt2560_vap_delete(struct ieee80211vap *); static void rt2560_dma_map_addr(void *, bus_dma_segment_t *, int, int); @@ -369,7 +370,8 @@ static struct ieee80211vap * rt2560_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct rt2560_vap *rvp; struct ieee80211vap *vap; @@ -383,7 +385,7 @@ vap = &rvp->ral_vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid); + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); vap->iv_reset = rt2560_reset; /* override state transition machine */ ==== //depot/projects/vap/sys/dev/ral/rt2661.c#4 (text) ==== @@ -78,7 +78,8 @@ static struct ieee80211vap *rt2661_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void rt2661_vap_delete(struct ieee80211vap *); static void rt2661_dma_map_addr(void *, bus_dma_segment_t *, int, int); @@ -388,7 +389,8 @@ static struct ieee80211vap * rt2661_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct rt2661_vap *rvp; struct ieee80211vap *vap; @@ -402,7 +404,7 @@ vap = &rvp->ral_vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid); + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); vap->iv_reset = rt2661_reset; /* override state transition machine */ ==== //depot/projects/vap/sys/dev/usb/if_rum.c#4 (text+ko) ==== @@ -127,7 +127,8 @@ static struct ieee80211vap *rum_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void rum_vap_delete(struct ieee80211vap *); static int rum_alloc_tx_list(struct rum_softc *); static void rum_free_tx_list(struct rum_softc *); @@ -577,7 +578,8 @@ static struct ieee80211vap * rum_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct rum_vap *rvp; struct ieee80211vap *vap; @@ -591,7 +593,7 @@ vap = &rvp->vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid); + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); /* override state transition machine */ rvp->newstate = vap->iv_newstate; ==== //depot/projects/vap/sys/dev/usb/if_ural.c#6 (text+ko) ==== @@ -117,7 +117,8 @@ static struct ieee80211vap *ural_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void ural_vap_delete(struct ieee80211vap *); static int ural_alloc_tx_list(struct ural_softc *); static void ural_free_tx_list(struct ural_softc *); @@ -567,7 +568,8 @@ static struct ieee80211vap * ural_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct ural_vap *uvp; struct ieee80211vap *vap; @@ -581,7 +583,7 @@ vap = &uvp->vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid); + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); vap->iv_reset = ural_reset; /* override state transition machine */ ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#4 (text+ko) ==== @@ -154,7 +154,8 @@ static struct ieee80211vap *zyd_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void zyd_vap_delete(struct ieee80211vap *); static int zyd_attachhook(struct zyd_softc *); static int zyd_complete_attach(struct zyd_softc *); @@ -470,7 +471,8 @@ static struct ieee80211vap * zyd_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct zyd_vap *zvp; struct ieee80211vap *vap; @@ -484,7 +486,7 @@ vap = &zvp->vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, - flags | IEEE80211_CLONE_NOBEACONS, bssid); + flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); /* override state transition machine */ zvp->newstate = vap->iv_newstate; ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#4 (text+ko) ==== @@ -154,7 +154,8 @@ static struct ieee80211vap *wpi_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN]); + int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]); static void wpi_vap_delete(struct ieee80211vap *); static int wpi_dma_contig_alloc(struct wpi_softc *, struct wpi_dma_info *, void **, bus_size_t, bus_size_t, int); @@ -800,7 +801,8 @@ static struct ieee80211vap * wpi_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, - const uint8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN]) { struct wpi_vap *wvp; struct ieee80211vap *vap; @@ -812,7 +814,7 @@ if (wvp == NULL) return NULL; vap = &wvp->vap; - ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); /* override with driver methods */ wvp->newstate = vap->iv_newstate; vap->iv_newstate = wpi_newstate; From owner-p4-projects@FreeBSD.ORG Fri Jan 11 20:53:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D55616A468; Fri, 11 Jan 2008 20:53:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D71C016A41A for ; Fri, 11 Jan 2008 20:53:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB80C13C447 for ; Fri, 11 Jan 2008 20:53:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BKrqQG079647 for ; Fri, 11 Jan 2008 20:53:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BKrqFa079644 for perforce@freebsd.org; Fri, 11 Jan 2008 20:53:52 GMT (envelope-from sam@freebsd.org) Date: Fri, 11 Jan 2008 20:53:52 GMT Message-Id: <200801112053.m0BKrqFa079644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 20:53:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=133066 Change 133066 by sam@sam_ebb on 2008/01/11 20:53:40 avoid potential null ptr deref Submitted by: cbz Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.h#2 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.h#2 (text+ko) ==== @@ -34,8 +34,7 @@ wh, NULL, "%s", "no " #__elem ); \ vap->iv_stats.is_rx_elem_missing++; \ _action; \ - } \ - if ((__elem)[1] > (__maxlen)) { \ + } else if ((__elem)[1] > (__maxlen)) { \ IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID, \ wh, NULL, "bad " #__elem " len %d", (__elem)[1]); \ vap->iv_stats.is_rx_elem_toobig++; \ From owner-p4-projects@FreeBSD.ORG Fri Jan 11 21:02:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F3CF16A420; Fri, 11 Jan 2008 21:02:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C820A16A41A for ; Fri, 11 Jan 2008 21:02:01 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A434513C459 for ; Fri, 11 Jan 2008 21:02:01 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BL21Ta085529 for ; Fri, 11 Jan 2008 21:02:01 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BL21t4085478 for perforce@freebsd.org; Fri, 11 Jan 2008 21:02:01 GMT (envelope-from andre@freebsd.org) Date: Fri, 11 Jan 2008 21:02:01 GMT Message-Id: <200801112102.m0BL21t4085478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 21:02:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=133067 Change 133067 by andre@andre_flirtbox on 2008/01/11 21:01:14 Testing. Affected files ... .. //depot/projects/tcp_reass/netinet/udp.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 11 21:09:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7133816A421; Fri, 11 Jan 2008 21:09:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 307F716A417 for ; Fri, 11 Jan 2008 21:09:30 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 233D613C459 for ; Fri, 11 Jan 2008 21:09:30 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BL9UJq094980 for ; Fri, 11 Jan 2008 21:09:30 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BL9UeI094972 for perforce@freebsd.org; Fri, 11 Jan 2008 21:09:30 GMT (envelope-from andre@freebsd.org) Date: Fri, 11 Jan 2008 21:09:30 GMT Message-Id: <200801112109.m0BL9UeI094972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 21:09:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=133068 Change 133068 by andre@andre_flirtbox on 2008/01/11 21:09:28 Try again to create the branch. Affected files ... .. //depot/projects/tcp_reass/Makefile#1 branch .. //depot/projects/tcp_reass/amd64/Makefile#1 branch .. //depot/projects/tcp_reass/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/tcp_reass/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/tcp_reass/amd64/acpica/madt.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/atomic.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/autoconf.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/bios.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/tcp_reass/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/db_interface.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/db_trace.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/exception.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/fpu.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/genassym.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/identcpu.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/initcpu.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/io.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/io_apic.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/legacy.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/local_apic.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/locore.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mem.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mpboot.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mptable.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/msi.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/nexus.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/pmap.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/support.S#1 branch .. //depot/projects/tcp_reass/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/trap.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/tsc.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/compile/.cvsignore#1 branch .. //depot/projects/tcp_reass/amd64/conf/.cvsignore#1 branch .. //depot/projects/tcp_reass/amd64/conf/DEFAULTS#1 branch .. //depot/projects/tcp_reass/amd64/conf/GENERIC#1 branch .. //depot/projects/tcp_reass/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/tcp_reass/amd64/conf/MAC#1 branch .. //depot/projects/tcp_reass/amd64/conf/Makefile#1 branch .. //depot/projects/tcp_reass/amd64/conf/NOTES#1 branch .. //depot/projects/tcp_reass/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/tcp_reass/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/tcp_reass/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/tcp_reass/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/tcp_reass/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/tcp_reass/amd64/include/_bus.h#1 branch .. //depot/projects/tcp_reass/amd64/include/_inttypes.h#1 branch .. //depot/projects/tcp_reass/amd64/include/_limits.h#1 branch .. //depot/projects/tcp_reass/amd64/include/_stdint.h#1 branch .. //depot/projects/tcp_reass/amd64/include/_types.h#1 branch .. //depot/projects/tcp_reass/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/tcp_reass/amd64/include/apicreg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/apicvar.h#1 branch .. //depot/projects/tcp_reass/amd64/include/asm.h#1 branch .. //depot/projects/tcp_reass/amd64/include/asmacros.h#1 branch .. //depot/projects/tcp_reass/amd64/include/atomic.h#1 branch .. //depot/projects/tcp_reass/amd64/include/bus.h#1 branch .. //depot/projects/tcp_reass/amd64/include/bus_dma.h#1 branch .. //depot/projects/tcp_reass/amd64/include/clock.h#1 branch .. //depot/projects/tcp_reass/amd64/include/cpu.h#1 branch .. //depot/projects/tcp_reass/amd64/include/cpufunc.h#1 branch .. //depot/projects/tcp_reass/amd64/include/cputypes.h#1 branch .. //depot/projects/tcp_reass/amd64/include/db_machdep.h#1 branch .. //depot/projects/tcp_reass/amd64/include/elf.h#1 branch .. //depot/projects/tcp_reass/amd64/include/endian.h#1 branch .. //depot/projects/tcp_reass/amd64/include/exec.h#1 branch .. //depot/projects/tcp_reass/amd64/include/float.h#1 branch .. //depot/projects/tcp_reass/amd64/include/floatingpoint.h#1 branch .. //depot/projects/tcp_reass/amd64/include/fpu.h#1 branch .. //depot/projects/tcp_reass/amd64/include/frame.h#1 branch .. //depot/projects/tcp_reass/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_reass/amd64/include/ieeefp.h#1 branch .. //depot/projects/tcp_reass/amd64/include/in_cksum.h#1 branch .. //depot/projects/tcp_reass/amd64/include/intr_machdep.h#1 branch .. //depot/projects/tcp_reass/amd64/include/iodev.h#1 branch .. //depot/projects/tcp_reass/amd64/include/kdb.h#1 branch .. //depot/projects/tcp_reass/amd64/include/legacyvar.h#1 branch .. //depot/projects/tcp_reass/amd64/include/limits.h#1 branch .. //depot/projects/tcp_reass/amd64/include/md_var.h#1 branch .. //depot/projects/tcp_reass/amd64/include/memdev.h#1 branch .. //depot/projects/tcp_reass/amd64/include/metadata.h#1 branch .. //depot/projects/tcp_reass/amd64/include/minidump.h#1 branch .. //depot/projects/tcp_reass/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/tcp_reass/amd64/include/mptable.h#1 branch .. //depot/projects/tcp_reass/amd64/include/mutex.h#1 branch .. //depot/projects/tcp_reass/amd64/include/param.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pc/bios.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pc/display.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pcb.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pcb_ext.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pcpu.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pmap.h#1 branch .. //depot/projects/tcp_reass/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_reass/amd64/include/ppireg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/proc.h#1 branch .. //depot/projects/tcp_reass/amd64/include/profile.h#1 branch .. //depot/projects/tcp_reass/amd64/include/psl.h#1 branch .. //depot/projects/tcp_reass/amd64/include/ptrace.h#1 branch .. //depot/projects/tcp_reass/amd64/include/reg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/reloc.h#1 branch .. //depot/projects/tcp_reass/amd64/include/resource.h#1 branch .. //depot/projects/tcp_reass/amd64/include/runq.h#1 branch .. //depot/projects/tcp_reass/amd64/include/segments.h#1 branch .. //depot/projects/tcp_reass/amd64/include/setjmp.h#1 branch .. //depot/projects/tcp_reass/amd64/include/sf_buf.h#1 branch .. //depot/projects/tcp_reass/amd64/include/sigframe.h#1 branch .. //depot/projects/tcp_reass/amd64/include/signal.h#1 branch .. //depot/projects/tcp_reass/amd64/include/smp.h#1 branch .. //depot/projects/tcp_reass/amd64/include/specialreg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/stack.h#1 branch .. //depot/projects/tcp_reass/amd64/include/stdarg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/sysarch.h#1 branch .. //depot/projects/tcp_reass/amd64/include/timerreg.h#1 branch .. //depot/projects/tcp_reass/amd64/include/trap.h#1 branch .. //depot/projects/tcp_reass/amd64/include/tss.h#1 branch .. //depot/projects/tcp_reass/amd64/include/ucontext.h#1 branch .. //depot/projects/tcp_reass/amd64/include/varargs.h#1 branch .. //depot/projects/tcp_reass/amd64/include/vmparam.h#1 branch .. //depot/projects/tcp_reass/amd64/isa/atpic.c#1 branch .. //depot/projects/tcp_reass/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/tcp_reass/amd64/isa/clock.c#1 branch .. //depot/projects/tcp_reass/amd64/isa/elcr.c#1 branch .. //depot/projects/tcp_reass/amd64/isa/icu.h#1 branch .. //depot/projects/tcp_reass/amd64/isa/isa.c#1 branch .. //depot/projects/tcp_reass/amd64/isa/isa.h#1 branch .. //depot/projects/tcp_reass/amd64/isa/isa_dma.c#1 branch .. //depot/projects/tcp_reass/amd64/isa/nmi.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/Makefile#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux.h#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/tcp_reass/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/tcp_reass/amd64/linux32/syscalls.master#1 branch .. //depot/projects/tcp_reass/amd64/pci/pci_bus.c#1 branch .. //depot/projects/tcp_reass/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/tcp_reass/arm/arm/autoconf.c#1 branch .. //depot/projects/tcp_reass/arm/arm/bcopy_page.S#1 branch .. //depot/projects/tcp_reass/arm/arm/bcopyinout.S#1 branch .. //depot/projects/tcp_reass/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/tcp_reass/arm/arm/blockio.S#1 branch .. //depot/projects/tcp_reass/arm/arm/bootconfig.c#1 branch .. //depot/projects/tcp_reass/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/tcp_reass/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/copystr.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc.c#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/tcp_reass/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/tcp_reass/arm/arm/db_disasm.c#1 branch .. //depot/projects/tcp_reass/arm/arm/db_interface.c#1 branch .. //depot/projects/tcp_reass/arm/arm/db_trace.c#1 branch .. //depot/projects/tcp_reass/arm/arm/disassem.c#1 branch .. //depot/projects/tcp_reass/arm/arm/dump_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/elf_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/tcp_reass/arm/arm/exception.S#1 branch .. //depot/projects/tcp_reass/arm/arm/fiq.c#1 branch .. //depot/projects/tcp_reass/arm/arm/fiq_subr.S#1 branch .. //depot/projects/tcp_reass/arm/arm/fusu.S#1 branch .. //depot/projects/tcp_reass/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/genassym.c#1 branch .. //depot/projects/tcp_reass/arm/arm/identcpu.c#1 branch .. //depot/projects/tcp_reass/arm/arm/in_cksum.c#1 branch .. //depot/projects/tcp_reass/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/tcp_reass/arm/arm/inckern.S#1 branch .. //depot/projects/tcp_reass/arm/arm/intr.c#1 branch .. //depot/projects/tcp_reass/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/tcp_reass/arm/arm/locore.S#1 branch .. //depot/projects/tcp_reass/arm/arm/machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/mem.c#1 branch .. //depot/projects/tcp_reass/arm/arm/nexus.c#1 branch .. //depot/projects/tcp_reass/arm/arm/pmap.c#1 branch .. //depot/projects/tcp_reass/arm/arm/setcpsr.S#1 branch .. //depot/projects/tcp_reass/arm/arm/setstack.s#1 branch .. //depot/projects/tcp_reass/arm/arm/stack_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/support.S#1 branch .. //depot/projects/tcp_reass/arm/arm/swtch.S#1 branch .. //depot/projects/tcp_reass/arm/arm/sys_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/trap.c#1 branch .. //depot/projects/tcp_reass/arm/arm/uio_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/arm/undefined.c#1 branch .. //depot/projects/tcp_reass/arm/arm/vectors.S#1 branch .. //depot/projects/tcp_reass/arm/arm/vm_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_mci.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pio.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_piovar.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pmc.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_rtc.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_spi.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_spireg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_ssc.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_st.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_streg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_twi.c#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_twiio.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_twireg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/at91var.h#1 branch .. //depot/projects/tcp_reass/arm/at91/files.at91#1 branch .. //depot/projects/tcp_reass/arm/at91/files.kb920x#1 branch .. //depot/projects/tcp_reass/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/tcp_reass/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/tcp_reass/arm/at91/if_ate.c#1 branch .. //depot/projects/tcp_reass/arm/at91/if_atereg.h#1 branch .. //depot/projects/tcp_reass/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/tcp_reass/arm/at91/std.at91#1 branch .. //depot/projects/tcp_reass/arm/at91/std.kb920x#1 branch .. //depot/projects/tcp_reass/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/tcp_reass/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/tcp_reass/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/tcp_reass/arm/compile/.cvsignore#1 branch .. //depot/projects/tcp_reass/arm/conf/.cvsignore#1 branch .. //depot/projects/tcp_reass/arm/conf/AVILA#1 branch .. //depot/projects/tcp_reass/arm/conf/AVILA.hints#1 branch .. //depot/projects/tcp_reass/arm/conf/BWCT#1 branch .. //depot/projects/tcp_reass/arm/conf/BWCT.hints#1 branch .. //depot/projects/tcp_reass/arm/conf/CRB#1 branch .. //depot/projects/tcp_reass/arm/conf/EP80219#1 branch .. //depot/projects/tcp_reass/arm/conf/HL200#1 branch .. //depot/projects/tcp_reass/arm/conf/IQ31244#1 branch .. //depot/projects/tcp_reass/arm/conf/KB920X#1 branch .. //depot/projects/tcp_reass/arm/conf/KB920X.hints#1 branch .. //depot/projects/tcp_reass/arm/conf/SIMICS#1 branch .. //depot/projects/tcp_reass/arm/conf/SKYEYE#1 branch .. //depot/projects/tcp_reass/arm/include/_bus.h#1 branch .. //depot/projects/tcp_reass/arm/include/_inttypes.h#1 branch .. //depot/projects/tcp_reass/arm/include/_limits.h#1 branch .. //depot/projects/tcp_reass/arm/include/_stdint.h#1 branch .. //depot/projects/tcp_reass/arm/include/_types.h#1 branch .. //depot/projects/tcp_reass/arm/include/armreg.h#1 branch .. //depot/projects/tcp_reass/arm/include/asm.h#1 branch .. //depot/projects/tcp_reass/arm/include/asmacros.h#1 branch .. //depot/projects/tcp_reass/arm/include/atomic.h#1 branch .. //depot/projects/tcp_reass/arm/include/blockio.h#1 branch .. //depot/projects/tcp_reass/arm/include/bootconfig.h#1 branch .. //depot/projects/tcp_reass/arm/include/bus.h#1 branch .. //depot/projects/tcp_reass/arm/include/bus_dma.h#1 branch .. //depot/projects/tcp_reass/arm/include/clock.h#1 branch .. //depot/projects/tcp_reass/arm/include/cpu.h#1 branch .. //depot/projects/tcp_reass/arm/include/cpuconf.h#1 branch .. //depot/projects/tcp_reass/arm/include/cpufunc.h#1 branch .. //depot/projects/tcp_reass/arm/include/db_machdep.h#1 branch .. //depot/projects/tcp_reass/arm/include/disassem.h#1 branch .. //depot/projects/tcp_reass/arm/include/elf.h#1 branch .. //depot/projects/tcp_reass/arm/include/endian.h#1 branch .. //depot/projects/tcp_reass/arm/include/exec.h#1 branch .. //depot/projects/tcp_reass/arm/include/fiq.h#1 branch .. //depot/projects/tcp_reass/arm/include/float.h#1 branch .. //depot/projects/tcp_reass/arm/include/floatingpoint.h#1 branch .. //depot/projects/tcp_reass/arm/include/fp.h#1 branch .. //depot/projects/tcp_reass/arm/include/frame.h#1 branch .. //depot/projects/tcp_reass/arm/include/gdb_machdep.h#1 branch .. //depot/projects/tcp_reass/arm/include/ieee.h#1 branch .. //depot/projects/tcp_reass/arm/include/ieeefp.h#1 branch .. //depot/projects/tcp_reass/arm/include/in_cksum.h#1 branch .. //depot/projects/tcp_reass/arm/include/intr.h#1 branch .. //depot/projects/tcp_reass/arm/include/katelib.h#1 branch .. //depot/projects/tcp_reass/arm/include/kdb.h#1 branch .. //depot/projects/tcp_reass/arm/include/limits.h#1 branch .. //depot/projects/tcp_reass/arm/include/machdep.h#1 branch .. //depot/projects/tcp_reass/arm/include/md_var.h#1 branch .. //depot/projects/tcp_reass/arm/include/memdev.h#1 branch .. //depot/projects/tcp_reass/arm/include/metadata.h#1 branch .. //depot/projects/tcp_reass/arm/include/mutex.h#1 branch .. //depot/projects/tcp_reass/arm/include/param.h#1 branch .. //depot/projects/tcp_reass/arm/include/pcb.h#1 branch .. //depot/projects/tcp_reass/arm/include/pcpu.h#1 branch .. //depot/projects/tcp_reass/arm/include/pmap.h#1 branch .. //depot/projects/tcp_reass/arm/include/pmc_mdep.h#1 branch .. //depot/projects/tcp_reass/arm/include/proc.h#1 branch .. //depot/projects/tcp_reass/arm/include/profile.h#1 branch .. //depot/projects/tcp_reass/arm/include/psl.h#1 branch .. //depot/projects/tcp_reass/arm/include/pte.h#1 branch .. //depot/projects/tcp_reass/arm/include/ptrace.h#1 branch .. //depot/projects/tcp_reass/arm/include/reg.h#1 branch .. //depot/projects/tcp_reass/arm/include/reloc.h#1 branch .. //depot/projects/tcp_reass/arm/include/resource.h#1 branch .. //depot/projects/tcp_reass/arm/include/runq.h#1 branch .. //depot/projects/tcp_reass/arm/include/setjmp.h#1 branch .. //depot/projects/tcp_reass/arm/include/sf_buf.h#1 branch .. //depot/projects/tcp_reass/arm/include/sigframe.h#1 branch .. //depot/projects/tcp_reass/arm/include/signal.h#1 branch .. //depot/projects/tcp_reass/arm/include/smp.h#1 branch .. //depot/projects/tcp_reass/arm/include/stack.h#1 branch .. //depot/projects/tcp_reass/arm/include/stdarg.h#1 branch .. //depot/projects/tcp_reass/arm/include/swi.h#1 branch .. //depot/projects/tcp_reass/arm/include/sysarch.h#1 branch .. //depot/projects/tcp_reass/arm/include/trap.h#1 branch .. //depot/projects/tcp_reass/arm/include/ucontext.h#1 branch .. //depot/projects/tcp_reass/arm/include/undefined.h#1 branch .. //depot/projects/tcp_reass/arm/include/utrap.h#1 branch .. //depot/projects/tcp_reass/arm/include/vmparam.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/tcp_reass/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/tcp_reass/arm/xscale/std.xscale#1 branch .. //depot/projects/tcp_reass/arm/xscale/xscalereg.h#1 branch .. //depot/projects/tcp_reass/arm/xscale/xscalevar.h#1 branch .. //depot/projects/tcp_reass/boot/Makefile#1 branch .. //depot/projects/tcp_reass/boot/README#1 branch .. //depot/projects/tcp_reass/boot/arm/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0/README#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/tcp_reass/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/tcp_reass/boot/common/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/common/bcache.c#1 branch .. //depot/projects/tcp_reass/boot/common/boot.c#1 branch .. //depot/projects/tcp_reass/boot/common/bootstrap.h#1 branch .. //depot/projects/tcp_reass/boot/common/commands.c#1 branch .. //depot/projects/tcp_reass/boot/common/console.c#1 branch .. //depot/projects/tcp_reass/boot/common/dev_net.c#1 branch .. //depot/projects/tcp_reass/boot/common/dev_net.h#1 branch .. //depot/projects/tcp_reass/boot/common/devopen.c#1 branch .. //depot/projects/tcp_reass/boot/common/help.common#1 branch .. //depot/projects/tcp_reass/boot/common/interp.c#1 branch .. //depot/projects/tcp_reass/boot/common/interp_backslash.c#1 branch .. //depot/projects/tcp_reass/boot/common/interp_forth.c#1 branch .. //depot/projects/tcp_reass/boot/common/interp_parse.c#1 branch .. //depot/projects/tcp_reass/boot/common/isapnp.c#1 branch .. //depot/projects/tcp_reass/boot/common/isapnp.h#1 branch .. //depot/projects/tcp_reass/boot/common/load.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf32.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf64.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/tcp_reass/boot/common/load_elf_obj.c#1 branch .. //depot/projects/tcp_reass/boot/common/loader.8#1 branch .. //depot/projects/tcp_reass/boot/common/ls.c#1 branch .. //depot/projects/tcp_reass/boot/common/merge_help.awk#1 branch .. //depot/projects/tcp_reass/boot/common/misc.c#1 branch .. //depot/projects/tcp_reass/boot/common/module.c#1 branch .. //depot/projects/tcp_reass/boot/common/newvers.sh#1 branch .. //depot/projects/tcp_reass/boot/common/panic.c#1 branch .. //depot/projects/tcp_reass/boot/common/pnp.c#1 branch .. //depot/projects/tcp_reass/boot/common/reloc_elf.c#1 branch .. //depot/projects/tcp_reass/boot/common/reloc_elf32.c#1 branch .. //depot/projects/tcp_reass/boot/common/reloc_elf64.c#1 branch .. //depot/projects/tcp_reass/boot/common/ufsread.c#1 branch .. //depot/projects/tcp_reass/boot/efi/Makefile#1 branch .. //depot/projects/tcp_reass/boot/efi/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/efi/include/README#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efi.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efiapi.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/eficon.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efidebug.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efidef.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efidevp.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efierr.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efifs.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efilib.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efinet.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efipart.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efiprot.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efiser.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/tcp_reass/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/Makefile#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/delay.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/errno.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/handles.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/tcp_reass/boot/efi/libefi/time.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/dict.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/ficl.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/ficl.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/fileaccess.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/float.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/loader.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/math64.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/math64.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/prefix.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/search.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/tcp_reass/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/tcp_reass/boot/ficl/stack.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/testmain.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/tools.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/unix.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/vm.c#1 branch .. //depot/projects/tcp_reass/boot/ficl/words.c#1 branch .. //depot/projects/tcp_reass/boot/forth/beastie.4th#1 branch .. //depot/projects/tcp_reass/boot/forth/frames.4th#1 branch .. //depot/projects/tcp_reass/boot/forth/loader.4th#1 branch .. //depot/projects/tcp_reass/boot/forth/loader.4th.8#1 branch .. //depot/projects/tcp_reass/boot/forth/loader.conf#1 branch .. //depot/projects/tcp_reass/boot/forth/loader.conf.5#1 branch .. //depot/projects/tcp_reass/boot/forth/loader.rc#1 branch .. //depot/projects/tcp_reass/boot/forth/pnp.4th#1 branch .. //depot/projects/tcp_reass/boot/forth/screen.4th#1 branch .. //depot/projects/tcp_reass/boot/forth/support.4th#1 branch .. //depot/projects/tcp_reass/boot/i386/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/i386/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/tcp_reass/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/tcp_reass/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/tcp_reass/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/tcp_reass/boot/i386/boot2/lib.h#1 branch .. //depot/projects/tcp_reass/boot/i386/boot2/sio.S#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_reass/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_reass/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_reass/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/tcp_reass/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/tcp_reass/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/tcp_reass/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/pread.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/time.c#1 branch .. //depot/projects/tcp_reass/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/conf.c#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/help.i386#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/loader.rc#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/main.c#1 branch .. //depot/projects/tcp_reass/boot/i386/loader/version#1 branch .. //depot/projects/tcp_reass/boot/i386/mbr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/tcp_reass/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/tcp_reass/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/tcp_reass/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/tcp_reass/boot/ia64/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ia64/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/autoload.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/copy.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/devicename.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/exec.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/common/libia64.h#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/conf.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/main.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/start.S#1 branch .. //depot/projects/tcp_reass/boot/ia64/efi/version#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/conf.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/delay.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/exit.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/libski.h#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/main.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/start.S#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/time.c#1 branch .. //depot/projects/tcp_reass/boot/ia64/ski/version#1 branch .. //depot/projects/tcp_reass/boot/ofw/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/ofw/common/main.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/tcp_reass/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/io.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/start.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/boot2/table.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/tcp_reass/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/loader/Makefile#1 branch .. //depot/projects/tcp_reass/boot/pc98/loader/conf.c#1 branch .. //depot/projects/tcp_reass/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/tcp_reass/boot/pc98/loader/main.c#1 branch .. //depot/projects/tcp_reass/boot/powerpc/Makefile#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/tcp_reass/boot/powerpc/ofw/version#1 branch .. //depot/projects/tcp_reass/boot/sparc64/Makefile#1 branch .. //depot/projects/tcp_reass/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/tcp_reass/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/tcp_reass/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/tcp_reass/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/main.c#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/tcp_reass/boot/sparc64/loader/version#1 branch .. //depot/projects/tcp_reass/bsm/audit.h#1 branch .. //depot/projects/tcp_reass/bsm/audit_internal.h#1 branch .. //depot/projects/tcp_reass/bsm/audit_kevents.h#1 branch .. //depot/projects/tcp_reass/bsm/audit_record.h#1 branch .. //depot/projects/tcp_reass/cam/README.quirks#1 branch .. //depot/projects/tcp_reass/cam/cam.c#1 branch .. //depot/projects/tcp_reass/cam/cam.h#1 branch .. //depot/projects/tcp_reass/cam/cam_ccb.h#1 branch .. //depot/projects/tcp_reass/cam/cam_debug.h#1 branch .. //depot/projects/tcp_reass/cam/cam_periph.c#1 branch .. //depot/projects/tcp_reass/cam/cam_periph.h#1 branch .. //depot/projects/tcp_reass/cam/cam_queue.c#1 branch .. //depot/projects/tcp_reass/cam/cam_queue.h#1 branch .. //depot/projects/tcp_reass/cam/cam_sim.c#1 branch .. //depot/projects/tcp_reass/cam/cam_sim.h#1 branch .. //depot/projects/tcp_reass/cam/cam_xpt.c#1 branch .. //depot/projects/tcp_reass/cam/cam_xpt.h#1 branch .. //depot/projects/tcp_reass/cam/cam_xpt_periph.h#1 branch .. //depot/projects/tcp_reass/cam/cam_xpt_sim.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_all.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_all.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_da.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_da.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_low.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_low.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_message.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_target.c#1 branch .. //depot/projects/tcp_reass/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/Makefile#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/tcp_reass/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/tcp_reass/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/tcp_reass/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/tcp_reass/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/tcp_reass/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/tcp_reass/compat/ia32/ia32_util.h#1 branch .. //depot/projects/tcp_reass/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/tcp_reass/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_emul.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_emul.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_file.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_futex.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_futex.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_ipc.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_ipc.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_mib.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_mib.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_misc.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_misc.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_signal.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_signal.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_socket.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_socket.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_stats.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_time.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_uid16.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_util.c#1 branch .. //depot/projects/tcp_reass/compat/linux/linux_util.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/cfg_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/hal_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/ndis_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/pe_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/resource_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/subr_hal.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/subr_pe.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/tcp_reass/compat/ndis/usbd_var.h#1 branch .. //depot/projects/tcp_reass/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/tcp_reass/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/tcp_reass/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/tcp_reass/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/tcp_reass/compat/opensolaris/sys/mnttab.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 11 21:20:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A85B16A41B; Fri, 11 Jan 2008 21:20:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FAED16A417 for ; Fri, 11 Jan 2008 21:20:42 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 144F213C4CE for ; Fri, 11 Jan 2008 21:20:42 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BLKghw004737 for ; Fri, 11 Jan 2008 21:20:42 GMT (envelope-from andre@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BLKf75004734 for perforce@freebsd.org; Fri, 11 Jan 2008 21:20:41 GMT (envelope-from andre@freebsd.org) Date: Fri, 11 Jan 2008 21:20:41 GMT Message-Id: <200801112120.m0BLKf75004734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andre@freebsd.org using -f From: Andre Oppermann To: Perforce Change Reviews Cc: Subject: PERFORCE change 133069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 21:20:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=133069 Change 133069 by andre@andre_flirtbox on 2008/01/11 21:20:25 Initial branch and import of new TCP reassembly queue. It's primarily a code dump. It compiles, doesn't crash and almost works as advertized. Description is at the top of the file. Lots of comments inline. Affected files ... .. //depot/projects/tcp_reass/netinet/tcp_input.c#2 edit .. //depot/projects/tcp_reass/netinet/tcp_reass.c#2 edit .. //depot/projects/tcp_reass/netinet/tcp_subr.c#2 edit .. //depot/projects/tcp_reass/netinet/tcp_usrreq.c#2 edit .. //depot/projects/tcp_reass/netinet/tcp_var.h#2 edit Differences ... ==== //depot/projects/tcp_reass/netinet/tcp_input.c#2 (text+ko) ==== @@ -980,7 +980,7 @@ tp->snd_nxt == tp->snd_max && tiwin && tiwin == tp->snd_wnd && ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) && - LIST_EMPTY(&tp->t_segq) && + TAILQ_EMPTY(&tp->t_trq) && ((to.to_flags & TOF_TS) == 0 || TSTMP_GEQ(to.to_tsval, tp->ts_recent)) ) { @@ -1705,8 +1705,7 @@ * later; if not, do so now to pass queued data to user. */ if (tlen == 0 && (thflags & TH_FIN) == 0) - (void) tcp_reass(tp, (struct tcphdr *)0, 0, - (struct mbuf *)0); + (void) tcp_reass(tp, NULL, NULL, NULL); tp->snd_wl1 = th->th_seq - 1; /* FALLTHROUGH */ @@ -2234,7 +2233,7 @@ * fast retransmit can work). */ if (th->th_seq == tp->rcv_nxt && - LIST_EMPTY(&tp->t_segq) && + TAILQ_EMPTY(&tp->t_trq) && TCPS_HAVEESTABLISHED(tp->t_state)) { if (DELAY_ACK(tp)) tp->t_flags |= TF_DELACK; ==== //depot/projects/tcp_reass/netinet/tcp_reass.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 1995 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2007 + * Andre Oppermann, Internet Business Solutions AG. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,14 +27,55 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 + * $FreeBSD: src/sys/netinet/tcp_reass.c,v 1.352 2007/05/13 22:16:13 andre Exp $ */ -#include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_reass.c,v 1.353 2007/10/07 20:44:24 silby Exp $"); +/* + * Operational overview of TCP reassembly: + * + * It is the purpose of tcp reassembly to store segments that are received + * out of order. This happens when packets are lost along the way due to + * various reasons. The most common one is traffic overload which causes + * routers to stop accepting packets for brief moments. + * + * Upon arrival of the missing segment(s) the whole chain of stored segments + * is moved into the socket buffer. In case of multiple missing segments + * the first consequtive part is moved with the remainder being kept in + * store until the next missing segment arrives. + * + * While in reassembly mode *all* arrving segments are put into the reassembly + * queue. + * + * Instead of storing all segments on their own we build blocks of consequtive + * segments chained together. We use a tailq because a new segments has the + * highest probability to fit the tail of the chain. If not, the second + * highest probability is the beginning of the chain for being the missing + * segment. Otherwise we cycle through each consequtive block until a match + * is found. If a segment matches the end of one block and the start of the + * next block the two blocks are joined together. If no match is found a + * new block is created. + * + * This system is very efficient and can deal efficiently with long chains + * and many holes. + * + * trq_tail ----------------------------------------------\ + * trq_head --> [block] ------> [block] ------> [block] <-/ + * m_next m_next m_next + * | | | + * m_next m_next m_next + * | | | + * m_next m_next m_next + * + * + * A further improvement is to merge the content of mbufs together if the + * preceeding one has enough space to hold the data of the new one. When + * trimming the head of an mbuf chain m_adj() empties the mbufs but leaves + * them in place. Only when trimming from the tail it actually frees them. + * Normally we don't get mbuf chains so this isn't too much of a concern + * right now. TODO. + */ #include "opt_inet.h" -#include "opt_inet6.h" -#include "opt_tcpdebug.h" #include #include @@ -48,30 +89,13 @@ #include -#include -#include - #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include #include -#include -#include -#ifdef TCPDEBUG -#include -#endif /* TCPDEBUG */ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0, "TCP Segment Reassembly Queue"); @@ -114,7 +138,7 @@ tcp_reass_maxseg = nmbclusters / 16; TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", &tcp_reass_maxseg); - tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), + tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct trq), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); EVENTHANDLER_REGISTER(nmbclusters_change, @@ -124,23 +148,15 @@ int tcp_reass(struct tcpcb *tp, struct tcphdr *th, int *tlenp, struct mbuf *m) { - struct tseg_qent *q; - struct tseg_qent *p = NULL; - struct tseg_qent *nq; - struct tseg_qent *te = NULL; + struct trq *tqe, *tqen; struct socket *so = tp->t_inpcb->inp_socket; - int flags; + struct mbuf *n; + int i, flags = 0, segs = 0; INP_LOCK_ASSERT(tp->t_inpcb); /* - * XXX: tcp_reass() is rather inefficient with its data structures - * and should be rewritten (see NetBSD for optimizations). While - * doing that it should move to its own file tcp_reass.c. - */ - - /* - * Call with th==NULL after become established to + * Call with th==NULL after becoming established to * force pre-ESTABLISHED data up to user socket. */ if (th == NULL) @@ -155,7 +171,7 @@ */ if (th->th_seq != tp->rcv_nxt && (tcp_reass_qsize + 1 >= tcp_reass_maxseg || - tp->t_segqlen >= tcp_reass_maxqlen)) { + tp->t_trqlen >= tcp_reass_maxqlen)) { tcp_reass_overflows++; tcpstat.tcps_rcvmemdrop++; m_freem(m); @@ -163,97 +179,145 @@ return (0); } - /* - * Allocate a new queue entry. If we can't, or hit the zone limit - * just drop the pkt. - */ - te = uma_zalloc(tcp_reass_zone, M_NOWAIT); - if (te == NULL) { - tcpstat.tcps_rcvmemdrop++; - m_freem(m); - *tlenp = 0; + /* Accounting. */ + tcpstat.tcps_rcvoopack++; + tcpstat.tcps_rcvoobyte += *tlenp; + /* NB: m_adj(m, -i) may free mbufs at the tail of a chain. */ + for (n = m; n; n = n->m_next) + segs++; + tp->t_trqlen += segs; + tcp_reass_qsize += segs; + + /* Get rid of packet header and mtags. */ + m_demote(m, 1); + + /* Check if this segment attaches to the end. */ + tqe = TAILQ_LAST(&tp->t_trq, trq_head); + if (tqe && tqe->trq_seq + tqe->trq_len == th->th_seq) { + tqe->trq_len += *tlenp; + tqe->trq_segs += segs; + tqe->trq_ml->m_next = m; + tqe->trq_ml = m_last(m); return (0); } - tp->t_segqlen++; - tcp_reass_qsize++; - /* - * Find a segment which begins after this one does. - */ - LIST_FOREACH(q, &tp->t_segq, tqe_q) { - if (SEQ_GT(q->tqe_th->th_seq, th->th_seq)) - break; - p = q; - } - - /* - * If there is a preceding segment, it may provide some of - * our data already. If so, drop the data from the incoming - * segment. If it provides all of our data, drop us. - */ - if (p != NULL) { - int i; - /* conversion to int (in i) handles seq wraparound */ - i = p->tqe_th->th_seq + p->tqe_len - th->th_seq; - if (i > 0) { - if (i >= *tlenp) { - tcpstat.tcps_rcvduppack++; - tcpstat.tcps_rcvdupbyte += *tlenp; - m_freem(m); - uma_zfree(tcp_reass_zone, te); - tp->t_segqlen--; - tcp_reass_qsize--; - /* - * Try to present any queued data - * at the left window edge to the user. - * This is needed after the 3-WHS - * completes. - */ - goto present; /* ??? */ + /* Check if this is the missing segment. */ + if (tp->rcv_nxt == th->th_seq) { + tqe = TAILQ_FIRST(&tp->t_trq); + KASSERT(tqe != NULL, + ("%s: missing segment but nothing in queue", __func__)); + if (SEQ_LT(tqe->trq_seq, th->th_seq + *tlenp)) { + /* Trim tail. */ + if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { + m_adj(m, i); + *tlenp -= i; + /* Update accounting. */ + if (segs > 1) { + for (n = m; n; n = n->m_next) + segs--; + tp->t_trqlen -= segs; + tcp_reass_qsize -= segs; + } } - m_adj(m, i); - *tlenp -= i; - th->th_seq += i; } + goto insert; } - tcpstat.tcps_rcvoopack++; - tcpstat.tcps_rcvoobyte += *tlenp; - /* - * While we overlap succeeding segments trim them or, - * if they are completely covered, dequeue them. - */ - while (q) { - int i = (th->th_seq + *tlenp) - q->tqe_th->th_seq; - if (i <= 0) + /* See where it fits. */ + TAILQ_FOREACH(tqe, &tp->t_trq, trq_q) { + /* Segment is after our coverage. */ + if (SEQ_LT(tqe->trq_seq + tqe->trq_len, th->th_seq)) + continue; + /* Segment is after the previous one but before us. */ + if (SEQ_GT(tqe->trq_seq, th->th_seq + *tlenp)) break; - if (i < q->tqe_len) { - q->tqe_th->th_seq += i; - q->tqe_len -= i; - m_adj(q->tqe_m, i); - break; + /* Segment is already fully covered. */ + if (SEQ_LEQ(tqe->trq_seq, th->th_seq) && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, th->th_seq + *tlenp)) { + tcpstat.tcps_rcvduppack++; + tcpstat.tcps_rcvdupbyte += *tlenp; + m_freem(m); + tp->t_trqlen -= segs; + tcp_reass_qsize -= segs; + *tlenp = 0; + return (0); + } + /* Segment appends. */ + if (SEQ_LEQ(tqe->trq_seq + tqe->trq_len, th->th_seq)) { + /* Trim head. */ + if ((i = tqe->trq_seq + tqe->trq_len - th->th_seq)) { + m_adj(m, i); + *tlenp -= i; + } + tqe->trq_len += *tlenp; + tqe->trq_segs += segs; + tqe->trq_ml->m_next = m; + tqe->trq_ml = m_last(m); + /* Check for next block to merge. */ + if ((tqen = TAILQ_NEXT(tqe, trq_q)) && + SEQ_GEQ(tqe->trq_seq + tqe->trq_len, tqen->trq_seq)) { + /* Trim head. */ + if ((i = tqe->trq_seq + tqe->trq_len - + tqen->trq_seq)) { + m_adj(tqen->trq_m, i); + tqen->trq_len -= i; + } + tqe->trq_len += tqen->trq_len; + tqe->trq_segs += tqen->trq_segs; + tqe->trq_ml->m_next = tqen->trq_m; + tqe->trq_ml = tqen->trq_ml; + TAILQ_REMOVE(&tp->t_trq, tqen, trq_q); + uma_zfree(tcp_reass_zone, tqen); + } + return (0); + } + /* Segment prepends. */ + if (SEQ_GT(tqe->trq_seq, th->th_seq)) { + /* Trim tail. */ + if ((i = tqe->trq_seq - (th->th_seq + *tlenp))) { + m_adj(m, i); + *tlenp -= i; + /* Update accounting. */ + if (segs > 1) { + for (n = m; n; n = n->m_next) + segs--; + tp->t_trqlen -= segs; + tcp_reass_qsize -= segs; + } + } + tqe->trq_len += *tlenp; + tqe->trq_segs += segs; + tqe->trq_m = m; + n = m_last(m); + n->m_next = tqe->trq_m; + return (0); } + } - nq = LIST_NEXT(q, tqe_q); - LIST_REMOVE(q, tqe_q); - m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); - tp->t_segqlen--; - tcp_reass_qsize--; - q = nq; +insert: + /* Prepare to insert into block queue. */ + tqen = uma_zalloc(tcp_reass_zone, (M_NOWAIT|M_ZERO)); + if (tqen == NULL) { + tcpstat.tcps_rcvmemdrop++; + m_freem(m); + *tlenp = 0; + return (0); } + tqen->trq_seq = th->th_seq; + tqen->trq_len = *tlenp; + tqen->trq_segs = segs; + tqen->trq_m = m; + tqen->trq_ml = m_last(m); - /* Insert the new segment queue entry into place. */ - te->tqe_m = m; - te->tqe_th = th; - te->tqe_len = *tlenp; + /* Where to insert. */ + if (tqe) + TAILQ_INSERT_BEFORE(tqe, tqen, trq_q); + else + TAILQ_INSERT_HEAD(&tp->t_trq, tqen, trq_q); - if (p == NULL) { - LIST_INSERT_HEAD(&tp->t_segq, te, tqe_q); - } else { - LIST_INSERT_AFTER(p, te, tqe_q); - } - + /* Missing segment? */ + if (tp->rcv_nxt != th->th_seq) + return (0); present: /* * Present data to user, advancing rcv_nxt through @@ -261,25 +325,55 @@ */ if (!TCPS_HAVEESTABLISHED(tp->t_state)) return (0); - q = LIST_FIRST(&tp->t_segq); - if (!q || q->tqe_th->th_seq != tp->rcv_nxt) + tqe = TAILQ_FIRST(&tp->t_trq); + if (tqe == NULL || tqe->trq_seq != tp->rcv_nxt) return (0); SOCKBUF_LOCK(&so->so_rcv); - do { - tp->rcv_nxt += q->tqe_len; - flags = q->tqe_th->th_flags & TH_FIN; - nq = LIST_NEXT(q, tqe_q); - LIST_REMOVE(q, tqe_q); + TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { + if (tqe->trq_seq != tp->rcv_nxt) + break; +#if 1 + /* XXX: This is bogus if we had a FIN. */ + flags = tqe->trq_flags & TH_FIN; +#endif + tp->rcv_nxt += tqe->trq_len; if (so->so_rcv.sb_state & SBS_CANTRCVMORE) - m_freem(q->tqe_m); + m_freem(tqe->trq_m); else - sbappendstream_locked(&so->so_rcv, q->tqe_m); - uma_zfree(tcp_reass_zone, q); - tp->t_segqlen--; - tcp_reass_qsize--; - q = nq; - } while (q && q->tqe_th->th_seq == tp->rcv_nxt); + sbappendstream_locked(&so->so_rcv, tqe->trq_m); + KASSERT(tp->t_trqlen >= tqe->trq_segs, + ("%s: t_trqlen incorrect", __func__)); + tp->t_trqlen -= tqe->trq_segs; + tcp_reass_qsize -= tqe->trq_segs; + TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); + uma_zfree(tcp_reass_zone, tqe); + } + /* NB: sorwakeup_locked() does an implicit socket buffer unlock. */ + sorwakeup_locked(so); ND6_HINT(tp); - sorwakeup_locked(so); +#if 1 return (flags); +#else + return (0); +#endif +} + +/* + * Free the reassembly queue on tcpcb free and on general memory shortage. + */ +void +tcp_reass_qfree(struct tcpcb *tp) { + struct trq *tqe, *tqen; + + INP_LOCK_ASSERT(tp->t_inpcb); + + TAILQ_FOREACH_SAFE(tqe, &tp->t_trq, trq_q, tqen) { + m_freem(tqe->trq_m); + KASSERT(tp->t_trqlen >= tqe->trq_segs, + ("%s: t_trqlen incorrect", __func__)); + tp->t_trqlen -= tqe->trq_segs; + tcp_reass_qsize -= tqe->trq_segs; + TAILQ_REMOVE(&tp->t_trq, tqe, trq_q); + uma_zfree(tcp_reass_zone, tqe); + } } ==== //depot/projects/tcp_reass/netinet/tcp_subr.c#2 (text+ko) ==== @@ -593,7 +593,6 @@ return (NULL); tp = &tm->tcb; tp->t_timers = &tm->tt; - /* LIST_INIT(&tp->t_segq); */ /* XXX covered by M_ZERO */ tp->t_maxseg = tp->t_maxopd = #ifdef INET6 isipv6 ? tcp_v6mssdflt : @@ -611,7 +610,8 @@ tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP); if (tcp_do_sack) tp->t_flags |= TF_SACK_PERMIT; - TAILQ_INIT(&tp->snd_holes); + TAILQ_INIT(&tp->snd_holes); /* Covered by M_ZERO. */ + TAILQ_INIT(&tp->t_trq); /* Covered by M_ZERO. */ tp->t_inpcb = inp; /* XXX */ /* * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no @@ -665,7 +665,6 @@ void tcp_discardcb(struct tcpcb *tp) { - struct tseg_qent *q; struct inpcb *inp = tp->t_inpcb; struct socket *so = inp->inp_socket; #ifdef INET6 @@ -742,18 +741,13 @@ tcp_hc_update(&inp->inp_inc, &metrics); } - /* free the reassembly queue, if any */ - while ((q = LIST_FIRST(&tp->t_segq)) != NULL) { - LIST_REMOVE(q, tqe_q); - m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); - tp->t_segqlen--; - tcp_reass_qsize--; - } + /* Free the reassembly queue and other data structures. */ + tcp_reass_qfree(tp); + tcp_free_sackholes(tp); + /* Disconnect offload device, if any. */ tcp_offload_detach(tp); - tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; uma_zfree(tcpcb_zone, tp); @@ -794,37 +788,27 @@ return (tp); } +/* + * Walk the tcpbs, if existing, and flush the reassembly queue, + * if there is one... + * According to RFC xxx we may flush the reassembly queue even + * if we have indicated receipt of segments through SACK. + */ void tcp_drain(void) { + struct inpcb *inpb; + struct tcpcb *tcpb; if (do_tcpdrain) { - struct inpcb *inpb; - struct tcpcb *tcpb; - struct tseg_qent *te; - /* - * Walk the tcpbs, if existing, and flush the reassembly queue, - * if there is one... - * XXX: The "Net/3" implementation doesn't imply that the TCP - * reassembly queue should be flushed, but in a situation - * where we're really low on mbufs, this is potentially - * usefull. - */ INP_INFO_RLOCK(&tcbinfo); LIST_FOREACH(inpb, tcbinfo.ipi_listhead, inp_list) { if (inpb->inp_vflag & INP_TIMEWAIT) continue; INP_LOCK(inpb); if ((tcpb = intotcpcb(inpb)) != NULL) { - while ((te = LIST_FIRST(&tcpb->t_segq)) - != NULL) { - LIST_REMOVE(te, tqe_q); - m_freem(te->tqe_m); - uma_zfree(tcp_reass_zone, te); - tcpb->t_segqlen--; - tcp_reass_qsize--; - } + tcp_reass_qfree(tcpb); tcp_clean_sackreport(tcpb); } INP_UNLOCK(inpb); ==== //depot/projects/tcp_reass/netinet/tcp_usrreq.c#2 (text+ko) ==== @@ -1745,7 +1745,7 @@ db_print_indent(indent); db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", - LIST_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks); + TAILQ_FIRST(&tp->t_trq), tp->t_trqlen, tp->t_dupacks); db_print_indent(indent); db_printf("tt_rexmt: %p tt_persist: %p tt_keep: %p\n", ==== //depot/projects/tcp_reass/netinet/tcp_var.h#2 (text+ko) ==== @@ -40,16 +40,20 @@ */ extern int tcp_do_rfc1323; -/* TCP segment queue entry */ -struct tseg_qent { - LIST_ENTRY(tseg_qent) tqe_q; - int tqe_len; /* TCP segment data length */ - struct tcphdr *tqe_th; /* a pointer to tcp header */ - struct mbuf *tqe_m; /* mbuf contains packet */ +/* TCP reassembly queue segment entry. */ +struct trq { + TAILQ_ENTRY(trq) trq_q; + tcp_seq trq_seq; /* start of segment */ + int trq_len; /* length of segment */ + int trq_segs; /* number of mbufs */ + int trq_flags; /* flags for segment chain */ +#define TRQ_FIN 0x01 /* FIN was on last segment */ + struct mbuf *trq_m; /* mbuf chain of data */ + struct mbuf *trq_ml; /* last mbuf in chain of data */ }; -LIST_HEAD(tsegqe_head, tseg_qent); -extern int tcp_reass_qsize; -extern struct uma_zone *tcp_reass_zone; +TAILQ_HEAD(trq_head, trq); +extern int tcp_reass_qsize; +extern struct uma_zone *tcp_reass_zone; struct sackblk { tcp_seq start; /* start seq no. of sack block */ @@ -92,8 +96,8 @@ * Organized for 16 byte cacheline efficiency. */ struct tcpcb { - struct tsegqe_head t_segq; /* segment reassembly queue */ - int t_segqlen; /* segment reassembly queue length */ + struct trq_head t_trq; /* segment reassembly queue */ + int t_trqlen; /* segment reassembly queue length */ int t_dupacks; /* consecutive dup acks recd */ struct tcp_timer *t_timers; /* All the TCP timers in one struct */ @@ -531,6 +535,7 @@ const void *); int tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *); void tcp_reass_init(void); +void tcp_reass_qfree(struct tcpcb *); void tcp_input(struct mbuf *, int); u_long tcp_maxmtu(struct in_conninfo *, int *); u_long tcp_maxmtu6(struct in_conninfo *, int *); From owner-p4-projects@FreeBSD.ORG Fri Jan 11 21:31:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 296AD16A421; Fri, 11 Jan 2008 21:31:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2A7F16A419 for ; Fri, 11 Jan 2008 21:31:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0E8113C447 for ; Fri, 11 Jan 2008 21:31:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BLVsEk008242 for ; Fri, 11 Jan 2008 21:31:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BLVspx008234 for perforce@freebsd.org; Fri, 11 Jan 2008 21:31:54 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 21:31:54 GMT Message-Id: <200801112131.m0BLVspx008234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 21:31:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=133070 Change 133070 by jb@jb_freebsd1 on 2008/01/11 21:31:52 Add a compatibility header for libproc so I can make our implementation gratuitously different. Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 11 21:44:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9E7516A46D; Fri, 11 Jan 2008 21:44:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FC0516A419 for ; Fri, 11 Jan 2008 21:44:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F0F313C442 for ; Fri, 11 Jan 2008 21:44:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0BLi7q4010377 for ; Fri, 11 Jan 2008 21:44:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0BLi7rQ010374 for perforce@freebsd.org; Fri, 11 Jan 2008 21:44:07 GMT (envelope-from jb@freebsd.org) Date: Fri, 11 Jan 2008 21:44:07 GMT Message-Id: <200801112144.m0BLi7rQ010374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2008 21:44:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=133071 Change 133071 by jb@jb_freebsd1 on 2008/01/11 21:43:59 Add another compatibility header. Yuk. Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/dtrace.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 12 04:59:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77CD716A468; Sat, 12 Jan 2008 04:59:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 344A016A419 for ; Sat, 12 Jan 2008 04:59:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 193C713C45D for ; Sat, 12 Jan 2008 04:59:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C4xs23006463 for ; Sat, 12 Jan 2008 04:59:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C4xsD8006460 for perforce@freebsd.org; Sat, 12 Jan 2008 04:59:54 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 04:59:54 GMT Message-Id: <200801120459.m0C4xsD8006460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 04:59:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=133089 Change 133089 by jb@jb_freebsd1 on 2008/01/12 04:59:21 Add the Solaris versions of these library D scripts. I'll get back to them later. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/net.d#1 add .. //depot/projects/dtrace/src/cddl/lib/libdtrace/nfs.d#1 add .. //depot/projects/dtrace/src/cddl/lib/libdtrace/sched.d#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:00:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2609816A473; Sat, 12 Jan 2008 05:00:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF86916A418 for ; Sat, 12 Jan 2008 05:00:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCFFB13C46E for ; Sat, 12 Jan 2008 05:00:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C50v2u006802 for ; Sat, 12 Jan 2008 05:00:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C50viG006775 for perforce@freebsd.org; Sat, 12 Jan 2008 05:00:57 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:00:57 GMT Message-Id: <200801120500.m0C50viG006775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:00:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=133090 Change 133090 by jb@jb_freebsd1 on 2008/01/12 05:00:46 Add a simple libproc for use by libdtrace. This is based on ptrace, kevent and kvm instead of procfs like the one in Solaris. Affected files ... .. //depot/projects/dtrace/src/lib/Makefile#19 edit .. //depot/projects/dtrace/src/lib/libproc/Makefile#1 add .. //depot/projects/dtrace/src/lib/libproc/_libproc.h#1 add .. //depot/projects/dtrace/src/lib/libproc/libproc.h#1 add .. //depot/projects/dtrace/src/lib/libproc/proc_create.c#1 add .. //depot/projects/dtrace/src/lib/libproc/proc_free.c#1 add .. //depot/projects/dtrace/src/lib/libproc/proc_util.c#1 add Differences ... ==== //depot/projects/dtrace/src/lib/Makefile#19 (text+ko) ==== @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc libproc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:01:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B62516A41B; Sat, 12 Jan 2008 05:01:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30AFC16A417 for ; Sat, 12 Jan 2008 05:01:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15DF013C469 for ; Sat, 12 Jan 2008 05:01:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C51xHK007091 for ; Sat, 12 Jan 2008 05:01:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C51xOW007087 for perforce@freebsd.org; Sat, 12 Jan 2008 05:01:59 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:01:59 GMT Message-Id: <200801120501.m0C51xOW007087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:01:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=133091 Change 133091 by jb@jb_freebsd1 on 2008/01/12 05:01:43 Update to allow vnode.h to be included. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace_test/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace_test/Makefile#2 (text+ko) ==== @@ -4,7 +4,11 @@ KMOD= dtrace_test SRCS= dtrace_test.c + +SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../.. +CFLAGS+= -D_KERNEL + .include From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:03:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8122E16A469; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4692D16A420 for ; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4459B13C455 for ; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C530gL007390 for ; Sat, 12 Jan 2008 05:03:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5306c007386 for perforce@freebsd.org; Sat, 12 Jan 2008 05:03:00 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:03:00 GMT Message-Id: <200801120503.m0C5306c007386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:03:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=133092 Change 133092 by jb@jb_freebsd1 on 2008/01/12 05:02:21 Enforce the return values when lookup fails. Affected files ... .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#3 (text+ko) ==== @@ -80,6 +80,8 @@ return DWARF_E_ARGUMENT; } + *valp = 0; + if ((av = dwarf_attrval_find(die, attr)) == NULL) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; @@ -114,8 +116,9 @@ return DWARF_E_ARGUMENT; } + *strp = NULL; + if ((av = dwarf_attrval_find(die, attr)) == NULL) { - *strp = NULL; DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; } else { @@ -152,6 +155,8 @@ return DWARF_E_ARGUMENT; } + *valp = 0; + if ((av = dwarf_attrval_find(die, attr)) == NULL) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; @@ -187,6 +192,8 @@ return DWARF_E_ARGUMENT; } + *valp = 0; + if ((av = dwarf_attrval_find(die, attr)) == NULL) { DWARF_SET_ERROR(err, DWARF_E_NO_ENTRY); ret = DWARF_E_NO_ENTRY; From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:03:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55BFB16A52E; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7017F16A421 for ; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC8313C457 for ; Sat, 12 Jan 2008 05:03:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C530Sx007396 for ; Sat, 12 Jan 2008 05:03:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C530MP007393 for perforce@freebsd.org; Sat, 12 Jan 2008 05:03:00 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:03:00 GMT Message-Id: <200801120503.m0C530MP007393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=133093 Change 133093 by jb@jb_freebsd1 on 2008/01/12 05:02:59 NULL pointer check. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#16 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#16 (text) ==== @@ -13183,7 +13183,10 @@ dtrace_format_destroy(state); - vmem_destroy(state->dts_aggid_arena); + if (state->dts_aggid_arena != NULL) { + vmem_destroy(state->dts_aggid_arena); + state->dts_aggid_arena = NULL; + } #if defined(sun) ddi_soft_state_free(dtrace_softstate, minor); vmem_free(dtrace_minor, (void *)(uintptr_t)minor, 1); From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:04:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0665216A468; Sat, 12 Jan 2008 05:04:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFA8F16A417 for ; Sat, 12 Jan 2008 05:04:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A486113C442 for ; Sat, 12 Jan 2008 05:04:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C541ew008963 for ; Sat, 12 Jan 2008 05:04:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C541dB008960 for perforce@freebsd.org; Sat, 12 Jan 2008 05:04:01 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:04:01 GMT Message-Id: <200801120504.m0C541dB008960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:04:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=133094 Change 133094 by jb@jb_freebsd1 on 2008/01/12 05:03:42 Always include (our) libproc.h now. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#6 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#6 (text) ==== @@ -29,9 +29,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#if defined(sun) #include -#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:05:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516FB16A419; Sat, 12 Jan 2008 05:05:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16A0116A417 for ; Sat, 12 Jan 2008 05:05:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F00BC13C44B for ; Sat, 12 Jan 2008 05:05:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C552j2009040 for ; Sat, 12 Jan 2008 05:05:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C552Sd009037 for perforce@freebsd.org; Sat, 12 Jan 2008 05:05:02 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:05:02 GMT Message-Id: <200801120505.m0C552Sd009037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:05:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=133095 Change 133095 by jb@jb_freebsd1 on 2008/01/12 05:04:24 Re-order to do what I meant originally. :-) Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#2 edit Differences ... ==== //depot/projects/dtrace/src/compat/opensolaris/include/libproc.h#2 (text+ko) ==== @@ -30,8 +30,8 @@ #ifndef _COMPAT_OPENSOLARIS_LIBPROC_H_ #define _COMPAT_OPENSOLARIS_LIBPROC_H_ +#define ps_prochandle proc_handle + #include_next -#define ps_prochandle proc_handle - #endif From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:07:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867FB16A421; Sat, 12 Jan 2008 05:07:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BCD216A418 for ; Sat, 12 Jan 2008 05:07:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4880613C457 for ; Sat, 12 Jan 2008 05:07:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C57DYT009140 for ; Sat, 12 Jan 2008 05:07:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C57Dsu009135 for perforce@freebsd.org; Sat, 12 Jan 2008 05:07:13 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:07:13 GMT Message-Id: <200801120507.m0C57Dsu009135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=133097 Change 133097 by jb@jb_freebsd1 on 2008/01/12 05:06:53 WIP. Enable use of our libproc to create a process, ptrace it, wait for it to stop, start it and check that it ends. More work required to attach to an existing process and to enable breakpoints, stop and start via DTrace actions, etc. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#7 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#7 (text) ==== @@ -117,27 +117,36 @@ return (dbp); } +#endif static void dt_proc_bpdestroy(dt_proc_t *dpr, int delbkpts) { +#if defined(sun) int state = Pstate(dpr->dpr_proc); +#else + int state = proc_state(dpr->dpr_proc); +#endif dt_bkpt_t *dbp, *nbp; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); for (dbp = dt_list_next(&dpr->dpr_bps); dbp != NULL; dbp = nbp) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD if (delbkpts && dbp->dbp_active && state != PS_LOST && state != PS_UNDEAD) { (void) Pdelbkpt(dpr->dpr_proc, dbp->dbp_addr, dbp->dbp_instr); } +#endif nbp = dt_list_next(dbp); dt_list_delete(&dpr->dpr_bps, dbp); dt_free(dpr->dpr_hdl, dbp); } } +#ifdef DOODAD static void dt_proc_bpmatch(dtrace_hdl_t *dtp, dt_proc_t *dpr) { @@ -206,7 +215,6 @@ #endif } -#ifdef DOODAD static void dt_proc_notify(dtrace_hdl_t *dtp, dt_proc_hash_t *dph, dt_proc_t *dpr, const char *msg) @@ -274,6 +282,7 @@ dt_proc_stop(dpr, DT_PROC_STOP_MAIN); } +#ifdef DOODAD static void dt_proc_rdevent(dtrace_hdl_t *dtp, dt_proc_t *dpr, const char *evname) { @@ -450,6 +459,7 @@ (void) pthread_mutex_lock(&dpr->dpr_lock); } +#endif typedef struct dt_proc_control_data { dtrace_hdl_t *dpcd_hdl; /* DTrace handle */ @@ -476,11 +486,13 @@ dt_proc_t *dpr = datap->dpcd_proc; dt_proc_hash_t *dph = dpr->dpr_hdl->dt_procs; struct ps_prochandle *P = dpr->dpr_proc; + int pid = dpr->dpr_pid; +#if defined(sun) int pfd = Pctlfd(P); - int pid = dpr->dpr_pid; const long wstop = PCWSTOP; +#endif int notify = B_FALSE; /* @@ -498,6 +510,7 @@ */ (void) pthread_mutex_lock(&dpr->dpr_lock); +#if defined(sun) (void) Punsetflags(P, PR_ASYNC); /* require synchronous mode */ (void) Psetflags(P, PR_BPTADJ); /* always adjust eip on x86 */ (void) Punsetflags(P, PR_FORK); /* do not inherit on fork */ @@ -543,7 +556,14 @@ dt_dprintf("pid %d: failed to set running: %s\n", (int)dpr->dpr_pid, strerror(errno)); } +#else + dt_proc_stop(dpr, DT_PROC_STOP_CREATE); + if (proc_continue(P) != 0) + dt_dprintf("pid %d: failed to set running: %s\n", + (int)dpr->dpr_pid, strerror(errno)); +#endif + (void) pthread_mutex_unlock(&dpr->dpr_lock); /* @@ -556,20 +576,34 @@ * Pwait() (which will return immediately) and do our processing. */ while (!dpr->dpr_quit) { +#if defined(sun) const lwpstatus_t *psp; if (write(pfd, &wstop, sizeof (wstop)) == -1 && errno == EINTR) continue; /* check dpr_quit and continue waiting */ +#else + /* Wait for the process to report status. */ + proc_wait(P); +#endif (void) pthread_mutex_lock(&dpr->dpr_lock); + +#if defined(sun) pwait_locked: if (Pstopstatus(P, PCNULL, 0) == -1 && errno == EINTR) { (void) pthread_mutex_unlock(&dpr->dpr_lock); continue; /* check dpr_quit and continue waiting */ } +#endif +#if defined(sun) switch (Pstate(P)) { +#else + switch (proc_state(P)) { +#endif case PS_STOP: +printf("Process has stopped!\n"); +#ifdef DOODAD psp = &Pstatus(P)->pr_lwp; dt_dprintf("pid %d: proc stopped showing %d/%d\n", @@ -612,11 +646,15 @@ else if (psp->pr_why == PR_SYSEXIT && IS_SYS_EXEC(psp->pr_what)) dt_proc_attach(dpr, B_TRUE); +#endif break; case PS_LOST: +printf("Process has been lost!\n"); +#if defined(sun) if (Preopen(P) == 0) goto pwait_locked; +#endif dt_dprintf("pid %d: proc lost: %s\n", pid, strerror(errno)); @@ -626,16 +664,19 @@ break; case PS_UNDEAD: +printf("Process is undead!\n"); dt_dprintf("pid %d: proc died\n", pid); dpr->dpr_quit = B_TRUE; notify = B_TRUE; break; } +#if defined(sun) if (Pstate(P) != PS_UNDEAD && Psetrun(P, 0, 0) == -1) { dt_dprintf("pid %d: failed to set running: %s\n", (int)dpr->dpr_pid, strerror(errno)); } +#endif (void) pthread_mutex_unlock(&dpr->dpr_lock); } @@ -675,21 +716,26 @@ va_end(ap); if (dpr->dpr_proc != NULL) +#if defined(sun) Prelease(dpr->dpr_proc, 0); +#else + proc_detach(dpr->dpr_proc); +#endif dt_free(dtp, dpr); (void) dt_set_errno(dtp, EDT_COMPILER); return (NULL); } -#endif dt_proc_t * dt_proc_lookup(dtrace_hdl_t *dtp, struct ps_prochandle *P, int remove) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; +#if defined(sun) pid_t pid = Pstatus(P)->pr_pid; +#else + pid_t pid = proc_getpid(P); +#endif dt_proc_t *dpr, **dpp = &dph->dph_hash[pid & (dph->dph_hashlen - 1)]; for (dpr = *dpp; dpr != NULL; dpr = dpr->dpr_hash) { @@ -706,9 +752,6 @@ *dpp = dpr->dpr_hash; /* remove from pid hash chain */ return (dpr); -#else -return NULL; -#endif } static void @@ -806,7 +849,6 @@ #endif } -#ifdef DOODAD static int dt_proc_create_thread(dtrace_hdl_t *dtp, dt_proc_t *dpr, uint_t stop) { @@ -823,7 +865,11 @@ (void) sigfillset(&nset); (void) sigdelset(&nset, SIGABRT); /* unblocked for assert() */ +#if defined(sun) (void) sigdelset(&nset, SIGCANCEL); /* see dt_proc_destroy() */ +#else + (void) sigdelset(&nset, SIGUSR1); /* see dt_proc_destroy() */ +#endif data.dpcd_hdl = dtp; data.dpcd_proc = dpr; @@ -851,14 +897,21 @@ * small amount of useful information to help figure it out. */ if (dpr->dpr_done) { +#if defined(sun) const psinfo_t *prp = Ppsinfo(dpr->dpr_proc); int stat = prp ? prp->pr_wstat : 0; +#endif int pid = dpr->dpr_pid; +#if defined(sun) if (Pstate(dpr->dpr_proc) == PS_LOST) { +#else + if (proc_state(dpr->dpr_proc) == PS_LOST) { +#endif (void) dt_proc_error(dpr->dpr_hdl, dpr, "failed to control pid %d: process exec'd " "set-id or unobservable program\n", pid); +#if defined(sun) } else if (WIFSIGNALED(stat)) { (void) dt_proc_error(dpr->dpr_hdl, dpr, "failed to control pid %d: process died " @@ -867,6 +920,7 @@ (void) dt_proc_error(dpr->dpr_hdl, dpr, "failed to control pid %d: process exited " "with status %d\n", pid, WEXITSTATUS(stat)); +#endif } err = ESRCH; /* cause grab() or create() to fail */ @@ -882,13 +936,10 @@ return (err); } -#endif struct ps_prochandle * dt_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_proc_hash_t *dph = dtp->dt_procs; dt_proc_t *dpr; int err; @@ -899,6 +950,7 @@ (void) pthread_mutex_init(&dpr->dpr_lock, NULL); (void) pthread_cond_init(&dpr->dpr_cv, NULL); +#if defined(sun) if ((dpr->dpr_proc = Pcreate(file, argv, &err, NULL, 0)) == NULL) { return (dt_proc_error(dtp, dpr, "failed to execute %s: %s\n", file, Pcreate_error(err))); @@ -909,8 +961,19 @@ (void) Punsetflags(dpr->dpr_proc, PR_RLC); (void) Psetflags(dpr->dpr_proc, PR_KLC); +#else + if ((err = proc_create(file, argv, &dpr->dpr_proc)) != 0) + return (dt_proc_error(dtp, dpr, + "failed to execute %s: %s\n", file, strerror(err))); + dpr->dpr_hdl = dtp; + dpr->dpr_pid = proc_getpid(dpr->dpr_proc); +#endif +#if defined(sun) if (dt_proc_create_thread(dtp, dpr, dtp->dt_prcmode) != 0) +#else + if (dt_proc_create_thread(dtp, dpr, DT_PROC_STOP_IDLE) != 0) +#endif return (NULL); /* dt_proc_error() has been called for us */ dpr->dpr_hash = dph->dph_hash[dpr->dpr_pid & (dph->dph_hashlen - 1)]; @@ -921,9 +984,6 @@ dpr->dpr_refs++; return (dpr->dpr_proc); -#else -return NULL; -#endif } struct ps_prochandle * @@ -1028,8 +1088,6 @@ void dt_proc_release(dtrace_hdl_t *dtp, struct ps_prochandle *P) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_proc_t *dpr = dt_proc_lookup(dtp, P, B_FALSE); dt_proc_hash_t *dph = dtp->dt_procs; @@ -1039,7 +1097,6 @@ if (--dpr->dpr_refs == 0 && (!dpr->dpr_cacheable || dph->dph_lrucnt > dph->dph_lrulim)) dt_proc_destroy(dtp, P); -#endif } void @@ -1103,18 +1160,17 @@ struct ps_prochandle * dtrace_proc_create(dtrace_hdl_t *dtp, const char *file, char *const *argv) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dt_ident_t *idp = dt_idhash_lookup(dtp->dt_macros, "target"); struct ps_prochandle *P = dt_proc_create(dtp, file, argv); if (P != NULL && idp != NULL && idp->di_id == 0) +#if defined(sun) idp->di_id = Pstatus(P)->pr_pid; /* $target = created pid */ +#else + idp->di_id = proc_getpid(P); /* $target = created pid */ +#endif return (P); -#else -return NULL; -#endif } struct ps_prochandle * From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:08:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B12A616A420; Sat, 12 Jan 2008 05:08:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 768C716A418 for ; Sat, 12 Jan 2008 05:08:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7451E13C455 for ; Sat, 12 Jan 2008 05:08:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C58Epb009218 for ; Sat, 12 Jan 2008 05:08:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C58Er6009215 for perforce@freebsd.org; Sat, 12 Jan 2008 05:08:14 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:08:14 GMT Message-Id: <200801120508.m0C58Er6009215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=133098 Change 133098 by jb@jb_freebsd1 on 2008/01/12 05:07:42 Remove some include paths which aren't required now we have our own libproc. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#19 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#19 (text+ko) ==== @@ -52,13 +52,11 @@ .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common CFLAGS+= -I${.OBJDIR} \ - -I${.CURDIR}/../libproc \ -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${.CURDIR}/../../../compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ - -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ -I${OPENSOLARIS_SYS_DISTDIR}/compat From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:10:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC2816A41B; Sat, 12 Jan 2008 05:10:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 152A116A418 for ; Sat, 12 Jan 2008 05:10:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12BEF13C455 for ; Sat, 12 Jan 2008 05:10:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5AHuX009382 for ; Sat, 12 Jan 2008 05:10:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5AG1q009374 for perforce@freebsd.org; Sat, 12 Jan 2008 05:10:16 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:10:16 GMT Message-Id: <200801120510.m0C5AG1q009374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=133099 Change 133099 by jb@jb_freebsd1 on 2008/01/12 05:09:19 Hack to get around asserts where libdtrace delves into private libc voodoo on Solaris to check if a mutex is held. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#14 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#14 (text) ==== @@ -848,14 +848,18 @@ extern int _rw_write_held(struct _rwlock *); return (_rw_write_held((struct _rwlock *)lock)); } +#endif int dt_mutex_held(pthread_mutex_t *lock) { +#if defined(sun) extern int _mutex_held(struct _lwp_mutex *); return (_mutex_held((struct _lwp_mutex *)lock)); +#else + return (1); +#endif } -#endif static int dt_string2str(char *s, char *str, int nbytes) From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:12:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF2F16A418; Sat, 12 Jan 2008 05:12:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EA2B16A468 for ; Sat, 12 Jan 2008 05:12:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BA2E13C469 for ; Sat, 12 Jan 2008 05:12:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5CJJl010200 for ; Sat, 12 Jan 2008 05:12:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5CJxb010196 for perforce@freebsd.org; Sat, 12 Jan 2008 05:12:19 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:12:19 GMT Message-Id: <200801120512.m0C5CJxb010196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=133100 Change 133100 by jb@jb_freebsd1 on 2008/01/12 05:11:23 Comment out some code which doesn't compile for me and doesn't who up on the tinderbox builds which don't compile kernels on arm. I just want the universe to build now so that I can ensure that the CTF build works across all arches (which I think it does!) Affected files ... .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#26 edit Differences ... ==== //depot/projects/dtrace/src/sys/arm/arm/pmap.c#26 (text+ko) ==== @@ -3827,10 +3827,12 @@ TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); pmap->pm_stats.resident_count = 1; +#ifdef DOODAD if (vector_page < KERNBASE) { pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa), VM_PROT_READ, 1); } +#endif return (1); } From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:13:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD1DB16A41B; Sat, 12 Jan 2008 05:13:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 928F716A417 for ; Sat, 12 Jan 2008 05:13:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7760F13C442 for ; Sat, 12 Jan 2008 05:13:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5DKgC010524 for ; Sat, 12 Jan 2008 05:13:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5DKRN010521 for perforce@freebsd.org; Sat, 12 Jan 2008 05:13:20 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:13:20 GMT Message-Id: <200801120513.m0C5DKRN010521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=133101 Change 133101 by jb@jb_freebsd1 on 2008/01/12 05:12:20 A bit of test code. More to come later. Perhaps. Probably needs to be packaged into a regression test and moved out of this directory. Affected files ... .. //depot/projects/dtrace/src/tools/test/libproc/Makefile#1 add .. //depot/projects/dtrace/src/tools/test/libproc/proctest.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:16:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEBA516A418; Sat, 12 Jan 2008 05:16:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92B6316A420 for ; Sat, 12 Jan 2008 05:16:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E8B813C43E for ; Sat, 12 Jan 2008 05:16:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5GOx0010779 for ; Sat, 12 Jan 2008 05:16:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5GOQL010776 for perforce@freebsd.org; Sat, 12 Jan 2008 05:16:24 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:16:24 GMT Message-Id: <200801120516.m0C5GOQL010776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=133102 Change 133102 by jb@jb_freebsd1 on 2008/01/12 05:15:42 IFC Affected files ... .. //depot/projects/dtrace/doc/share/pgpkeys/marius.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#30 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#29 integrate .. //depot/projects/dtrace/ports/GIDs#13 integrate .. //depot/projects/dtrace/ports/UIDs#15 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#34 integrate .. //depot/projects/dtrace/src/etc/namedb/named.conf#5 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm.c#7 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_csqrtf.c#2 integrate .. //depot/projects/dtrace/src/sys/amd64/include/ieeefp.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/include/ieeefp.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#15 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/dtrace/src/usr.bin/systat/ifstat.c#6 integrate .. //depot/projects/dtrace/www/en/java/news.xml#1 branch .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#7 integrate .. //depot/projects/dtrace/www/share/sgml/templates.oldnewsflash.xsl#5 integrate .. //depot/projects/dtrace/www/share/sgml/templates.oldpress.xsl#5 integrate .. //depot/projects/dtrace/www/share/sgml/templates.press.xsl#3 integrate Differences ... ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1044,6 +1044,11 @@ &pgpkey.xride; + + &a.marius; + &pgpkey.marius; + + &a.clsung; &pgpkey.clsung; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#29 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -155,6 +155,7 @@ + ==== //depot/projects/dtrace/ports/GIDs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.47 2007/09/07 03:08:58 edwin Exp $ +$FreeBSD: ports/GIDs,v 1.48 2008/01/11 15:46:29 rafan Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -92,6 +92,7 @@ dkfilter:*:325: wildfire:*:340: stunnel:*:341: +_iodined:*:353: ldap:*:389: tiarra:*:398: drweb:*:426: ==== //depot/projects/dtrace/ports/UIDs#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.52 2007/09/30 07:19:48 edwin Exp $ +$FreeBSD: ports/UIDs,v 1.53 2008/01/11 15:46:29 rafan Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin @@ -102,6 +102,7 @@ dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin +_iodined:*:353:353:Iodine Daemon:/nonexistent:/usr/sbin/nologin ldap:*:389:389:OpenLDAP Server:/nonexistent:/usr/sbin/nologin tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080108: Moved to section 2 +OLD_FILES+=usr/share/man/man3/shm_open.3.gz +OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat @@ -25,6 +28,8 @@ .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h +# 20071125: Renamed to pmc_get_msr() +OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. @@ -33,6 +38,8 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif +# 20071026: kthread(9)/kproc(9) API changes +OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/dtrace/src/etc/namedb/named.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.26 2007/08/17 04:37:02 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.27 2008/01/11 22:41:21 dougb Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -121,14 +121,6 @@ // "This" Network (RFCs 1912 and 3330) zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; -// IANA Reserved - Unlikely to ever be assigned -zone "1.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "2.in-addr.arpa" { type master; file "master/empty.db"; }; -zone "223.in-addr.arpa" { type master; file "master/empty.db"; }; - -// Public Data Networks (RFC 3330) -zone "14.in-addr.arpa" { type master; file "master/empty.db"; }; - // Private Use Networks (RFC 1918) zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; ==== //depot/projects/dtrace/src/lib/libkvm/kvm.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.31 2007/06/15 11:35:11 simokawa Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.32 2008/01/12 00:54:47 delphij Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -290,6 +290,10 @@ _kvm_freevtop(kd); if (kd->procbase != 0) free((void *)kd->procbase); + if (kd->argbuf != 0) + free((void *) kd->argbuf); + if (kd->argspc != 0) + free((void *) kd->argspc); if (kd->argv != 0) free((void *)kd->argv); free((void *)kd); ==== //depot/projects/dtrace/src/lib/msun/src/s_csqrt.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.1 2007/12/15 08:38:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.2 2008/01/11 04:18:25 das Exp $"); #include #include @@ -41,17 +41,20 @@ */ #pragma STDC CX_LIMITED_RANGE on -/* We risk spurious overflow for components >= DBL_MAX/(1+sqrt(2)) */ -#define THRESH 0x1.a827999fcef32p+1022 +/* We risk spurious overflow for components >= DBL_MAX / (1 + sqrt(2)). */ +#define THRESH 0x1.a827999fcef32p+1022 double complex csqrt(double complex z) { - double a = creal(z), b = cimag(z); + double complex result; + double a, b; double t; - double complex result; int scale; + a = creal(z); + b = cimag(z); + /* Handle special cases. */ if (z == 0) return (cpack(0, b)); @@ -59,13 +62,13 @@ return (cpack(INFINITY, b)); if (isnan(a)) { t = (b - b) / (b - b); /* raise invalid if b is not a NaN */ - return (cpack(t, t)); /* return NaN + NaN i */ + return (cpack(a, t)); /* return NaN + NaN i */ } if (isinf(a)) { /* - * csqrt(inf + nan i) = inf + nan i + * csqrt(inf + NaN i) = inf + NaN i * csqrt(inf + y i) = inf + 0 i - * csqrt(-inf + nan i) = nan +- inf i + * csqrt(-inf + NaN i) = NaN +- inf i * csqrt(-inf + y i) = 0 + inf i */ if (signbit(a)) @@ -79,15 +82,15 @@ */ /* Scale to avoid overflow. */ - if (a >= THRESH || b >= THRESH) { - a *= 0.25; - b *= 0.25; - scale = 1; + if (fabs(a) >= THRESH || fabs(b) >= THRESH) { + a *= 0.25; + b *= 0.25; + scale = 1; } else { - scale = 0; + scale = 0; } - /* Algorithm 312, CACM vol 10, Oct 1967 */ + /* Algorithm 312, CACM vol 10, Oct 1967. */ if (a >= 0) { t = sqrt((a + hypot(a, b)) * 0.5); result = cpack(t, b / (2 * t)); @@ -96,9 +99,9 @@ result = cpack(fabs(b) / (2 * t), copysign(t, b)); } - /* Rescale */ + /* Rescale. */ if (scale) - return (result * 2); + return (result * 2); else - return (result); + return (result); } ==== //depot/projects/dtrace/src/lib/msun/src/s_csqrtf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.1 2007/12/15 08:38:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.2 2008/01/11 04:18:25 das Exp $"); #include #include @@ -54,13 +54,13 @@ return (cpackf(INFINITY, b)); if (isnan(a)) { t = (b - b) / (b - b); /* raise invalid if b is not a NaN */ - return (cpackf(t, t)); /* return NaN + NaN i */ + return (cpackf(a, t)); /* return NaN + NaN i */ } if (isinf(a)) { /* - * csqrtf(inf + nan i) = inf + nan i + * csqrtf(inf + NaN i) = inf + NaN i * csqrtf(inf + y i) = inf + 0 i - * csqrtf(-inf + nan i) = nan +- inf i + * csqrtf(-inf + NaN i) = NaN +- inf i * csqrtf(-inf + y i) = 0 + inf i */ if (signbit(a)) ==== //depot/projects/dtrace/src/sys/amd64/include/ieeefp.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.17 2008/01/09 15:03:03 bde Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.19 2008/01/11 17:11:32 bde Exp $ */ #ifndef _MACHINE_IEEEFP_H_ @@ -40,6 +40,7 @@ /* * IEEE floating point type, constant and function definitions. + * XXX: {FP,SSE}*FLD and {FP,SSE}*OFF are undocumented pollution. */ #ifndef _SYS_CDEFS_H_ @@ -47,17 +48,17 @@ #endif /* - * FP rounding modes + * Rounding modes. */ typedef enum { FP_RN=0, /* round to nearest */ - FP_RM, /* round down to minus infinity */ - FP_RP, /* round up to plus infinity */ + FP_RM, /* round down towards minus infinity */ + FP_RP, /* round up towards plus infinity */ FP_RZ /* truncate */ } fp_rnd_t; /* - * FP precision modes + * Precision (i.e., rounding precision) modes. */ typedef enum { FP_PS=0, /* 24 bit (single-precision) */ @@ -69,7 +70,7 @@ #define fp_except_t int /* - * FP exception masks + * Exception bit masks. */ #define FP_X_INV 0x01 /* invalid operation */ #define FP_X_DNML 0x02 /* denormal */ @@ -80,23 +81,19 @@ #define FP_X_STK 0x40 /* stack fault */ /* - * FP registers + * FPU control word bit-field masks. */ -#define FP_MSKS_REG 0 /* exception masks */ -#define FP_PRC_REG 0 /* precision */ -#define FP_RND_REG 0 /* direction */ -#define FP_STKY_REG 1 /* sticky flags */ +#define FP_MSKS_FLD 0x3f /* exception masks field */ +#define FP_PRC_FLD 0x300 /* precision control field */ +#define FP_RND_FLD 0xc00 /* rounding control field */ /* - * FP register bit field masks + * FPU status word bit-field masks. */ -#define FP_MSKS_FLD 0x3f /* exception masks field */ -#define FP_PRC_FLD 0x300 /* precision control field */ -#define FP_RND_FLD 0xc00 /* round control field */ #define FP_STKY_FLD 0x3f /* sticky flags field */ /* - * SSE mxcsr register bit field masks + * SSE mxcsr register bit-field masks. */ #define SSE_STKY_FLD 0x3f /* exception flags */ #define SSE_DAZ_FLD 0x40 /* Denormals are zero */ @@ -105,15 +102,19 @@ #define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */ /* - * FP register bit field offsets + * FPU control word bit-field offsets (shift counts). */ #define FP_MSKS_OFF 0 /* exception masks offset */ #define FP_PRC_OFF 8 /* precision control offset */ -#define FP_RND_OFF 10 /* round control offset */ +#define FP_RND_OFF 10 /* rounding control offset */ + +/* + * FPU status word bit-field offsets (shift counts). + */ #define FP_STKY_OFF 0 /* sticky flags offset */ /* - * SSE mxcsr register bit field offsets + * SSE mxcsr register bit-field offsets (shift counts). */ #define SSE_STKY_OFF 0 /* exception flags offset */ #define SSE_DAZ_OFF 6 /* DAZ exception mask offset */ @@ -124,12 +125,42 @@ #ifdef __GNUCLIKE_ASM #define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) +#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) +#define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : : "m" (*(addr))) #define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) /* + * Load the control word. Be careful not to trap if there is a currently + * unmasked exception (ones that will become freshly unmasked are not a + * problem). This case must be handled by a save/restore of the + * environment or even of the full x87 state. Accessing the environment + * is very inefficient, so only do it when necessary. + */ +static __inline void +__fnldcw(unsigned short _cw, unsigned short _newcw) +{ + struct { + unsigned _cw; + unsigned _other[6]; + } _env; + unsigned short _sw; + + if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { + __fnstsw(&_sw); + if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { + __fnstenv(&_env); + _env._cw = _newcw; + __fldenv(&_env); + return; + } + } + __fldcw(&_newcw); +} + +/* * General notes about conflicting SSE vs FP status bits. * This code assumes that software will not fiddle with the control * bits of the SSE and x87 in such a way to get them out of sync and @@ -154,13 +185,13 @@ { fp_rnd_t _p; unsigned _mxcsr; - unsigned short _cw; + unsigned short _cw, _newcw; __fnstcw(&_cw); _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); - _cw &= ~FP_RND_FLD; - _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; - __fldcw(&_cw); + _newcw = _cw & ~FP_RND_FLD; + _newcw |= (_m << FP_RND_OFF) & FP_RND_FLD; + __fnldcw(_cw, _newcw); __stmxcsr(&_mxcsr); _mxcsr &= ~SSE_RND_FLD; _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD; @@ -186,13 +217,13 @@ __fpsetprec(fp_prec_t _m) { fp_prec_t _p; - unsigned short _cw; + unsigned short _cw, _newcw; __fnstcw(&_cw); _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); - _cw &= ~FP_PRC_FLD; - _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; - __fldcw(&_cw); + _newcw = _cw & ~FP_PRC_FLD; + _newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; + __fnldcw(_cw, _newcw); return (_p); } @@ -216,13 +247,13 @@ { fp_except_t _p; unsigned _mxcsr; - unsigned short _cw; + unsigned short _cw, _newcw; __fnstcw(&_cw); _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; - _cw &= ~FP_MSKS_FLD; - _cw |= (~_m >> FP_MSKS_OFF) & FP_MSKS_FLD; - __fldcw(&_cw); + _newcw = _cw & ~FP_MSKS_FLD; + _newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD; + __fnldcw(_cw, _newcw); __stmxcsr(&_mxcsr); /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */ _mxcsr &= ~SSE_MSKS_FLD; @@ -248,13 +279,13 @@ #if !defined(__IEEEFP_NOINLINES__) && defined(__GNUCLIKE_ASM) +#define fpgetmask() __fpgetmask() +#define fpgetprec() __fpgetprec() #define fpgetround() __fpgetround() -#define fpsetround(_m) __fpsetround(_m) -#define fpgetprec() __fpgetprec() -#define fpsetprec(_m) __fpsetprec(_m) -#define fpgetmask() __fpgetmask() -#define fpsetmask(_m) __fpsetmask(_m) #define fpgetsticky() __fpgetsticky() +#define fpsetmask(m) __fpsetmask(m) +#define fpsetprec(m) __fpsetprec(m) +#define fpsetround(m) __fpsetround(m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 ==== //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#10 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.318 2007/10/20 23:23:14 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.320 2008/01/11 16:50:52 kib Exp $"); #include "opt_fdc.h" @@ -1383,6 +1383,7 @@ struct fd_data *fd; struct fdc_data *fdc; int ar, aw, ae; + int busy; fd = pp->geom->softc; fdc = fd->fdc; @@ -1403,6 +1404,7 @@ return (0); } + busy = 0; if (pp->acr == 0 && pp->acw == 0 && pp->ace == 0) { if (fdmisccmd(fd, BIO_PROBE, NULL)) return (ENXIO); @@ -1415,10 +1417,14 @@ mtx_unlock(&fdc->fdc_mtx); } device_busy(fd->dev); + busy = 1; } - if (w > 0 && (fd->flags & FD_WP)) + if (w > 0 && (fd->flags & FD_WP)) { + if (busy) + device_unbusy(fd->dev); return (EROFS); + } pp->sectorsize = fd->sectorsize; pp->stripesize = fd->ft->heads * fd->ft->sectrac * fd->sectorsize; @@ -1714,7 +1720,7 @@ fdc->flags |= FDC_KTHREAD_EXIT; wakeup(&fdc->head); while ((fdc->flags & FDC_KTHREAD_ALIVE) != 0) - msleep(&fdc->fdc_thread, &fdc->fdc_mtx, PRIBIO, "fdcdet", 0); + msleep(fdc->fdc_thread, &fdc->fdc_mtx, PRIBIO, "fdcdet", 0); mtx_unlock(&fdc->fdc_mtx); /* reset controller, turn motor off */ ==== //depot/projects/dtrace/src/sys/i386/include/ieeefp.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2003 Peter Wemm. * Copyright (c) 1990 Andrew Moore, Talke Studio * All rights reserved. * @@ -31,32 +32,33 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.11 2005/03/15 15:53:39 das Exp $ + * $FreeBSD: src/sys/i386/include/ieeefp.h,v 1.14 2008/01/11 18:59:35 bde Exp $ */ +#ifndef _MACHINE_IEEEFP_H_ +#define _MACHINE_IEEEFP_H_ + /* - * IEEE floating point type and constant definitions. + * IEEE floating point type, constant and function definitions. + * XXX: FP*FLD and FP*OFF are undocumented pollution. */ -#ifndef _MACHINE_IEEEFP_H_ -#define _MACHINE_IEEEFP_H_ - #ifndef _SYS_CDEFS_H_ #error this file needs sys/cdefs.h as a prerequisite #endif /* - * FP rounding modes + * Rounding modes. */ typedef enum { FP_RN=0, /* round to nearest */ - FP_RM, /* round down to minus infinity */ - FP_RP, /* round up to plus infinity */ + FP_RM, /* round down towards minus infinity */ + FP_RP, /* round up towards plus infinity */ FP_RZ /* truncate */ } fp_rnd_t; /* - * FP precision modes + * Precision (i.e., rounding precision) modes. */ typedef enum { FP_PS=0, /* 24 bit (single-precision) */ @@ -68,7 +70,7 @@ #define fp_except_t int /* - * FP exception masks + * Exception bit masks. */ #define FP_X_INV 0x01 /* invalid operation */ #define FP_X_DNML 0x02 /* denormal */ @@ -79,105 +81,178 @@ #define FP_X_STK 0x40 /* stack fault */ /* - * FP registers + * FPU control word bit-field masks. */ -#define FP_MSKS_REG 0 /* exception masks */ -#define FP_PRC_REG 0 /* precision */ -#define FP_RND_REG 0 /* direction */ -#define FP_STKY_REG 1 /* sticky flags */ +#define FP_MSKS_FLD 0x3f /* exception masks field */ +#define FP_PRC_FLD 0x300 /* precision control field */ +#define FP_RND_FLD 0xc00 /* rounding control field */ /* - * FP register bit field masks + * FPU status word bit-field masks. */ -#define FP_MSKS_FLD 0x3f /* exception masks field */ -#define FP_PRC_FLD 0x300 /* precision control field */ -#define FP_RND_FLD 0xc00 /* round control field */ #define FP_STKY_FLD 0x3f /* sticky flags field */ /* - * FP register bit field offsets + * FPU control word bit-field offsets (shift counts). */ #define FP_MSKS_OFF 0 /* exception masks offset */ #define FP_PRC_OFF 8 /* precision control offset */ -#define FP_RND_OFF 10 /* round control offset */ +#define FP_RND_OFF 10 /* rounding control offset */ + +/* + * FPU status word bit-field offsets (shift counts). + */ #define FP_STKY_OFF 0 /* sticky flags offset */ #ifdef __GNUCLIKE_ASM +#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) +#define __fnclex() __asm __volatile("fnclex") +#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) -#define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) /* - * return the contents of a FP register + * Load the control word. Be careful not to trap if there is a currently + * unmasked exception (ones that will become freshly unmasked are not a + * problem). This case must be handled by a save/restore of the + * environment or even of the full x87 state. Accessing the environment + * is very inefficient, so only do it when necessary. */ -static __inline__ int -__fpgetreg(int _reg) +static __inline void +__fnldcw(unsigned short _cw, unsigned short _newcw) { - unsigned short _mem; + struct { + unsigned _cw; + unsigned _other[6]; + } _env; + unsigned short _sw; - /*- - * This is more efficient than it looks. The switch gets optimized - * away if _reg is constant. - * - * The default case only supports _reg == 0. We could handle more - * registers (e.g., tags) using fnstenv, but the interface doesn't - * support more. - */ - switch(_reg) { - default: - __fnstcw(&_mem); - break; - case FP_STKY_REG: - __fnstsw(&_mem); - break; + if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) { + __fnstsw(&_sw); + if (((_sw & ~_cw) & FP_STKY_FLD) != 0) { + __fnstenv(&_env); + _env._cw = _newcw; + __fldenv(&_env); + return; + } } - return _mem; + __fldcw(&_newcw); +} + +static __inline fp_rnd_t +fpgetround(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF)); +} + +static __inline fp_rnd_t +fpsetround(fp_rnd_t _m) +{ + fp_rnd_t _p; + unsigned short _cw, _newcw; + + __fnstcw(&_cw); + _p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF); + _newcw = _cw & ~FP_RND_FLD; + _newcw |= (_m << FP_RND_OFF) & FP_RND_FLD; + __fnldcw(_cw, _newcw); + return (_p); +} + +static __inline fp_prec_t +fpgetprec(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF)); +} + +static __inline fp_prec_t +fpsetprec(fp_prec_t _m) +{ + fp_prec_t _p; + unsigned short _cw, _newcw; + + __fnstcw(&_cw); + _p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF); + _newcw = _cw & ~FP_PRC_FLD; + _newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; + __fnldcw(_cw, _newcw); + return (_p); } /* - * set a FP mode; return previous mode + * Get or set the exception mask. + * Note that the x87 mask bits are inverted by the API -- a mask bit of 1 + * means disable for x87 and SSE, but for fp*mask() it means enable. */ -static __inline__ int -__fpsetreg(int _m, int _reg, int _fld, int _off) + +static __inline fp_except_t +fpgetmask(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF); +} + +static __inline fp_except_t +fpsetmask(fp_except_t _m) +{ + fp_except_t _p; + unsigned short _cw, _newcw; + + __fnstcw(&_cw); + _p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF; + _newcw = _cw & ~FP_MSKS_FLD; + _newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD; + __fnldcw(_cw, _newcw); + return (_p); +} + +static __inline fp_except_t +fpgetsticky(void) +{ + unsigned _ex; + unsigned short _sw; + + __fnstsw(&_sw); + _ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF; + return ((fp_except_t)_ex); +} + +static __inline fp_except_t +fpresetsticky(fp_except_t _m) { - unsigned _env[7]; - unsigned _p; + struct { + unsigned _cw; + unsigned _sw; + unsigned _other[5]; + } _env; + fp_except_t _p; - /* - * _reg == 0 could be handled better using fnstcw/fldcw. - */ - __fnstenv(_env); - _p = (_env[_reg] & _fld) >> _off; - _env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld); - __fldenv(_env); - return _p; + _m &= FP_STKY_FLD >> FP_STKY_OFF; + _p = fpgetsticky(); + if ((_p & ~_m) == _p) + return (_p); + if ((_p & ~_m) == 0) { + __fnclex(); + return (_p); + } + __fnstenv(&_env); + _env._sw &= ~_m; + __fldenv(&_env); + return (_p); } #endif /* __GNUCLIKE_ASM */ -/* - * SysV/386 FP control interface - */ -#define fpgetround() ((fp_rnd_t) \ - ((__fpgetreg(FP_RND_REG) & FP_RND_FLD) >> FP_RND_OFF)) -#define fpsetround(m) ((fp_rnd_t) \ - __fpsetreg((m), FP_RND_REG, FP_RND_FLD, FP_RND_OFF)) -#define fpgetprec() ((fp_prec_t) \ - ((__fpgetreg(FP_PRC_REG) & FP_PRC_FLD) >> FP_PRC_OFF)) -#define fpsetprec(m) ((fp_prec_t) \ - __fpsetreg((m), FP_PRC_REG, FP_PRC_FLD, FP_PRC_OFF)) -#define fpgetmask() ((fp_except_t) \ - ((~__fpgetreg(FP_MSKS_REG) & FP_MSKS_FLD) >> FP_MSKS_OFF)) -#define fpsetmask(m) ((fp_except_t) \ - (~__fpsetreg(~(m), FP_MSKS_REG, FP_MSKS_FLD, FP_MSKS_OFF)) & \ - (FP_MSKS_FLD >> FP_MSKS_OFF)) -#define fpgetsticky() ((fp_except_t) \ - ((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF)) -#define fpresetsticky(m) ((fp_except_t) \ - __fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF)) - /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 ==== //depot/projects/dtrace/src/sys/kern/kern_lock.c#15 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.118 2008/01/09 00:02:43 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.119 2008/01/11 16:38:12 attilio Exp $"); #include "opt_ddb.h" #include "opt_global.h" @@ -546,16 +546,19 @@ struct thread *td; td = curthread; - KASSERT(lkp->lk_exclusivecount, + KASSERT(panicstr != NULL || lkp->lk_exclusivecount, ("%s: %p lockmgr must be exclusively locked", __func__, lkp)); - KASSERT(lkp->lk_lockholder == td || lkp->lk_lockholder == LK_KERNPROC, + KASSERT(panicstr != NULL || lkp->lk_lockholder == td || + lkp->lk_lockholder == LK_KERNPROC, ("%s: %p lockmgr must be locked by curthread (%p)", __func__, lkp, td)); /* * Drop the lock reference and switch the owner. This will result * in an atomic operation like td_lock is only accessed by curthread - * and lk_lockholder only needs one write. + * and lk_lockholder only needs one write. Note also that the lock + * owner can be alredy KERNPROC, so in that case just skip the + * decrement. */ if (lkp->lk_lockholder == td) td->td_locks--; ==== //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#15 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.156 2008/01/10 23:36:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.157 2008/01/11 23:57:39 jhb Exp $"); /* * Socket operations for use by nfs @@ -264,7 +264,22 @@ int error, rcvreserve, sndreserve; int pktscale; struct sockaddr *saddr; - struct thread *td = curthread; /* only used for socreate and sobind */ + struct ucred *origcred; + struct thread *td = curthread; + + /* + * We need to establish the socket using the credentials of + * the mountpoint. Some parts of this process (such as + * sobind() and soconnect()) will use the curent thread's + * credential instead of the socket credential. To work + * around this, temporarily change the current thread's + * credential to that of the mountpoint. + * + * XXX: It would be better to explicitly pass the correct + * credential to sobind() and soconnect(). + */ + origcred = td->td_ucred; + td->td_ucred = nmp->nm_mountp->mnt_cred; if (nmp->nm_sotype == SOCK_STREAM) { mtx_lock(&nmp->nm_mtx); @@ -453,6 +468,9 @@ so->so_snd.sb_flags |= SB_NOINTR; SOCKBUF_UNLOCK(&so->so_snd); + /* Restore current thread's credentials. */ + td->td_ucred = origcred; + mtx_lock(&nmp->nm_mtx); /* Initialize other non-zero congestion variables */ nfs_init_rtt(nmp); @@ -463,6 +481,9 @@ return (0); bad: + /* Restore current thread's credentials. */ + td->td_ucred = origcred; + nfs_disconnect(nmp); return (error); } ==== //depot/projects/dtrace/src/usr.bin/systat/ifstat.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.bin/systat/ifstat.c,v 1.6 2006/11/27 16:59:08 yar Exp $ + * $FreeBSD: src/usr.bin/systat/ifstat.c,v 1.7 2008/01/12 00:11:26 delphij Exp $ */ #include @@ -37,6 +37,7 @@ #include #include #include +#include #include "systat.h" #include "extern.h" @@ -210,10 +211,9 @@ SLIST_INIT(&curlist); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:17:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F36D16A469; Sat, 12 Jan 2008 05:17:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8F4416A417 for ; Sat, 12 Jan 2008 05:17:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE32313C457 for ; Sat, 12 Jan 2008 05:17:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5HPa3010823 for ; Sat, 12 Jan 2008 05:17:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5HPGh010820 for perforce@freebsd.org; Sat, 12 Jan 2008 05:17:25 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:17:25 GMT Message-Id: <200801120517.m0C5HPGh010820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:17:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=133103 Change 133103 by jb@jb_freebsd1 on 2008/01/12 05:17:03 Add libproc to the prebuild libs Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#34 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#34 (text+ko) ==== @@ -1081,7 +1081,7 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libdwarf + ${_secure_lib_libssl} lib/libdwarf lib/libproc .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} From owner-p4-projects@FreeBSD.ORG Sat Jan 12 05:55:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8251416A419; Sat, 12 Jan 2008 05:55:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4803516A41A for ; Sat, 12 Jan 2008 05:55:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44F6C13C43E for ; Sat, 12 Jan 2008 05:55:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0C5t8rY016493 for ; Sat, 12 Jan 2008 05:55:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0C5t8TL016490 for perforce@freebsd.org; Sat, 12 Jan 2008 05:55:08 GMT (envelope-from jb@freebsd.org) Date: Sat, 12 Jan 2008 05:55:08 GMT Message-Id: <200801120555.m0C5t8TL016490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 05:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=133105 Change 133105 by jb@jb_freebsd1 on 2008/01/12 05:54:43 I think I might have reached the point where I don't need to see the file anf line number location of every error. Woohoo. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#13 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#13 (text) ==== @@ -202,7 +202,7 @@ static void dfatal(const char *fmt, ...) { -#if !defined(sun) +#if !defined(sun) && defined(NEED_ERRLOC) char *p_errfile = NULL; int errline = 0; #endif @@ -223,7 +223,7 @@ (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } -#if !defined(sun) +#if !defined(sun) && defined(NEED_ERRLOC) dt_get_errloc(g_dtp, &p_errfile, &errline); if (p_errfile != NULL) printf("File '%s', line %d\n", p_errfile, errline); From owner-p4-projects@FreeBSD.ORG Sat Jan 12 12:35:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 238A416A420; Sat, 12 Jan 2008 12:35:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD5A816A41A for ; Sat, 12 Jan 2008 12:35:33 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 8D22E13C459 for ; Sat, 12 Jan 2008 12:35:33 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 2B8EF49153; Sat, 12 Jan 2008 07:35:33 -0500 (EST) Date: Sat, 12 Jan 2008 12:35:33 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Birrell In-Reply-To: <200801120500.m0C50viG006775@repoman.freebsd.org> Message-ID: <20080112123333.B36731@fledge.watson.org> References: <200801120500.m0C50viG006775@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 133090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 12:35:34 -0000 On Sat, 12 Jan 2008, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=133090 > > Change 133090 by jb@jb_freebsd1 on 2008/01/12 05:00:46 > > Add a simple libproc for use by libdtrace. This is based on > ptrace, kevent and kvm instead of procfs like the one in Solaris. Does it actually depend on kvm (/dev/kmem) or just on libkvm interfaces? We've been trying to eliminate dependence on /dev/kmem for tools that otherwise don't require privilege over the last few years, in the interests of eliminating setgid kmem. Generally, we've done this by adding sysctls that explicitly export the required information, and in some cases, those sysctls have been wrapped by existing libkvm interfaces. I guess this is most easily answered by knowing if things using libdtrace->libproc require setgid to operate :-). Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Sat Jan 12 14:02:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 501B116A421; Sat, 12 Jan 2008 14:02:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4DC416A417 for ; Sat, 12 Jan 2008 14:02:22 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B147A13C442 for ; Sat, 12 Jan 2008 14:02:22 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CE2Mrh017271 for ; Sat, 12 Jan 2008 14:02:22 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CE0bTC016719 for perforce@freebsd.org; Sat, 12 Jan 2008 14:00:37 GMT (envelope-from sephe@FreeBSD.org) Date: Sat, 12 Jan 2008 14:00:37 GMT Message-Id: <200801121400.m0CE0bTC016719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 133115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 14:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=133115 Change 133115 by sephe@sephe_zealot:sam_wifi on 2008/01/12 14:00:32 IFC Affected files ... .. //depot/projects/wifi/COPYRIGHT#5 integrate .. //depot/projects/wifi/Makefile#17 integrate .. //depot/projects/wifi/Makefile.inc1#38 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#24 integrate .. //depot/projects/wifi/UPDATING#36 integrate .. //depot/projects/wifi/bin/cp/cp.c#6 integrate .. //depot/projects/wifi/bin/ed/Makefile#5 integrate .. //depot/projects/wifi/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/wifi/bin/ln/ln.1#5 integrate .. //depot/projects/wifi/bin/ln/ln.c#5 integrate .. //depot/projects/wifi/bin/mv/mv.1#5 integrate .. //depot/projects/wifi/bin/mv/mv.c#5 integrate .. //depot/projects/wifi/bin/ps/extern.h#2 integrate .. //depot/projects/wifi/bin/ps/keyword.c#5 integrate .. //depot/projects/wifi/bin/ps/print.c#4 integrate .. //depot/projects/wifi/bin/ps/ps.c#6 integrate .. //depot/projects/wifi/bin/sh/Makefile#4 integrate .. //depot/projects/wifi/bin/sh/eval.c#6 integrate .. //depot/projects/wifi/bin/sh/sh.1#13 integrate .. //depot/projects/wifi/cddl/Makefile.inc#3 integrate .. //depot/projects/wifi/cddl/lib/Makefile#5 integrate .. //depot/projects/wifi/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/wifi/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/wifi/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/wifi/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/wifi/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/wifi/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/wifi/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/wifi/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/wifi/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/wifi/contrib/amd/AUTHORS#2 integrate .. //depot/projects/wifi/contrib/amd/BUGS#2 integrate .. //depot/projects/wifi/contrib/amd/COPYING#2 integrate .. //depot/projects/wifi/contrib/amd/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/amd/FAQ#1 branch .. //depot/projects/wifi/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/amd/INSTALL#2 integrate .. //depot/projects/wifi/contrib/amd/NEWS#2 integrate .. //depot/projects/wifi/contrib/amd/README.attrcache#1 branch .. //depot/projects/wifi/contrib/amd/README.ldap#2 integrate .. //depot/projects/wifi/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/wifi/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/wifi/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/wifi/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/wifi/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/wifi/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/wifi/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/map.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/wifi/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/wifi/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/wifi/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/wifi/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/wifi/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/wifi/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/wifi/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/wifi/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/wifi/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/wifi/contrib/amd/bootstrap#2 integrate .. //depot/projects/wifi/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/wifi/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/wifi/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/wifi/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/wifi/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/wifi/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/wifi/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/wifi/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/wifi/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/wifi/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/wifi/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/wifi/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/wifi/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/wifi/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/wifi/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/wifi/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/wifi/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/wifi/contrib/amd/ldap.schema#1 branch .. //depot/projects/wifi/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/wifi/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/wifi/contrib/amd/libamu/util.c#2 delete .. //depot/projects/wifi/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/wifi/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/wifi/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/wifi/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/wifi/contrib/amd/m4/amindent#2 delete .. //depot/projects/wifi/contrib/amd/m4/autopat#2 delete .. //depot/projects/wifi/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/wifi/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/wifi/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/wifi/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/wifi/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/wifi/contrib/amd/m4/mkconf#2 delete .. //depot/projects/wifi/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/wifi/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/wifi/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/wifi/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/wifi/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/wifi/contrib/amd/tasks#2 integrate .. //depot/projects/wifi/contrib/amd/vers.m4#1 branch .. //depot/projects/wifi/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/wifi/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/wifi/contrib/bind9/CHANGES#8 integrate .. //depot/projects/wifi/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/wifi/contrib/bind9/FAQ#8 integrate .. //depot/projects/wifi/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/wifi/contrib/bind9/Makefile.in#5 integrate .. //depot/projects/wifi/contrib/bind9/README#8 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/check-tool.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.docbook#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.1#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dighost.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.1#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/include/dig/dig.h#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.1#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.docbook#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/control.c#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.5#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.docbook#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.html#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.docbook#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/update.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.c#7 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.8#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.5#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.html#6 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.html#6 integrate .. //depot/projects/wifi/contrib/bind9/configure.in#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.html#7 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Makefile.in#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/wifi/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/wifi/contrib/bind9/version#8 integrate .. //depot/projects/wifi/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/wifi/contrib/csup/mux.c#2 integrate .. //depot/projects/wifi/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/wifi/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/wifi/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/wifi/contrib/gcc/opts.c#3 integrate .. //depot/projects/wifi/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/wifi/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/wifi/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/wifi/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-common#7 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/wifi/contrib/groff/tmac/groff_mdoc.man#6 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/Makefile#6 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/wifi/contrib/ipfilter/HISTORY#6 integrate .. //depot/projects/wifi/contrib/ipfilter/Makefile#6 integrate .. //depot/projects/wifi/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/iptests.c#6 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sock.c#6 integrate .. //depot/projects/wifi/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/wifi/contrib/ipfilter/l4check/l4check.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printstate.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/wifi/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/wifi/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in1#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/f11#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfstat.c#6 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipmon.c#7 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/wifi/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/less/LICENSE#3 integrate .. //depot/projects/wifi/contrib/less/Makefile.dsm#2 delete .. //depot/projects/wifi/contrib/less/NEWS#5 integrate .. //depot/projects/wifi/contrib/less/README#5 integrate .. //depot/projects/wifi/contrib/less/ch.c#4 integrate .. //depot/projects/wifi/contrib/less/charset.c#4 integrate .. //depot/projects/wifi/contrib/less/command.c#5 integrate .. //depot/projects/wifi/contrib/less/configure#4 integrate .. //depot/projects/wifi/contrib/less/configure.ac#4 integrate .. //depot/projects/wifi/contrib/less/decode.c#4 integrate .. //depot/projects/wifi/contrib/less/defines.ds#4 integrate .. //depot/projects/wifi/contrib/less/defines.h.in#4 integrate .. //depot/projects/wifi/contrib/less/defines.o2#4 integrate .. //depot/projects/wifi/contrib/less/defines.o9#4 integrate .. //depot/projects/wifi/contrib/less/defines.wn#4 integrate .. //depot/projects/wifi/contrib/less/edit.c#4 integrate .. //depot/projects/wifi/contrib/less/filename.c#4 integrate .. //depot/projects/wifi/contrib/less/funcs.h#4 integrate .. //depot/projects/wifi/contrib/less/jump.c#4 integrate .. //depot/projects/wifi/contrib/less/less.h#4 integrate .. //depot/projects/wifi/contrib/less/less.man#5 integrate .. //depot/projects/wifi/contrib/less/less.nro#5 integrate .. //depot/projects/wifi/contrib/less/lessecho.man#4 integrate .. //depot/projects/wifi/contrib/less/lessecho.nro#4 integrate .. //depot/projects/wifi/contrib/less/lesskey.man#5 integrate .. //depot/projects/wifi/contrib/less/lesskey.nro#5 integrate .. //depot/projects/wifi/contrib/less/line.c#5 integrate .. //depot/projects/wifi/contrib/less/optfunc.c#5 integrate .. //depot/projects/wifi/contrib/less/opttbl.c#4 integrate .. //depot/projects/wifi/contrib/less/screen.c#6 integrate .. //depot/projects/wifi/contrib/less/search.c#5 integrate .. //depot/projects/wifi/contrib/less/signal.c#4 integrate .. //depot/projects/wifi/contrib/less/tags.c#4 integrate .. //depot/projects/wifi/contrib/less/version.c#5 integrate .. //depot/projects/wifi/contrib/libiberty/cp-demangle.c#1 branch .. //depot/projects/wifi/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/wifi/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/wifi/contrib/libpcap/FILES#3 integrate .. //depot/projects/wifi/contrib/libpcap/INSTALL#2 delete .. //depot/projects/wifi/contrib/libpcap/INSTALL.txt#3 integrate .. //depot/projects/wifi/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/libpcap/README.dag#3 integrate .. //depot/projects/wifi/contrib/libpcap/TODO#2 integrate .. //depot/projects/wifi/contrib/libpcap/VERSION#4 integrate .. //depot/projects/wifi/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/wifi/contrib/libpcap/configure#4 integrate .. //depot/projects/wifi/contrib/libpcap/configure.in#4 integrate .. //depot/projects/wifi/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/wifi/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/wifi/contrib/libpcap/inet.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/wifi/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/wifi/contrib/libpcap/pf.h#3 delete .. //depot/projects/wifi/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/wifi/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/wifi/contrib/libreadline/complete.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/display.c#5 integrate .. //depot/projects/wifi/contrib/libreadline/input.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/misc.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/readline.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/text.c#4 integrate .. //depot/projects/wifi/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/wifi/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/wifi/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/wifi/contrib/ncurses/NEWS#3 integrate .. //depot/projects/wifi/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/wifi/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/wifi/contrib/ncurses/config.guess#3 integrate .. //depot/projects/wifi/contrib/ncurses/config.sub#3 integrate .. //depot/projects/wifi/contrib/ncurses/configure#3 integrate .. //depot/projects/wifi/contrib/ncurses/configure.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/wifi/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/wifi/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/wifi/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/form/headers#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/modules#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/headers#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/include/tic.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/install-sh#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/wifi/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/wifi/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/wifi/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/wifi/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/wifi/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/wifi/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/wifi/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/wifi/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/wifi/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/wifi/contrib/ncurses/mkinstalldirs#3 delete .. //depot/projects/wifi/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/curses.priv.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_parse.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/clear.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/modules#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/tack/COPYING#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/HISTORY#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/Makefile.in#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/README#2 delete .. //depot/projects/wifi/contrib/ncurses/tack/ansi.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/charset.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/color.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/control.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/crum.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/edit.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/fun.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/init.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/menu.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/modes.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/modules#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/output.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/pad.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/scan.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/sync.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/sysdep.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/tack.1#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/tack.c#3 delete .. //depot/projects/wifi/contrib/ncurses/tack/tack.h#3 delete .. //depot/projects/wifi/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/wifi/contrib/one-true-awk/FREEBSD-upgrade#4 integrate .. //depot/projects/wifi/contrib/one-true-awk/lib.c#4 integrate .. //depot/projects/wifi/contrib/one-true-awk/tran.c#3 integrate .. //depot/projects/wifi/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/wifi/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/VERSION#5 integrate .. //depot/projects/wifi/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/wifi/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/wifi/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/wifi/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/wifi/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/wifi/contrib/openbsm/configure#5 integrate .. //depot/projects/wifi/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/wifi/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/wifi/contrib/openbsm/etc/audit_event#5 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/wifi/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/CREDITS#3 integrate .. //depot/projects/wifi/contrib/openpam/HISTORY#4 integrate .. //depot/projects/wifi/contrib/openpam/INSTALL#2 integrate .. //depot/projects/wifi/contrib/openpam/LICENSE#2 integrate .. //depot/projects/wifi/contrib/openpam/MANIFEST#4 delete .. //depot/projects/wifi/contrib/openpam/Makefile.am#4 integrate .. //depot/projects/wifi/contrib/openpam/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/README#2 integrate .. //depot/projects/wifi/contrib/openpam/RELNOTES#4 integrate .. //depot/projects/wifi/contrib/openpam/aclocal.m4#4 integrate .. //depot/projects/wifi/contrib/openpam/autogen.sh#3 integrate .. //depot/projects/wifi/contrib/openpam/bin/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/bin/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/wifi/contrib/openpam/compile#1 branch .. //depot/projects/wifi/contrib/openpam/config.h.in#3 integrate .. //depot/projects/wifi/contrib/openpam/configure#4 integrate .. //depot/projects/wifi/contrib/openpam/configure.ac#2 integrate .. //depot/projects/wifi/contrib/openpam/configure.in#2 delete .. //depot/projects/wifi/contrib/openpam/depcomp#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.am#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam.man#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_data.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_envlist.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_get_option.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_log.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_nullconv.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_readline.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_set_option.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.man#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_authenticate.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_close_session.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_end.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_error.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_data.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_item.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_user.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenv.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_info.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_open_session.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_prompt.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_putenv.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_data.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_item.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setcred.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setenv.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_start.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_strerror.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_verror.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vinfo.3#4 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vprompt.3#4 integrate .. //depot/projects/wifi/contrib/openpam/include/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/include/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/include/security/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/include/security/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/include/security/openpam.h#3 integrate .. //depot/projects/wifi/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/wifi/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/wifi/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/wifi/contrib/openpam/install-sh#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.am#4 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_dynamic.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_free_data.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_load.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#4 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_restore_cred.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_ttyconv.c#4 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_authtok.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_data.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_get_user.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_open_session.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_strerror.c#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/wifi/contrib/openpam/ltconfig#2 delete .. //depot/projects/wifi/contrib/openpam/ltmain.sh#4 integrate .. //depot/projects/wifi/contrib/openpam/misc/gendoc.pl#4 integrate .. //depot/projects/wifi/contrib/openpam/missing#3 integrate .. //depot/projects/wifi/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/wifi/contrib/openpam/modules/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/wifi/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/wifi/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/wifi/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/wifi/contrib/sendmail/CACerts#2 integrate .. //depot/projects/wifi/contrib/sendmail/FREEBSD-upgrade#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 12 19:38:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01F9416A41B; Sat, 12 Jan 2008 19:38:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB82116A419 for ; Sat, 12 Jan 2008 19:37:59 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.freebsd.org (Postfix) with ESMTP id 5C24C13C44B for ; Sat, 12 Jan 2008 19:37:59 +0000 (UTC) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id D48877329D; Sat, 12 Jan 2008 19:40:05 +0000 (GMT) Date: Sat, 12 Jan 2008 19:40:05 +0000 From: John Birrell To: Robert Watson Message-ID: <20080112194005.GA47058@what-creek.com> References: <200801120500.m0C50viG006775@repoman.freebsd.org> <20080112123333.B36731@fledge.watson.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080112123333.B36731@fledge.watson.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 133090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 19:38:00 -0000 On Sat, Jan 12, 2008 at 12:35:33PM +0000, Robert Watson wrote: > On Sat, 12 Jan 2008, John Birrell wrote: > > >http://perforce.freebsd.org/chv.cgi?CH=133090 > > > >Change 133090 by jb@jb_freebsd1 on 2008/01/12 05:00:46 > > > > Add a simple libproc for use by libdtrace. This is based on > > ptrace, kevent and kvm instead of procfs like the one in Solaris. > > Does it actually depend on kvm (/dev/kmem) or just on libkvm interfaces? > We've been trying to eliminate dependence on /dev/kmem for tools that > otherwise don't require privilege over the last few years, in the interests > of eliminating setgid kmem. Generally, we've done this by adding sysctls > that explicitly export the required information, and in some cases, those > sysctls have been wrapped by existing libkvm interfaces. I guess this is > most easily answered by knowing if things using libdtrace->libproc require > setgid to operate :-). I started using the process status via kvm, but found that it was better obtained as a kevent, so the code at the moment doesn't do anything via kvm. I can probably complete the functionality via the ptrace() call and remove the libkvm stuff altogether. -- John Birrell From owner-p4-projects@FreeBSD.ORG Sat Jan 12 21:45:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8475216A41B; Sat, 12 Jan 2008 21:45:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49E4916A417 for ; Sat, 12 Jan 2008 21:45:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08DF213C459 for ; Sat, 12 Jan 2008 21:45:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CLjVWX030119 for ; Sat, 12 Jan 2008 21:45:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CLjVWS030116 for perforce@freebsd.org; Sat, 12 Jan 2008 21:45:31 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jan 2008 21:45:31 GMT Message-Id: <200801122145.m0CLjVWS030116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 133128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 21:45:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=133128 Change 133128 by marcel@marcel_cluster on 2008/01/12 21:44:35 Import cfi(4), a driver for CFI compliant flash devices. This supports Intel (un-tested) and AMD devices. It presents /dev/cfi# to userspace for reading and writing. To be done: o Use KOBJ to handle the differences between the various CFI implementations and commands. o Add locking and unlocking of sectors. o See how this can be integrated with nvram_powermac(4) and likewise drivers that bundle raw CFI access with high-level functionality or use of the flash device. Obtained from: Juniper Networks Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#1 add .. //depot/projects/e500/sys/dev/cfi/cfi_core.c#1 add .. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#1 add .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#1 add .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 12 21:53:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF62016A41A; Sat, 12 Jan 2008 21:53:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8530416A418 for ; Sat, 12 Jan 2008 21:53:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A54A13C448 for ; Sat, 12 Jan 2008 21:53:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CLrfed031378 for ; Sat, 12 Jan 2008 21:53:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CLrfcs031375 for perforce@freebsd.org; Sat, 12 Jan 2008 21:53:41 GMT (envelope-from marcel@freebsd.org) Date: Sat, 12 Jan 2008 21:53:41 GMT Message-Id: <200801122153.m0CLrfcs031375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 133130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 21:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=133130 Change 133130 by marcel@marcel_cluster on 2008/01/12 21:53:28 Add cfi(4) to the build. Due to the fact that there's no localbus driver here (yet), this won't work. Affected files ... .. //depot/projects/e500/sys/conf/files#10 edit .. //depot/projects/e500/sys/conf/files.powerpc#13 edit Differences ... ==== //depot/projects/e500/sys/conf/files#10 (text+ko) ==== @@ -503,6 +503,8 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus +dev/cfi/cfi_core.c optional cfi +dev/cfi/cfi_dev.c optional cfi dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cnw/if_cnw.c optional cnw pccard ==== //depot/projects/e500/sys/conf/files.powerpc#13 (text+ko) ==== @@ -27,6 +27,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb +dev/cfi/cfi_bus_lbc optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:18:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A0AD16A421; Sat, 12 Jan 2008 23:18:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E36E016A41A for ; Sat, 12 Jan 2008 23:18:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE84113C44B for ; Sat, 12 Jan 2008 23:18:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNI9eu046243 for ; Sat, 12 Jan 2008 23:18:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNI9dH046240 for perforce@freebsd.org; Sat, 12 Jan 2008 23:18:09 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:18:09 GMT Message-Id: <200801122318.m0CNI9dH046240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:18:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=133133 Change 133133 by sam@sam_ebb on 2008/01/12 23:17:50 maintain per-node rssi state using the LPF scheme that's employed many other places (and cleanup scan code to use defs now common) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#18 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#15 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#3 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#3 (text+ko) ==== @@ -355,7 +355,7 @@ goto err; } } - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (HAS_SEQ(type)) { @@ -714,7 +714,7 @@ sizeof(ni->ni_tstamp)); } if (ni != NULL) { - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; } @@ -796,7 +796,7 @@ /* XXX find a better class or define it's own */ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, "%s", "recv probe req"); - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_rstamp = rstamp; rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#3 (text+ko) ==== @@ -507,7 +507,7 @@ goto out; } - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (HAS_SEQ(type)) { @@ -1053,7 +1053,7 @@ * after the transaction completes. */ ni->ni_flags |= IEEE80211_NODE_AREF; - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (!ieee80211_alloc_challenge(ni)) { @@ -1798,7 +1798,7 @@ /* XXX find a better class or define it's own */ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, "%s", "recv probe req"); - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_rstamp = rstamp; rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE @@ -2089,7 +2089,7 @@ vap->iv_stats.is_ht_assoc_nohtcap++; return; } - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; ni->ni_intval = lintval; ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#18 (text+ko) ==== @@ -445,7 +445,6 @@ printf(" %s%c", ether_sprintf(ni->ni_bssid), fail & 0x20 ? '!' : ' '); printf(" %3d%c", ieee80211_chan2ieee(ic, ni->ni_chan), fail & 0x01 ? '!' : ' '); - printf(" %+4d", ni->ni_rssi); printf(" %2dM%c", (rate & IEEE80211_RATE_VAL) / 2, fail & 0x08 ? '!' : ' '); printf(" %4s%c", @@ -686,7 +685,7 @@ ni->ni_fhdwell = se->se_fhdwell; ni->ni_fhindex = se->se_fhindex; ni->ni_erp = se->se_erp; - ni->ni_rssi = se->se_rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, se->se_rssi); ni->ni_noise = se->se_noise; if (ieee80211_ies_init(&ni->ni_ies, se->se_ies.data, se->se_ies.len)) { @@ -890,13 +889,19 @@ static int8_t node_getrssi(const struct ieee80211_node *ni) { - return ni->ni_rssi; + uint32_t avgrssi = ni->ni_avgrssi; + int32_t rssi; + + if (avgrssi == IEEE80211_RSSI_DUMMY_MARKER) + return 0; + rssi = IEEE80211_RSSI_GET(avgrssi); + return rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; } static void node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) { - *rssi = ni->ni_rssi; + *rssi = node_getrssi(ni); *noise = ni->ni_noise; } @@ -932,6 +937,7 @@ ni->ni_authmode = IEEE80211_AUTH_OPEN; ni->ni_txpower = ic->ic_txpowlimit; /* max power */ ieee80211_crypto_resetkey(vap, &ni->ni_ucastkey, IEEE80211_KEYIX_NONE); + ni->ni_avgrssi = IEEE80211_RSSI_DUMMY_MARKER; ni->ni_inact_reload = nt->nt_inact_init; ni->ni_inact = ni->ni_inact_reload; ni->ni_ath_defkeyix = 0x7fff; @@ -1779,7 +1785,7 @@ ni->ni_rxseqs[IEEE80211_NONQOS_TID] & IEEE80211_SEQ_FRAG_MASK, ni->ni_rxfragstamp); printf("\trstamp %u rssi %d noise %d intval %u capinfo 0x%x\n", - ni->ni_rstamp, ni->ni_rssi, ni->ni_noise, + ni->ni_rstamp, node_getrssi(ni), ni->ni_noise, ni->ni_intval, ni->ni_capinfo); printf("\tbssid %s essid \"%.*s\" channel %u:0x%x\n", ether_sprintf(ni->ni_bssid), ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#12 (text+ko) ==== @@ -140,7 +140,7 @@ /* hardware */ uint32_t ni_rstamp; /* recv timestamp */ - int8_t ni_rssi; /* recv ssi */ + uint32_t ni_avgrssi; /* recv ssi state */ int8_t ni_noise; /* noise floor */ /* header */ @@ -202,6 +202,38 @@ #define IEEE80211_NODE_STAT_ADD(ni,stat,v) (ni->ni_stats.ns_##stat += v) #define IEEE80211_NODE_STAT_SET(ni,stat,v) (ni->ni_stats.ns_##stat = v) +/* + * Filtered rssi calculation support. The receive rssi is maintained + * as an average over the last 10 frames received using a low pass filter + * (all frames for now, possibly need to be more selective). Calculations + * are designed such that a good compiler can optimize them. The avg + * rssi state should be initialized to IEEE80211_RSSI_DUMMY_MARKER and + * each sample incorporated with IEEE80211_RSSI_LPF. Use IEEE80211_RSSI_GET + * to extract the current value. + * + * Note that we assume rssi data are in the range [-127..127] and we + * discard values <-20. This is consistent with assumptions throughout + * net80211 that signal strength data are in .5 dBm units relative to + * the current noise floor (linear, not log). + */ +#define IEEE80211_RSSI_LPF_LEN 10 +#define IEEE80211_RSSI_DUMMY_MARKER 127 +/* NB: pow2 to optimize out * and / */ +#define IEEE80211_RSSI_EP_MULTIPLIER (1<<7) +#define IEEE80211_RSSI_IN(x) ((x) * IEEE80211_RSSI_EP_MULTIPLIER) +#define _IEEE80211_RSSI_LPF(x, y, len) \ + (((x) != IEEE80211_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y)) +#define IEEE80211_RSSI_LPF(x, y) do { \ + if ((y) >= -20) { \ + x = _IEEE80211_RSSI_LPF((x), IEEE80211_RSSI_IN((y)), \ + IEEE80211_RSSI_LPF_LEN); \ + } \ +} while (0) +#define IEEE80211_RSSI_EP_RND(x, mul) \ + ((((x) % (mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul)) +#define IEEE80211_RSSI_GET(x) \ + IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER) + static __inline struct ieee80211_node * ieee80211_ref_node(struct ieee80211_node *ni) { ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#15 (text+ko) ==== @@ -65,20 +65,6 @@ #define STA_RSSI_MIN 8 /* min acceptable rssi */ #define STA_RSSI_MAX 40 /* max rssi for comparison */ -#define RSSI_LPF_LEN 10 -#define RSSI_DUMMY_MARKER 0x127 -#define RSSI_EP_MULTIPLIER (1<<7) /* pow2 to optimize out * and / */ -#define RSSI_IN(x) ((x) * RSSI_EP_MULTIPLIER) -#define LPF_RSSI(x, y, len) \ - ((x != RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y)) -#define RSSI_LPF(x, y) do { \ - if ((y) >= -20) \ - x = LPF_RSSI((x), RSSI_IN((y)), RSSI_LPF_LEN); \ -} while (0) -#define EP_RND(x, mul) \ - ((((x)%(mul)) >= ((mul)/2)) ? howmany(x, mul) : (x)/(mul)) -#define RSSI_GET(x) EP_RND(x, RSSI_EP_MULTIPLIER) - struct sta_entry { struct ieee80211_scan_entry base; TAILQ_ENTRY(sta_entry) se_list; @@ -250,7 +236,7 @@ return 0; } se->se_scangen = st->st_scaniter-1; - se->se_avgrssi = RSSI_DUMMY_MARKER; + se->se_avgrssi = IEEE80211_RSSI_DUMMY_MARKER; IEEE80211_ADDR_COPY(se->base.se_macaddr, macaddr); TAILQ_INSERT_TAIL(&st->st_entry, se, se_list); LIST_INSERT_HEAD(&st->st_hash[hash], se, se_hash); @@ -278,8 +264,8 @@ * NB: use only on-channel data to insure we get a good * estimate of the signal we'll see when associated. */ - RSSI_LPF(se->se_avgrssi, rssi); - ise->se_rssi = RSSI_GET(se->se_avgrssi); + IEEE80211_RSSI_LPF(se->se_avgrssi, rssi); + ise->se_rssi = IEEE80211_RSSI_GET(se->se_avgrssi); ise->se_noise = noise; } ise->se_rstamp = rstamp; ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#3 (text+ko) ==== @@ -552,7 +552,7 @@ vap->iv_stats.is_rx_wrongbss++; goto out; } - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (HAS_SEQ(type)) { ==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#3 (text+ko) ==== @@ -233,9 +233,12 @@ * Flush pending frames now that were setup. */ if (ni != NULL && IEEE80211_NODE_WDSQ_QLEN(ni) != 0) { + int8_t rssi, noise; + IEEE80211_NOTE(vap, IEEE80211_MSG_WDS, ni, "flush wds queue, %u packets queued", IEEE80211_NODE_WDSQ_QLEN(ni)); + ic->ic_node_getsignal(ni, &rssi, &noise); for (;;) { struct mbuf *m; @@ -244,9 +247,8 @@ IEEE80211_NODE_WDSQ_UNLOCK(ni); if (m == NULL) break; - /* XXX cheat and re-use last rssi+rstamp */ - ieee80211_input(ni, m, - ni->ni_rssi, ni->ni_noise, ni->ni_rstamp); + /* XXX cheat and re-use last rstamp */ + ieee80211_input(ni, m, rssi, noise, ni->ni_rstamp); } } } @@ -568,7 +570,7 @@ vap->iv_stats.is_rx_wrongbss++; goto out; } - ni->ni_rssi = rssi; + IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (HAS_SEQ(type)) { From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:20:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2420916A421; Sat, 12 Jan 2008 23:20:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC3C716A41B for ; Sat, 12 Jan 2008 23:20:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F1CE13C44B for ; Sat, 12 Jan 2008 23:20:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNKBdY046373 for ; Sat, 12 Jan 2008 23:20:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNKBXM046365 for perforce@freebsd.org; Sat, 12 Jan 2008 23:20:11 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:20:11 GMT Message-Id: <200801122320.m0CNKBXM046365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=133134 Change 133134 by sam@sam_ebb on 2008/01/12 23:19:33 need opt_wlan.h Affected files ... .. //depot/projects/vap/sys/modules/wlan_scan_sta/Makefile#3 edit Differences ... ==== //depot/projects/vap/sys/modules/wlan_scan_sta/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_scan_sta SRCS= ieee80211_scan_sta.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:21:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 586F616A421; Sat, 12 Jan 2008 23:21:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E25D16A419 for ; Sat, 12 Jan 2008 23:21:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6E7313C44B for ; Sat, 12 Jan 2008 23:21:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNLC7x046692 for ; Sat, 12 Jan 2008 23:21:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNLCCC046688 for perforce@freebsd.org; Sat, 12 Jan 2008 23:21:12 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:21:12 GMT Message-Id: <200801122321.m0CNLCCC046688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:21:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=133135 Change 133135 by sam@sam_ebb on 2008/01/12 23:20:36 purge old stuff; ap scanning is now merged w/ sta scanning Affected files ... .. //depot/projects/vap/sys/modules/wlan_scan_ap/Makefile#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:22:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE6316A469; Sat, 12 Jan 2008 23:22:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 659D416A419 for ; Sat, 12 Jan 2008 23:22:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AEEC13C448 for ; Sat, 12 Jan 2008 23:22:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNMFp5047058 for ; Sat, 12 Jan 2008 23:22:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNMExe047053 for perforce@freebsd.org; Sat, 12 Jan 2008 23:22:14 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:22:14 GMT Message-Id: <200801122322.m0CNMExe047053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:22:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=133136 Change 133136 by sam@sam_ebb on 2008/01/12 23:21:33 need opt_wlan.h Affected files ... .. //depot/projects/vap/sys/modules/wlan_xauth/Makefile#3 edit Differences ... ==== //depot/projects/vap/sys/modules/wlan_xauth/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_xauth SRCS= ieee80211_xauth.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:25:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43AAC16A41B; Sat, 12 Jan 2008 23:25:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 058DB16A46C for ; Sat, 12 Jan 2008 23:25:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D335313C4E5 for ; Sat, 12 Jan 2008 23:25:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNPJkk047753 for ; Sat, 12 Jan 2008 23:25:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNPJTw047750 for perforce@freebsd.org; Sat, 12 Jan 2008 23:25:19 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:25:19 GMT Message-Id: <200801122325.m0CNPJTw047750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:25:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=133137 Change 133137 by sam@sam_ebb on 2008/01/12 23:24:18 need opt_wlan.h Affected files ... .. //depot/projects/vap/sys/modules/wlan_acl/Makefile#3 edit .. //depot/projects/vap/sys/modules/wlan_amrr/Makefile#3 edit .. //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#3 edit .. //depot/projects/vap/sys/modules/wlan_tkip/Makefile#3 edit .. //depot/projects/vap/sys/modules/wlan_wep/Makefile#3 edit Differences ... ==== //depot/projects/vap/sys/modules/wlan_acl/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_acl SRCS= ieee80211_acl.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include ==== //depot/projects/vap/sys/modules/wlan_amrr/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_amrr SRCS= ieee80211_amrr.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include ==== //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#3 (text+ko) ==== @@ -6,5 +6,11 @@ KMOD= wlan_ccmp SRCS= ieee80211_crypto_ccmp.c SRCS+= rijndael-alg-fst.c rijndael-api.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include ==== //depot/projects/vap/sys/modules/wlan_tkip/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_tkip SRCS= ieee80211_crypto_tkip.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include ==== //depot/projects/vap/sys/modules/wlan_wep/Makefile#3 (text+ko) ==== @@ -4,5 +4,11 @@ KMOD= wlan_wep SRCS= ieee80211_crypto_wep.c +SRCS+= opt_wlan.h + +.if !defined(KERNBUILDDIR) +opt_wlan.h: + echo "#define IEEE80211_DEBUG 1" > opt_wlan.h +.endif .include From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:33:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 933E716A421; Sat, 12 Jan 2008 23:33:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5770016A418 for ; Sat, 12 Jan 2008 23:33:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDCD813C447 for ; Sat, 12 Jan 2008 23:33:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNXS4H048972 for ; Sat, 12 Jan 2008 23:33:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNXSME048966 for perforce@freebsd.org; Sat, 12 Jan 2008 23:33:28 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:33:28 GMT Message-Id: <200801122333.m0CNXSME048966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=133138 Change 133138 by sam@sam_ebb on 2008/01/12 23:33:15 bandaid uses of ni_rssi; probably need to track last rssi value for use by rate control algorithms but for now use the rolling avg Affected files ... .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#11 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#5 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#5 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#5 edit Differences ... ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#11 (text+ko) ==== @@ -2882,7 +2882,7 @@ goto done; } - error = iwi_set_sensitivity(sc, ni->ni_rssi); + error = iwi_set_sensitivity(sc, ic->ic_node_getrssi(ni)); if (error != 0) goto done; ==== //depot/projects/vap/sys/dev/ral/rt2560.c#5 (text) ==== @@ -1972,7 +1972,8 @@ data->id.id_len = m0->m_pkthdr.len; data->id.id_rateidx = ni->ni_txrate; data->id.id_node = ni; - data->id.id_rssi = ni->ni_rssi; + /* XXX probably need last rssi value and not avg */ + data->id.id_rssi = ic->ic_node_getrssi(ni); } else data->id.id_node = NULL; ==== //depot/projects/vap/sys/dev/ral/rt2661.c#5 (text) ==== @@ -1144,7 +1144,7 @@ if (ni != NULL) { /* Error happened during RSSI conversion. */ if (rssi < 0) - rssi = ni->ni_rssi; + rssi = -30; /* XXX ignored by net80211 */ (void) ieee80211_input(ni, m, rssi, RT2661_NOISE_FLOOR, 0); @@ -1734,7 +1734,8 @@ data->id.id_len = m0->m_pkthdr.len; data->id.id_rateidx = ni->ni_txrate; data->id.id_node = ni; - data->id.id_rssi = ni->ni_rssi; + /* XXX probably want last value, not avg */ + data->id.id_rssi = ic->ic_node_getrssi(ni); } else data->id.id_node = NULL; ==== //depot/projects/vap/sys/dev/usb/if_rum.c#5 (text+ko) ==== @@ -941,7 +941,7 @@ if (ni != NULL) { /* Error happened during RSSI conversion. */ if (rssi < 0) - rssi = ni->ni_rssi; + rssi = -30; /* XXX ignored by net80211 */ (void) ieee80211_input(ni, m, rssi, RT2573_NOISE_FLOOR, 0); ieee80211_free_node(ni); } else From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:49:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AA5916A421; Sat, 12 Jan 2008 23:49:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDCD416A41B for ; Sat, 12 Jan 2008 23:49:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8567A13C447 for ; Sat, 12 Jan 2008 23:49:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNnla6050834 for ; Sat, 12 Jan 2008 23:49:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNnlCD050831 for perforce@freebsd.org; Sat, 12 Jan 2008 23:49:47 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:49:47 GMT Message-Id: <200801122349.m0CNnlCD050831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=133140 Change 133140 by sam@sam_ebb on 2008/01/12 23:49:20 11n fixed rates can be either mcs or legacy Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#20 (text+ko) ==== @@ -2030,6 +2030,7 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_txparams_req parms; /* XXX stack use? */ struct ieee80211_txparam *src, *dst; + const struct ieee80211_rateset *rs; int error, i, changed; if (ireq->i_len != sizeof(parms)) @@ -2044,18 +2045,19 @@ continue; src = &parms.params[i]; dst = &vap->iv_txparms[i]; + rs = &ic->ic_sup_rates[i]; if (src->ucastrate != dst->ucastrate) { - if (!checkrate(&ic->ic_sup_rates[i], src->ucastrate)) + if (!checkrate(rs, src->ucastrate)) return EINVAL; changed++; } if (src->mcastrate != dst->mcastrate) { - if (!checkrate(&ic->ic_sup_rates[i], src->mcastrate)) + if (!checkrate(rs, src->mcastrate)) return EINVAL; changed++; } if (src->mgmtrate != dst->mgmtrate) { - if (!checkrate(&ic->ic_sup_rates[i], src->mgmtrate)) + if (!checkrate(rs, src->mgmtrate)) return EINVAL; changed++; } @@ -2068,18 +2070,23 @@ continue; src = &parms.params[i]; dst = &vap->iv_txparms[i]; + rs = &ic->ic_sup_rates[i == IEEE80211_MODE_11NA ? + IEEE80211_MODE_11A : IEEE80211_MODE_11G]; if (src->ucastrate != dst->ucastrate) { - if (!checkmcs(src->ucastrate)) + if (!checkmcs(src->ucastrate) && + !checkrate(rs, src->ucastrate)) return EINVAL; changed++; } if (src->mcastrate != dst->mcastrate) { - if (!checkmcs(src->mcastrate)) + if (!checkmcs(src->mcastrate) && + !checkrate(rs, src->mcastrate)) return EINVAL; changed++; } if (src->mgmtrate != dst->mgmtrate) { - if (!checkmcs(src->mgmtrate)) + if (!checkmcs(src->mgmtrate) && + !checkrate(rs, src->mgmtrate)) return EINVAL; changed++; } From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:50:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1491F16A420; Sat, 12 Jan 2008 23:50:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE45616A41A for ; Sat, 12 Jan 2008 23:50:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1C7413C447 for ; Sat, 12 Jan 2008 23:50:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNomsd051158 for ; Sat, 12 Jan 2008 23:50:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNom0p051155 for perforce@freebsd.org; Sat, 12 Jan 2008 23:50:48 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:50:48 GMT Message-Id: <200801122350.m0CNom0p051155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=133141 Change 133141 by sam@sam_ebb on 2008/01/12 23:50:11 do a deep copy when distributing an mcast packet as ieee80211_decap blindly modifies the mbuf chain Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#24 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#24 (text+ko) ==== @@ -75,7 +75,11 @@ if (vap->iv_opmode == IEEE80211_M_WDS) continue; if (TAILQ_NEXT(vap, iv_next) != NULL) { - mcopy = m_copypacket(m, M_DONTWAIT); + /* + * Packet contents are changed by ieee80211_decap + * so do a deep copy of the packet. + */ + mcopy = m_dup(m, M_DONTWAIT); if (mcopy == NULL) { /* XXX stat+msg */ continue; From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:51:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EEFF16A421; Sat, 12 Jan 2008 23:51:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 149B016A41B for ; Sat, 12 Jan 2008 23:51:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF65A13C459 for ; Sat, 12 Jan 2008 23:51:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNpn4X051447 for ; Sat, 12 Jan 2008 23:51:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNpnpn051443 for perforce@freebsd.org; Sat, 12 Jan 2008 23:51:49 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:51:49 GMT Message-Id: <200801122351.m0CNpnpn051443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=133142 Change 133142 by sam@sam_ebb on 2008/01/12 23:50:53 must check the ucast cipher and not the mcast cipher when looking to downgrade an ht station Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#4 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#4 (text+ko) ==== @@ -2063,20 +2063,16 @@ * or AES-CCM; the 11n spec only specifies these ciphers * so permitting any others is undefined and can lead * to interoperability problems. - * - * NB: We check for AES by looking at the GTK cipher - * since the WPA/11i specs say the PTK cipher has - * to be "as good or better". */ if ((ni->ni_flags & IEEE80211_NODE_HT) && (((vap->iv_flags & IEEE80211_F_WPA) && - rsnparms.rsn_mcastcipher != IEEE80211_CIPHER_AES_CCM) || + rsnparms.rsn_ucastcipher != IEEE80211_CIPHER_AES_CCM) || (vap->iv_flags & (IEEE80211_F_WPA|IEEE80211_F_PRIVACY)) == IEEE80211_F_PRIVACY)) { IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni, "disallow HT use because WEP or TKIP requested, " - "capinfo 0x%x mcastcipher %d", capinfo, - rsnparms.rsn_mcastcipher); + "capinfo 0x%x ucastcipher %d", capinfo, + rsnparms.rsn_ucastcipher); ieee80211_ht_node_cleanup(ni); vap->iv_stats.is_ht_assoc_downgrade++; } From owner-p4-projects@FreeBSD.ORG Sat Jan 12 23:52:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F5B716A468; Sat, 12 Jan 2008 23:52:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4458A16A41A for ; Sat, 12 Jan 2008 23:52:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4B7E13C455 for ; Sat, 12 Jan 2008 23:52:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0CNqpj6051742 for ; Sat, 12 Jan 2008 23:52:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNqpcE051739 for perforce@freebsd.org; Sat, 12 Jan 2008 23:52:51 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Jan 2008 23:52:51 GMT Message-Id: <200801122352.m0CNqpcE051739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 133143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2008 23:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=133143 Change 133143 by sam@sam_ebb on 2008/01/12 23:52:33 fix handling of multiple vaps pending in CAC: we don't handle this directly in ieee80211_new_state_locked (as for SCAN) so we must explicitly walk the vap list; hide the details in a new ieee80211_cac_completeswitch (a la ieee80211_csa_completeswitch) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#3 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#18 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.h#12 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_dfs.c#3 (text+ko) ==== @@ -134,7 +134,7 @@ } ieee80211_notify_cac(ic, ic->ic_curchan, IEEE80211_NOTIFY_CAC_EXPIRE); - ieee80211_new_state(vap, IEEE80211_S_RUN, 0); + ieee80211_cac_completeswitch(vap); } } ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#18 (text+ko) ==== @@ -1367,6 +1367,31 @@ } /* + * Complete a DFS CAC started by ieee80211_dfs_cac_start. + * We clear state and move all vap's in CAC state to RUN state. + */ +void +ieee80211_cac_completeswitch(struct ieee80211vap *vap0) +{ + struct ieee80211com *ic = vap0->iv_ic; + struct ieee80211vap *vap; + + IEEE80211_LOCK(ic); + /* + * Complete CAC state change for lead vap first; then + * clock all the other vap's waiting. + */ + KASSERT(vap0->iv_state == IEEE80211_S_CAC, + ("wrong state %d", vap0->iv_state)); + ieee80211_new_state_locked(vap0, IEEE80211_S_RUN, 0); + + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if (vap->iv_state == IEEE80211_S_CAC) + ieee80211_new_state_locked(vap, IEEE80211_S_RUN, 0); + IEEE80211_UNLOCK(ic); +} + +/* * Force all vap's other than the specified vap to the INIT state * and mark them as waiting for a scan to complete. These vaps * will be brought up when the scan completes and the scanning vap ==== //depot/projects/vap/sys/net80211/ieee80211_proto.h#12 (text+ko) ==== @@ -320,6 +320,7 @@ void ieee80211_csa_startswitch(struct ieee80211com *, struct ieee80211_channel *, int mode, int count); void ieee80211_csa_completeswitch(struct ieee80211com *); +void ieee80211_cac_completeswitch(struct ieee80211vap *); /* * Notification methods called from the 802.11 state machine.