From owner-p4-projects@FreeBSD.ORG Sun Feb 18 19:58:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD71116A407; Sun, 18 Feb 2007 19:58:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 808EA16A402 for ; Sun, 18 Feb 2007 19:58:24 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BEC413C481 for ; Sun, 18 Feb 2007 19:58:24 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1IJwOiL050363 for ; Sun, 18 Feb 2007 19:58:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1IJveqi050310 for perforce@freebsd.org; Sun, 18 Feb 2007 19:57:40 GMT (envelope-from piso@freebsd.org) Date: Sun, 18 Feb 2007 19:57:40 GMT Message-Id: <200702181957.l1IJveqi050310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114696 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, 18 Feb 2007 19:58:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=114696 Change 114696 by piso@piso_newluxor on 2007/02/18 19:56:52 IFC@114695 Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#10 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#18 integrate .. //depot/projects/soc2005/libalias/UPDATING#15 integrate .. //depot/projects/soc2005/libalias/bin/sh/exec.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/CHANGES#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/README#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bind9/version#5 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/NEWS#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/README.emx#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/README.glibc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/headers#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/c++/modules#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/config.guess#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/config.sub#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/configure#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/configure.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/form/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/install-sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/csort#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/soc2005/libalias/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/README#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/configure#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/modules#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/view.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/soc2005/libalias/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#12 integrate .. //depot/projects/soc2005/libalias/etc/devd.conf#2 integrate .. //depot/projects/soc2005/libalias/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#7 integrate .. //depot/projects/soc2005/libalias/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/hostname#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/netif#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/quota#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/Makefile#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzip.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/gzip.h#3 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/inflate.c#3 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/match.S#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unlzh.c#3 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unpack.c#3 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/unzip.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/soc2005/libalias/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/soc2005/libalias/include/Makefile#7 integrate .. //depot/projects/soc2005/libalias/include/objformat.h#2 delete .. //depot/projects/soc2005/libalias/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/soc2005/libalias/include/tgmath.h#2 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#6 integrate .. //depot/projects/soc2005/libalias/lib/bind/bind/config.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/config.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/dns/code.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/dns/dns/enumclass.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/dns/dns/enumtype.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/dns/dns/rdatastruct.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_all.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/getobjformat.3#3 delete .. //depot/projects/soc2005/libalias/lib/libc/gen/getobjformat.c#2 delete .. //depot/projects/soc2005/libalias/lib/libc/gen/siglist.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kse.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/quotactl.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libform/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libmenu/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/libncurses/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/libncurses/ncurses_cfg.h#2 delete .. //depot/projects/soc2005/libalias/lib/libncurses/pathnames.h#3 delete .. //depot/projects/soc2005/libalias/lib/libncurses/termcap.c#3 delete .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libpanel/Makefile#2 delete .. //depot/projects/soc2005/libalias/lib/libypclnt/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libypclnt/ypclnt.3#1 branch .. //depot/projects/soc2005/libalias/lib/ncurses/Makefile#1 branch .. //depot/projects/soc2005/libalias/lib/ncurses/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/lib/ncurses/config.mk#1 branch .. //depot/projects/soc2005/libalias/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/ncurses/pathnames.h#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/ncurses/termcap.c#2 integrate .. //depot/projects/soc2005/libalias/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/soc2005/libalias/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/soc2005/libalias/release/Makefile#7 integrate .. //depot/projects/soc2005/libalias/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile.inc#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/i386/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#3 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/soc2005/libalias/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/soc2005/libalias/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/soc2005/libalias/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/soc2005/libalias/release/doc/share/sgml/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/soc2005/libalias/rescue/rescue/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sbin/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/clparse.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/tables.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/soc2005/libalias/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/misc/subr.h#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifgroup.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/init/init.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/soc2005/libalias/sbin/kldload/kldload.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/kldstat/kldstat.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/mdmfs/mdmfs.8#6 integrate .. //depot/projects/soc2005/libalias/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.c#6 integrate .. //depot/projects/soc2005/libalias/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount_nfs4/Makefile#2 delete .. //depot/projects/soc2005/libalias/sbin/mount_nfs4/mount_nfs4.8#2 delete .. //depot/projects/soc2005/libalias/sbin/mount_nfs4/mount_nfs4.c#2 delete .. //depot/projects/soc2005/libalias/sbin/mount_unionfs/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sbin/mount_unionfs/mount_unionfs.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/soc2005/libalias/share/dict/freebsd#2 integrate .. //depot/projects/soc2005/libalias/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/soc2005/libalias/share/examples/etc/make.conf#4 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread.3#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#9 integrate .. //depot/projects/soc2005/libalias/share/man/man4/altq.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/an.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ata.4#8 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ath.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/aue.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/awi.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bce.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bfe.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bge.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/dc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/de.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/em.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/enc.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fxp.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/hme.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/icmp.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipw.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/iwi.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/joy.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/kame.4#2 delete .. //depot/projects/soc2005/libalias/share/man/man4/kld.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/le.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/ndis.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/msk.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/mxge.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/my.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_deflate.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/nve.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/pim.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ral.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/re.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/rl.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sf.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sis.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sk.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ste.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/stge.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/tap.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/tcp.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/tun.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uark.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ubsa.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/udav.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ural.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/vr.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/wi.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/xl.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/linsysfs.5#4 integrate .. //depot/projects/soc2005/libalias/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/quota.user.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/soc2005/libalias/share/man/man5/src.conf.5#5 integrate .. //depot/projects/soc2005/libalias/share/man/man7/tuning.7#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#9 integrate .. //depot/projects/soc2005/libalias/share/man/man9/VFS_VPTOFH.9#2 delete .. //depot/projects/soc2005/libalias/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/soc2005/libalias/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/disk.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/firmware.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/hashinit.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/ieee80211_ioctl.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/mbuf.9#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sf_buf.9#1 branch .. //depot/projects/soc2005/libalias/share/man/man9/style.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/vm_map.9#2 integrate .. //depot/projects/soc2005/libalias/share/misc/bsd-family-tree#7 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.own.mk#6 integrate .. //depot/projects/soc2005/libalias/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/syscons/keymaps/fr.dvorak.acc.kbd#1 branch .. //depot/projects/soc2005/libalias/share/syscons/keymaps/hr.iso.kbd#2 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/clock.h#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/mem.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/EP80219#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/pmap.h#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/loader.8#5 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/soc2005/libalias/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.c#10 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#19 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#23 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.powerpc#7 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sparc64#5 integrate .. //depot/projects/soc2005/libalias/sys/conf/kmod.mk#6 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#18 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.sun4v#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_command.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_thread.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/exca/exca.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/fb/creator.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/fb/creatorreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/lance.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/mii.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/si/si.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/driver.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/midiq.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 19 13:58:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA5416A407; Mon, 19 Feb 2007 13:58:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE9B516A402 for ; Mon, 19 Feb 2007 13:58:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C81BF13C481 for ; Mon, 19 Feb 2007 13:58:57 +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.13.6/8.13.6) with ESMTP id l1JDwvYR001947 for ; Mon, 19 Feb 2007 13:58:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JDwrpD001938 for perforce@freebsd.org; Mon, 19 Feb 2007 13:58:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Feb 2007 13:58:53 GMT Message-Id: <200702191358.l1JDwrpD001938@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 114717 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, 19 Feb 2007 13:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=114717 Change 114717 by rwatson@rwatson_zoo on 2007/02/19 13:58:26 Integrate TrustedBSD base branch from FreeBSD CVS: - CIDR-modernized netstat -r output. - VFS_VPTOFH -> VOP_VPTOFH - firmware(9) cleanup - vm_page_queue lock reduction - GEOM_LABEL - cd9660 moved to fs/ - DDB show options for several types of network objects - PIM non-optional - Various minor priv(9) tweaks to privilege checks - UMA interface to set cache line size - The usual countless driver updates and enhancements Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#19 integrate .. //depot/projects/trustedbsd/base/UPDATING#76 integrate .. //depot/projects/trustedbsd/base/bin/expr/expr.y#8 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#65 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#21 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hostname#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc0#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/trustedbsd/base/include/Makefile#59 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_adjtime.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libypclnt/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libypclnt/ypclnt.3#1 branch .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#33 integrate .. //depot/projects/trustedbsd/base/release/Makefile#83 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/Makefile#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/Makefile#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#11 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#8 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#8 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#20 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#13 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/man2hwnotes.pl#5 integrate .. //depot/projects/trustedbsd/base/release/doc/share/mk/doc.relnotes.mk#4 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/clparse.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/tables.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifgroup.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#24 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#51 integrate .. //depot/projects/trustedbsd/base/sbin/kldload/kldload.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#18 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.c#12 integrate .. //depot/projects/trustedbsd/base/share/dict/web2a#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#72 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bce.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/enc.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/icmp.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/joy.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kame.4#6 delete .. //depot/projects/trustedbsd/base/share/man/man4/kld.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/fe.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ndis.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_bt3c.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pim.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_sbc.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uark.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubsa.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#67 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#55 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VFS_VPTOFH.9#4 delete .. //depot/projects/trustedbsd/base/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/device_set_driver.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/firmware.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ieee80211_ioctl.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#37 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#17 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/mem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/sys_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/EP80219#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#82 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#111 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#79 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.seq#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#46 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#65 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/exca.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphyreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#55 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#60 integrate .. //depot/projects/trustedbsd/base/sys/fs/cd9660/TODO#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#27 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#31 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#27 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#34 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#62 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/msi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#72 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#31 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#29 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#41 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#56 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_bmap.c#8 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_lookup.c#13 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_mount.h#6 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.c#15 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.h#10 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_rrip.c#11 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_rrip.h#5 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_util.c#7 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#33 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#22 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/iso.h#12 delete .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/iso_rrip.h#5 delete .. //depot/projects/trustedbsd/base/sys/kern/Make.tags.inc#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#70 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#69 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_debug.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#66 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_export.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_init.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#76 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#63 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#31 integrate .. //depot/projects/trustedbsd/base/sys/modules/cd9660/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_dev.c#19 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#41 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#44 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#51 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#35 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#42 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#54 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#58 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/firmware.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#44 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#66 integrate .. //depot/projects/trustedbsd/base/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/README.softupdates#2 delete .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#36 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#44 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#57 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#41 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma.h#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#71 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#22 integrate .. //depot/projects/trustedbsd/base/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/gzip/zgrep#2 delete .. //depot/projects/trustedbsd/base/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/route.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/quota/quota.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/update.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/setfmac/setfmac.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.8#20 integrate Differences ... ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.71 2007/02/01 08:45:26 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.73 2007/02/12 21:41:17 brueffer 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070212: kame.4 removed +OLD_FILES+=usr/share/man/man4/kame.4.gz # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so @@ -33,7 +35,7 @@ OLD_FILES+=usr/lib/libalias_pptp.so OLD_FILES+=usr/lib/libalias_skinny.so OLD_FILES+=usr/lib/libalias_smedia.so -# 20061201: remove old *.so.4 liablias modules +# 20061201: remove old *.so.4 libalias modules OLD_FILES+=lib/libalias_cuseeme.so.4 OLD_FILES+=lib/libalias_dummy.so.4 OLD_FILES+=lib/libalias_ftp.so.4 ==== //depot/projects/trustedbsd/base/UPDATING#76 (text+ko) ==== @@ -21,6 +21,24 @@ developers choose to disable these features on build machines to maximize performance. +20070214: + The output of netstat -r has changed. Without -n, we now only + print a "network name" without the prefix length if the network + address and mask exactly match a Class A/B/C network, and an entry + exists in the nsswitch "networks" map. + With -n, we print the full unabbreviated CIDR network prefix in + the form "a.b.c.d/p". 0.0.0.0/0 is always printed as "default". + This change is in preparation for changes such as equal-cost + multipath, and to more generally assist operational deployment + of FreeBSD as a modern IPv4 router. + +20070210: + PIM has been turned on by default in the IPv4 multicast + routing code. The kernel option 'PIM' has now been removed. + PIM is now built by default if option 'MROUTING' is specified. + It may now be loaded into GENERIC kernels by loading the + ip_mroute.ko module. + 20070207: Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing has been removed. Its functionality may be achieved by explicitly @@ -712,4 +730,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.471 2007/02/07 16:04:11 bms Exp $ +$FreeBSD: src/UPDATING,v 1.473 2007/02/14 14:17:01 bms Exp $ ==== //depot/projects/trustedbsd/base/bin/expr/expr.y#8 (text+ko) ==== @@ -5,7 +5,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $ */ #include @@ -539,7 +539,7 @@ /* special case: first operand is 0, no overflow possible */ if (a == 0) return 0; - /* cerify that result of division matches second operand */ + /* verify that result of division matches second operand */ if (r / a != b) return 1; return 0; @@ -637,7 +637,7 @@ int eval; struct val *v; - /* coerce to both arguments to strings */ + /* coerce both arguments to strings */ to_string(a); to_string(b); ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#65 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.303 2007/01/20 04:24:19 mpp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.304 2007/02/09 12:11:27 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -178,11 +178,15 @@ sppp_interfaces="" # List of sppp interfaces. #sppp_interfaces="isp0" # example: sppp over ISDN #spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'" -gif_interfaces="NO" # List of GIF tunnels (or "NO"). +gif_interfaces="" # List of GIF tunnels. #gif_interfaces="gif0 gif1" # Examples typically for a router. # Choose correct tunnel addrs. #gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router. #gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router. +fec_interfaces="" # List of Fast EtherChannels. +#fec_interfaces="fec0 fec1" +#fecconfig_fec0="fxp0 dc0" # Examples typically for two NICs +#fecconfig_fec1="em0 em1 bge0 bge1" # Examples typically for four NICs # User ppp configuration. ppp_enable="NO" # Start user-ppp (or NO). ==== //depot/projects/trustedbsd/base/etc/devd.conf#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -155,11 +155,42 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet. +# moment, as the pnpinfo variable isn't set in devd yet. Individual +# variables within the bus supplied pnpinfo are set. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; +# Various logging of unknown devices. +nomatch 10 { + match "bus" "uhub[0-9]+"; + action "logger Unknown USB device: vendor $vendor product $product \ + bus $bus"; +}; + +# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# show the CIS info there. +nomatch 20 { + match "bus" "pccard[0-9]+"; + match "manufacturer" "0xffffffff"; + match "product" "0xffffffff"; + action "logger Unknown PCCARD device: CISproduct $cisproduct \ + CIS-vendor $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "pccard[0-9]+"; + action "logger Unknown PCCARD device: manufacturer $manufacturer \ + product $product CISproduct $cisproduct CIS-vendor \ + $cisvendor bus $bus"; +}; + +nomatch 10 { + match "bus" "cardbus[0-9]+"; + action "logger Unknown Cardbus device: device $device class $class \ + vendor $vendor bus $bus"; +}; + # Switch power profiles when the AC line state changes. notify 10 { match "system" "ACPI"; ==== //depot/projects/trustedbsd/base/etc/network.subr#16 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $ +# $FreeBSD: src/etc/network.subr,v 1.177 2007/02/09 12:11:26 flz Exp $ # # @@ -455,26 +455,89 @@ debug "Destroyed clones: ${_list}" } +# Create netgraph nodes. +# +ng_mkpeer() { + ngctl -f - 2> /dev/null </dev/null 2>&1 + ifconfig $i tunnel ${peers} + ifconfig $i up + ;; + esac + done +} + +# ng_fec_create ifn +# Configure Fast EtherChannel for interface $ifn. Returns 0 if FEC +# arguments were found and configured; returns !0 otherwise. +ng_fec_create() { + local req_iface iface bogus + req_iface="$1" + + ngctl shutdown ${req_iface}: > /dev/null 2>&1 + + bogus="" + while true; do + iface=`ng_create_one fec dummy fec` + if [ -z "${iface}" ]; then + exit 2 + fi + if [ "${iface}" = "${req_iface}" ]; then + break + fi + bogus="${bogus} ${iface}" + done + + for iface in ${bogus}; do + ngctl shutdown ${iface}: + done +} + +fec_up() { + for i in ${fec_interfaces}; do + ng_fec_create $i + for j in `get_if_var $i fecconfig_IF`; do + case ${j} in '') continue ;; *) - ifconfig $i create >/dev/null 2>&1 - ifconfig $i tunnel ${peers} - ifconfig $i up + ngctl msg ${i}: add_iface "\"${j}\"" ;; esac done - ;; - esac + done } # ==== //depot/projects/trustedbsd/base/etc/rc.d/dhclient#17 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.26 2007/02/15 06:51:31 yar Exp $ # # PROVIDE: dhclient @@ -19,9 +19,9 @@ dhclient_start() { # prevent unnecessary restarts - # XXX: should use a pidfile - if [ -x /usr/bin/pgrep ]; then - pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` + # XXX: dhclient had better create a pidfile + if [ -x /bin/pgrep ]; then + pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then exit 0 fi ==== //depot/projects/trustedbsd/base/etc/rc.d/hostname#7 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.11 2007/02/15 06:46:33 yar Exp $ # # PROVIDE: hostname @@ -31,6 +31,7 @@ # BEFORE: netif . /etc/rc.subr +. /etc/network.subr name="hostname" start_cmd="hostname_start" @@ -58,8 +59,21 @@ fi fi - /bin/hostname ${hostname} - echo "Setting hostname: `hostname`." + # Have we got a hostname yet? + # + if [ -z "${hostname}" ]; then + # Null hostname is probably OK if DHCP is in use. + # + if [ -z "`list_net_interfaces dhcp`" ]; then + warn "\$hostname is not set -- see ${rcvar_manpage}." + fi + return + fi + + # All right, it is safe to invoke hostname(1) now. + # + echo "Setting hostname: ${hostname}." + /bin/hostname "${hostname}" } load_rc_config $name ==== //depot/projects/trustedbsd/base/etc/rc.d/netif#16 (text+ko) ==== @@ -22,7 +22,7 @@ # (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/etc/rc.d/netif,v 1.21 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.22 2007/02/09 12:11:26 flz Exp $ # # PROVIDE: netif @@ -57,6 +57,9 @@ # Create cloned interfaces clone_up + # Create Fast EtherChannel interfaces + fec_up + # Create IPv6<-->IPv4 tunnels gif_up ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc0#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.37 2004/07/08 17:05:30 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.38 2007/02/11 07:15:05 marcel Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -22,6 +22,12 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 +.else +CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 +.endif + CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/bfd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.3 2004/07/08 17:05:32 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -58,14 +58,10 @@ #if defined(__i386__) || defined(__powerpc__) || defined(__arm__) -/* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 32 #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long #elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__) -/* The word size of the default bfd target. */ -#define BFD_DEFAULT_TARGET_SIZE 64 #define BFD_HOST_64BIT_LONG 1 #define BFD_HOST_64_BIT long #define BFD_HOST_U_64_BIT unsigned long ==== //depot/projects/trustedbsd/base/include/Makefile#59 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.268 2007/02/11 14:01:32 rodrigc Exp $ # # Doing a "make install" builds /usr/include. @@ -47,7 +47,6 @@ fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ @@ -163,6 +162,9 @@ cd ${.CURDIR}/../sys/contrib/altq/altq; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/altq + cd ${.CURDIR}/../sys/fs/cd9660/; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -287,3 +289,8 @@ done .endif .endif + cd ${.CURDIR}/../sys/fs/cd9660; \ + for h in *.h; do \ + ln -fs ../../../../sys/fs/cd9660/$$h \ + ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ + done ==== //depot/projects/trustedbsd/base/lib/libc/gen/getcap.3#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getcap.3 8.4 (Berkeley) 5/13/94 -.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.29 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/getcap.3,v 1.30 2007/02/11 18:14:49 maxim Exp $ .\" .Dd March 22, 2002 .Dt GETCAP 3 @@ -527,7 +527,7 @@ The .Fn cgetent , and -.Fn cgetseq +.Fn cgetset functions may fail and set .Va errno for any of the errors specified for the library functions: ==== //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#15 (text+ko) ==== @@ -33,9 +33,9 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.19 2006/12/12 08:13:02 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.22 2007/02/14 07:38:39 brueffer Exp $ .\" -.Dd July 12, 2004 +.Dd February 13, 2007 .Dt KSE 2 .Os .Sh NAME @@ -47,7 +47,7 @@ .In sys/types.h .In sys/kse.h .Ft int -.Fn kse_create "struct kse_mailbox *mbx" "int newgroup" +.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope" .Ft int .Fn kse_exit void .Ft int @@ -103,9 +103,6 @@ .It All operations that block in the kernel become asynchronous, allowing the user process to schedule another thread when any thread blocks. -.It -Multiple thread schedulers within the same process are possible, and they -may operate independently of each other. .El .\" .Ss Definitions @@ -124,6 +121,8 @@ The KSE is said to be .Sy assigned to the thread. +KSEs (a user abstraction) are implemented on top +of kernel threads using an 'upcall' entity. .Pp The KSE becomes .Sy unassigned , @@ -160,22 +159,13 @@ KSEs always complete as much work as possible in the kernel before becoming unassigned. .Pp -A -.Sy "KSE group" -is a collection of KSEs that are scheduled uniformly and which share -access to the same pool of threads, which are associated with the KSE group. -A KSE group is the smallest entity to which a kernel scheduling -priority may be assigned. -For the purposes of process scheduling and accounting, each -KSE group -counts similarly to a traditional unthreaded process. -Individual KSEs within a KSE group are effectively indistinguishable, -and any KSE in a KSE group may be assigned by the kernel to any runnable -(in the kernel) thread associated with that KSE group. +Individual KSEs within a process are effectively indistinguishable, +and any KSE in a process may be assigned by the kernel to any runnable +(in the kernel) thread associated with that process. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the user process. -(Affinity is not yet implemented.) +(Affinity is not yet fully implemented.) .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -199,17 +189,17 @@ This pointer is saved when the thread blocks in the kernel. .Pp Whenever a thread blocked in the kernel is ready to return to user space, -it is added to the KSE group's list of +it is added to the process's list of .Sy completed threads. This list is presented to the user code at the next upcall as a linked list of thread mailboxes. .Pp -There is a kernel-imposed limit on the number of threads in a KSE group +There is a kernel-imposed limit on the number of threads in a process that may be simultaneously blocked in the kernel (this number is not currently visible to the user). When this limit is reached, upcalls are blocked and no work is performed -for the KSE group until one of the threads completes (or a signal is +for the process until one of the threads completes (or a signal is received). .\" .Ss Managing KSEs @@ -223,27 +213,32 @@ The KSE will be associated with the mailbox pointed to by .Fa mbx . If -.Fa newgroup -is non-zero, a new KSE group is also created containing the KSE. -Otherwise, the new KSE is added to the current KSE group. -Newly created KSEs are initially unassigned; therefore, -they will upcall immediately. +.Fa sys_scope +is non-zero, then the new thread will be counted as a system scope +thread. Other things must be done as well to make a system scope thread +so this is not sufficient (yet). +System scope variables are not covered +in detail in this manual page yet, but briefly, they never perform +upcalls and do not return to the user thread scheduler. +Once launched they run autonomously. +The pthreads library knows how to make system +scope threads and users are encouraged to use the library interface. .Pp -Each process initially has a single KSE in a single KSE group executing -a single user thread. +Each process initially has a single KSE executing a single user thread. Since the KSE does not have an associated mailbox, it must remain assigned to the thread and does not perform any upcalls. +(It is by definition a system scope thread). The result is the traditional, unthreaded mode of operation. Therefore, as a special case, the first call to .Fn kse_create by this initial thread with -.Fa newgroup +.Fa sys_scope equal to zero does not create a new KSE; instead, it simply associates the current KSE with the supplied KSE mailbox, and no immediate upcall results. However, an upcall will be triggered the next time the thread blocks and the required conditions are met. .Pp -The kernel does not allow more KSEs to exist in a KSE group than the +The kernel does not allow more KSEs to exist in a process than the number of physical CPUs in the system (this number is available as the .Xr sysctl 3 variable @@ -261,8 +256,8 @@ .Fn kse_exit system call causes the KSE assigned to the currently running thread to be destroyed. -If this KSE is the last one in the KSE group, there must be no remaining -threads associated with the KSE group blocked in the kernel. +If this KSE is the last one in the process, there must be no remaining +threads associated with that process blocked in the kernel. This system call does not return unless there is an error. Calling .Fn kse_exit @@ -309,7 +304,7 @@ may be .Dv NULL to specify -.Dq "any KSE in the current KSE group" . +.Dq "any KSE in the current process" . .Pp The .Fn kse_thr_interrupt @@ -460,7 +455,7 @@ in the kernel since the last upcall. The user thread scheduler should put these threads back into its own runnable queue. -Each thread in a KSE group that completes a kernel operation +Each thread in a process that completes a kernel operation (synchronous or asynchronous) that results in an upcall is guaranteed to be linked into exactly one KSE's .Va km_completed @@ -571,24 +566,8 @@ will fail if: .Bl -tag -width Er .It Bq Er ENXIO -There are already as many KSEs in the KSE group as hardware processors. +There are already as many KSEs in the process as hardware processors. .It Bq Er EAGAIN -The system-imposed limit on the total number of KSE groups under -execution would be exceeded. -The limit is given by the -.Xr sysctl 3 -MIB variable -.Dv KERN_MAXPROC . -(The limit is actually ten less than this -except for the super user.) -.It Bq Er EAGAIN -The user is not the super user, and the system-imposed limit on the total -number of KSE groups under execution by a single user would be exceeded. -The limit is given by the -.Xr sysctl 3 -MIB variable -.Dv KERN_MAXPROCPERUID . -.It Bq Er EAGAIN The user is not the super user, and the soft resource limit corresponding to the .Fa resource @@ -609,8 +588,8 @@ will fail if: .Bl -tag -width Er .It Bq Er EDEADLK -The current KSE is the last in its KSE group and there are still one or more -threads associated with the KSE group blocked in the kernel. +The current KSE is the last in its process and there are still one or more +threads associated with the process blocked in the kernel. .It Bq Er ESRCH The current KSE has no associated mailbox, i.e., the process is operating >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 19 14:10:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3B3516A409; Mon, 19 Feb 2007 14:10:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4782D16A407 for ; Mon, 19 Feb 2007 14:10:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 30DBA13C4A6 for ; Mon, 19 Feb 2007 14:10:15 +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.13.6/8.13.6) with ESMTP id l1JEAFoi007707 for ; Mon, 19 Feb 2007 14:10:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JEABLO007659 for perforce@freebsd.org; Mon, 19 Feb 2007 14:10:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 19 Feb 2007 14:10:11 GMT Message-Id: <200702191410.l1JEABLO007659@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 114718 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, 19 Feb 2007 14:10:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=114718 Change 114718 by rwatson@rwatson_zoo on 2007/02/19 14:09:34 Integrate TrustedBSD priv branch through @114717. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/locore.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/EP80219#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#11 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#7 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/exca/exca.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/TODO#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/msi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_bmap.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_lookup.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_mount.h#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_node.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_node.h#3 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_rrip.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_rrip.h#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_util.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_vfsops.c#5 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_vnops.c#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/iso.h#2 delete .. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/iso_rrip.h#2 delete .. //depot/projects/trustedbsd/priv/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#16 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_firmware.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_debug.c#1 branch .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_default.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_init.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vnode_if.src#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/cd9660/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_proto.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/firmware.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mount.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#11 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vnode.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/README.softupdates#2 delete .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.4 2007/02/15 22:22:56 jhb Exp $"); #include #include @@ -347,6 +347,9 @@ msi->msi_intsrc.is_pic = &msi_pic; msi->msi_dev = dev; msi->msi_vector = vector + i; + if (bootverbose) + printf("msi: routing MSI IRQ %d to vector %u\n", + msi->msi_irq, msi->msi_vector); msi->msi_index = i; msi->msi_first = fsrc; @@ -463,6 +466,9 @@ /* Allocate an IDT vector. */ vector = apic_alloc_vector(i); + if (bootverbose) + printf("msi: routing MSI-X IRQ %d to vector %u\n", msi->msi_irq, + vector); /* Setup source. */ msi->msi_intsrc.is_pic = &msix_pic; ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.579 2007/02/19 10:55:16 kib Exp $"); /* * Manages physical address maps. @@ -1498,11 +1498,9 @@ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ - vm_page_lock_queues(); m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(m); - vm_page_unlock_queues(); PMAP_LOCK_DESTROY(pmap); } @@ -1544,9 +1542,15 @@ while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); nkpt++; + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } addr = roundup2(addr, PAGE_SIZE * NPTEPG); + if (addr - 1 >= kernel_map->max_offset) + addr = kernel_map->max_offset; while (kernel_vm_end < addr) { pde = pmap_pde(kernel_pmap, kernel_vm_end); if (pde == NULL) { @@ -1564,6 +1568,10 @@ } if ((*pde & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } continue; } @@ -1583,6 +1591,10 @@ *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); #include #include @@ -82,7 +82,5 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); vm_page_free(m); - vm_page_unlock_queues(); } ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#6 (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.472 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ cpu HAMMER ident GENERIC @@ -44,6 +44,7 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * (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/sys/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -167,6 +167,15 @@ #define LINUX_MAP_ANON 0x0020 #define LINUX_MAP_GROWSDOWN 0x0100 +struct l_mmap_argv { + l_uintptr_t addr; + l_size_t len; + l_int prot; + l_int flags; + l_int fd; + l_off_t pgoff; +} __packed; + /* * stat family of syscalls */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 13:27:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); #include #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,7 @@ #include #include +#include #include #include @@ -690,16 +692,6 @@ return (0); } -/* XXX move */ -struct l_mmap_argv { - l_ulong addr; - l_ulong len; - l_ulong prot; - l_ulong flags; - l_ulong fd; - l_ulong pgoff; -}; - #define STACK_SIZE (2 * 1024 * 1024) #define GUARD_SIZE (4 * PAGE_SIZE) @@ -789,9 +781,44 @@ bsd_args.flags |= MAP_ANON; else bsd_args.flags |= MAP_NOSYNC; - if (linux_args->flags & LINUX_MAP_GROWSDOWN) { + if (linux_args->flags & LINUX_MAP_GROWSDOWN) bsd_args.flags |= MAP_STACK; + /* + * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC + * on Linux/i386. We do this to ensure maximum compatibility. + * Linux/ia64 does the same in i386 emulation mode. + */ + bsd_args.prot = linux_args->prot; + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) + bsd_args.prot |= PROT_READ | PROT_EXEC; + + if (linux_args->fd != -1) { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (!(fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + + fdrop(fp, td); + } + bsd_args.fd = linux_args->fd; + + if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* * The linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option @@ -814,11 +841,7 @@ * fixed size of (STACK_SIZE - GUARD_SIZE). */ - /* This gives us TOS */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) + - linux_args->len; - - if ((caddr_t)PTRIN(bsd_args.addr) > + if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len > p->p_vmspace->vm_maxsaddr) { /* * Some linux apps will attempt to mmap @@ -837,8 +860,7 @@ * mmap's return value. */ PROC_LOCK(p); - p->p_vmspace->vm_maxsaddr = - (char *)LINUX32_USRSTACK - + p->p_vmspace->vm_maxsaddr = (char *)LINUX32_USRSTACK - lim_cur(p, RLIMIT_STACK); PROC_UNLOCK(p); } @@ -856,49 +878,12 @@ * not using VM_STACK we map the full stack, since we * don't have a way to autogrow it. */ - bsd_args.addr -= bsd_args.len; + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + bsd_args.len; } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } - - /* - * We add PROT_EXEC to work around buggy applications (e.g. Java) - * that take advantage of the fact that execute permissions are not - * enforced by x86 CPUs. - */ - bsd_args.prot = linux_args->prot | PROT_EXEC; - if (linux_args->flags & LINUX_MAP_ANON) - bsd_args.fd = -1; - else { - /* - * Linux follows Solaris mmap(2) description: - * The file descriptor fildes is opened with - * read permission, regardless of the - * protection options specified. - * If PROT_WRITE is specified, the application - * must have opened the file descriptor - * fildes with write permission unless - * MAP_PRIVATE is specified in the flag - * argument as described below. - */ - - if ((error = fget(td, linux_args->fd, &fp)) != 0) - return (error); - if (fp->f_type != DTYPE_VNODE) { - fdrop(fp, td); - return (EINVAL); - } - - /* Linux mmap() just fails for O_WRONLY files */ - if (! (fp->f_flag & FREAD)) { - fdrop(fp, td); - return (EACCES); - } - - bsd_args.fd = linux_args->fd; - fdrop(fp, td); - } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; @@ -919,6 +904,23 @@ } int +linux_iopl(struct thread *td, struct linux_iopl_args *args) +{ + int error; + + if (args->level < 0 || args->level > 3) + return (EINVAL); + if ((error = priv_check(td, PRIV_IO)) != 0) + return (error); + if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + return (error); + td->td_frame->tf_rflags = (td->td_frame->tf_rflags & ~PSL_IOPL) | + (args->level * (PSL_IOPL / 3)); + + return (0); +} + +int linux_pipe(struct thread *td, struct linux_pipe_args *args) { int pip[2]; @@ -1181,8 +1183,7 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - /* XXX PROT_READ implies PROT_EXEC; see linux_mmap_common(). */ - if ((bsd_args.prot & PROT_READ) != 0) - bsd_args.prot |= PROT_EXEC; + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) + bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -341,6 +341,9 @@ struct linux_uname_args { register_t dummy; }; +struct linux_iopl_args { + char level_l_[PADL_(l_ulong)]; l_ulong level; char level_r_[PADR_(l_ulong)]; +}; struct linux_vhangup_args { register_t dummy; }; @@ -995,6 +998,7 @@ int linux_newlstat(struct thread *, struct linux_newlstat_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); int linux_uname(struct thread *, struct linux_uname_args *); +int linux_iopl(struct thread *, struct linux_iopl_args *); int linux_vhangup(struct thread *, struct linux_vhangup_args *); int linux_wait4(struct thread *, struct linux_wait4_args *); int linux_swapoff(struct thread *, struct linux_swapoff_args *); @@ -1240,6 +1244,7 @@ #define LINUX_SYS_AUE_linux_newlstat AUE_LSTAT #define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT #define LINUX_SYS_AUE_linux_uname AUE_NULL +#define LINUX_SYS_AUE_linux_iopl AUE_NULL #define LINUX_SYS_AUE_linux_vhangup AUE_NULL #define LINUX_SYS_AUE_linux_wait4 AUE_WAIT4 #define LINUX_SYS_AUE_linux_swapoff AUE_SWAPOFF ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #define LINUX_SYS_exit 1 @@ -103,6 +103,7 @@ #define LINUX_SYS_linux_newlstat 107 #define LINUX_SYS_linux_newfstat 108 #define LINUX_SYS_linux_uname 109 +#define LINUX_SYS_linux_iopl 110 #define LINUX_SYS_linux_vhangup 111 #define LINUX_SYS_linux_wait4 114 #define LINUX_SYS_linux_swapoff 115 ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #include @@ -130,7 +130,7 @@ { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 110 = iopl */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ ==== //depot/projects/trustedbsd/priv/sys/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -198,7 +198,7 @@ 108 AUE_FSTAT STD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 109 AUE_NULL STD { int linux_uname(void); } -110 AUE_NULL UNIMPL iopl +110 AUE_NULL STD { int linux_iopl(l_ulong level); } 111 AUE_NULL STD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old ==== //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,10 +29,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); /* - * MacPPC bus dma support routines + * ARM bus dma support routines */ #define _ARM32_BUS_DMA_PRIVATE ==== //depot/projects/trustedbsd/priv/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include +#include #include #include @@ -799,7 +800,7 @@ cpu_reset_needs_v4_MMU_disable = 0; get_cachetype_cp15(); pmap_pte_init_generic(); - return 0; + goto out; } #endif #ifdef CPU_ARM8 @@ -809,7 +810,7 @@ cpu_reset_needs_v4_MMU_disable = 0; /* XXX correct? */ get_cachetype_cp15(); pmap_pte_init_arm8(); - return 0; + goto out; } #endif /* CPU_ARM8 */ #ifdef CPU_ARM9 @@ -829,7 +830,7 @@ #else pmap_pte_init_generic(); #endif - return 0; + goto out; } #endif /* CPU_ARM9 */ #ifdef CPU_ARM10 @@ -849,7 +850,7 @@ arm10_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); arm10_dcache_index_max = 0U - arm10_dcache_index_inc; pmap_pte_init_generic(); - return 0; + goto out; } #endif /* CPU_ARM10 */ #ifdef CPU_SA110 @@ -858,7 +859,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_SA110 */ #ifdef CPU_SA1100 @@ -870,7 +871,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1100 */ #ifdef CPU_SA1110 @@ -882,7 +883,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1110 */ #ifdef CPU_IXP12X0 @@ -891,7 +892,7 @@ cpu_reset_needs_v4_MMU_disable = 1; get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_IXP12X0 */ #ifdef CPU_XSCALE_80200 @@ -948,7 +949,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80200 */ #if defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) @@ -975,7 +976,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80321 */ @@ -989,7 +990,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 @@ -1009,7 +1010,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_XSCALE_PXA2X0 */ #ifdef CPU_XSCALE_IXP425 @@ -1025,7 +1026,7 @@ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_IXP425 */ /* @@ -1033,6 +1034,9 @@ */ panic("No support for this CPU type (%08x) in kernel", cputype); return(ARCHITECTURE_NOT_PRESENT); +out: + uma_set_align(arm_dcache_align_mask); + return (0); } /* ==== //depot/projects/trustedbsd/priv/sys/arm/arm/db_interface.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.5 2005/06/23 11:38:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.6 2007/02/14 01:25:41 kevlo Exp $"); #include "opt_ddb.h" #include @@ -109,7 +109,7 @@ *valp = get_stackptr(PSR_UND32_MODE); return (1); } - return(0); + return (0); } int @@ -120,7 +120,7 @@ *valp = get_stackptr(PSR_ABT32_MODE); return (1); } - return(0); + return (0); } int @@ -131,7 +131,7 @@ *valp = get_stackptr(PSR_IRQ32_MODE); return (1); } - return(0); + return (0); } int db_frame(struct db_variable *vp, db_expr_t *valp, int rw) @@ -146,7 +146,7 @@ *valp = *reg; else *reg = *valp; - return(1); + return (1); } void @@ -339,4 +339,3 @@ panic("branch_taken: botch"); } } - ==== //depot/projects/trustedbsd/priv/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.16 2006/11/01 12:41:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $"); #include #include #include @@ -103,7 +103,7 @@ char *d = dst; while (len) { - if (len >= 4 && !((vm_offset_t)d & 3) && + if (0 && len >= 4 && !((vm_offset_t)d & 3) && !((vm_offset_t)s & 3)) { *(uint32_t *)d = *(uint32_t *)s; s += 4; @@ -143,6 +143,37 @@ int physaddr = KERNPHYSADDR; int tmp1; unsigned int sp = ((unsigned int)&_end & ~3) + 4; +#if defined(FLASHADDR) && defined(LOADERRAMADDR) + unsigned int pc; + + __asm __volatile("adr %0, _start\n" + : "=r" (pc)); + if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) || + (FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) { + /* + * We're running from flash, so just copy the whole thing + * from flash to memory. + * This is far from optimal, we could do the relocation or + * the unzipping directly from flash to memory to avoid this + * needless copy, but it would require to know the flash + * physical address. + */ + unsigned int target_addr; + unsigned int tmp_sp; + + target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR; + tmp_sp = target_addr + 0x100000 + + (unsigned int)&_end - (unsigned int)&_start; + memcpy((char *)target_addr, (char *)pc, + (unsigned int)&_end - (unsigned int)&_start); + /* Temporary set the sp and jump to the new location. */ + __asm __volatile( + "mov sp, %1\n" + "mov pc, %0\n" + : : "r" (target_addr), "r" (tmp_sp)); + + } +#endif #ifdef KZIP sp += KERNSIZE + 0x100; sp &= ~(L1_TABLE_SIZE - 1); ==== //depot/projects/trustedbsd/priv/sys/arm/arm/locore.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -66,47 +66,53 @@ ENTRY_NP(btext) ASENTRY_NP(_start) - - - /* Check if we are running on RAM, if not move ourself to RAM */ -#if 0 - cmp pc, #PHYSADDR - bhi start_inram /* XXX: This is wrong */ +#if defined (FLASHADDR) && defined(LOADERRAMADDR) + /* Check if we're running from flash. */ + ldr r7, =FLASHADDR + /* + * If we're running with MMU disabled, test against the + * physical address instead. + */ + mrc p15, 0, r2, c1, c0, 0 + ands r2, r2, #CPU_CONTROL_MMU_ENABLE + ldreq r8, =PHYSADDR + ldrne r8, =LOADERRAMADDR + cmp r7, r8 + bls flash_lower + cmp r7, pc + bhi from_ram + b do_copy + +flash_lower: + cmp r8, pc + bls from_ram +do_copy: + ldr r9, =KERNBASE + adr r1, _start + ldr r0, Lreal_start + ldr r2, Lend + sub r2, r2, r0 + sub r0, r0, r9 + add r0, r0, r8 + mov r4, r0 + /* Make sure _arm_memcpy is NULL */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 19 18:35:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 956A316B818; Mon, 19 Feb 2007 18:35:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46C1C16B815 for ; Mon, 19 Feb 2007 18:35:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 19E8C13C442 for ; Mon, 19 Feb 2007 18:35:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1JIZo6e075010 for ; Mon, 19 Feb 2007 18:35:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JIZoq3075007 for perforce@freebsd.org; Mon, 19 Feb 2007 18:35:50 GMT (envelope-from sam@freebsd.org) Date: Mon, 19 Feb 2007 18:35:50 GMT Message-Id: <200702191835.l1JIZoq3075007@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 114725 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, 19 Feb 2007 18:35:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114725 Change 114725 by sam@sam_ebb on 2007/02/19 18:35:17 remove dead comment Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#7 (text+ko) ==== @@ -158,10 +158,6 @@ * * Unitless indication of the Rx/Tx antenna for this packet. * The first antenna is antenna 0. - * - * IEEE80211_RADIOTAP_FCS u_int32_t data - * - * FCS from frame in network byte order. */ enum ieee80211_radiotap_type { IEEE80211_RADIOTAP_TSFT = 0, From owner-p4-projects@FreeBSD.ORG Mon Feb 19 19:16:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AB4B16C0D1; Mon, 19 Feb 2007 19:16:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2A4F16C0A9 for ; Mon, 19 Feb 2007 19:16:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BEB5E13C4A3 for ; Mon, 19 Feb 2007 19:16:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1JJGgNL082425 for ; Mon, 19 Feb 2007 19:16:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JJGg84082422 for perforce@freebsd.org; Mon, 19 Feb 2007 19:16:42 GMT (envelope-from sam@freebsd.org) Date: Mon, 19 Feb 2007 19:16:42 GMT Message-Id: <200702191916.l1JJGg84082422@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 114726 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, 19 Feb 2007 19:16:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114726 Change 114726 by sam@sam_ebb on 2007/02/19 19:15:55 sync a bit w/ netbsd; remove incorrect and very misleading comment about radiotap headers being padded to 64 bytes; they have not been padded in freebsd for several years Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#8 (text+ko) ==== @@ -29,14 +29,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. */ -#ifndef _NET_IF_IEEE80211RADIOTAP_H_ -#define _NET_IF_IEEE80211RADIOTAP_H_ +#ifndef _NET80211_IEEE80211_RADIOTAP_H_ +#define _NET80211_IEEE80211_RADIOTAP_H_ -/* A generic radio capture format is desirable. There is one for - * Linux, but it is neither rigidly defined (there were not even - * units given for some fields) nor easily extensible. +/* A generic radio capture format is desirable. It must be + * rigidly defined (e.g., units for fields should be given), + * and easily extensible. * - * I suggest the following extensible radio capture format. It is + * The following is an extensible radio capture format. It is * based on a bitmap indicating which fields are present. * * I am trying to describe precisely what the application programmer @@ -52,11 +52,6 @@ #endif #endif /* defined(__KERNEL__) || defined(_KERNEL) */ -/* XXX tcpdump/libpcap do not tolerate variable-length headers, - * yet, so we pad every radiotap header to 64 bytes. Ugh. - */ -#define IEEE80211_RADIOTAP_HDRLEN 64 - /* The radio capture header precedes the 802.11 header. */ struct ieee80211_radiotap_header { u_int8_t it_version; /* Version 0. Only increases @@ -79,7 +74,8 @@ */ } __attribute__((__packed__)); -/* Name Data type Units +/* + * Name Data type Units * ---- --------- ----- * * IEEE80211_RADIOTAP_TSFT u_int64_t microseconds From owner-p4-projects@FreeBSD.ORG Mon Feb 19 22:56:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FA4816EE05; Mon, 19 Feb 2007 22:56:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 195BE16EE00 for ; Mon, 19 Feb 2007 22:56:21 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 06B9213C4A3 for ; Mon, 19 Feb 2007 22:56:21 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1JMuKtO029287 for ; Mon, 19 Feb 2007 22:56:20 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JMuKHH029284 for perforce@freebsd.org; Mon, 19 Feb 2007 22:56:20 GMT (envelope-from jkim@freebsd.org) Date: Mon, 19 Feb 2007 22:56:20 GMT Message-Id: <200702192256.l1JMuKHH029284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114732 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, 19 Feb 2007 22:56:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=114732 Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 Finish TLS on amd64 support. It may have rough edges but it seems usable. Tested on a real UP machine and QEMU SMP. PCB_32BIT flag was half-baked and never used from the day one. Unfortunately it was confusing me from the beginning. :-( Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#5 edit .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#6 edit .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#4 edit .. //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#3 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_locore.s#3 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#37 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#11 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -104,11 +104,11 @@ testl $PCB_32BIT,PCB_FLAGS(%r8) jz 1f /* no, skip over */ - /* Save segment selector numbers */ - movl %ds,PCB_DS(%r8) - movl %es,PCB_ES(%r8) - movl %fs,PCB_FS(%r8) + /* Save userland %gs */ movl %gs,PCB_GS(%r8) + movq PCB_GS32P(%r8),%rax + movq (%rax),%rax + movq %rax,PCB_GS32SD(%r8) 1: /* Test if debug registers should be saved. */ @@ -171,30 +171,6 @@ */ movq TD_PCB(%rsi),%r8 - testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - - /* Restore segment selector numbers */ - movl PCB_DS(%r8),%ds - movl PCB_ES(%r8),%es - movl PCB_FS(%r8),%fs - - /* Restore userland %gs while preserving kernel gsbase */ - movl $MSR_GSBASE,%ecx - rdmsr - movl PCB_GS(%r8),%gs - wrmsr - - /* Restore userland 32 bit GS descriptor for Linuxulator */ - movq PCB_GS32P(%r8),%rax - testq %rax,%rax - jz 2f /* no, skip over */ - - movq PCB_GS32SD(%r8),%rcx - movq %rcx,(%rax) - jmp 2f - -1: /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax @@ -207,7 +183,6 @@ movl PCB_GSBASE+4(%r8),%edx wrmsr -2: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax addq $COMMON_TSS_RSP0, %rax @@ -220,6 +195,19 @@ movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ + testl $PCB_32BIT,PCB_FLAGS(%r8) + jz 1f /* no, skip over */ + + /* Restore userland %gs while preserving kernel gsbase */ + movq PCB_GS32P(%r8),%rax + movq PCB_GS32SD(%r8),%rbx + movq %rbx,(%rax) + movl $MSR_GSBASE,%ecx + rdmsr + movl PCB_GS(%r8),%gs + wrmsr + +1: /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -136,20 +136,19 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); +ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); -ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); +ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); +ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); -ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); -ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); - ASSYM(TF_R15, offsetof(struct trapframe, tf_r15)); ASSYM(TF_R14, offsetof(struct trapframe, tf_r14)); ASSYM(TF_R13, offsetof(struct trapframe, tf_r13)); ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#4 (text+ko) ==== @@ -727,7 +727,6 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; - pcb->pcb_gs32p = NULL; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#3 (text+ko) ==== @@ -41,6 +41,7 @@ * AMD64 process control block */ #include +#include struct pcb { register_t pcb_cr3; @@ -74,8 +75,9 @@ caddr_t pcb_onfault; /* copyin/out fault recovery */ - caddr_t pcb_gs32p; /* XXX pointer to gdt[GUGS32_SEL] */ - u_int64_t pcb_gs32sd; /* 32 bit GS segment descriptor */ + /* 32-bit segment descriptor */ + struct user_segment_descriptor *pcb_gs32p; + struct user_segment_descriptor pcb_gs32sd; }; #ifdef _KERNEL ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_locore.s#3 (text+ko) ==== @@ -11,10 +11,6 @@ NON_GPROF_ENTRY(linux_sigcode) call *LINUX_SIGF_HANDLER(%esp) leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */ -#if 0 - movl LINUX_SC_GS(%ebx),%gs -#endif - movl LINUX_SC_FS(%ebx),%fs movl LINUX_SC_ES(%ebx),%es movl LINUX_SC_DS(%ebx),%ds movl %esp, %ebx /* pass sigframe */ @@ -27,10 +23,6 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ -#if 0 - movl LINUX_SC_GS(%ebx),%gs -#endif - movl LINUX_SC_FS(%ebx),%fs movl LINUX_SC_ES(%ebx),%es movl LINUX_SC_DS(%ebx),%ds push %eax /* fake ret addr */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#37 (text+ko) ==== @@ -724,8 +724,9 @@ sd.sd_gran); #endif td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; - td2->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; - memcpy(&td2->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); + td2->td_pcb->pcb_gs32sd = sd; + td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; + td2->td_pcb->pcb_flags |= PCB_32BIT; } } @@ -1350,11 +1351,11 @@ critical_enter(); td->td_pcb->pcb_gsbase = (register_t)info.base_addr; - td->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; - memcpy(&td->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); + td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd; + td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; + td->td_pcb->pcb_flags |= PCB_32BIT; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); - gdt[GUGS32_SEL] = sd; critical_exit(); - + return (0); } ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -408,6 +408,7 @@ td->td_pcb->pcb_ds = _udatasel; load_es(_udatasel); td->td_pcb->pcb_es = _udatasel; + /* leave user %fs and %gs untouched */ PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -528,6 +529,7 @@ td->td_pcb->pcb_ds = _udatasel; load_es(_udatasel); td->td_pcb->pcb_es = _udatasel; + /* leave user %fs and %gs untouched */ PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -813,10 +815,12 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; + critical_exit(); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); @@ -825,7 +829,6 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; - pcb->pcb_gs32p = NULL; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; From owner-p4-projects@FreeBSD.ORG Mon Feb 19 23:00:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E2CD16EFED; Mon, 19 Feb 2007 23:00:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0930516EF81 for ; Mon, 19 Feb 2007 23:00:28 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E956913C48D for ; Mon, 19 Feb 2007 23:00:27 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1JN0R4b029684 for ; Mon, 19 Feb 2007 23:00:27 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1JN0Qac029680 for perforce@freebsd.org; Mon, 19 Feb 2007 23:00:26 GMT (envelope-from jkim@freebsd.org) Date: Mon, 19 Feb 2007 23:00:26 GMT Message-Id: <200702192300.l1JN0Qac029680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114733 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, 19 Feb 2007 23:00:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=114733 Change 114733 by jkim@jkim_hammer on 2007/02/19 22:59:41 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/files#19 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/cd9660/iso.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_firmware.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_debug.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_export.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/linuxolator/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/linuxolator/src/sys/sys/firmware.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/vnode.h#5 integrate .. //depot/projects/linuxolator/src/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/README.softupdates#2 delete .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#9 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.4 2007/02/15 22:22:56 jhb Exp $"); #include #include @@ -347,6 +347,9 @@ msi->msi_intsrc.is_pic = &msi_pic; msi->msi_dev = dev; msi->msi_vector = vector + i; + if (bootverbose) + printf("msi: routing MSI IRQ %d to vector %u\n", + msi->msi_irq, msi->msi_vector); msi->msi_index = i; msi->msi_first = fsrc; @@ -463,6 +466,9 @@ /* Allocate an IDT vector. */ vector = apic_alloc_vector(i); + if (bootverbose) + printf("msi: routing MSI-X IRQ %d to vector %u\n", msi->msi_irq, + vector); /* Setup source. */ msi->msi_intsrc.is_pic = &msix_pic; ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.579 2007/02/19 10:55:16 kib Exp $"); /* * Manages physical address maps. @@ -1498,11 +1498,9 @@ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ - vm_page_lock_queues(); m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(m); - vm_page_unlock_queues(); PMAP_LOCK_DESTROY(pmap); } @@ -1544,9 +1542,15 @@ while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); nkpt++; + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } addr = roundup2(addr, PAGE_SIZE * NPTEPG); + if (addr - 1 >= kernel_map->max_offset) + addr = kernel_map->max_offset; while (kernel_vm_end < addr) { pde = pmap_pde(kernel_pmap, kernel_vm_end); if (pde == NULL) { @@ -1564,6 +1568,10 @@ } if ((*pde & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } continue; } @@ -1583,6 +1591,10 @@ *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); #include #include @@ -82,7 +82,5 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); vm_page_free(m); - vm_page_unlock_queues(); } ==== //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.16 2006/11/01 12:41:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $"); #include #include #include @@ -103,7 +103,7 @@ char *d = dst; while (len) { - if (len >= 4 && !((vm_offset_t)d & 3) && + if (0 && len >= 4 && !((vm_offset_t)d & 3) && !((vm_offset_t)s & 3)) { *(uint32_t *)d = *(uint32_t *)s; s += 4; @@ -143,6 +143,37 @@ int physaddr = KERNPHYSADDR; int tmp1; unsigned int sp = ((unsigned int)&_end & ~3) + 4; +#if defined(FLASHADDR) && defined(LOADERRAMADDR) + unsigned int pc; + + __asm __volatile("adr %0, _start\n" + : "=r" (pc)); + if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) || + (FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) { + /* + * We're running from flash, so just copy the whole thing + * from flash to memory. + * This is far from optimal, we could do the relocation or + * the unzipping directly from flash to memory to avoid this + * needless copy, but it would require to know the flash + * physical address. + */ + unsigned int target_addr; + unsigned int tmp_sp; + + target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR; + tmp_sp = target_addr + 0x100000 + + (unsigned int)&_end - (unsigned int)&_start; + memcpy((char *)target_addr, (char *)pc, + (unsigned int)&_end - (unsigned int)&_start); + /* Temporary set the sp and jump to the new location. */ + __asm __volatile( + "mov sp, %1\n" + "mov pc, %0\n" + : : "r" (target_addr), "r" (tmp_sp)); + + } +#endif #ifdef KZIP sp += KERNSIZE + 0x100; sp &= ~(L1_TABLE_SIZE - 1); ==== //depot/projects/linuxolator/src/sys/arm/arm/locore.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -66,47 +66,53 @@ ENTRY_NP(btext) ASENTRY_NP(_start) - - - /* Check if we are running on RAM, if not move ourself to RAM */ -#if 0 - cmp pc, #PHYSADDR - bhi start_inram /* XXX: This is wrong */ +#if defined (FLASHADDR) && defined(LOADERRAMADDR) + /* Check if we're running from flash. */ + ldr r7, =FLASHADDR + /* + * If we're running with MMU disabled, test against the + * physical address instead. + */ + mrc p15, 0, r2, c1, c0, 0 + ands r2, r2, #CPU_CONTROL_MMU_ENABLE + ldreq r8, =PHYSADDR + ldrne r8, =LOADERRAMADDR + cmp r7, r8 + bls flash_lower + cmp r7, pc + bhi from_ram + b do_copy + +flash_lower: + cmp r8, pc + bls from_ram +do_copy: + ldr r9, =KERNBASE + adr r1, _start + ldr r0, Lreal_start + ldr r2, Lend + sub r2, r2, r0 + sub r0, r0, r9 + add r0, r0, r8 + mov r4, r0 + /* Make sure _arm_memcpy is NULL */ + ldr r3, .L_arm_memcpy + ldr r3, [r3] + mov r5, #0 + str r5, [r3] + bl memcpy + ldr r0, Lram_offset + add pc, r4, r0 +Lram_offset: .word from_ram-_C_LABEL(_start) +from_ram: + nop #endif - b start_inram /* - * XXX: this is even more wrong, but RedBoot - * use 0x00000000-0x100000000 as virtual - * addresses for the RAM. - */ - - /* move me to RAM - * XXX: we can use memcpy if it is PIC - */ - ldr r1, Lcopy_size - adr r0, _C_LABEL(_start) - add r1, r1, #3 - mov r1, r1, LSR #2 - mov r2, #PHYSADDR - add r2, r2, #0x00200000 - mov r4, r2 - -5: ldr r3,[r0],#4 - str r3,[r2],#4 - subs r1,r1,#1 - bhi 5b - - /* Jump to RAM */ - ldr r0, Lstart_off - add pc, r4, r0 - -Lcopy_size: .word _edata-_C_LABEL(_start) -Lstart_off: .word start_inram-_C_LABEL(_start) -start_inram: adr r7, Lunmapped bic r7, r7, #0xff000000 orr r7, r7, #PHYSADDR +disable_mmu: /* Disable MMU for a while */ mrc p15, 0, r2, c1, c0, 0 bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ @@ -120,7 +126,6 @@ nop mov pc, r7 Lunmapped: - #ifdef STARTUP_PAGETABLE_ADDR /* build page table from scratch */ ldr r0, Lstartup_pagetable @@ -191,6 +196,10 @@ .word KERNVIRTADDR Lphysaddr: .word KERNPHYSADDR +Lreal_start: + .word _start +Lend: + .word _edata Lstartup_pagetable: .word STARTUP_PAGETABLE_ADDR mmu_init_table: @@ -207,6 +216,11 @@ .word _end .word svcstk + INIT_ARM_STACK_SIZE +#if defined(FLASHADDR) && defined(LOADERRAMADDR) +.L_arm_memcpy: + .word _C_LABEL(_arm_memcpy) +#endif + .Lvirt_done: .word virt_done .Lmainreturned: ==== //depot/projects/linuxolator/src/sys/arm/conf/EP80219#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# -*- makefile-bsdmake -*- GENERIC -- Generic kernel configuration file for FreeBSD/arm +# EP80219 -- Custom kernel configuration file for FreeBSD/arm on the EP80219 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.4 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.5 2007/02/19 00:37:25 cognet Exp $ machine arm ident EP80219 ==== //depot/projects/linuxolator/src/sys/arm/conf/IQ31244#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# IQ31244 -- Custom kernel configuration file for FreeBSD/arm on the IQ31244 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.17 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.19 2007/02/19 01:03:08 cognet Exp $ machine arm ident IQ31244 @@ -23,6 +23,8 @@ options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options FLASHADDR=0xf0000000 +options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0xa0000000 include "../xscale/i80321/std.iq31244" ==== //depot/projects/linuxolator/src/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# SIMICS -- Custom kernel configuration file for FreeBSD/arm on Simics SA1110 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.12 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.13 2007/02/19 00:37:25 cognet Exp $ machine arm ident SIMICS ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.2 2007/02/15 17:21:30 luigi Exp $"); /* * Intel XScale Network Processing Engine (NPE) support. @@ -422,7 +422,7 @@ { uint32_t imageSize; const uint32_t *imageCodePtr; - struct firmware *fw; + const struct firmware *fw; int error; DPRINTF(sc->sc_dev, "load %s, imageId 0x%08x\n", imageName, imageId); ==== //depot/projects/linuxolator/src/sys/conf/files#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1176 2007/02/11 14:01:32 rodrigc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1177 2007/02/15 01:28:22 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1443,6 +1443,7 @@ kern/tty_tty.c standard kern/uipc_accf.c optional inet kern/uipc_cow.c optional zero_copy_sockets +kern/uipc_debug.c optional ddb kern/uipc_domain.c standard kern/uipc_mbuf.c standard kern/uipc_mbuf2.c standard ==== //depot/projects/linuxolator/src/sys/conf/options.arm#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.15 2007/01/05 02:08:35 ticso Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.16 2007/02/19 01:03:07 cognet Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -11,8 +11,10 @@ CPU_XSCALE_80321 opt_global.h CPU_XSCALE_80219 opt_global.h CPU_XSCALE_IXP425 opt_global.h +FLASHADDR opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h +LOADERRAMADDR opt_global.h PHYSADDR opt_global.h SKYEYE_WORKAROUNDS opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h ==== //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.seq#2 (text+ko) ==== @@ -37,7 +37,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.18 2005/01/06 01:42:26 imp Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.19 2007/02/18 19:48:59 ceri Exp $ */ VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $" @@ -2139,7 +2139,7 @@ END_CRITICAL; pkt_status_check_overrun: /* - * Status PKT overruns are uncerimoniously recovered with a + * Status PKT overruns are unceremoniously recovered with a * bus reset. If we've overrun, let the host know so that * recovery can be performed. * ==== //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#4 (text+ko) ==== @@ -52,8 +52,11 @@ ** with scsi pass-through command ** add new device id of sas raid adapters ** code fit for SPARC64 & PPC +** 1.20.00.14 02/05/2007 Erich Chen bug fix for incorrect ccb_h.status report +** and cause g_vfs_done() read write error + ****************************************************************************************** -* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.15 2006/12/13 08:46:03 scottl Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.16 2007/02/15 15:36:15 scottl Exp $ */ #include #include @@ -1299,7 +1302,8 @@ } pccb->ccb_h.status |= CAM_SIM_QUEUED; if(acb->srboutstandingcount >= ARCMSR_MAX_OUTSTANDING_CMD) { - pccb->ccb_h.status |= CAM_SCSI_BUSY; + pccb->ccb_h.status &= ~CAM_STATUS_MASK; + pccb->ccb_h.status |= CAM_REQUEUE_REQ; arcmsr_srb_complete(srb, 0); return; } ==== //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.h#3 (text+ko) ==== @@ -35,9 +35,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/sys/dev/arcmsr/arcmsr.h,v 1.2 2006/12/13 08:46:03 scottl Exp $ +* $FreeBSD: src/sys/dev/arcmsr/arcmsr.h,v 1.3 2007/02/15 15:36:15 scottl Exp $ */ -#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.13 2006-8-18" +#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.14 2007-2-05" #define ARCMSR_SCSI_INITIATOR_ID 255 #define ARCMSR_DEV_SECTOR_SIZE 512 #define ARCMSR_MAX_XFER_SECTORS 4096 ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/sys/dev/ata/ata-all.h,v 1.118 2006/06/28 09:59:09 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.119 2007/02/15 21:51:42 sos Exp $ */ /* ATA register defines */ @@ -228,6 +228,29 @@ #define ATA_AHCI_CT_SG_OFFSET 128 #define ATA_AHCI_CT_SIZE 256 +struct ata_ahci_dma_prd { + u_int64_t dba; + u_int32_t reserved; + u_int32_t dbc; /* 0 based */ +#define ATA_AHCI_PRD_MASK 0x003fffff /* max 4MB */ +#define ATA_AHCI_PRD_IPC (1<<31) +} __packed; + +struct ata_ahci_cmd_tab { + u_int8_t cfis[64]; + u_int8_t acmd[32]; + u_int8_t reserved[32]; + struct ata_ahci_dma_prd prd_tab[16]; +} __packed; + +struct ata_ahci_cmd_list { + u_int16_t cmd_flags; + u_int16_t prd_length; /* PRD entries */ + u_int32_t bytecount; + u_int64_t cmd_table_phys; /* 128byte aligned */ +} __packed; + + /* DMA register defines */ #define ATA_DMA_ENTRIES 256 #define ATA_DMA_EOT 0x80000000 ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.181 2007/02/12 17:17:31 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.182 2007/02/15 21:51:42 sos Exp $"); #include "opt_ata.h" #include @@ -67,7 +67,7 @@ static void ata_ahci_reset(device_t dev); static void ata_ahci_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); static void ata_ahci_dmainit(device_t dev); -static int ata_ahci_setup_fis(u_int8_t *fis, struct ata_request *request); +static int ata_ahci_setup_fis(struct ata_ahci_cmd_tab *ctp, struct ata_request *request); static int ata_acard_chipinit(device_t dev); static int ata_acard_allocate(device_t dev); static int ata_acard_status(device_t dev); @@ -326,8 +326,22 @@ if (bootverbose) device_printf(ch->dev, "SATA connect ready time=%dms\n", timeout * 10); - /* do a reset and find out what type device we've got */ - ata_generic_reset(ch->dev); + /* if we have legacy resources an old fashioned reset might be needed */ + if (ch->r_io[ATA_DATA].res) + ata_generic_reset(ch->dev); + + /* register device type from signature */ + ch->devices = 0; + if (timeout < 1000) { + if ((ATA_IDX_INB(ch, ATA_CYL_LSB) == ATAPI_MAGIC_LSB) && + (ATA_IDX_INB(ch, ATA_CYL_MSB) == ATAPI_MAGIC_MSB)) + ch->devices = ATA_ATAPI_MASTER; + else + ch->devices = ATA_ATA_MASTER; + } + if (bootverbose) + device_printf(ch->dev, "sata_connect devices=0x%b\n", + ch->devices, "\20\3ATAPI_MASTER\1ATA_MASTER"); return 1; } @@ -367,36 +381,15 @@ /* - * AHCI v1.0 compliant SATA chipset support functions + * AHCI v1.x compliant SATA chipset support functions */ -struct ata_ahci_dma_prd { - u_int64_t dba; - u_int32_t reserved; - u_int32_t dbc; /* 0 based */ -#define ATA_AHCI_PRD_MASK 0x003fffff /* max 4MB */ -#define ATA_AHCI_PRD_IPC (1<<31) -} __packed; - -struct ata_ahci_cmd_tab { - u_int8_t cfis[64]; - u_int8_t acmd[32]; - u_int8_t reserved[32]; - struct ata_ahci_dma_prd prd_tab[16]; -} __packed; - -struct ata_ahci_cmd_list { - u_int16_t cmd_flags; - u_int16_t prd_length; /* PRD entries */ - u_int32_t bytecount; - u_int64_t cmd_table_phys; /* 128byte aligned */ -} __packed; - - static int ata_ahci_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); - u_int32_t version; + u_int32_t version, ports_implemented;; + int i, j; + static int mapping[32]; /* reset AHCI controller */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_GHC, @@ -415,6 +408,14 @@ /* get the number of HW channels */ ctlr->channels = (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_NPMASK)+1; + /* if port layout has holes setup the right mapping */ + ports_implemented = ATA_INL(ctlr->r_res2, ATA_AHCI_PI); + for (i=0, j=0; i<32 && jchannels; i++) { + if (ports_implemented & (1<r_res2, ATA_AHCI_IS, ATA_INL(ctlr->r_res2, ATA_AHCI_IS)); @@ -445,11 +446,12 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); - int offset = (ch->unit << 7); + int offset = ((int*)(device_get_ivars(ctlr->dev)))[ch->unit] << 7; /* setup legacy cruft we need */ + ch->r_io[ATA_DATA].res = NULL; ch->r_io[ATA_CYL_LSB].res = ctlr->r_res2; - ch->r_io[ATA_CYL_LSB].offset = ATA_AHCI_P_SIG + 1 + offset; + ch->r_io[ATA_CYL_LSB].offset = ATA_AHCI_P_SIG + 2 + offset; ch->r_io[ATA_CYL_MSB].res = ctlr->r_res2; ch->r_io[ATA_CYL_MSB].offset = ATA_AHCI_P_SIG + 3 + offset; ch->r_io[ATA_STATUS].res = ctlr->r_res2; @@ -503,11 +505,11 @@ struct ata_channel *ch = device_get_softc(dev); struct ata_connect_task *tp; u_int32_t action, istatus, sstatus, error, issued; - int offset = (ch->unit << 7); + int offset = ((int*)(device_get_ivars(ctlr->dev)))[ch->unit] << 7; int tag = 0; action = ATA_INL(ctlr->r_res2, ATA_AHCI_IS); - if (action & (1 << ch->unit)) { + if (action & (1 << ((int*)(device_get_ivars(ctlr->dev)))[ch->unit])) { istatus = ATA_INL(ctlr->r_res2, ATA_AHCI_P_IS + offset); issued = ATA_INL(ctlr->r_res2, ATA_AHCI_P_CI + offset); sstatus = ATA_INL(ctlr->r_res2, ATA_AHCI_P_SSTS + offset); @@ -569,15 +571,16 @@ struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); struct ata_ahci_cmd_tab *ctp; struct ata_ahci_cmd_list *clp; + int offset = ((int*)(device_get_ivars(ctlr->dev)))[ch->unit] << 7; int tag = 0, entries = 0; int fis_size; - + /* get a piece of the workspace for this request */ ctp = (struct ata_ahci_cmd_tab *) (ch->dma->work + ATA_AHCI_CT_OFFSET + (ATA_AHCI_CT_SIZE * tag)); - /* setup the FIS for this request */ /* XXX SOS ATAPI missing still */ - if (!(fis_size = ata_ahci_setup_fis(&ctp->cfis[0], request))) { + /* setup the FIS for this request */ + if (!(fis_size = ata_ahci_setup_fis(ctp, request))) { device_printf(request->dev, "setting up SATA FIS failed\n"); request->result = EIO; return ATA_OP_FINISHED; @@ -600,7 +603,7 @@ clp->prd_length = entries; clp->cmd_flags = (request->flags & ATA_R_WRITE ? (1<<6) : 0) | - (request->flags & ATA_R_ATAPI ? (1<<5) : 0) | + (request->flags & ATA_R_ATAPI ? ((1<<5) | (1<<7)) : 0) | (fis_size / sizeof(u_int32_t)); clp->bytecount = 0; clp->cmd_table_phys = htole64(ch->dma->work_bus + ATA_AHCI_CT_OFFSET + @@ -609,8 +612,18 @@ /* clear eventual ACTIVE bit */ ATA_IDX_OUTL(ch, ATA_SACTIVE, ATA_IDX_INL(ch, ATA_SACTIVE) & (1 << tag)); + /* set command type bit */ + if (request->flags & ATA_R_ATAPI) + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, + ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset) | + ATA_AHCI_P_CMD_ATAPI); + else + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, + ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset) & + ~ATA_AHCI_P_CMD_ATAPI); + /* issue the command */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + (ch->unit << 7), (1 << tag)); + ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << tag)); /* start the timeout */ callout_reset(&request->callout, request->timeout * hz, @@ -626,13 +639,14 @@ struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); struct ata_ahci_cmd_list *clp; u_int32_t tf_data; + int offset = ((int*)(device_get_ivars(ctlr->dev)))[ch->unit] << 7; int tag = 0; /* kill the timeout */ callout_stop(&request->callout); /* get status */ - tf_data = ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + (ch->unit << 7)); + tf_data = ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + offset); request->status = tf_data; /* if error status get details */ @@ -656,7 +670,8 @@ struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); u_int32_t cmd; - int timeout, offset = (ch->unit << 7); + int offset = ((int*)(device_get_ivars(ctlr->dev)))[ch->unit] << 7; + int timeout; /* kill off all activity on this channel */ cmd = ATA_INL(ctlr->r_res2, ATA_AHCI_P_CMD + offset); @@ -691,8 +706,15 @@ /* spin up device */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset, ATA_AHCI_P_CMD_SUD); + /* enable interface */ ata_sata_phy_enable(ch); + /* no ATAPI yet */ + if (ch->devices & ATA_ATAPI_MASTER) { + device_printf(ch->dev, "AHCI SATA ATAPI devices not supported yet\n"); + ch->devices = 0; + } + /* clear any interrupts pending on this channel */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_IS + offset, ATA_INL(ctlr->r_res2, ATA_AHCI_P_IS + offset)); @@ -733,43 +755,49 @@ } static int -ata_ahci_setup_fis(u_int8_t *fis, struct ata_request *request) +ata_ahci_setup_fis(struct ata_ahci_cmd_tab *ctp, struct ata_request *request) { struct ata_device *atadev = device_get_softc(request->dev); - int idx = 0; - /* XXX SOS add ATAPI commands support later */ - ata_modify_if_48bit(request); - - fis[idx++] = 0x27; /* host to device */ - fis[idx++] = 0x80; /* command FIS (note PM goes here) */ - fis[idx++] = request->u.ata.command; - fis[idx++] = request->u.ata.feature; - - fis[idx++] = request->u.ata.lba; - fis[idx++] = request->u.ata.lba >> 8; - fis[idx++] = request->u.ata.lba >> 16; - fis[idx] = ATA_D_LBA | atadev->unit; - if (atadev->flags & ATA_D_48BIT_ACTIVE) - idx++; - else - fis[idx++] |= (request->u.ata.lba >> 24 & 0x0f); - - fis[idx++] = request->u.ata.lba >> 24; - fis[idx++] = request->u.ata.lba >> 32; - fis[idx++] = request->u.ata.lba >> 40; - fis[idx++] = request->u.ata.feature >> 8; - - fis[idx++] = request->u.ata.count; - fis[idx++] = request->u.ata.count >> 8; - fis[idx++] = 0x00; - fis[idx++] = ATA_A_4BIT; - - fis[idx++] = 0x00; - fis[idx++] = 0x00; - fis[idx++] = 0x00; - fis[idx++] = 0x00; - return idx; + bzero(ctp->cfis, 64); + if (request->flags & ATA_R_ATAPI) { + ctp->cfis[0] = 0x27; /* host to device */ + ctp->cfis[1] = 0x80; /* command FIS (note PM goes here) */ + ctp->cfis[2] = ATA_PACKET_CMD; + if (request->flags & ATA_R_DMA) + ctp->cfis[3] = ATA_F_DMA; + else { + ctp->cfis[5] = request->transfersize; + ctp->cfis[6] = request->transfersize >> 8; + } + ctp->cfis[7] = ATA_D_LBA | atadev->unit; + ctp->cfis[15] = ATA_A_4BIT; + bzero(ctp->acmd, 32); + bcopy(request->u.atapi.ccb, ctp->acmd, 12); + return 20; + } + else { + ata_modify_if_48bit(request); + ctp->cfis[0] = 0x27; /* host to device */ + ctp->cfis[1] = 0x80; /* command FIS (note PM goes here) */ + ctp->cfis[2] = request->u.ata.command; + ctp->cfis[3] = request->u.ata.feature; + ctp->cfis[4] = request->u.ata.lba; + ctp->cfis[5] = request->u.ata.lba >> 8; + ctp->cfis[6] = request->u.ata.lba >> 16; + ctp->cfis[7] = ATA_D_LBA | atadev->unit; + if (!(atadev->flags & ATA_D_48BIT_ACTIVE)) + ctp->cfis[7] |= (request->u.ata.lba >> 24 & 0x0f); + ctp->cfis[8] = request->u.ata.lba >> 24; + ctp->cfis[9] = request->u.ata.lba >> 32; + ctp->cfis[10] = request->u.ata.lba >> 40; + ctp->cfis[11] = request->u.ata.feature >> 8; + ctp->cfis[12] = request->u.ata.count; + ctp->cfis[13] = request->u.ata.count >> 8; + ctp->cfis[15] = ATA_A_4BIT; + return 20; + } + return 0; } @@ -1740,7 +1768,7 @@ /* SATA parts can be either compat or AHCI */ else { /* force all ports active "the legacy way" */ - pci_write_config(dev, 0x92, pci_read_config(dev, 0x92, 2) | 0x0f,2); + pci_write_config(dev, 0x92, pci_read_config(dev, 0x92, 2) | 0x0f, 2); ctlr->allocate = ata_intel_allocate; ctlr->reset = ata_intel_reset; @@ -2886,8 +2914,7 @@ if (ata_pci_allocate(dev)) return ENXIO; - /* don't use 32 bit PIO transfers; these cause the NetCell to return - * garbage */ + /* the NetCell only supports 16 bit PIO transfers */ ch->flags |= ATA_USE_16BIT; return 0; ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.118 2007/02/03 20:12:00 rink Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.119 2007/02/17 16:56:39 sos Exp $"); #include "opt_ata.h" #include @@ -59,10 +59,14 @@ int ata_legacy(device_t dev) { - return ((pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV) && - ((pci_read_config(dev, PCIR_PROGIF, 1) & - (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC)) != - (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC))); + return (((pci_read_config(dev, PCIR_PROGIF, 1)&PCIP_STORAGE_IDE_MASTERDEV)&& + ((pci_read_config(dev, PCIR_PROGIF, 1) & + (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC)) != + (PCIP_STORAGE_IDE_MODEPRIM | PCIP_STORAGE_IDE_MODESEC))) || + (!pci_read_config(dev, PCIR_BAR(0), 4) && + !pci_read_config(dev, PCIR_BAR(1), 4) && + !pci_read_config(dev, PCIR_BAR(2), 4) && + !pci_read_config(dev, PCIR_BAR(3), 4))); } int @@ -211,11 +215,7 @@ /* attach all channels on this controller */ for (unit = 0; unit < ctlr->channels; unit++) { - if (unit == 0 && (pci_get_progif(dev) & 0x81) == 0x80) { - device_add_child(dev, "ata", unit); - continue; - } - if (unit == 1 && (pci_get_progif(dev) & 0x84) == 0x80) { + if ((unit == 0 || unit == 1) && ata_legacy(dev)) { device_add_child(dev, "ata", unit); continue; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 20 00:36:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D43AA170657; Tue, 20 Feb 2007 00:36:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAE15170672 for ; Tue, 20 Feb 2007 00:35:28 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C0A4013C494 for ; Tue, 20 Feb 2007 00:35:28 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1K0ZSvQ048070 for ; Tue, 20 Feb 2007 00:35:28 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1K0ZSng048067 for perforce@freebsd.org; Tue, 20 Feb 2007 00:35:28 GMT (envelope-from jkim@freebsd.org) Date: Tue, 20 Feb 2007 00:35:28 GMT Message-Id: <200702200035.l1K0ZSng048067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114738 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, 20 Feb 2007 00:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=114738 Change 114738 by jkim@jkim_hammer on 2007/02/20 00:34:29 Set %gs in PCB for CLONE_SETTLS. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#38 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#38 (text+ko) ==== @@ -726,6 +726,7 @@ td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; td2->td_pcb->pcb_gs32sd = sd; td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; + td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL); td2->td_pcb->pcb_flags |= PCB_32BIT; } } From owner-p4-projects@FreeBSD.ORG Tue Feb 20 12:59:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFED816DEEA; Tue, 20 Feb 2007 12:48:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0A2F7170A5E for ; Tue, 20 Feb 2007 12:11:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D32D213C4B4 for ; Tue, 20 Feb 2007 12:11:06 +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.13.6/8.13.6) with ESMTP id l1KCB6rb004484 for ; Tue, 20 Feb 2007 12:11:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1KCB67s004476 for perforce@freebsd.org; Tue, 20 Feb 2007 12:11:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 20 Feb 2007 12:11:06 GMT Message-Id: <200702201211.l1KCB67s004476@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 114746 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, 20 Feb 2007 12:59:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=114746 Change 114746 by rwatson@rwatson_cinnamon on 2007/02/20 12:10:31 Eliminate one more suser() call. Affected files ... .. //depot/projects/trustedbsd/priv/sys/net/if_ppp.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/net/if_ppp.c#6 (text+ko) ==== @@ -719,7 +719,7 @@ * XXXRW: Isn't this suser() check redundant to the one at the ifnet * layer? */ - if ((error = suser(td)) != 0) + if ((error = priv_check(td, PRIV_NET_SETIFMTU)) != 0) break; if (ifr->ifr_mtu > PPP_MAXMTU) error = EINVAL; From owner-p4-projects@FreeBSD.ORG Tue Feb 20 18:20:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4556116C267; Tue, 20 Feb 2007 18:20:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 56FB616C235; Tue, 20 Feb 2007 18:20:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 0A93F13C48E; Tue, 20 Feb 2007 18:20:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l1KIKQUO086577; Tue, 20 Feb 2007 13:20:40 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Jung-uk Kim Date: Tue, 20 Feb 2007 12:25:10 -0500 User-Agent: KMail/1.9.4 References: <200702192256.l1JMuKHH029284@repoman.freebsd.org> In-Reply-To: <200702192256.l1JMuKHH029284@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200702201225.10406.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Tue, 20 Feb 2007 13:20:40 -0500 (EST) X-Virus-Scanned: ClamAV 0.88.3/2613/Tue Feb 20 11:39:58 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114732 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, 20 Feb 2007 18:20:45 -0000 On Monday 19 February 2007 17:56, Jung-uk Kim wrote: > http://perforce.freebsd.org/chv.cgi?CH=114732 > > Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 > > Finish TLS on amd64 support. > It may have rough edges but it seems usable. > Tested on a real UP machine and QEMU SMP. > > > PCB_32BIT flag was half-baked and never used from the day one. > Unfortunately it was confusing me from the beginning. :-( > Are you going to set the flag for ia32 processes as well? -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Feb 20 18:37:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1B3016AB82; Tue, 20 Feb 2007 18:37:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 806EE16AA91; Tue, 20 Feb 2007 18:37:56 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id F22F413C428; Tue, 20 Feb 2007 18:37:55 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l1KIbs6V051672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Feb 2007 19:37:54 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l1KIbsI7051670; Tue, 20 Feb 2007 19:37:54 +0100 (CET) Date: Tue, 20 Feb 2007 19:37:54 +0100 From: Divacky Roman To: Jung-uk Kim Message-ID: <20070220183754.GA51314@stud.fit.vutbr.cz> References: <200702192256.l1JMuKHH029284@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200702192256.l1JMuKHH029284@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114732 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, 20 Feb 2007 18:37:57 -0000 On Mon, Feb 19, 2007 at 10:56:20PM +0000, Jung-uk Kim wrote: > http://perforce.freebsd.org/chv.cgi?CH=114732 > > Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 > > Finish TLS on amd64 support. > It may have rough edges but it seems usable. > Tested on a real UP machine and QEMU SMP. you are awesome! thnx for that... any tentative timeframe for an MFP4? thnx roman From owner-p4-projects@FreeBSD.ORG Tue Feb 20 19:19:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E45D16C2CB; Tue, 20 Feb 2007 19:19:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CCE3616C159; Tue, 20 Feb 2007 19:19:34 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id 6F5AA13C461; Tue, 20 Feb 2007 19:19:33 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l1KJJWSL072038; Tue, 20 Feb 2007 14:19:32 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: John Baldwin Date: Tue, 20 Feb 2007 14:19:29 -0500 User-Agent: KMail/1.6.2 References: <200702192256.l1JMuKHH029284@repoman.freebsd.org> <200702201225.10406.jhb@freebsd.org> In-Reply-To: <200702201225.10406.jhb@freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200702201419.30764.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.88.6/2614/Tue Feb 20 13:53:11 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114732 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, 20 Feb 2007 19:19:36 -0000 On Tuesday 20 February 2007 12:25 pm, John Baldwin wrote: > On Monday 19 February 2007 17:56, Jung-uk Kim wrote: > > http://perforce.freebsd.org/chv.cgi?CH=114732 > > > > Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 > > > > Finish TLS on amd64 support. > > It may have rough edges but it seems usable. > > Tested on a real UP machine and QEMU SMP. > > > > > > PCB_32BIT flag was half-baked and never used from the day one. > > Unfortunately it was confusing me from the beginning. :-( > > > > Are you going to set the flag for ia32 processes as well? No, not at the moment. freebsd32 does not modify %gs at all. We modify base address directly with sysarch(2). It is nice to have consistent %gs and base address pair but it adds overhead for context switching. Jung-uk Kim From owner-p4-projects@FreeBSD.ORG Tue Feb 20 19:24:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C397216B349; Tue, 20 Feb 2007 19:24:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 41BCA16B158 for ; Tue, 20 Feb 2007 19:24:16 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id C62A513C49D for ; Tue, 20 Feb 2007 19:24:15 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l1KJOEwa072312; Tue, 20 Feb 2007 14:24:14 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: Divacky Roman Date: Tue, 20 Feb 2007 14:24:11 -0500 User-Agent: KMail/1.6.2 References: <200702192256.l1JMuKHH029284@repoman.freebsd.org> <20070220183754.GA51314@stud.fit.vutbr.cz> In-Reply-To: <20070220183754.GA51314@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200702201424.12916.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.88.6/2614/Tue Feb 20 13:53:11 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114732 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, 20 Feb 2007 19:24:17 -0000 On Tuesday 20 February 2007 01:37 pm, Divacky Roman wrote: > On Mon, Feb 19, 2007 at 10:56:20PM +0000, Jung-uk Kim wrote: > > http://perforce.freebsd.org/chv.cgi?CH=114732 > > > > Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 > > > > Finish TLS on amd64 support. > > It may have rough edges but it seems usable. > > Tested on a real UP machine and QEMU SMP. > > you are awesome! thnx for that... any tentative > timeframe for an MFP4? I'd like to test clone syscalls with CLONE_SETTLS before I do that but I couldn't find any reference code. Do you have one? Jung-uk Kim From owner-p4-projects@FreeBSD.ORG Tue Feb 20 21:17:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37B1A16B172; Tue, 20 Feb 2007 21:17:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CAB016B101 for ; Tue, 20 Feb 2007 21:17:31 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F198113C467 for ; Tue, 20 Feb 2007 21:17:30 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1KLHUoS028534 for ; Tue, 20 Feb 2007 21:17:30 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1KLHUjB028528 for perforce@freebsd.org; Tue, 20 Feb 2007 21:17:30 GMT (envelope-from jkim@freebsd.org) Date: Tue, 20 Feb 2007 21:17:30 GMT Message-Id: <200702202117.l1KLHUjB028528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114770 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, 20 Feb 2007 21:17:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114770 Change 114770 by jkim@jkim_hammer on 2007/02/20 21:16:55 Fix style(9). Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#39 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#39 (text+ko) ==== @@ -71,22 +71,6 @@ #include #include -/* - * Memory and System segment descriptors - */ -struct segment_descriptor { - unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ - unsigned sd_type:5 ; /* segment type */ - unsigned sd_dpl:2 ; /* segment descriptor priority level */ - unsigned sd_p:1 ; /* segment descriptor present */ - unsigned sd_hilimit:4 ; /* segment extent (msb) */ - unsigned sd_xx:2 ; /* unused */ - unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ - unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ - unsigned sd_hibase:8 ; /* segment base address (msb) */ -} ; - struct l_old_select_argv { l_int nfds; l_uintptr_t readfds; @@ -140,7 +124,7 @@ * Allocate temporary demand zeroed space for argument and * environment strings */ - args->buf = (char *) kmem_alloc_wait(exec_map, + args->buf = (char *)kmem_alloc_wait(exec_map, PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); if (args->buf == NULL) return (ENOMEM); @@ -174,14 +158,14 @@ if (error) { if (error == ENAMETOOLONG) error = E2BIG; - + goto err_exit; } args->stringspace -= length; args->endp += length; args->argc++; } - + args->begin_envv = args->endp; /* @@ -238,13 +222,13 @@ if (error == 0) error = kern_execve(td, &eargs, NULL); if (error == 0) - /* linux process can exec fbsd one, dont attempt + /* Linux process can execute FreeBSD one, do not attempt * to create emuldata for such process using * linux_proc_init, this leads to a panic on KASSERT - * because such process has p->p_emuldata == NULL + * because such process has p->p_emuldata == NULL. */ if (td->td_proc->p_sysent == &elf_linux_sysvec) - error = linux_proc_init(td, 0, 0); + error = linux_proc_init(td, 0, 0); return (error); } @@ -485,7 +469,7 @@ if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); - + if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; @@ -520,7 +504,7 @@ printf(ARGS(vfork, "")); #endif - /* exclude RFPPWAIT */ + /* Exclude RFPPWAIT */ if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { @@ -539,7 +523,7 @@ PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - + /* make it run */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); @@ -551,7 +535,7 @@ while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); - + return (0); } @@ -566,10 +550,9 @@ #ifdef DEBUG if (ldebug(clone)) { - printf(ARGS(clone, "flags %x, stack %x, parent tid: %x, child tid: %x"), - (unsigned int)args->flags, (unsigned int)(uintptr_t)args->stack, - (unsigned int)(uintptr_t)args->parent_tidptr, - (unsigned int)(uintptr_t)args->child_tidptr); + printf(ARGS(clone, "flags %x, stack %p, parent tid: %p, " + "child tid: %p"), (unsigned)args->flags, + args->stack, args->parent_tidptr, args->child_tidptr); } #endif @@ -584,11 +567,11 @@ ff |= RFMEM; if (args->flags & CLONE_SIGHAND) ff |= RFSIGSHARE; - /* - * XXX: in linux sharing of fs info (chroot/cwd/umask) - * and open files is independant. in fbsd its in one - * structure but in reality it doesnt make any problems - * because both this flags are set at once usually. + /* + * XXX: In Linux, sharing of fs info (chroot/cwd/umask) + * and open files is independant. In FreeBSD, its in one + * structure but in reality it does not make any problems + * because both of these flags are set at once usually. */ if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; @@ -624,7 +607,7 @@ PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); } - + /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ @@ -638,7 +621,7 @@ p2->p_pgrp = td->td_proc->p_pgrp; PROC_UNLOCK(p2); #endif - exit_signal = 0; + exit_signal = 0; } if (args->flags & CLONE_CHILD_SETTID) @@ -654,7 +637,8 @@ EMUL_UNLOCK(&emul_lock); if (args->flags & CLONE_PARENT_SETTID) { - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); + error = copyout(&p2->p_pid, args->parent_tidptr, + sizeof(p2->p_pid)); if (error) printf(LMSG("copyout failed!")); } @@ -663,40 +647,47 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* - * in a case of stack = NULL we are supposed to COW calling process stack - * this is what normal fork() does so we just keep the tf_rsp arg intact + /* + * In a case of stack = NULL, we are supposed to COW calling process + * stack. This is what normal fork() does, so we just keep tf_rsp arg + * intact. */ if (args->stack) - td2->td_frame->tf_rsp = PTROUT(args->stack); + td2->td_frame->tf_rsp = PTROUT(args->stack); if (args->flags & CLONE_SETTLS) { struct user_segment_descriptor sd; - struct l_user_desc info; + struct l_user_desc info; int a[2]; - int idx; + int idx; - error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); + error = copyin((void *)td->td_frame->tf_rsi, &info, + sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { - + idx = info.entry_number; - + /* - * looks like we're getting the idx we returned - * in the set_thread_area() syscall + * It looks like we're getting the idx we returned + * in the set_thread_area() syscall. */ if (idx != 6 && idx != GUGS32_SEL) { printf(LMSG("resetting idx!")); idx = 6; /* or GUGS32_SEL? */ - } + } /* this doesnt happen in practice */ if (idx == 6) { - /* we might copy out the entry_number as GUGS32_SEL */ + /* + * We might copy out the entry_number + * as GUGS32_SEL. + */ info.entry_number = GUGS32_SEL; - error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); + error = copyout(&info, + (void *)td->td_frame->tf_rsi, + sizeof(struct l_user_desc)); if (error) printf(LMSG("copyout failed!")); } @@ -707,21 +698,14 @@ memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG if (ldebug(clone)) - printf("Segment created in clone with CLONE_SETTLS: " - "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " - "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " - "def32: %i, gran: %i\n", - sd.sd_lobase, - sd.sd_hibase, - sd.sd_lolimit, - sd.sd_hilimit, - sd.sd_type, - sd.sd_dpl, - sd.sd_p, - sd.sd_xx, - sd.sd_long, - sd.sd_def32, - sd.sd_gran); + printf("Segment created in clone with " + "CLONE_SETTLS: lobase: %x, hibase: %x, " + "lolimit: %x, hilimit: %x, type: %i, " + "dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", sd.sd_lobase, + sd.sd_hibase, sd.sd_lolimit, sd.sd_hilimit, + sd.sd_type, sd.sd_dpl, sd.sd_p, sd.sd_xx, + sd.sd_long, sd.sd_def32, sd.sd_gran); #endif td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; td2->td_pcb->pcb_gs32sd = sd; @@ -733,8 +717,9 @@ #ifdef DEBUG if (ldebug(clone)) - printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), - (long)p2->p_pid, args->stack, exit_signal); + printf(LMSG("clone: successful rfork to %d, " + "stack %p sig = %d"), (int)p2->p_pid, args->stack, + exit_signal); #endif if (args->flags & CLONE_VFORK) { PROC_LOCK(p2); @@ -752,12 +737,12 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; - + if (args->flags & CLONE_VFORK) { - /* wait for the children to exit, ie. emulate vfork */ - PROC_LOCK(p2); + /* wait for the children to exit, ie. emulate vfork */ + PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) - msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); } @@ -776,8 +761,8 @@ #ifdef DEBUG if (ldebug(mmap2)) - printf(ARGS(mmap2, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)args->addr, args->len, args->prot, + printf(ARGS(mmap2, "0x%08x, %d, %d, 0x%08x, %d, %d"), + args->addr, args->len, args->prot, args->flags, args->fd, args->pgoff); #endif @@ -803,10 +788,9 @@ #ifdef DEBUG if (ldebug(mmap)) - printf(ARGS(mmap, "%p, %d, %d, 0x%08x, %d, %d"), - (void *)(intptr_t)linux_args.addr, linux_args.len, - linux_args.prot, linux_args.flags, linux_args.fd, - linux_args.pgoff); + printf(ARGS(mmap, "0x%08x, %d, %d, 0x%08x, %d, %d"), + linux_args.addr, linux_args.len, linux_args.prot, + linux_args.flags, linux_args.fd, linux_args.pgoff); #endif if ((linux_args.pgoff % PAGE_SIZE) != 0) return (EINVAL); @@ -891,14 +875,14 @@ bsd_args.fd = linux_args->fd; if (linux_args->flags & LINUX_MAP_GROWSDOWN) { - /* - * The linux MAP_GROWSDOWN option does not limit auto + /* + * The Linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option * takes as addr the inital BOS, and as len, the initial * region size. It can then grow down from addr without - * limit. However, linux threads has an implicit internal + * limit. However, Linux threads has an implicit internal * limit to stack size of STACK_SIZE. Its just not - * enforced explicitly in linux. But, here we impose + * enforced explicitly in Linux. But, here we impose * a limit of (STACK_SIZE - GUARD_SIZE) on the stack * region, since we can do this with our mmap. * @@ -915,8 +899,8 @@ if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len > p->p_vmspace->vm_maxsaddr) { - /* - * Some linux apps will attempt to mmap + /* + * Some Linux apps will attempt to mmap * thread stacks near the top of their * address space. If their TOS is greater * than vm_maxsaddr, vm_map_growstack() @@ -943,7 +927,7 @@ else bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* + /* * This gives us a new BOS. If we're using VM_STACK, then * mmap will just map the top SGROWSIZ bytes, and let * the stack grow down to the limit at BOS. If we're @@ -1261,7 +1245,8 @@ } int -linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args) +linux_set_thread_area(struct thread *td, + struct linux_set_thread_area_args *args) { struct l_user_desc info; struct user_segment_descriptor sd; @@ -1275,47 +1260,43 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i"), - info.entry_number, - info.base_addr, - info.limit, - info.seg_32bit, - info.contents, - info.read_exec_only, - info.limit_in_pages, - info.seg_not_present, - info.useable); + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, " + "%i, %i, %i"), info.entry_number, info.base_addr, + info.limit, info.seg_32bit, info.contents, + info.read_exec_only, info.limit_in_pages, + info.seg_not_present, info.useable); #endif idx = info.entry_number; - /* - * Semantics of linux version: every thread in the system has array - * of 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This - * syscall loads one of the selected tls decriptors with a value - * and also loads GDT descriptors 6, 7 and 8 with the content of the per-thread - * descriptors. + /* + * Semantics of Linux version: every thread in the system has array + * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. + * This syscall loads one of the selected TLS decriptors with a value + * and also loads GDT descriptors 6, 7 and 8 with the content of + * the per-thread descriptors. * - * Semantics of fbsd version: I think we can ignore that linux has 3 per-thread - * descriptors and use just the 1st one. The tls_array[] is used only in - * set/get-thread_area() syscalls and for loading the GDT descriptors. In fbsd - * we use just one GDT descriptor for TLS so we will load just one. - * XXX: this doesnt work when user-space process tries to use more then 1 TLS segment - * comment in the linux sources says wine might do that. + * Semantics of FreeBSD version: I think we can ignore that Linux has + * three per-thread descriptors and use just the first one. + * The tls_array[] is used only in [gs]et_thread_area() syscalls and + * for loading the GDT descriptors. We use just one GDT descriptor + * for TLS, so we will load just one. + * XXX: This doesnt work when user-space process tries to use more + * than one TLS segment. Comment in the Linux source says wine might + * do that. */ - /* - * we support just GLIBC TLS now - * we should let 4 proceed as well because we use this segment so - * if code does two subsequent calls it should succeed + /* + * GLIBC reads current %gs and call set_thread_area() with it. + * We should let GUGS32_SEL proceed as well because we use this + * segment. */ if (idx != 6 && idx != -1 && idx != GUGS32_SEL) return (EINVAL); - /* - * we have to copy out the GDT entry we use - * FreeBSD uses GUGS32_SEL for storing %gs so load that - * XXX: what if userspace program doesnt check this value and tries - * to use 6, 7 or 8? + /* + * We have to copy out the GDT entry we use. + * XXX: What if userspace program does not check return value and + * tries to use 6, 7 or 8? */ idx = info.entry_number = GUGS32_SEL; error = copyout(&info, args->desc, sizeof(struct l_user_desc)); From owner-p4-projects@FreeBSD.ORG Tue Feb 20 21:22:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35ED116A8A4; Tue, 20 Feb 2007 21:22:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C64DF16C6DE for ; Tue, 20 Feb 2007 21:22:39 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B53BA13C481 for ; Tue, 20 Feb 2007 21:22:39 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1KLMdCQ029793 for ; Tue, 20 Feb 2007 21:22:39 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1KLMdXR029790 for perforce@freebsd.org; Tue, 20 Feb 2007 21:22:39 GMT (envelope-from jkim@freebsd.org) Date: Tue, 20 Feb 2007 21:22:39 GMT Message-Id: <200702202122.l1KLMdXR029790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114771 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, 20 Feb 2007 21:22:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=114771 Change 114771 by jkim@jkim_hammer on 2007/02/20 21:21:45 - Check GUDATA_SEL for set_thread_area(). It is default selector for %gs. - Force GUGS32_SEL for clone with CLONE_SETTLS. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#40 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#40 (text+ko) ==== @@ -659,39 +659,19 @@ struct user_segment_descriptor sd; struct l_user_desc info; int a[2]; - int idx; error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); if (error) { printf(LMSG("copyin failed!")); } else { + /* We might copy out the entry_number as GUGS32_SEL. */ + info.entry_number = GUGS32_SEL; + error = copyout(&info, (void *)td->td_frame->tf_rsi, + sizeof(struct l_user_desc)); + if (error) + printf(LMSG("copyout failed!")); - idx = info.entry_number; - - /* - * It looks like we're getting the idx we returned - * in the set_thread_area() syscall. - */ - if (idx != 6 && idx != GUGS32_SEL) { - printf(LMSG("resetting idx!")); - idx = 6; /* or GUGS32_SEL? */ - } - - /* this doesnt happen in practice */ - if (idx == 6) { - /* - * We might copy out the entry_number - * as GUGS32_SEL. - */ - info.entry_number = GUGS32_SEL; - error = copyout(&info, - (void *)td->td_frame->tf_rsi, - sizeof(struct l_user_desc)); - if (error) - printf(LMSG("copyout failed!")); - } - a[0] = LDT_entry_a(&info); a[1] = LDT_entry_b(&info); @@ -1252,7 +1232,6 @@ struct user_segment_descriptor sd; int a[2]; int error; - int idx; error = copyin(args->desc, &info, sizeof(struct l_user_desc)); if (error) @@ -1267,7 +1246,6 @@ info.seg_not_present, info.useable); #endif - idx = info.entry_number; /* * Semantics of Linux version: every thread in the system has array * of three TLS descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. @@ -1287,18 +1265,25 @@ /* * GLIBC reads current %gs and call set_thread_area() with it. - * We should let GUGS32_SEL proceed as well because we use this - * segment. + * We should let GUDATA_SEL and GUGS32_SEL proceed as well because + * we use these segments. */ - if (idx != 6 && idx != -1 && idx != GUGS32_SEL) + switch (info.entry_number) { + case GUGS32_SEL: + case GUDATA_SEL: + case 6: + case -1: + info.entry_number = GUGS32_SEL; + break; + default: return (EINVAL); + } /* * We have to copy out the GDT entry we use. * XXX: What if userspace program does not check return value and * tries to use 6, 7 or 8? */ - idx = info.entry_number = GUGS32_SEL; error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Tue Feb 20 23:42:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8148016BB34; Tue, 20 Feb 2007 23:42:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 577F216B798 for ; Tue, 20 Feb 2007 23:42:45 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46C4513C478 for ; Tue, 20 Feb 2007 23:42:45 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1KNgj2Z056895 for ; Tue, 20 Feb 2007 23:42:45 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1KNgiGr056886 for perforce@freebsd.org; Tue, 20 Feb 2007 23:42:44 GMT (envelope-from jkim@freebsd.org) Date: Tue, 20 Feb 2007 23:42:44 GMT Message-Id: <200702202342.l1KNgiGr056886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 114776 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, 20 Feb 2007 23:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114776 Change 114776 by jkim@jkim_hammer on 2007/02/20 23:41:57 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.46 2007/02/15 17:21:31 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.48 2007/02/20 17:32:30 luigi Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -157,6 +157,7 @@ static int iwi_reset(struct iwi_softc *); static int iwi_load_ucode(struct iwi_softc *, const struct iwi_fw *); static int iwi_load_firmware(struct iwi_softc *, const struct iwi_fw *); +static void iwi_release_fw_dma(struct iwi_softc *sc); static int iwi_config(struct iwi_softc *); static int iwi_get_firmware(struct iwi_softc *); static void iwi_put_firmware(struct iwi_softc *); @@ -331,34 +332,17 @@ goto fail; } - error = iwi_alloc_tx_ring(sc, &sc->txq[0], IWI_TX_RING_COUNT, - IWI_CSR_TX1_RIDX, IWI_CSR_TX1_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 1\n"); - goto fail; + for (i = 0; i < 4; i++) { + error = iwi_alloc_tx_ring(sc, &sc->txq[i], IWI_TX_RING_COUNT, + IWI_CSR_TX1_RIDX + i * 4, + IWI_CSR_TX1_WIDX + i * 4); + if (error != 0) { + device_printf(dev, "could not allocate Tx ring %d\n", + i+i); + goto fail; + } } - error = iwi_alloc_tx_ring(sc, &sc->txq[1], IWI_TX_RING_COUNT, - IWI_CSR_TX2_RIDX, IWI_CSR_TX2_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 2\n"); - goto fail; - } - - error = iwi_alloc_tx_ring(sc, &sc->txq[2], IWI_TX_RING_COUNT, - IWI_CSR_TX3_RIDX, IWI_CSR_TX3_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 3\n"); - goto fail; - } - - error = iwi_alloc_tx_ring(sc, &sc->txq[3], IWI_TX_RING_COUNT, - IWI_CSR_TX4_RIDX, IWI_CSR_TX4_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 4\n"); - goto fail; - } - if (iwi_alloc_rx_ring(sc, &sc->rxq, IWI_RX_RING_COUNT) != 0) { device_printf(dev, "could not allocate Rx ring\n"); goto fail; @@ -496,6 +480,7 @@ ieee80211_ifdetach(ic); } iwi_put_firmware(sc); + iwi_release_fw_dma(sc); iwi_free_cmd_ring(sc, &sc->cmdq); iwi_free_tx_ring(sc, &sc->txq[0]); @@ -970,6 +955,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; + IWI_LOCK_CHECK(sc); DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, ieee80211_state_name[ic->ic_state], ieee80211_state_name[nstate], sc->flags)); @@ -1216,6 +1202,7 @@ { struct ieee80211com *ic = &sc->sc_ic; + IWI_LOCK_CHECK(sc); ic->ic_curchan = &ic->ic_channels[chan]; sc->curchan = chan; @@ -1709,6 +1696,8 @@ { struct iwi_cmd_desc *desc; + IWI_LOCK_CHECK(sc); + if (sc->flags & IWI_FLAG_BUSY) { device_printf(sc->sc_dev, "%s: cmd %d not sent, busy\n", __func__, type); @@ -1771,6 +1760,7 @@ int error, nsegs, hdrlen, i; int ismcast, flags, xflags, staid; + IWI_LOCK_CHECK(sc); wh = mtod(m0, const struct ieee80211_frame *); /* NB: only data frames use this path */ hdrlen = ieee80211_hdrsize(wh); @@ -2064,6 +2054,13 @@ IWI_LOCK(sc); + /* + * wait until pending iwi_cmd() are completed, to avoid races + * that could cause problems. + */ + while (sc->flags & IWI_FLAG_BUSY) + msleep(sc, &sc->sc_mtx, 0, "iwiioctl", hz); + switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { @@ -2080,7 +2077,6 @@ */ sc->sc_rfkill_timer = 0; } - iwi_put_firmware(sc); } break; @@ -2107,6 +2103,8 @@ uint32_t tmp; int ntries; + IWI_LOCK_CHECK(sc); + /* disable interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); @@ -2223,6 +2221,7 @@ * This is necessary because we re-init the device sometimes * from a context where we cannot read from the filesystem * (e.g. from the taskqueue thread when rfkill is re-enabled). + * XXX return 0 on success, 1 on error. * * NB: the order of get'ing and put'ing images here is * intentional to support handling firmware images bundled @@ -2306,33 +2305,38 @@ /* * Check and setup combined image. */ - if (fp->datasize < sizeof(hdr)) { + if (fp->datasize < sizeof(struct iwi_firmware_hdr)) { device_printf(sc->sc_dev, "image '%s' too small\n", fp->name); goto bad; } hdr = (const struct iwi_firmware_hdr *)fp->data; - if (fp->datasize < sizeof(*hdr) + hdr->bsize + hdr->usize + hdr->fsize) { + if (fp->datasize < sizeof(*hdr) + le32toh(hdr->bsize) + le32toh(hdr->usize) + + le32toh(hdr->fsize)) { device_printf(sc->sc_dev, "image '%s' too small (2)\n", fp->name); goto bad; } sc->fw_boot.data = ((const char *) fp->data) + sizeof(*hdr); - sc->fw_boot.size = hdr->bsize; + sc->fw_boot.size = le32toh(hdr->bsize); sc->fw_boot.name = fp->name; sc->fw_uc.data = sc->fw_boot.data + sc->fw_boot.size; - sc->fw_uc.size = hdr->usize; + sc->fw_uc.size = le32toh(hdr->usize); sc->fw_uc.name = fp->name; sc->fw_fw.data = sc->fw_uc.data + sc->fw_uc.size; - sc->fw_fw.size = hdr->fsize; + sc->fw_fw.size = le32toh(hdr->fsize); sc->fw_fw.name = fp->name; } +#if 0 + device_printf(sc->sc_dev, "boot %d ucode %d fw %d bytes\n", + sc->fw_boot.size, sc->fw_uc.size, sc->fw_fw.size); +#endif sc->fw_mode = ic->ic_opmode; - return 1; + return 0; bad: iwi_put_firmware(sc); - return 0; + return 1; } static void @@ -2367,6 +2371,7 @@ size_t size = fw->size; int i, ntries, error; + IWI_LOCK_CHECK(sc); error = 0; CSR_WRITE_4(sc, IWI_CSR_RST, CSR_READ_4(sc, IWI_CSR_RST) | IWI_RST_STOP_MASTER); @@ -2439,6 +2444,7 @@ uint32_t sentinel, ctl, src, dst, sum, len, mlen, tmp; int ntries, error; + IWI_LOCK_CHECK(sc); /* copy firmware image to DMA memory */ memcpy(sc->fw_virtaddr, fw->data, fw->size); @@ -2498,12 +2504,13 @@ break; DELAY(100); } + /* sync dma, just in case */ + bus_dmamap_sync(sc->fw_dmat, sc->fw_map, BUS_DMASYNC_POSTWRITE); if (ntries == 400) { device_printf(sc->sc_dev, "timeout processing command blocks for %s firmware\n", fw->name); - error = EIO; - goto fail5; + return EIO; } /* we're done with command blocks processing */ @@ -2524,7 +2531,6 @@ "initialization to complete\n", fw->name); } -fail5: return error; } @@ -2580,6 +2586,7 @@ struct iwi_txpower power; uint32_t data; int error, i; + IWI_LOCK_CHECK(sc); IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":")); @@ -2707,6 +2714,8 @@ struct iwi_scan_ext scan; int i, ix, start, scan_type, error; + IWI_LOCK_CHECK(sc); + memset(&scan, 0, sizeof scan); /* XXX different dwell times for different scan types */ @@ -2908,7 +2917,8 @@ struct iwi_rateset rs; uint16_t capinfo; int error; - + + IWI_LOCK_CHECK(sc); if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { memset(&config, 0, sizeof config); config.bluetooth_coexistence = sc->bluetooth; @@ -3077,6 +3087,66 @@ IWI_UNLOCK(sc); } +/* + * release dma resources for the firmware + */ +static void +iwi_release_fw_dma(struct iwi_softc *sc) +{ + if (sc->fw_flags & IWI_FW_HAVE_PHY) + bus_dmamap_unload(sc->fw_dmat, sc->fw_map); + if (sc->fw_flags & IWI_FW_HAVE_MAP) + bus_dmamem_free(sc->fw_dmat, sc->fw_virtaddr, sc->fw_map); + if (sc->fw_flags & IWI_FW_HAVE_DMAT) + bus_dma_tag_destroy(sc->fw_dmat); + + sc->fw_flags = 0; + sc->fw_dma_size = 0; + sc->fw_dmat = NULL; + sc->fw_map = NULL; + sc->fw_physaddr = 0; + sc->fw_virtaddr = NULL; +} + +/* + * allocate the dma descriptor for the firmware. + * Return 0 on success, 1 on error. + * Must be called unlocked, protected by IWI_FLAG_FW_LOADING. + */ +static int +iwi_init_fw_dma(struct iwi_softc *sc, int size) +{ + if (sc->fw_dma_size > size) + return 0; + if (bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + size, 1, size, 0, NULL, NULL, &sc->fw_dmat) != 0) { + device_printf(sc->sc_dev, + "could not create firmware DMA tag\n"); + goto error; + } + sc->fw_flags |= IWI_FW_HAVE_DMAT; + if (bus_dmamem_alloc(sc->fw_dmat, &sc->fw_virtaddr, 0, + &sc->fw_map) != 0) { + device_printf(sc->sc_dev, + "could not allocate firmware DMA memory\n"); + goto error; + } + sc->fw_flags |= IWI_FW_HAVE_MAP; + if (bus_dmamap_load(sc->fw_dmat, sc->fw_map, sc->fw_virtaddr, + size, iwi_dma_map_addr, &sc->fw_physaddr, 0) != 0) { + device_printf(sc->sc_dev, "could not load firmware DMA map\n"); + goto error; + } + sc->fw_flags |= IWI_FW_HAVE_PHY; + sc->fw_dma_size = size; + return 0; + +error: + iwi_release_fw_dma(sc); + return 1; +} + static void iwi_init_locked(void *priv, int force) { @@ -3087,8 +3157,11 @@ int i; IWI_LOCK_DECL; - if (sc->flags & IWI_FLAG_FW_LOADING) + IWI_LOCK_CHECK(sc); + if (sc->flags & IWI_FLAG_FW_LOADING) { + device_printf(sc->sc_dev, "%s: already loading\n", __func__); return; /* XXX: condvar? */ + } iwi_stop(sc); @@ -3100,53 +3173,34 @@ sc->flags |= IWI_FLAG_FW_LOADING; IWI_UNLOCK(sc); - if (!iwi_get_firmware(sc)) { + if (iwi_get_firmware(sc)) { IWI_LOCK(sc); goto fail; } /* allocate DMA memory for mapping firmware image */ - if (sc->fw_boot.size > sc->fw_dma_size) - sc->fw_dma_size = sc->fw_boot.size; - if (sc->fw_fw.size > sc->fw_dma_size) - sc->fw_dma_size = sc->fw_fw.size; - if (sc->fw_uc.size > sc->fw_dma_size) - sc->fw_dma_size = sc->fw_uc.size; - - if (bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 4, 0, - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - sc->fw_dma_size, 1, sc->fw_dma_size, 0, NULL, NULL, - &sc->fw_dmat) != 0) { - device_printf(sc->sc_dev, - "could not create firmware DMA tag\n"); + i = sc->fw_fw.size; + if (sc->fw_boot.size > i) + i = sc->fw_boot.size; + /* XXX do we dma the ucode as well ? */ + if (sc->fw_uc.size > i) + i = sc->fw_uc.size; + if (iwi_init_fw_dma(sc, i)) { IWI_LOCK(sc); goto fail; } - if (bus_dmamem_alloc(sc->fw_dmat, &sc->fw_virtaddr, 0, - &sc->fw_map) != 0) { - device_printf(sc->sc_dev, - "could not allocate firmware DMA memory\n"); - IWI_LOCK(sc); - goto fail2; - } - if (bus_dmamap_load(sc->fw_dmat, sc->fw_map, sc->fw_virtaddr, - sc->fw_dma_size, iwi_dma_map_addr, &sc->fw_physaddr, 0) != 0) { - device_printf(sc->sc_dev, "could not load firmware DMA map\n"); - IWI_LOCK(sc); - goto fail3; - } IWI_LOCK(sc); if (iwi_load_firmware(sc, &sc->fw_boot) != 0) { device_printf(sc->sc_dev, "could not load boot firmware %s\n", sc->fw_boot.name); - goto fail4; + goto fail; } if (iwi_load_ucode(sc, &sc->fw_uc) != 0) { device_printf(sc->sc_dev, "could not load microcode %s\n", sc->fw_uc.name); - goto fail4; + goto fail; } iwi_stop_master(sc); @@ -3181,15 +3235,10 @@ if (iwi_load_firmware(sc, &sc->fw_fw) != 0) { device_printf(sc->sc_dev, "could not load main firmware %s\n", sc->fw_fw.name); - goto fail4; + goto fail; } sc->flags |= IWI_FLAG_FW_INITED; - bus_dmamap_sync(sc->fw_dmat, sc->fw_map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->fw_dmat, sc->fw_map); - bus_dmamem_free(sc->fw_dmat, sc->fw_virtaddr, sc->fw_map); - bus_dma_tag_destroy(sc->fw_dmat); - if (iwi_config(sc) != 0) { device_printf(sc->sc_dev, "device configuration failed\n"); goto fail; @@ -3213,10 +3262,6 @@ sc->flags &= ~IWI_FLAG_FW_LOADING; return; -fail4: bus_dmamap_sync(sc->fw_dmat, sc->fw_map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->fw_dmat, sc->fw_map); -fail3: bus_dmamem_free(sc->fw_dmat, sc->fw_virtaddr, sc->fw_map); -fail2: bus_dma_tag_destroy(sc->fw_dmat); fail: ifp->if_flags &= ~IFF_UP; sc->flags &= ~IWI_FLAG_FW_LOADING; iwi_stop(sc); @@ -3230,6 +3275,7 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; + IWI_LOCK_CHECK(sc); /* XXX: pretty sure this triggers */ if (sc->sc_softled) { callout_stop(&sc->sc_ledtimer); sc->sc_blinking = 0; ==== //depot/projects/linuxolator/src/sys/dev/iwi/if_iwireg.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.13 2006/10/23 00:34:07 mlaier Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.14 2007/02/20 14:29:09 luigi Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -134,7 +134,10 @@ #define IWI_RATE_OFDM48 1 #define IWI_RATE_OFDM54 3 -/* firmware binary image header, fields in little endian */ +/* + * Old version firmware images start with this header, + * fields are in little endian (le32) format. + */ struct iwi_firmware_ohdr { uint32_t version; uint32_t mode; @@ -150,6 +153,11 @@ #define IWI_FW_MODE_IBSS 1 #define IWI_FW_MODE_MONITOR 2 +/* + * New version firmware images contain boot, ucode and firmware + * all in one chunk. The header at the beginning gives the version + * and the size of each (sub)image, in le32 format. + */ struct iwi_firmware_hdr { uint32_t version; /* version stamp */ uint32_t bsize; /* size of boot image */ ==== //depot/projects/linuxolator/src/sys/dev/iwi/if_iwivar.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwivar.h,v 1.12 2007/02/15 17:21:31 luigi Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwivar.h,v 1.14 2007/02/20 17:32:30 luigi Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -149,7 +149,22 @@ int mem_rid; int irq_rid; + /* + * The card needs external firmware images to work, which is made of a + * bootloader, microcode and firmware proper. In version 3.00 and + * above, all pieces are contained in a single image, preceded by a + * struct iwi_firmware_hdr indicating the size of the 3 pieces. + * Old firmware < 3.0 has separate boot and ucode, so we need to + * load all of them explicitly. + * To avoid issues related to fragmentation, we keep the block of + * dma-ble memory around until detach time, and reallocate it when + * it becomes too small. fw_dma_size is the size currently allocated. + */ int fw_dma_size; + uint32_t fw_flags; /* allocation status */ +#define IWI_FW_HAVE_DMAT 0x01 +#define IWI_FW_HAVE_MAP 0x02 +#define IWI_FW_HAVE_PHY 0x04 bus_dma_tag_t fw_dmat; bus_dmamap_t fw_map; bus_addr_t fw_physaddr; @@ -216,6 +231,10 @@ * and must be kept in sync. */ #define IWI_LOCK_DECL int __waslocked = 0 +#define IWI_LOCK_CHECK(sc) do { \ + if (!mtx_owned(&(sc)->sc_mtx)) \ + DPRINTF(("%s iwi_lock not held\n", __func__)); \ +} while (0) #define IWI_LOCK(sc) do { \ if (!(__waslocked = mtx_owned(&(sc)->sc_mtx))) \ mtx_lock(&(sc)->sc_mtx); \ ==== //depot/projects/linuxolator/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.57 2007/02/19 13:33:09 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.58 2007/02/20 00:12:52 rwatson Exp $"); #include "opt_mac.h" @@ -596,7 +596,6 @@ */ case PRIV_IPC_READ: case PRIV_IPC_WRITE: - case PRIV_IPC_EXEC: case PRIV_IPC_ADMIN: case PRIV_IPC_MSGSIZE: case PRIV_MQ_ADMIN: ==== //depot/projects/linuxolator/src/sys/kern/sysv_ipc.c#4 (text+ko) ==== @@ -1,8 +1,12 @@ /* $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */ /*- * Copyright (c) 1994 Herb Peyerl + * Copyright (c) 2006 nCircle Network Security, Inc. * All rights reserved. * + * This software was developed by Robert N. M. Watson for the TrustedBSD + * Project under contract to nCircle Network Security, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -30,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_ipc.c,v 1.31 2006/12/16 11:30:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_ipc.c,v 1.33 2007/02/20 00:06:59 rwatson Exp $"); #include "opt_sysvipc.h" @@ -39,6 +43,7 @@ #include #include #include +#include #include #include @@ -72,50 +77,76 @@ * Note: The MAC Framework does not require any modifications to the * ipcperm() function, as access control checks are performed throughout the * implementation of each primitive. Those entry point calls complement the - * ipcperm() discertionary checks. + * ipcperm() discertionary checks. Unlike file system discretionary access + * control, the original create of an object is given the same rights as the + * current owner. */ int -ipcperm(td, perm, mode) - struct thread *td; - struct ipc_perm *perm; - int mode; +ipcperm(struct thread *td, struct ipc_perm *perm, int acc_mode) { struct ucred *cred = td->td_ucred; - int error; + int error, obj_mode, dac_granted, priv_granted; - if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) { - /* - * For a non-create/owner, we require privilege to - * modify the object protections. Note: some other - * implementations permit IPC_M to be delegated to - * unprivileged non-creator/owner uids/gids. - */ - if (mode & IPC_M) { - error = suser(td); - if (error) - return (error); - } - /* - * Try to match against creator/owner group; if not, fall - * back on other. - */ - mode >>= 3; - if (!groupmember(perm->gid, cred) && - !groupmember(perm->cgid, cred)) - mode >>= 3; + dac_granted = 0; + if (cred->cr_uid == perm->cuid || cred->cr_uid == perm->uid) { + obj_mode = perm->mode; + dac_granted |= IPC_M; + } else if (groupmember(perm->gid, cred) || + groupmember(perm->cgid, cred)) { + obj_mode = perm->mode; + obj_mode <<= 3; } else { - /* - * Always permit the creator/owner to update the object - * protections regardless of whether the object mode - * permits it. - */ - if (mode & IPC_M) - return (0); + obj_mode = perm->mode; + obj_mode <<= 6; + } + + /* + * While the System V IPC permission model allows IPC_M to be + * granted, as part of the mode, our implementation requires + * privilege to adminster the object if not the owner or creator. + */ +#if 0 + if (obj_mode & IPC_M) + dac_granted |= IPC_M; +#endif + if (obj_mode & IPC_R) + dac_granted |= IPC_R; + if (obj_mode & IPC_W) + dac_granted |= IPC_W; + + /* + * Simple case: all required rights are granted by DAC. + */ + if ((dac_granted & acc_mode) == acc_mode) + return (0); + + /* + * Privilege is required to satisfy the request. + */ + priv_granted = 0; + if ((acc_mode & IPC_M) && !(dac_granted & IPC_M)) { + error = priv_check_cred(td->td_ucred, PRIV_IPC_ADMIN, + SUSER_ALLOWJAIL); + if (error == 0) + priv_granted |= IPC_M; + } + + if ((acc_mode & IPC_R) && !(dac_granted & IPC_R)) { + error = priv_check_cred(td->td_ucred, PRIV_IPC_READ, + SUSER_ALLOWJAIL); + if (error == 0) + priv_granted |= IPC_R; } - if ((mode & perm->mode) != mode) { - if (suser(td) != 0) - return (EACCES); + if ((acc_mode & IPC_W) && !(dac_granted & IPC_W)) { + error = priv_check_cred(td->td_ucred, PRIV_IPC_WRITE, + SUSER_ALLOWJAIL); + if (error == 0) + priv_granted |= IPC_W; } - return (0); + + if (((dac_granted | priv_granted) & acc_mode) == acc_mode) + return (0); + else + return (EACCES); } ==== //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#4 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.108 2006/10/22 11:52:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sysv_shm.c,v 1.109 2007/02/19 22:56:10 rwatson Exp $"); #include "opt_compat.h" #include "opt_sysvipc.h" @@ -722,9 +722,6 @@ if (error != 0) return (error); #endif - error = ipcperm(td, &shmseg->u.shm_perm, mode); - if (error) - return (error); if (uap->size && uap->size > shmseg->u.shm_segsz) return (EINVAL); td->td_retval[0] = IXSEQ_TO_IPCID(segnum, shmseg->u.shm_perm); ==== //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#8 (text+ko) ==== @@ -41,12 +41,13 @@ * connected in pairs (socketpair(2)), or bound/connected to using the file * system name space. For most purposes, only the receive socket buffer is * used, as sending on one socket delivers directly to the receive socket - * buffer of a second socket. The implementation is substantially - * complicated by the fact that "ancillary data", such as file descriptors or - * credentials, may be passed across UNIX domain sockets. The potential for - * passing UNIX domain sockets over other UNIX domain sockets requires the - * implementation of a simple garbage collector to find and tear down cycles - * of disconnected sockets. + * buffer of a second socket. + * + * The implementation is substantially complicated by the fact that + * "ancillary data", such as file descriptors or credentials, may be passed + * across UNIX domain sockets. The potential for passing UNIX domain sockets + * over other UNIX domain sockets requires the implementation of a simple + * garbage collector to find and tear down cycles of disconnected sockets. * * TODO: * SEQPACKET, RDM @@ -56,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.194 2007/02/14 15:05:40 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.195 2007/02/20 10:50:02 rwatson Exp $"); #include "opt_mac.h" @@ -184,7 +185,7 @@ static int unp_internalize(struct mbuf **, struct thread *); static int unp_listen(struct socket *, struct unpcb *, int, struct thread *); -struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); +static struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); /* * Definitions of protocols supported in the LOCAL domain. @@ -461,10 +462,6 @@ unp->unp_gencnt = ++unp_gencnt; --unp_count; if ((vp = unp->unp_vnode) != NULL) { - /* - * XXXRW: should v_socket be frobbed only while holding - * Giant? - */ unp->unp_vnode->v_socket = NULL; unp->unp_vnode = NULL; } @@ -1557,7 +1554,7 @@ return (error); } -struct mbuf * +static struct mbuf * unp_addsockcred(struct thread *td, struct mbuf *control) { struct mbuf *m, *n, *n_prev; ==== //depot/projects/linuxolator/src/sys/net/if_ppp.c#6 (text+ko) ==== @@ -71,7 +71,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $FreeBSD: src/sys/net/if_ppp.c,v 1.119 2006/12/05 18:54:21 ume Exp $ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.120 2007/02/20 15:20:36 rwatson Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -719,7 +719,8 @@ * XXXRW: Isn't this suser() check redundant to the one at the ifnet * layer? */ - if ((error = suser(td)) != 0) + error = priv_check(td, PRIV_NET_SETIFMTU); + if (error) break; if (ifr->ifr_mtu > PPP_MAXMTU) error = EINVAL; ==== //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.312 2007/02/01 18:32:13 andre Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.313 2007/02/20 10:20:02 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -105,9 +105,9 @@ SYSCTL_STRUCT(_net_inet_tcp, TCPCTL_STATS, stats, CTLFLAG_RW, &tcpstat , tcpstat, "TCP statistics (struct tcpstat, netinet/tcp_var.h)"); -static int log_in_vain = 0; +static int tcp_log_in_vain = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_in_vain, CTLFLAG_RW, - &log_in_vain, 0, "Log all incoming TCP connections"); + &tcp_log_in_vain, 0, "Log all incoming TCP connections"); static int blackhole = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, blackhole, CTLFLAG_RW, @@ -714,7 +714,7 @@ * but should either do a listen or a connect soon. */ if (inp == NULL) { - if (log_in_vain) { + if (tcp_log_in_vain) { #ifdef INET6 char dbuf[INET6_ADDRSTRLEN+2], sbuf[INET6_ADDRSTRLEN+2]; #else @@ -736,7 +736,7 @@ strcpy(dbuf, inet_ntoa(ip->ip_dst)); strcpy(sbuf, inet_ntoa(ip->ip_src)); } - switch (log_in_vain) { + switch (tcp_log_in_vain) { case 1: if ((thflags & TH_SYN) == 0) break; ==== //depot/projects/linuxolator/src/sys/netinet/udp.h#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,14 +28,14 @@ * SUCH DAMAGE. * * @(#)udp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/udp.h,v 1.9 2005/01/07 01:45:45 imp Exp $ + * $FreeBSD: src/sys/netinet/udp.h,v 1.10 2007/02/20 10:13:11 rwatson Exp $ */ #ifndef _NETINET_UDP_H_ -#define _NETINET_UDP_H_ +#define _NETINET_UDP_H_ /* - * Udp protocol header. + * UDP protocol header. * Per RFC 768, September, 1981. */ struct udphdr { ==== //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#6 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,7 +28,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.200 2007/01/06 13:12:24 maxim Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.202 2007/02/20 10:20:02 rwatson Exp $ */ #include "opt_ipfw.h" @@ -79,11 +80,11 @@ #ifdef FAST_IPSEC #include -#endif /*FAST_IPSEC*/ +#endif #ifdef IPSEC #include -#endif /*IPSEC*/ +#endif #include @@ -95,33 +96,28 @@ */ /* - * BSD 4.2 defaulted the udp checksum to be off. Turning off udp - * checksums removes the only data integrity mechanism for packets and - * malformed packets that would otherwise be discarded by bad checksums - * may cause problems (especially for NFS data blocks). + * BSD 4.2 defaulted the udp checksum to be off. Turning off udp checksums + * removes the only data integrity mechanism for packets and malformed + * packets that would otherwise be discarded by bad checksums may cause + * problems (especially for NFS data blocks). */ -#ifndef COMPAT_42 static int udpcksum = 1; -#else -static int udpcksum = 0; -#endif -SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW, - &udpcksum, 0, ""); +SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW, &udpcksum, + 0, ""); -int log_in_vain = 0; +int udp_log_in_vain = 0; SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, - &log_in_vain, 0, "Log all incoming UDP packets"); + &udp_log_in_vain, 0, "Log all incoming UDP packets"); static int blackhole = 0; -SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_RW, - &blackhole, 0, "Do not send port unreachables for refused connects"); +SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_RW, &blackhole, 0, + "Do not send port unreachables for refused connects"); static int strict_mcast_mship = 0; SYSCTL_INT(_net_inet_udp, OID_AUTO, strict_mcast_mship, CTLFLAG_RW, - &strict_mcast_mship, 0, "Only send multicast to member sockets"); + &strict_mcast_mship, 0, "Only send multicast to member sockets"); struct inpcbhead udb; /* from udp_var.h */ -#define udb6 udb /* for KAME src sync over BSD*'s */ struct inpcbinfo udbinfo; #ifndef UDBHASHSIZE @@ -129,15 +125,15 @@ #endif struct udpstat udpstat; /* from udp_var.h */ -SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RW, - &udpstat, udpstat, "UDP statistics (struct udpstat, netinet/udp_var.h)"); +SYSCTL_STRUCT(_net_inet_udp, UDPCTL_STATS, stats, CTLFLAG_RW, &udpstat, + udpstat, "UDP statistics (struct udpstat, netinet/udp_var.h)"); -static void udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, - int off, struct sockaddr_in *udp_in); +static void udp_append(struct inpcb *last, struct ip *ip, struct mbuf *n, + int off, struct sockaddr_in *udp_in); -static void udp_detach(struct socket *so); -static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, - struct mbuf *, struct thread *); +static void udp_detach(struct socket *so); +static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, + struct mbuf *, struct thread *); static void udp_zone_change(void *tag) @@ -163,7 +159,7 @@ udbinfo.listhead = &udb; udbinfo.hashbase = hashinit(UDBHASHSIZE, M_PCB, &udbinfo.hashmask); udbinfo.porthashbase = hashinit(UDBHASHSIZE, M_PCB, - &udbinfo.porthashmask); + &udbinfo.porthashmask); udbinfo.ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(udbinfo.ipi_zone, maxsockets); @@ -172,14 +168,12 @@ } void -udp_input(m, off) - register struct mbuf *m; - int off; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 21 07:19:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF4AB16B5CB; Wed, 21 Feb 2007 07:19:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 29AE416AFAF; Wed, 21 Feb 2007 07:19:44 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id D46B213C442; Wed, 21 Feb 2007 07:19:43 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54A5DB60.dip.t-dialin.net [84.165.219.96]) by redbull.bpaserver.net (Postfix) with ESMTP id 592A02E0F7; Wed, 21 Feb 2007 08:19:37 +0100 (CET) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id 7D4D05B480D; Wed, 21 Feb 2007 08:19:34 +0100 (CET) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id l1L7JYdU057236; Wed, 21 Feb 2007 08:19:34 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Wed, 21 Feb 2007 08:19:34 +0100 Message-ID: <20070221081934.9xozhpf2m8088co8@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Wed, 21 Feb 2007 08:19:34 +0100 From: Alexander Leidinger To: Jung-uk Kim References: <200702192256.l1JMuKHH029284@repoman.freebsd.org> <20070220183754.GA51314@stud.fit.vutbr.cz> <200702201424.12916.jkim@FreeBSD.org> In-Reply-To: <200702201424.12916.jkim@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.3) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.787, required 8, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14, TW_HN 0.08) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Divacky Roman , Perforce Change Reviews Subject: Re: PERFORCE change 114732 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, 21 Feb 2007 07:19:45 -0000 Quoting Jung-uk Kim (from Tue, 20 Feb 2007 14:24:11 -0500= ): > On Tuesday 20 February 2007 01:37 pm, Divacky Roman wrote: >> On Mon, Feb 19, 2007 at 10:56:20PM +0000, Jung-uk Kim wrote: >> > http://perforce.freebsd.org/chv.cgi?CH=3D114732 >> > >> > Change 114732 by jkim@jkim_hammer on 2007/02/19 22:56:14 >> > >> > =09Finish TLS on amd64 support. >> > =09It may have rough edges but it seems usable. >> > =09Tested on a real UP machine and QEMU SMP. >> >> you are awesome! thnx for that... any tentative >> timeframe for an MFP4? > > I'd like to test clone syscalls with CLONE_SETTLS before I do that but > I couldn't find any reference code. Do you have one? Did you had a look at the glibc regression tests for nptl? Maybe =20 there's such code. I have a compile version of it at http://www.leidinger.net/FreeBSD/linuxolator/glibc24-install.tar.bz2 http://www.leidinger.net/FreeBSD/linuxolator/nptl-tests.tar.bz2 Extract both into /home/ziggo/alex/, cd into the nptl directory and =20 try to run one of the test you are interested in (not chrooted). Not =20 all tests succeed on i386, but I didn't had a look at the failures so =20 far. Bye, Alexander. --=20 Sometimes a cigar is just a cigar. =09=09-- Sigmund Freud http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137 From owner-p4-projects@FreeBSD.ORG Wed Feb 21 09:03:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B9516E18E; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BD9916DF16 for ; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1B32413C461 for ; Wed, 21 Feb 2007 09:03:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1L93nNl081397 for ; Wed, 21 Feb 2007 09:03:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1L93n2f081393 for perforce@freebsd.org; Wed, 21 Feb 2007 09:03:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 21 Feb 2007 09:03:49 GMT Message-Id: <200702210903.l1L93n2f081393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114786 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, 21 Feb 2007 09:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=114786 Change 114786 by rdivacky@rdivacky_witten on 2007/02/21 09:02:58 In the FUTEX_WAKE_OP the *timeout param is being abused for number of wakes up. Change the code accordingly. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#10 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#10 (text+ko) ==== @@ -304,12 +304,10 @@ if (op_ret > 0) { op_ret = 0; /* - * Linux uses the address of the timespec parameter - * as the number of retries, so any large number will - * be ok. + * Linux abuses the address of the timespec parameter + * as the number of retries. */ op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL); -// op_ret += futex_wake(f2, 0xffffffff, NULL); ret += op_ret; } futex_put(f2); From owner-p4-projects@FreeBSD.ORG Wed Feb 21 11:03:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B4D616E721; Wed, 21 Feb 2007 11:03:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD52F16E662 for ; Wed, 21 Feb 2007 11:03:23 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 83CC213C46B for ; Wed, 21 Feb 2007 11:03:23 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LB3NAt003173 for ; Wed, 21 Feb 2007 11:03:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LB3NNo003169 for perforce@freebsd.org; Wed, 21 Feb 2007 11:03:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 21 Feb 2007 11:03:23 GMT Message-Id: <200702211103.l1LB3NNo003169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114790 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, 21 Feb 2007 11:03:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=114790 Change 114790 by rdivacky@rdivacky_witten on 2007/02/21 11:03:00 Change the number of woken up threads to N instead of N+1. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#11 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#11 (text+ko) ==== @@ -413,7 +413,7 @@ FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { - if (count <= n) { + if (count < n) { wakeup_one(wp); count++; } else { From owner-p4-projects@FreeBSD.ORG Wed Feb 21 11:13:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE38216E6F5; Wed, 21 Feb 2007 11:13:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BFA3616D7F8 for ; Wed, 21 Feb 2007 11:13:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AE09513C4BA for ; Wed, 21 Feb 2007 11:13:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LBDbfd005059 for ; Wed, 21 Feb 2007 11:13:37 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LBDbCg005053 for perforce@freebsd.org; Wed, 21 Feb 2007 11:13:37 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 21 Feb 2007 11:13:37 GMT Message-Id: <200702211113.l1LBDbCg005053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 114791 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, 21 Feb 2007 11:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=114791 Change 114791 by rdivacky@rdivacky_witten on 2007/02/21 11:12:41 o revert the previous change. linux wakes up N threads for all operations BUT requeue ones. mimic this by checking for newf being non-NULL and setting count accordingly. o introduce one more param to futex_wake which mimics the nr_requeue in linux thats wake up N+1 threads then requeue upto N2 on the new futex. note that the code doing the requeueing is likely to be rewritten (pending discussion with the original author). Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#12 (text+ko) ==== @@ -88,7 +88,7 @@ static struct futex *futex_get(void *, int); static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); -static int futex_wake(struct futex *, int, struct futex *); +static int futex_wake(struct futex *, int, struct futex *, int); static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr); static int futex_orl(int oparg, caddr_t uaddr, int *oldval); static int futex_andl(int oparg, caddr_t uaddr, int *oldval); @@ -218,7 +218,7 @@ td->td_proc->p_pid, args->uaddr, args->val); #endif f = futex_get(args->uaddr, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, NULL); + td->td_retval[0] = futex_wake(f, args->val, NULL, 0); futex_put(f); FUTEX_SYSTEM_UNLOCK; @@ -240,7 +240,7 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf); + td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); @@ -252,7 +252,7 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); newf = futex_get(args->uaddr2, FUTEX_UNLOCKED); - td->td_retval[0] = futex_wake(f, args->val, newf); + td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout); futex_put(f); futex_put(newf); @@ -299,7 +299,7 @@ } - ret = futex_wake(f, args->val, NULL); + ret = futex_wake(f, args->val, NULL, 0); futex_put(f); if (op_ret > 0) { op_ret = 0; @@ -307,7 +307,7 @@ * Linux abuses the address of the timespec parameter * as the number of retries. */ - op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL); + op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL, 0); ret += op_ret; } futex_put(f2); @@ -406,14 +406,24 @@ } static int -futex_wake(struct futex *f, int n, struct futex *newf) +futex_wake(struct futex *f, int n, struct futex *newf, int n2) { struct waiting_proc *wp; - int count = 0; + int count; + + /* + * Linux is very strange it wakes up N threads for + * all operations BUT requeue ones where its N+1 + * mimic this. + */ + if (newf) + count = 0; + else + count = 1; FUTEX_LOCK; TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) { - if (count < n) { + if (count <= n) { wakeup_one(wp); count++; } else { @@ -421,6 +431,8 @@ /* futex_put called after tsleep */ wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED); wakeup_one(wp); + if (count - n >= n2) + break; } } } From owner-p4-projects@FreeBSD.ORG Wed Feb 21 13:57:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06DE116BAFE; Wed, 21 Feb 2007 13:57:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B703E16B6EE for ; Wed, 21 Feb 2007 13:57:15 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A30BC13C4A3 for ; Wed, 21 Feb 2007 13:57:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LDvAC9041383 for ; Wed, 21 Feb 2007 13:57:10 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LDv9h9041367 for perforce@freebsd.org; Wed, 21 Feb 2007 13:57:09 GMT (envelope-from piso@freebsd.org) Date: Wed, 21 Feb 2007 13:57:09 GMT Message-Id: <200702211357.l1LDv9h9041367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 114801 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, 21 Feb 2007 13:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=114801 Change 114801 by piso@piso_newluxor on 2007/02/21 13:56:59 IFC@114800 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#16 integrate .. //depot/projects/soc2005/libalias/bin/expr/expr.y#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_allocate.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libwrap/Makefile#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/soc2005/libalias/share/dict/web2a#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/EP80219#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.arm#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/umass.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/soc2005/libalias/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_disk.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_resource.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ppp.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netatalk/at_control.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#46 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/priv.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/tree.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/sysinstall.8#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#16 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070218: + The following build error may appear when upgrading from an old + -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): + line 31: '(' expected at begin of node + context: " TruthValue ENUM ( + *** Error code 1 + If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It + should probably be a build tool). In the same module, you may + also get the error: + ...snmp_bridge/bridge_sys.c:39:27: + net/bridgestp.h: No such file or directory + If so, run "cp src/sys/net/bridgestp.h /usr/include/net". + 20070214: The output of netstat -r has changed. Without -n, we now only print a "network name" without the prefix length if the network @@ -730,4 +743,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.473 2007/02/14 14:17:01 bms Exp $ +$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $ ==== //depot/projects/soc2005/libalias/bin/expr/expr.y#2 (text+ko) ==== @@ -5,7 +5,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $ */ #include @@ -539,7 +539,7 @@ /* special case: first operand is 0, no overflow possible */ if (a == 0) return 0; - /* cerify that result of division matches second operand */ + /* verify that result of division matches second operand */ if (r / a != b) return 1; return 0; @@ -637,7 +637,7 @@ int eval; struct val *v; - /* coerce to both arguments to strings */ + /* coerce both arguments to strings */ to_string(a); to_string(b); ==== //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.15 2006/02/07 02:29:55 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.16 2007/02/20 18:10:13 emaste Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -961,18 +961,21 @@ err = td_thr_getgregs_p (&th, gregset); if (err != TD_OK) error ("%s: td_thr_getgregs %s", __func__, thread_db_err_str (err)); - err = td_thr_getfpregs_p (&th, &fpregset); +#ifdef PT_GETXMMREGS + err = td_thr_getxmmregs_p (&th, xmmregs); if (err != TD_OK) - error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err)); + { +#endif + err = td_thr_getfpregs_p (&th, &fpregset); + if (err != TD_OK) + error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err)); +#ifdef PT_GETXMMREGS + } +#endif supply_register (regno, old_value); } fill_gregset (gregset, regno); - fill_fpregset (&fpregset, regno); -#ifdef PT_GETXMMREGS - i387_fill_fxsave (xmmregs, regno); -#endif - err = td_thr_setgregs_p (&th, gregset); if (err != TD_OK) error ("Cannot store general-purpose registers for thread %d: Thread ID=%d, %s", @@ -980,11 +983,13 @@ thread_db_err_str (err)); #ifdef PT_GETXMMREGS + i387_fill_fxsave (xmmregs, regno); err = td_thr_setxmmregs_p (&th, xmmregs); if (err == TD_OK) return; #endif + fill_fpregset (&fpregset, regno); err = td_thr_setfpregs_p (&th, &fpregset); if (err != TD_OK) error ("Cannot store floating-point registers for thread %d: Thread ID=%d, %s", ==== //depot/projects/soc2005/libalias/lib/libelf/libelf_allocate.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2 2007/02/21 08:14:22 dumbbell Exp $"); #include @@ -191,7 +191,7 @@ d = _libelf_release_data(d); } - STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) { + STAILQ_FOREACH_SAFE(d, &s->s_rawdata, d_next, td) { assert((d->d_flags & LIBELF_F_MALLOCED) == 0); STAILQ_REMOVE(&s->s_rawdata, d, _Elf_Data, d_next); d = _libelf_release_data(d); ==== //depot/projects/soc2005/libalias/lib/libwrap/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libwrap/Makefile,v 1.18 2006/03/17 18:54:28 ru Exp $ +# $FreeBSD: src/lib/libwrap/Makefile,v 1.19 2007/02/20 23:12:04 n_hibma Exp $ # .include @@ -9,8 +9,10 @@ INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 -MLINKS= hosts_access.3 hosts_ctl.3 hosts_access.3 request_init.3 \ - hosts_access.3 request_set.3 +MLINKS= hosts_access.3 hosts_ctl.3 \ + hosts_access.3 request_init.3 \ + hosts_access.3 request_set.3 \ + hosts_access.3 hosts.allow.5 \ .PATH: ${.CURDIR}/../../contrib/tcp_wrappers ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.9 2007/02/16 02:20:09 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.10 2007/02/19 02:46:12 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. .ifdef NO_LANGCODE_IN_DESTDIR -DESTDIR?= ${DOCDIR}/relnotes +DESTDIR?= ${DOCDIR}/hardware .else -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/hardware .endif DOC?= article ==== //depot/projects/soc2005/libalias/sbin/mdconfig/mdconfig.8#2 (text+ko) ==== @@ -39,7 +39,7 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.33 2005/01/22 20:02:01 pjd Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.36 2007/02/20 22:04:23 n_hibma Exp $ .\" .Dd November 6, 2004 .Dt MDCONFIG 8 @@ -101,7 +101,11 @@ Swap space is used to back this memory disk. .El .It Fl f Ar file -Filename to use for the vnode type memory disk. +Filename to use for the vnode type memory disk. Options +.Fl a +and +.Fl t Ar vnode +are implied if not specified. .It Fl l List configured devices. If given with @@ -118,7 +122,11 @@ or .Cm t which -denotes byte, kilobyte, megabyte, gigabyte and terabyte respectively. +denotes byte, kilobyte, megabyte, gigabyte and terabyte respectively. Options +.Fl a +and +.Fl t Ar swap +are implied if not specified. .It Fl S Ar sectorsize Sectorsize to use for malloc backed device. .It Fl x Ar sectors/track @@ -195,10 +203,14 @@ chmod 1777 /tmp .Ed .Pp -To create a 5MB file-backed disk: +To create a 5MB file-backed disk ( +.Fl -a +and +.Fl -t Ar vnode +are implied): .Bd -literal -offset indent dd if=/dev/zero of=somebackingfile bs=1k count=5k -mdconfig -a -t vnode -f somebackingfile -u 0 +mdconfig -f somebackingfile -u 0 bsdlabel -w md0 auto newfs md0c mount /dev/md0c /mnt ==== //depot/projects/soc2005/libalias/sbin/mdconfig/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.51 2006/03/27 05:33:35 jasone Exp $ + * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54 2007/02/20 22:04:23 n_hibma Exp $ * */ #include @@ -130,14 +130,18 @@ cmdline=2; break; case 'f': - if (cmdline != 1 && cmdline != 2) - usage(); + if (cmdline == 0) { + action = ATTACH; + cmdline = 1; + } if (cmdline == 1) { /* Imply ``-t vnode'' */ mdio.md_type = MD_VNODE; mdio.md_options = MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; cmdline = 2; } + if (cmdline != 2) + usage(); if (realpath(optarg, mdio.md_file) == NULL) { err(1, "could not find full path for %s", optarg); @@ -190,6 +194,17 @@ mdio.md_sectorsize = strtoul(optarg, &p, 0); break; case 's': + if (cmdline == 0) { + /* Imply ``-a'' */ + action = ATTACH; + cmdline = 1; + } + if (cmdline == 1) { + /* Imply ``-t swap'' */ + mdio.md_type = MD_SWAP; + mdio.md_options = MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; + cmdline = 2; + } if (cmdline != 2) usage(); mdio.md_mediasize = (off_t)strtoumax(optarg, &p, 0); ==== //depot/projects/soc2005/libalias/share/dict/web2a#2 (text+ko) ==== @@ -59704,7 +59704,7 @@ stock buckle stock card stock cattle -stock cerificate +stock certificate stock change stock company stock dividend ==== //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.578 2007/02/18 06:33:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.579 2007/02/19 10:55:16 kib Exp $"); /* * Manages physical address maps. @@ -1542,9 +1542,15 @@ while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); nkpt++; + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } addr = roundup2(addr, PAGE_SIZE * NPTEPG); + if (addr - 1 >= kernel_map->max_offset) + addr = kernel_map->max_offset; while (kernel_vm_end < addr) { pde = pmap_pde(kernel_pmap, kernel_vm_end); if (pde == NULL) { @@ -1562,6 +1568,10 @@ } if ((*pde & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } continue; } @@ -1581,6 +1591,10 @@ *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } ==== //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.16 2006/11/01 12:41:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $"); #include #include #include @@ -103,7 +103,7 @@ char *d = dst; while (len) { - if (len >= 4 && !((vm_offset_t)d & 3) && + if (0 && len >= 4 && !((vm_offset_t)d & 3) && !((vm_offset_t)s & 3)) { *(uint32_t *)d = *(uint32_t *)s; s += 4; @@ -143,6 +143,37 @@ int physaddr = KERNPHYSADDR; int tmp1; unsigned int sp = ((unsigned int)&_end & ~3) + 4; +#if defined(FLASHADDR) && defined(LOADERRAMADDR) + unsigned int pc; + + __asm __volatile("adr %0, _start\n" + : "=r" (pc)); + if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) || + (FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) { + /* + * We're running from flash, so just copy the whole thing + * from flash to memory. + * This is far from optimal, we could do the relocation or + * the unzipping directly from flash to memory to avoid this + * needless copy, but it would require to know the flash + * physical address. + */ + unsigned int target_addr; + unsigned int tmp_sp; + + target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR; + tmp_sp = target_addr + 0x100000 + + (unsigned int)&_end - (unsigned int)&_start; + memcpy((char *)target_addr, (char *)pc, + (unsigned int)&_end - (unsigned int)&_start); + /* Temporary set the sp and jump to the new location. */ + __asm __volatile( + "mov sp, %1\n" + "mov pc, %0\n" + : : "r" (target_addr), "r" (tmp_sp)); + + } +#endif #ifdef KZIP sp += KERNSIZE + 0x100; sp &= ~(L1_TABLE_SIZE - 1); ==== //depot/projects/soc2005/libalias/sys/arm/arm/locore.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -66,47 +66,53 @@ ENTRY_NP(btext) ASENTRY_NP(_start) - - - /* Check if we are running on RAM, if not move ourself to RAM */ -#if 0 - cmp pc, #PHYSADDR - bhi start_inram /* XXX: This is wrong */ +#if defined (FLASHADDR) && defined(LOADERRAMADDR) + /* Check if we're running from flash. */ + ldr r7, =FLASHADDR + /* + * If we're running with MMU disabled, test against the + * physical address instead. + */ + mrc p15, 0, r2, c1, c0, 0 + ands r2, r2, #CPU_CONTROL_MMU_ENABLE + ldreq r8, =PHYSADDR + ldrne r8, =LOADERRAMADDR + cmp r7, r8 + bls flash_lower + cmp r7, pc + bhi from_ram + b do_copy + +flash_lower: + cmp r8, pc + bls from_ram +do_copy: + ldr r9, =KERNBASE + adr r1, _start + ldr r0, Lreal_start + ldr r2, Lend + sub r2, r2, r0 + sub r0, r0, r9 + add r0, r0, r8 + mov r4, r0 + /* Make sure _arm_memcpy is NULL */ + ldr r3, .L_arm_memcpy + ldr r3, [r3] + mov r5, #0 + str r5, [r3] + bl memcpy + ldr r0, Lram_offset + add pc, r4, r0 +Lram_offset: .word from_ram-_C_LABEL(_start) +from_ram: + nop #endif - b start_inram /* - * XXX: this is even more wrong, but RedBoot - * use 0x00000000-0x100000000 as virtual - * addresses for the RAM. - */ - - /* move me to RAM - * XXX: we can use memcpy if it is PIC - */ - ldr r1, Lcopy_size - adr r0, _C_LABEL(_start) - add r1, r1, #3 - mov r1, r1, LSR #2 - mov r2, #PHYSADDR - add r2, r2, #0x00200000 - mov r4, r2 - -5: ldr r3,[r0],#4 - str r3,[r2],#4 - subs r1,r1,#1 - bhi 5b - - /* Jump to RAM */ - ldr r0, Lstart_off - add pc, r4, r0 - -Lcopy_size: .word _edata-_C_LABEL(_start) -Lstart_off: .word start_inram-_C_LABEL(_start) -start_inram: adr r7, Lunmapped bic r7, r7, #0xff000000 orr r7, r7, #PHYSADDR +disable_mmu: /* Disable MMU for a while */ mrc p15, 0, r2, c1, c0, 0 bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ @@ -120,7 +126,6 @@ nop mov pc, r7 Lunmapped: - #ifdef STARTUP_PAGETABLE_ADDR /* build page table from scratch */ ldr r0, Lstartup_pagetable @@ -191,6 +196,10 @@ .word KERNVIRTADDR Lphysaddr: .word KERNPHYSADDR +Lreal_start: + .word _start +Lend: + .word _edata Lstartup_pagetable: .word STARTUP_PAGETABLE_ADDR mmu_init_table: @@ -207,6 +216,11 @@ .word _end .word svcstk + INIT_ARM_STACK_SIZE +#if defined(FLASHADDR) && defined(LOADERRAMADDR) +.L_arm_memcpy: + .word _C_LABEL(_arm_memcpy) +#endif + .Lvirt_done: .word virt_done .Lmainreturned: ==== //depot/projects/soc2005/libalias/sys/arm/conf/EP80219#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# -*- makefile-bsdmake -*- GENERIC -- Generic kernel configuration file for FreeBSD/arm +# EP80219 -- Custom kernel configuration file for FreeBSD/arm on the EP80219 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.4 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.5 2007/02/19 00:37:25 cognet Exp $ machine arm ident EP80219 ==== //depot/projects/soc2005/libalias/sys/arm/conf/IQ31244#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# IQ31244 -- Custom kernel configuration file for FreeBSD/arm on the IQ31244 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.17 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.19 2007/02/19 01:03:08 cognet Exp $ machine arm ident IQ31244 @@ -23,6 +23,8 @@ options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +options FLASHADDR=0xf0000000 +options LOADERRAMADDR=0x00000000 options STARTUP_PAGETABLE_ADDR=0xa0000000 include "../xscale/i80321/std.iq31244" ==== //depot/projects/soc2005/libalias/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# GENERIC -- Generic kernel configuration file for FreeBSD/arm +# SIMICS -- Custom kernel configuration file for FreeBSD/arm on Simics SA1110 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.12 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.13 2007/02/19 00:37:25 cognet Exp $ machine arm ident SIMICS ==== //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.202 2007/01/23 17:29:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.203 2007/02/21 07:45:01 n_hibma Exp $"); #include @@ -1820,11 +1820,15 @@ uint32_t block_len; uint64_t maxsector; int error; + u_int32_t sense_flags; softc = (struct da_softc *)periph->softc; block_len = 0; maxsector = 0; error = 0; + sense_flags = SF_RETRY_UA; + if (softc->flags & DA_FLAG_PACK_REMOVABLE) + sense_flags |= SF_NO_PRINT; /* Do a read capacity */ rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcaplong), @@ -1843,7 +1847,7 @@ error = cam_periph_runccb(ccb, daerror, /*cam_flags*/CAM_RETRY_SELTO, - /*sense_flags*/SF_RETRY_UA, + sense_flags, softc->disk->d_devstat); if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) @@ -1878,7 +1882,7 @@ error = cam_periph_runccb(ccb, daerror, /*cam_flags*/CAM_RETRY_SELTO, - /*sense_flags*/SF_RETRY_UA, + sense_flags, softc->disk->d_devstat); if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) ==== //depot/projects/soc2005/libalias/sys/conf/options.arm#7 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.15 2007/01/05 02:08:35 ticso Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.16 2007/02/19 01:03:07 cognet Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -11,8 +11,10 @@ CPU_XSCALE_80321 opt_global.h CPU_XSCALE_80219 opt_global.h CPU_XSCALE_IXP425 opt_global.h +FLASHADDR opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h +LOADERRAMADDR opt_global.h PHYSADDR opt_global.h SKYEYE_WORKAROUNDS opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h ==== //depot/projects/soc2005/libalias/sys/dev/aic7xxx/aic79xx.seq#2 (text+ko) ==== @@ -37,7 +37,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.18 2005/01/06 01:42:26 imp Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.19 2007/02/18 19:48:59 ceri Exp $ */ VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $" @@ -2139,7 +2139,7 @@ END_CRITICAL; pkt_status_check_overrun: /* - * Status PKT overruns are uncerimoniously recovered with a + * Status PKT overruns are unceremoniously recovered with a * bus reset. If we've overrun, let the host know so that * recovery can be performed. * ==== //depot/projects/soc2005/libalias/sys/dev/iwi/if_iwi.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.46 2007/02/15 17:21:31 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.48 2007/02/20 17:32:30 luigi Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -157,6 +157,7 @@ static int iwi_reset(struct iwi_softc *); static int iwi_load_ucode(struct iwi_softc *, const struct iwi_fw *); static int iwi_load_firmware(struct iwi_softc *, const struct iwi_fw *); +static void iwi_release_fw_dma(struct iwi_softc *sc); static int iwi_config(struct iwi_softc *); static int iwi_get_firmware(struct iwi_softc *); static void iwi_put_firmware(struct iwi_softc *); @@ -331,34 +332,17 @@ goto fail; } - error = iwi_alloc_tx_ring(sc, &sc->txq[0], IWI_TX_RING_COUNT, - IWI_CSR_TX1_RIDX, IWI_CSR_TX1_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 1\n"); - goto fail; + for (i = 0; i < 4; i++) { + error = iwi_alloc_tx_ring(sc, &sc->txq[i], IWI_TX_RING_COUNT, + IWI_CSR_TX1_RIDX + i * 4, + IWI_CSR_TX1_WIDX + i * 4); + if (error != 0) { + device_printf(dev, "could not allocate Tx ring %d\n", + i+i); + goto fail; + } } - error = iwi_alloc_tx_ring(sc, &sc->txq[1], IWI_TX_RING_COUNT, - IWI_CSR_TX2_RIDX, IWI_CSR_TX2_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 2\n"); - goto fail; - } - - error = iwi_alloc_tx_ring(sc, &sc->txq[2], IWI_TX_RING_COUNT, - IWI_CSR_TX3_RIDX, IWI_CSR_TX3_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 3\n"); - goto fail; - } - - error = iwi_alloc_tx_ring(sc, &sc->txq[3], IWI_TX_RING_COUNT, - IWI_CSR_TX4_RIDX, IWI_CSR_TX4_WIDX); - if (error != 0) { - device_printf(dev, "could not allocate Tx ring 4\n"); - goto fail; - } - if (iwi_alloc_rx_ring(sc, &sc->rxq, IWI_RX_RING_COUNT) != 0) { device_printf(dev, "could not allocate Rx ring\n"); goto fail; @@ -496,6 +480,7 @@ ieee80211_ifdetach(ic); } iwi_put_firmware(sc); + iwi_release_fw_dma(sc); iwi_free_cmd_ring(sc, &sc->cmdq); iwi_free_tx_ring(sc, &sc->txq[0]); @@ -970,6 +955,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; + IWI_LOCK_CHECK(sc); DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, ieee80211_state_name[ic->ic_state], ieee80211_state_name[nstate], sc->flags)); @@ -1216,6 +1202,7 @@ { struct ieee80211com *ic = &sc->sc_ic; + IWI_LOCK_CHECK(sc); ic->ic_curchan = &ic->ic_channels[chan]; sc->curchan = chan; @@ -1709,6 +1696,8 @@ { struct iwi_cmd_desc *desc; + IWI_LOCK_CHECK(sc); + if (sc->flags & IWI_FLAG_BUSY) { device_printf(sc->sc_dev, "%s: cmd %d not sent, busy\n", __func__, type); @@ -1771,6 +1760,7 @@ int error, nsegs, hdrlen, i; int ismcast, flags, xflags, staid; + IWI_LOCK_CHECK(sc); wh = mtod(m0, const struct ieee80211_frame *); /* NB: only data frames use this path */ hdrlen = ieee80211_hdrsize(wh); @@ -2064,6 +2054,13 @@ IWI_LOCK(sc); + /* + * wait until pending iwi_cmd() are completed, to avoid races + * that could cause problems. + */ + while (sc->flags & IWI_FLAG_BUSY) + msleep(sc, &sc->sc_mtx, 0, "iwiioctl", hz); + switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { @@ -2080,7 +2077,6 @@ */ sc->sc_rfkill_timer = 0; } - iwi_put_firmware(sc); } break; @@ -2107,6 +2103,8 @@ uint32_t tmp; int ntries; + IWI_LOCK_CHECK(sc); + /* disable interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); @@ -2223,6 +2221,7 @@ * This is necessary because we re-init the device sometimes * from a context where we cannot read from the filesystem * (e.g. from the taskqueue thread when rfkill is re-enabled). + * XXX return 0 on success, 1 on error. * * NB: the order of get'ing and put'ing images here is * intentional to support handling firmware images bundled @@ -2306,33 +2305,38 @@ /* * Check and setup combined image. */ - if (fp->datasize < sizeof(hdr)) { + if (fp->datasize < sizeof(struct iwi_firmware_hdr)) { device_printf(sc->sc_dev, "image '%s' too small\n", fp->name); goto bad; } hdr = (const struct iwi_firmware_hdr *)fp->data; - if (fp->datasize < sizeof(*hdr) + hdr->bsize + hdr->usize + hdr->fsize) { + if (fp->datasize < sizeof(*hdr) + le32toh(hdr->bsize) + le32toh(hdr->usize) + + le32toh(hdr->fsize)) { device_printf(sc->sc_dev, "image '%s' too small (2)\n", fp->name); goto bad; } sc->fw_boot.data = ((const char *) fp->data) + sizeof(*hdr); - sc->fw_boot.size = hdr->bsize; + sc->fw_boot.size = le32toh(hdr->bsize); sc->fw_boot.name = fp->name; sc->fw_uc.data = sc->fw_boot.data + sc->fw_boot.size; - sc->fw_uc.size = hdr->usize; + sc->fw_uc.size = le32toh(hdr->usize); sc->fw_uc.name = fp->name; sc->fw_fw.data = sc->fw_uc.data + sc->fw_uc.size; - sc->fw_fw.size = hdr->fsize; + sc->fw_fw.size = le32toh(hdr->fsize); sc->fw_fw.name = fp->name; } +#if 0 + device_printf(sc->sc_dev, "boot %d ucode %d fw %d bytes\n", + sc->fw_boot.size, sc->fw_uc.size, sc->fw_fw.size); +#endif sc->fw_mode = ic->ic_opmode; - return 1; + return 0; bad: iwi_put_firmware(sc); - return 0; + return 1; } static void @@ -2367,6 +2371,7 @@ size_t size = fw->size; int i, ntries, error; + IWI_LOCK_CHECK(sc); error = 0; CSR_WRITE_4(sc, IWI_CSR_RST, CSR_READ_4(sc, IWI_CSR_RST) | IWI_RST_STOP_MASTER); @@ -2439,6 +2444,7 @@ uint32_t sentinel, ctl, src, dst, sum, len, mlen, tmp; int ntries, error; + IWI_LOCK_CHECK(sc); /* copy firmware image to DMA memory */ memcpy(sc->fw_virtaddr, fw->data, fw->size); @@ -2498,12 +2504,13 @@ break; DELAY(100); } + /* sync dma, just in case */ + bus_dmamap_sync(sc->fw_dmat, sc->fw_map, BUS_DMASYNC_POSTWRITE); if (ntries == 400) { device_printf(sc->sc_dev, "timeout processing command blocks for %s firmware\n", fw->name); - error = EIO; - goto fail5; + return EIO; } /* we're done with command blocks processing */ @@ -2524,7 +2531,6 @@ "initialization to complete\n", fw->name); } -fail5: return error; } @@ -2580,6 +2586,7 @@ struct iwi_txpower power; uint32_t data; int error, i; + IWI_LOCK_CHECK(sc); IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":")); @@ -2707,6 +2714,8 @@ struct iwi_scan_ext scan; int i, ix, start, scan_type, error; + IWI_LOCK_CHECK(sc); + memset(&scan, 0, sizeof scan); /* XXX different dwell times for different scan types */ @@ -2908,7 +2917,8 @@ struct iwi_rateset rs; uint16_t capinfo; int error; - + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 21 15:28:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AAAB16F88B; Wed, 21 Feb 2007 15:28:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EF58416F7F3 for ; Wed, 21 Feb 2007 15:28:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DF61113C441 for ; Wed, 21 Feb 2007 15:28:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LFSLaK075744 for ; Wed, 21 Feb 2007 15:28:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LFSL0t075741 for perforce@freebsd.org; Wed, 21 Feb 2007 15:28:21 GMT (envelope-from millert@freebsd.org) Date: Wed, 21 Feb 2007 15:28:21 GMT Message-Id: <200702211528.l1LFSL0t075741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114805 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, 21 Feb 2007 15:28:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=114805 Change 114805 by millert@millert_p4 on 2007/02/21 15:27:45 Remove dependence on gawk Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/mkaccess_vector.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ # flask needs to know where to export the kernel headers. LINUXDIR ?= ../../../linux-2.6 -AWK = gawk +AWK = awk CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/refpolicy/policy/flask/mkaccess_vector.sh#2 (text+ko) ==== @@ -15,6 +15,23 @@ av_perm_to_string="av_perm_to_string.h" cat $* | $awk " + # Quicksort function for awk arrays, from The AWK Programming + # Language, by Aho, Kernighan and Weinberger. + # Call qsort(array, smallestindex, largestindex) + function qsort(a,left,right, i,last) { + if (left >= right) return + swap(a, left, left + int((right-left+1)*rand())) + last = left + for (i=left+1; i<=right; i++) + if (a[i] < a[left]) swap(a, ++last, i) + swap(a, left, last) + qsort(a, left, last-1) + qsort(a, last+1, right) + } + function swap(a,i,j, t) { + t = a[i]; a[i] = a[j]; a[j] = t; + } + BEGIN { outfile = \"$av_permissions\" inheritfile = \"$av_inherit\" @@ -102,12 +119,12 @@ } } - j = 1; + n = 0; for (i in inherited_perms) { - ind[j] = i + 0; - j++; + n++; + ind[n] = i + 0; } - n = asort(ind); + qsort(ind, 1, n); for (i = 1; i <= n; i++) { perm = inherited_perms[ind[i]]; printf("#define %s__%s", toupper(tclass), toupper(perm)) > outfile; @@ -118,7 +135,6 @@ printf(" ") > outfile; printf("0x%08xUL\n", ind[i]) > outfile; } - printf("\n") > outfile; for (i in ind) delete ind[i]; for (i in inherited_perms) delete inherited_perms[i]; @@ -214,8 +230,6 @@ printf("TE_(common_%s_perm_to_string)\n\n", common_name) > cpermfile; } - printf("\n") > outfile; - nextstate = "COMMON_OR_AV"; } END { From owner-p4-projects@FreeBSD.ORG Wed Feb 21 18:34:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7833B170773; Wed, 21 Feb 2007 18:34:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2ECA817076A for ; Wed, 21 Feb 2007 18:34:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1E80B13C49D for ; Wed, 21 Feb 2007 18:34:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LIYJmG024528 for ; Wed, 21 Feb 2007 18:34:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LIYGdJ024519 for perforce@freebsd.org; Wed, 21 Feb 2007 18:34:16 GMT (envelope-from jhb@freebsd.org) Date: Wed, 21 Feb 2007 18:34:16 GMT Message-Id: <200702211834.l1LIYGdJ024519@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 114812 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, 21 Feb 2007 18:34:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=114812 Change 114812 by jhb@jhb_mutex on 2007/02/21 18:33:39 IFC @114808. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#71 integrate .. //depot/projects/smpng/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#56 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#24 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#20 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/db_interface.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#13 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#20 integrate .. //depot/projects/smpng/sys/arm/arm/mem.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#12 integrate .. //depot/projects/smpng/sys/arm/conf/EP80219#4 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#13 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#74 integrate .. //depot/projects/smpng/sys/conf/NOTES#136 integrate .. //depot/projects/smpng/sys/conf/files#197 integrate .. //depot/projects/smpng/sys/conf/options#135 integrate .. //depot/projects/smpng/sys/conf/options.arm#14 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#56 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#16 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#76 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#64 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#65 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#87 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#52 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#21 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#37 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#49 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#24 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwireg.h#10 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#8 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#38 integrate .. //depot/projects/smpng/sys/dev/mii/brgphyreg.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#56 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#61 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#86 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/fire/fire_saver.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/logo/logo_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/rain/rain_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/warp/warp_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#60 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#18 integrate .. //depot/projects/smpng/sys/fs/cd9660/TODO#1 branch .. //depot/projects/smpng/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/smpng/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#32 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#53 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#34 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#29 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#16 integrate .. //depot/projects/smpng/sys/fs/udf/udf.h#9 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#33 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#37 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#31 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#49 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#86 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#36 integrate .. //depot/projects/smpng/sys/i386/i386/msi.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#113 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#42 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#40 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#38 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#39 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#45 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#55 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#83 integrate .. //depot/projects/smpng/sys/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/smpng/sys/isofs/cd9660/TODO#2 delete .. //depot/projects/smpng/sys/isofs/cd9660/TODO.hibler#2 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#7 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#15 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_mount.h#5 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#18 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#10 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#11 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.h#4 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_util.c#6 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#44 delete .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#25 delete .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#12 delete .. //depot/projects/smpng/sys/isofs/cd9660/iso_rrip.h#4 delete .. //depot/projects/smpng/sys/kern/Make.tags.inc#6 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#131 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#159 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#17 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#35 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#37 integrate .. //depot/projects/smpng/sys/kern/uipc_debug.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_socket.c#100 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#49 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#26 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#41 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#68 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#121 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#78 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#30 integrate .. //depot/projects/smpng/sys/modules/cd9660/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#46 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#15 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#72 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#43 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#51 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#7 integrate .. //depot/projects/smpng/sys/netinet/sctputil.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#94 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#56 integrate .. //depot/projects/smpng/sys/netinet/udp.h#4 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#74 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#8 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#38 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#43 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#49 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#50 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#68 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#41 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#73 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#46 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#23 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#11 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#76 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/smpng/sys/sys/firmware.h#3 integrate .. //depot/projects/smpng/sys/sys/mount.h#57 integrate .. //depot/projects/smpng/sys/sys/priv.h#2 integrate .. //depot/projects/smpng/sys/sys/systm.h#78 integrate .. //depot/projects/smpng/sys/sys/vnode.h#77 integrate .. //depot/projects/smpng/sys/tools/fw_stub.awk#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/README.softupdates#2 delete .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#45 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#59 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#92 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#49 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#37 integrate .. //depot/projects/smpng/sys/vm/uma.h#21 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#69 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#89 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#34 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/msi.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.4 2007/02/15 22:22:56 jhb Exp $"); #include #include @@ -347,6 +347,9 @@ msi->msi_intsrc.is_pic = &msi_pic; msi->msi_dev = dev; msi->msi_vector = vector + i; + if (bootverbose) + printf("msi: routing MSI IRQ %d to vector %u\n", + msi->msi_irq, msi->msi_vector); msi->msi_index = i; msi->msi_first = fsrc; @@ -463,6 +466,9 @@ /* Allocate an IDT vector. */ vector = apic_alloc_vector(i); + if (bootverbose) + printf("msi: routing MSI-X IRQ %d to vector %u\n", msi->msi_irq, + vector); /* Setup source. */ msi->msi_intsrc.is_pic = &msix_pic; ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#71 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.579 2007/02/19 10:55:16 kib Exp $"); /* * Manages physical address maps. @@ -1498,11 +1498,9 @@ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ - vm_page_lock_queues(); m->wire_count--; atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(m); - vm_page_unlock_queues(); PMAP_LOCK_DESTROY(pmap); } @@ -1544,9 +1542,15 @@ while ((*pmap_pde(kernel_pmap, kernel_vm_end) & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); nkpt++; + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } addr = roundup2(addr, PAGE_SIZE * NPTEPG); + if (addr - 1 >= kernel_map->max_offset) + addr = kernel_map->max_offset; while (kernel_vm_end < addr) { pde = pmap_pde(kernel_pmap, kernel_vm_end); if (pde == NULL) { @@ -1564,6 +1568,10 @@ } if ((*pde & PG_V) != 0) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } continue; } @@ -1583,6 +1591,10 @@ *pmap_pde(kernel_pmap, kernel_vm_end) = newpdir; kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); + if (kernel_vm_end - 1 >= kernel_map->max_offset) { + kernel_vm_end = kernel_map->max_offset; + break; + } } } ==== //depot/projects/smpng/sys/amd64/amd64/uma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.2 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); #include #include @@ -82,7 +82,5 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); vm_page_free(m); - vm_page_unlock_queues(); } ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#56 (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.472 2007/02/07 18:55:29 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.473 2007/02/09 19:03:17 brooks Exp $ cpu HAMMER ident GENERIC @@ -44,6 +44,7 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * (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/sys/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -167,6 +167,15 @@ #define LINUX_MAP_ANON 0x0020 #define LINUX_MAP_GROWSDOWN 0x0100 +struct l_mmap_argv { + l_uintptr_t addr; + l_size_t len; + l_int prot; + l_int flags; + l_int fd; + l_off_t pgoff; +} __packed; + /* * stat family of syscalls */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#18 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 13:27:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); #include #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,7 @@ #include #include +#include #include #include @@ -690,16 +692,6 @@ return (0); } -/* XXX move */ -struct l_mmap_argv { - l_ulong addr; - l_ulong len; - l_ulong prot; - l_ulong flags; - l_ulong fd; - l_ulong pgoff; -}; - #define STACK_SIZE (2 * 1024 * 1024) #define GUARD_SIZE (4 * PAGE_SIZE) @@ -789,9 +781,44 @@ bsd_args.flags |= MAP_ANON; else bsd_args.flags |= MAP_NOSYNC; - if (linux_args->flags & LINUX_MAP_GROWSDOWN) { + if (linux_args->flags & LINUX_MAP_GROWSDOWN) bsd_args.flags |= MAP_STACK; + /* + * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC + * on Linux/i386. We do this to ensure maximum compatibility. + * Linux/ia64 does the same in i386 emulation mode. + */ + bsd_args.prot = linux_args->prot; + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) + bsd_args.prot |= PROT_READ | PROT_EXEC; + + if (linux_args->fd != -1) { + /* + * Linux follows Solaris mmap(2) description: + * The file descriptor fildes is opened with + * read permission, regardless of the + * protection options specified. + */ + + if ((error = fget(td, linux_args->fd, &fp)) != 0) + return (error); + if (fp->f_type != DTYPE_VNODE) { + fdrop(fp, td); + return (EINVAL); + } + + /* Linux mmap() just fails for O_WRONLY files */ + if (!(fp->f_flag & FREAD)) { + fdrop(fp, td); + return (EACCES); + } + + fdrop(fp, td); + } + bsd_args.fd = linux_args->fd; + + if (linux_args->flags & LINUX_MAP_GROWSDOWN) { /* * The linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option @@ -814,11 +841,7 @@ * fixed size of (STACK_SIZE - GUARD_SIZE). */ - /* This gives us TOS */ - bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) + - linux_args->len; - - if ((caddr_t)PTRIN(bsd_args.addr) > + if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len > p->p_vmspace->vm_maxsaddr) { /* * Some linux apps will attempt to mmap @@ -837,8 +860,7 @@ * mmap's return value. */ PROC_LOCK(p); - p->p_vmspace->vm_maxsaddr = - (char *)LINUX32_USRSTACK - + p->p_vmspace->vm_maxsaddr = (char *)LINUX32_USRSTACK - lim_cur(p, RLIMIT_STACK); PROC_UNLOCK(p); } @@ -856,49 +878,12 @@ * not using VM_STACK we map the full stack, since we * don't have a way to autogrow it. */ - bsd_args.addr -= bsd_args.len; + bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) - + bsd_args.len; } else { bsd_args.addr = (caddr_t)PTRIN(linux_args->addr); bsd_args.len = linux_args->len; } - - /* - * We add PROT_EXEC to work around buggy applications (e.g. Java) - * that take advantage of the fact that execute permissions are not - * enforced by x86 CPUs. - */ - bsd_args.prot = linux_args->prot | PROT_EXEC; - if (linux_args->flags & LINUX_MAP_ANON) - bsd_args.fd = -1; - else { - /* - * Linux follows Solaris mmap(2) description: - * The file descriptor fildes is opened with - * read permission, regardless of the - * protection options specified. - * If PROT_WRITE is specified, the application - * must have opened the file descriptor - * fildes with write permission unless - * MAP_PRIVATE is specified in the flag - * argument as described below. - */ - - if ((error = fget(td, linux_args->fd, &fp)) != 0) - return (error); - if (fp->f_type != DTYPE_VNODE) { - fdrop(fp, td); - return (EINVAL); - } - - /* Linux mmap() just fails for O_WRONLY files */ - if (! (fp->f_flag & FREAD)) { - fdrop(fp, td); - return (EACCES); - } - - bsd_args.fd = linux_args->fd; - fdrop(fp, td); - } bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE; bsd_args.pad = 0; @@ -919,6 +904,23 @@ } int +linux_iopl(struct thread *td, struct linux_iopl_args *args) +{ + int error; + + if (args->level < 0 || args->level > 3) + return (EINVAL); + if ((error = priv_check(td, PRIV_IO)) != 0) + return (error); + if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + return (error); + td->td_frame->tf_rflags = (td->td_frame->tf_rflags & ~PSL_IOPL) | + (args->level * (PSL_IOPL / 3)); + + return (0); +} + +int linux_pipe(struct thread *td, struct linux_pipe_args *args) { int pip[2]; @@ -1181,8 +1183,7 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - /* XXX PROT_READ implies PROT_EXEC; see linux_mmap_common(). */ - if ((bsd_args.prot & PROT_READ) != 0) - bsd_args.prot |= PROT_EXEC; + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) + bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#20 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -341,6 +341,9 @@ struct linux_uname_args { register_t dummy; }; +struct linux_iopl_args { + char level_l_[PADL_(l_ulong)]; l_ulong level; char level_r_[PADR_(l_ulong)]; +}; struct linux_vhangup_args { register_t dummy; }; @@ -995,6 +998,7 @@ int linux_newlstat(struct thread *, struct linux_newlstat_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); int linux_uname(struct thread *, struct linux_uname_args *); +int linux_iopl(struct thread *, struct linux_iopl_args *); int linux_vhangup(struct thread *, struct linux_vhangup_args *); int linux_wait4(struct thread *, struct linux_wait4_args *); int linux_swapoff(struct thread *, struct linux_swapoff_args *); @@ -1240,6 +1244,7 @@ #define LINUX_SYS_AUE_linux_newlstat AUE_LSTAT #define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT #define LINUX_SYS_AUE_linux_uname AUE_NULL +#define LINUX_SYS_AUE_linux_iopl AUE_NULL #define LINUX_SYS_AUE_linux_vhangup AUE_NULL #define LINUX_SYS_AUE_linux_wait4 AUE_WAIT4 #define LINUX_SYS_AUE_linux_swapoff AUE_SWAPOFF ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#20 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #define LINUX_SYS_exit 1 @@ -103,6 +103,7 @@ #define LINUX_SYS_linux_newlstat 107 #define LINUX_SYS_linux_newfstat 108 #define LINUX_SYS_linux_uname 109 +#define LINUX_SYS_linux_iopl 110 #define LINUX_SYS_linux_vhangup 111 #define LINUX_SYS_linux_wait4 114 #define LINUX_SYS_linux_swapoff 115 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#20 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.29 2007/02/15 01:15:31 jkim Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp */ #include @@ -130,7 +130,7 @@ { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 110 = iopl */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#24 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.26 2007/02/15 01:13:36 jkim Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -198,7 +198,7 @@ 108 AUE_FSTAT STD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 109 AUE_NULL STD { int linux_uname(void); } -110 AUE_NULL UNIMPL iopl +110 AUE_NULL STD { int linux_iopl(l_ulong level); } 111 AUE_NULL STD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#20 (text+ko) ==== @@ -29,10 +29,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); /* - * MacPPC bus dma support routines + * ARM bus dma support routines */ #define _ARM32_BUS_DMA_PRIVATE ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#14 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include +#include #include #include @@ -799,7 +800,7 @@ cpu_reset_needs_v4_MMU_disable = 0; get_cachetype_cp15(); pmap_pte_init_generic(); - return 0; + goto out; } #endif #ifdef CPU_ARM8 @@ -809,7 +810,7 @@ cpu_reset_needs_v4_MMU_disable = 0; /* XXX correct? */ get_cachetype_cp15(); pmap_pte_init_arm8(); - return 0; + goto out; } #endif /* CPU_ARM8 */ #ifdef CPU_ARM9 @@ -829,7 +830,7 @@ #else pmap_pte_init_generic(); #endif - return 0; + goto out; } #endif /* CPU_ARM9 */ #ifdef CPU_ARM10 @@ -849,7 +850,7 @@ arm10_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); arm10_dcache_index_max = 0U - arm10_dcache_index_inc; pmap_pte_init_generic(); - return 0; + goto out; } #endif /* CPU_ARM10 */ #ifdef CPU_SA110 @@ -858,7 +859,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_SA110 */ #ifdef CPU_SA1100 @@ -870,7 +871,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1100 */ #ifdef CPU_SA1110 @@ -882,7 +883,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_SA1110 */ #ifdef CPU_IXP12X0 @@ -891,7 +892,7 @@ cpu_reset_needs_v4_MMU_disable = 1; get_cachetype_table(); pmap_pte_init_sa1(); - return 0; + goto out; } #endif /* CPU_IXP12X0 */ #ifdef CPU_XSCALE_80200 @@ -948,7 +949,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80200 */ #if defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) @@ -975,7 +976,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_80321 */ @@ -989,7 +990,7 @@ cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 @@ -1009,7 +1010,7 @@ /* Use powersave on this CPU. */ cpu_do_powersave = 1; - return 0; + goto out; } #endif /* CPU_XSCALE_PXA2X0 */ #ifdef CPU_XSCALE_IXP425 @@ -1025,7 +1026,7 @@ get_cachetype_cp15(); pmap_pte_init_xscale(); - return 0; + goto out; } #endif /* CPU_XSCALE_IXP425 */ /* @@ -1033,6 +1034,9 @@ */ panic("No support for this CPU type (%08x) in kernel", cputype); return(ARCHITECTURE_NOT_PRESENT); +out: + uma_set_align(arm_dcache_align_mask); + return (0); } /* ==== //depot/projects/smpng/sys/arm/arm/db_interface.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.5 2005/06/23 11:38:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_interface.c,v 1.6 2007/02/14 01:25:41 kevlo Exp $"); #include "opt_ddb.h" #include @@ -109,7 +109,7 @@ *valp = get_stackptr(PSR_UND32_MODE); return (1); } - return(0); + return (0); } int @@ -120,7 +120,7 @@ *valp = get_stackptr(PSR_ABT32_MODE); return (1); } - return(0); + return (0); } int @@ -131,7 +131,7 @@ *valp = get_stackptr(PSR_IRQ32_MODE); return (1); } - return(0); + return (0); } int db_frame(struct db_variable *vp, db_expr_t *valp, int rw) @@ -146,7 +146,7 @@ *valp = *reg; else *reg = *valp; - return(1); + return (1); } void @@ -339,4 +339,3 @@ panic("branch_taken: botch"); } } - ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.16 2006/11/01 12:41:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $"); #include #include #include @@ -103,7 +103,7 @@ char *d = dst; while (len) { - if (len >= 4 && !((vm_offset_t)d & 3) && + if (0 && len >= 4 && !((vm_offset_t)d & 3) && !((vm_offset_t)s & 3)) { *(uint32_t *)d = *(uint32_t *)s; s += 4; @@ -143,6 +143,37 @@ int physaddr = KERNPHYSADDR; int tmp1; unsigned int sp = ((unsigned int)&_end & ~3) + 4; +#if defined(FLASHADDR) && defined(LOADERRAMADDR) + unsigned int pc; + + __asm __volatile("adr %0, _start\n" + : "=r" (pc)); + if ((FLASHADDR > LOADERRAMADDR && pc >= FLASHADDR) || + (FLASHADDR < LOADERRAMADDR && pc < LOADERRAMADDR)) { + /* + * We're running from flash, so just copy the whole thing + * from flash to memory. + * This is far from optimal, we could do the relocation or + * the unzipping directly from flash to memory to avoid this + * needless copy, but it would require to know the flash + * physical address. + */ + unsigned int target_addr; + unsigned int tmp_sp; + + target_addr = (unsigned int)&_start - PHYSADDR + LOADERRAMADDR; + tmp_sp = target_addr + 0x100000 + + (unsigned int)&_end - (unsigned int)&_start; + memcpy((char *)target_addr, (char *)pc, + (unsigned int)&_end - (unsigned int)&_start); + /* Temporary set the sp and jump to the new location. */ + __asm __volatile( + "mov sp, %1\n" + "mov pc, %0\n" + : : "r" (target_addr), "r" (tmp_sp)); + + } +#endif #ifdef KZIP sp += KERNSIZE + 0x100; sp &= ~(L1_TABLE_SIZE - 1); ==== //depot/projects/smpng/sys/arm/arm/locore.S#13 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.15 2007/02/19 00:57:27 cognet Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -66,47 +66,53 @@ ENTRY_NP(btext) ASENTRY_NP(_start) - - - /* Check if we are running on RAM, if not move ourself to RAM */ -#if 0 - cmp pc, #PHYSADDR - bhi start_inram /* XXX: This is wrong */ +#if defined (FLASHADDR) && defined(LOADERRAMADDR) + /* Check if we're running from flash. */ + ldr r7, =FLASHADDR + /* + * If we're running with MMU disabled, test against the + * physical address instead. + */ + mrc p15, 0, r2, c1, c0, 0 + ands r2, r2, #CPU_CONTROL_MMU_ENABLE + ldreq r8, =PHYSADDR >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 21 18:35:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D3C11703B2; Wed, 21 Feb 2007 18:35:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B17E170300 for ; Wed, 21 Feb 2007 18:35:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F0E3E13C49D for ; Wed, 21 Feb 2007 18:35:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1LIZKx5024652 for ; Wed, 21 Feb 2007 18:35:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1LIZK3S024649 for perforce@freebsd.org; Wed, 21 Feb 2007 18:35:20 GMT (envelope-from jhb@freebsd.org) Date: Wed, 21 Feb 2007 18:35:20 GMT Message-Id: <200702211835.l1LIZK3S024649@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 114813 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, 21 Feb 2007 18:35:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=114813 Change 114813 by jhb@jhb_mutex on 2007/02/21 18:34:58 IFC @114811. Affected files ... .. //depot/projects/smpng/sys/dev/mii/brgphy.c#39 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#24 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#6 integrate Differences ... ==== //depot/projects/smpng/sys/dev/mii/brgphy.c#39 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.64 2007/02/14 18:21:32 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.65 2007/02/21 18:17:44 jhb Exp $"); /* * Driver for the Broadcom BCM54xx/57xx 1000baseTX PHY. @@ -97,6 +97,7 @@ static int brgphy_mii_phy_auto(struct mii_softc *); static void brgphy_reset(struct mii_softc *); static void brgphy_loop(struct mii_softc *); +static int bcm5706_is_tbi(device_t); static void bcm5401_load_dspcode(struct mii_softc *); static void bcm5411_load_dspcode(struct mii_softc *); static void brgphy_fixup_5704_a0_bug(struct mii_softc *); @@ -122,6 +123,7 @@ MII_PHY_DESC(xxBROADCOM, BCM5752), MII_PHY_DESC(xxBROADCOM, BCM5754), MII_PHY_DESC(xxBROADCOM, BCM5780), + MII_PHY_DESC(xxBROADCOM, BCM5708C), MII_PHY_DESC(xxBROADCOM_ALT1, BCM5787), MII_PHY_END }; @@ -129,8 +131,29 @@ static int brgphy_probe(device_t dev) { + struct mii_attach_args *ma; + int error; - return (mii_phy_dev_probe(dev, brgphys, BUS_PROBE_DEFAULT)); + error = mii_phy_dev_probe(dev, brgphys, BUS_PROBE_DEFAULT); + if (error != BUS_PROBE_DEFAULT) + return (error); + + ma = device_get_ivars(dev); + if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM && + MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5706C) { + /* + * Broadcom uses the same MII model ID on two + * different types of phys. The first is found on the + * BCM 5706 and is supported by this driver. The + * other is found on the BCM 5706S and 5708S and is + * supported by the gentbi(4) driver, so we check to + * see if this phy is supported by gentbi(4) and fail + * the probe if so. + */ + if (bcm5706_is_tbi(dev)) + return (ENXIO); + } + return (error); } static int @@ -488,6 +511,34 @@ } } +/* + * Check to see if a 5706 phy is really a SerDes phy. Copied from + * gentbi_probe(). + */ +static int +bcm5706_is_tbi(device_t dev) +{ + device_t parent; + struct mii_attach_args *ma; + int bmsr, extsr; + + parent = device_get_parent(dev); + ma = device_get_ivars(dev); + + bmsr = MIIBUS_READREG(parent, ma->mii_phyno, MII_BMSR); + if ((bmsr & BMSR_EXTSTAT) == 0 || (bmsr & BMSR_MEDIAMASK) != 0) + return (0); + + extsr = MIIBUS_READREG(parent, ma->mii_phyno, MII_EXTSR); + if (extsr & (EXTSR_1000TFDX|EXTSR_1000THDX)) + return (0); + + if (extsr & (EXTSR_1000XFDX|EXTSR_1000XHDX)) + return (1); + + return (0); +} + /* Turn off tap power management on 5401. */ static void bcm5401_load_dspcode(struct mii_softc *sc) ==== //depot/projects/smpng/sys/dev/mii/miidevs#24 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.40 2007/01/26 17:05:24 dwhite Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.41 2007/02/21 18:17:44 jhb Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -123,13 +123,14 @@ model xxBROADCOM BCM5754 0x000e BCM5754 10/100/1000baseTX PHY model xxBROADCOM BCM5752 0x0010 BCM5752 10/100/1000baseTX PHY model xxBROADCOM BCM5701 0x0011 BCM5701 10/100/1000baseTX PHY +model xxBROADCOM BCM5706C 0x0015 BCM5706C 10/100/1000baseTX PHY model xxBROADCOM BCM5703 0x0016 BCM5703 10/100/1000baseTX PHY model xxBROADCOM BCM5704 0x0019 BCM5704 10/100/1000baseTX PHY model xxBROADCOM BCM5705 0x001a BCM5705 10/100/1000baseTX PHY model xxBROADCOM BCM5750 0x0018 BCM5750 10/100/1000baseTX PHY model xxBROADCOM BCM5714 0x0034 BCM5714 10/100/1000baseTX PHY model xxBROADCOM BCM5780 0x0035 BCM5780 10/100/1000baseTX PHY -model xxBROADCOM BCM5706C 0x0036 BCM5706C/5708C 10/100/1000baseTX PHY +model xxBROADCOM BCM5708C 0x0036 BCM5708C 10/100/1000baseTX PHY model xxBROADCOM_ALT1 BCM5787 0x000e BCM5787 10/100/1000baseTX PHY /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ ==== //depot/projects/smpng/sys/dev/mxge/if_mxge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.21 2007/02/15 17:21:31 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.22 2007/02/21 17:34:05 gallatin Exp $"); #include #include @@ -482,7 +482,7 @@ static int mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr) { - int major, minor; + if (be32toh(hdr->mcp_type) != MCP_TYPE_ETH) { device_printf(sc->dev, "Bad firmware type: 0x%x\n", @@ -495,10 +495,11 @@ if (mxge_verbose) device_printf(sc->dev, "firmware id: %s\n", hdr->version); - sscanf(sc->fw_version, "%d.%d", &major, &minor); + sscanf(sc->fw_version, "%d.%d.%d", &sc->fw_ver_major, + &sc->fw_ver_minor, &sc->fw_ver_tiny); - if (!(major == MXGEFW_VERSION_MAJOR - && minor == MXGEFW_VERSION_MINOR)) { + if (!(sc->fw_ver_major == MXGEFW_VERSION_MAJOR + && sc->fw_ver_minor == MXGEFW_VERSION_MINOR)) { device_printf(sc->dev, "Found firmware version %s\n", sc->fw_version); device_printf(sc->dev, "Driver needs %d.%d\n", @@ -713,6 +714,21 @@ hdr_offset, (char *)hdr, bytes); status = mxge_validate_firmware(sc, hdr); free(hdr, M_DEVBUF); + + /* + * check to see if adopted firmware has bug where adopting + * it will cause broadcasts to be filtered unless the NIC + * is kept in ALLMULTI mode + */ + if (sc->fw_ver_major == 1 && sc->fw_ver_minor == 4 && + sc->fw_ver_tiny >= 4 && sc->fw_ver_tiny <= 11) { + sc->adopted_rx_filter_bug = 1; + device_printf(sc->dev, "Adopting fw %d.%d.%d: " + "working around rx filter bug\n", + sc->fw_ver_major, sc->fw_ver_minor, + sc->fw_ver_tiny); + } + return status; } @@ -875,7 +891,9 @@ " error status: %d\n", err); return; } - + + if (sc->adopted_rx_filter_bug) + return; if (ifp->if_flags & IFF_ALLMULTI) /* request to disable multicast filtering, so quit here */ ==== //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#6 (text+ko) ==== @@ -29,7 +29,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/mxge/if_mxge_var.h,v 1.9 2007/01/31 19:53:36 gallatin Exp $ +$FreeBSD: src/sys/dev/mxge/if_mxge_var.h,v 1.10 2007/02/21 17:34:05 gallatin Exp $ ***************************************************************************/ @@ -153,6 +153,10 @@ char *fw_name; char eeprom_strings[MXGE_EEPROM_STRINGS_SIZE]; char fw_version[128]; + int fw_ver_major; + int fw_ver_minor; + int fw_ver_tiny; + int adopted_rx_filter_bug; device_t dev; struct ifmedia media; int read_dma; From owner-p4-projects@FreeBSD.ORG Thu Feb 22 17:55:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A13B016A403; Thu, 22 Feb 2007 17:55:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 655D716A400 for ; Thu, 22 Feb 2007 17:55:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5803B13C48E for ; Thu, 22 Feb 2007 17:55:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1MHtvnr049585 for ; Thu, 22 Feb 2007 17:55:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1MHtuVe049581 for perforce@freebsd.org; Thu, 22 Feb 2007 17:55:56 GMT (envelope-from jhb@freebsd.org) Date: Thu, 22 Feb 2007 17:55:56 GMT Message-Id: <200702221755.l1MHtuVe049581@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 114835 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, 22 Feb 2007 17:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=114835 Change 114835 by jhb@jhb_mutex on 2007/02/22 17:55:28 s/setrunqueue/sched_add/ Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#34 edit .. //depot/projects/smpng/sys/modules/crash2/crash2.c#18 edit .. //depot/projects/smpng/sys/modules/evtest/evtest.c#22 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#34 (text+ko) ==== @@ -800,7 +800,7 @@ mtx_lock_spin(&sched_lock); sched_prio(td, PRI_MIN_IDLE); TD_SET_CAN_RUN(td); - setrunqueue(td, SRQ_BORING); + sched_add(td, SRQ_BORING); mtx_unlock_spin(&sched_lock); kthread = p; return (0); ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#18 (text+ko) ==== @@ -420,7 +420,7 @@ mtx_lock_spin(&sched_lock); sched_prio(td, PRI_MIN_IDLE); TD_SET_CAN_RUN(td); - setrunqueue(td, SRQ_BORING); + sched_add(td, SRQ_BORING); mtx_unlock_spin(&sched_lock); } return (0); ==== //depot/projects/smpng/sys/modules/evtest/evtest.c#22 (text+ko) ==== @@ -390,7 +390,7 @@ mtx_lock_spin(&sched_lock); sched_prio(td, PRI_MIN_IDLE); TD_SET_CAN_RUN(td); - setrunqueue(td, SRQ_BORING); + sched_add(td, SRQ_BORING); mtx_unlock_spin(&sched_lock); mtx_lock(&event_mtx); num_threads++; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 05:22:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CA3716A404; Fri, 23 Feb 2007 05:22:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06EAE16A401 for ; Fri, 23 Feb 2007 05:22:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E9BF113C478 for ; Fri, 23 Feb 2007 05:22:33 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N5MX9H000431 for ; Fri, 23 Feb 2007 05:22:33 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N5KemD098297 for perforce@freebsd.org; Fri, 23 Feb 2007 05:20:40 GMT (envelope-from marcel@freebsd.org) Date: Fri, 23 Feb 2007 05:20:40 GMT Message-Id: <200702230520.l1N5KemD098297@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 114847 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, 23 Feb 2007 05:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=114847 Change 114847 by marcel@marcel_cluster on 2007/02/23 05:19:12 IFC @114845 Affected files ... .. //depot/projects/ia64/COPYRIGHT#5 integrate .. //depot/projects/ia64/Makefile.inc1#115 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#16 integrate .. //depot/projects/ia64/UPDATING#95 integrate .. //depot/projects/ia64/bin/cat/cat.1#4 integrate .. //depot/projects/ia64/bin/chmod/chmod.1#11 integrate .. //depot/projects/ia64/bin/expr/expr.y#8 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.1#7 integrate .. //depot/projects/ia64/bin/rm/rm.1#15 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/ia64/bin/sh/exec.c#14 integrate .. //depot/projects/ia64/contrib/bind9/CHANGES#8 integrate .. //depot/projects/ia64/contrib/bind9/FAQ#5 integrate .. //depot/projects/ia64/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/ia64/contrib/bind9/README#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/ia64/contrib/bind9/version#8 integrate .. //depot/projects/ia64/contrib/gdtoa/README#4 integrate .. //depot/projects/ia64/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g__fmt.c#4 integrate .. //depot/projects/ia64/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#7 integrate .. //depot/projects/ia64/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/ia64/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/makefile#2 integrate .. //depot/projects/ia64/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/ia64/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#5 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodg.c#4 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/ia64/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/ia64/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/xsum0.out#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#18 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#10 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#15 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGELOG#5 integrate .. //depot/projects/ia64/contrib/libreadline/CHANGES#5 integrate .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#6 integrate .. //depot/projects/ia64/contrib/libreadline/INSTALL#5 integrate .. //depot/projects/ia64/contrib/libreadline/NEWS#3 integrate .. //depot/projects/ia64/contrib/libreadline/README#5 integrate .. //depot/projects/ia64/contrib/libreadline/aclocal.m4#5 integrate .. //depot/projects/ia64/contrib/libreadline/bind.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/callback.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/complete.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/config.h.in#5 integrate .. //depot/projects/ia64/contrib/libreadline/configure#5 integrate .. //depot/projects/ia64/contrib/libreadline/configure.in#5 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/readline.3#6 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/ia64/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/ia64/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/ia64/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libreadline/histexpand.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/history.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/input.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/kill.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/macro.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/misc.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/readline.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/readline.h#7 integrate .. //depot/projects/ia64/contrib/libreadline/rlconf.h#5 integrate .. //depot/projects/ia64/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/ia64/contrib/libreadline/rlprivate.h#5 integrate .. //depot/projects/ia64/contrib/libreadline/rltty.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/search.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/signals.c#5 integrate .. //depot/projects/ia64/contrib/libreadline/support/shlib-install#5 integrate .. //depot/projects/ia64/contrib/libreadline/support/shobj-conf#5 integrate .. //depot/projects/ia64/contrib/libreadline/terminal.c#6 integrate .. //depot/projects/ia64/contrib/libreadline/text.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/undo.c#4 integrate .. //depot/projects/ia64/contrib/libreadline/vi_mode.c#6 integrate .. //depot/projects/ia64/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/ia64/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/ia64/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/ia64/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/ia64/contrib/ncurses/Makefile.glibc#3 delete .. //depot/projects/ia64/contrib/ncurses/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/ia64/contrib/ncurses/NEWS#4 integrate .. //depot/projects/ia64/contrib/ncurses/README#2 integrate .. //depot/projects/ia64/contrib/ncurses/README.emx#2 integrate .. //depot/projects/ia64/contrib/ncurses/README.glibc#2 delete .. //depot/projects/ia64/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/ia64/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/ia64/contrib/ncurses/c++/Makefile.in#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesf.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesf.h#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesm.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesmain.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesp.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesp.h#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesw.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursesw.h#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/demo.cc#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/edit_cfg.sh#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/etip.h.in#3 delete .. //depot/projects/ia64/contrib/ncurses/c++/headers#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/ia64/contrib/ncurses/c++/modules#2 delete .. //depot/projects/ia64/contrib/ncurses/config.guess#3 integrate .. //depot/projects/ia64/contrib/ncurses/config.sub#3 integrate .. //depot/projects/ia64/contrib/ncurses/configure#4 integrate .. //depot/projects/ia64/contrib/ncurses/configure.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/ia64/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/ia64/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/ia64/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/ia64/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/ia64/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/ia64/contrib/ncurses/doc/html/ncurses-intro.html#3 integrate .. //depot/projects/ia64/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/ia64/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/form.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/ia64/contrib/ncurses/form/modules#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/Caps#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/ia64/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKkey_defs.sh#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/ia64/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/ia64/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/ncurses_dll.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/tic.h#4 integrate .. //depot/projects/ia64/contrib/ncurses/install-sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_addstr.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_attr.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_bkgd.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_border.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_color.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_extend.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getch.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getstr.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_insstr.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_instr.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_kernel.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_mouse.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_move.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_outopts.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_overlay.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_print.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_refresh.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_scroll.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_termattrs.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_termcap.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_trace.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/default_colors.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/define_key.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_attributes.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_info.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_just.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_new.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_validation.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_fieldtype.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_new_page.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/infocmp.1m#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/ia64/contrib/ncurses/man/keybound.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/keyok.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/ia64/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_format.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_spacing.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_value.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/resizeterm.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/term.5#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/term.7#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/wresize.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/ia64/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_global.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/ia64/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/menu.priv.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/mf_common.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/csort#1 branch .. //depot/projects/ia64/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/ia64/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/ia64/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/ia64/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/ia64/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/ia64/contrib/ncurses/misc/run_tic.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/ia64/contrib/ncurses/mk-0th.awk#3 integrate .. //depot/projects/ia64/contrib/ncurses/mk-1st.awk#3 integrate .. //depot/projects/ia64/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/ia64/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addstr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_box.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_chgat.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_clrbot.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_color.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_erase.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_hline.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insch.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insdel.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insstr.c#3 delete .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_instr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_mvwin.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_pad.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_printw.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_redrawln.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_refresh.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_scroll.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkclear.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkset.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_vline.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/safe_sprintf.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/sigaction.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/vsscanf.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/modules#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKfallback.sh#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/access.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_error.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_kernel.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_print.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_termname.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/read_termcap.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/hashmap.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_vidattr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/ia64/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/ansi.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/charset.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/edit.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/init.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/output.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/sync.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/sysdep.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/ia64/contrib/ncurses/tack/tack.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/tack/tack.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/ia64/contrib/ncurses/test/Makefile.in#3 delete .. //depot/projects/ia64/contrib/ncurses/test/README#2 delete .. //depot/projects/ia64/contrib/ncurses/test/blue.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/ia64/contrib/ncurses/test/bs.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/cardfile.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/ia64/contrib/ncurses/test/configure#3 delete .. //depot/projects/ia64/contrib/ncurses/test/configure.in#3 delete .. //depot/projects/ia64/contrib/ncurses/test/ditto.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/dots.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/filter.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/firework.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/firstlast.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/ia64/contrib/ncurses/test/gdc.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/hanoi.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/hashtest.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/keynames.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/knight.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/lrtest.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/modules#2 delete .. //depot/projects/ia64/contrib/ncurses/test/ncurses.c#4 delete .. //depot/projects/ia64/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/ia64/contrib/ncurses/test/newdemo.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/railroad.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/rain.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/tclock.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/test.priv.h#3 delete .. //depot/projects/ia64/contrib/ncurses/test/testaddch.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/testcurs.c#4 delete .. //depot/projects/ia64/contrib/ncurses/test/testscanw.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/ia64/contrib/ncurses/test/view.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/worm.c#3 delete .. //depot/projects/ia64/contrib/ncurses/test/xmas.c#3 delete .. //depot/projects/ia64/etc/defaults/rc.conf#75 integrate .. //depot/projects/ia64/etc/devd.conf#25 integrate .. //depot/projects/ia64/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/ia64/etc/network.subr#18 integrate .. //depot/projects/ia64/etc/periodic/security/800.loginfail#7 integrate .. //depot/projects/ia64/etc/rc.d/abi#8 integrate .. //depot/projects/ia64/etc/rc.d/accounting#8 integrate .. //depot/projects/ia64/etc/rc.d/archdep#11 integrate .. //depot/projects/ia64/etc/rc.d/atm1#8 integrate .. //depot/projects/ia64/etc/rc.d/auto_linklocal#5 integrate .. //depot/projects/ia64/etc/rc.d/bluetooth#2 integrate .. //depot/projects/ia64/etc/rc.d/bootconf.sh#5 integrate .. //depot/projects/ia64/etc/rc.d/bridge#2 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#17 integrate .. //depot/projects/ia64/etc/rc.d/geli#3 integrate .. //depot/projects/ia64/etc/rc.d/hcsecd#3 integrate .. //depot/projects/ia64/etc/rc.d/hostname#7 integrate .. //depot/projects/ia64/etc/rc.d/ip6fw#8 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#20 integrate .. //depot/projects/ia64/etc/rc.d/ipfw#13 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#13 integrate .. //depot/projects/ia64/etc/rc.d/jail#21 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#15 integrate .. //depot/projects/ia64/etc/rc.d/lpd#7 integrate .. //depot/projects/ia64/etc/rc.d/mdconfig#3 integrate .. //depot/projects/ia64/etc/rc.d/mdconfig2#3 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#13 integrate .. //depot/projects/ia64/etc/rc.d/moused#10 integrate .. //depot/projects/ia64/etc/rc.d/natd#4 integrate .. //depot/projects/ia64/etc/rc.d/netif#15 integrate .. //depot/projects/ia64/etc/rc.d/nfsclient#6 integrate .. //depot/projects/ia64/etc/rc.d/nfsserver#5 integrate .. //depot/projects/ia64/etc/rc.d/nsswitch#8 integrate .. //depot/projects/ia64/etc/rc.d/pf#8 integrate .. //depot/projects/ia64/etc/rc.d/pflog#8 integrate .. //depot/projects/ia64/etc/rc.d/pfsync#2 integrate .. //depot/projects/ia64/etc/rc.d/power_profile#8 integrate .. //depot/projects/ia64/etc/rc.d/pppoed#4 integrate .. //depot/projects/ia64/etc/rc.d/quota#6 integrate .. //depot/projects/ia64/etc/rc.d/sdpd#3 integrate .. //depot/projects/ia64/etc/rc.d/syscons#12 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#9 integrate .. //depot/projects/ia64/etc/rc.d/ugidfw#5 integrate .. //depot/projects/ia64/etc/rc.d/var#6 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#9 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#9 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#10 integrate .. //depot/projects/ia64/etc/rc.d/ypset#7 integrate .. //depot/projects/ia64/etc/rc.d/ypupdated#6 integrate .. //depot/projects/ia64/etc/rc.d/ypxfrd#8 integrate .. //depot/projects/ia64/etc/rc.firewall#7 integrate .. //depot/projects/ia64/etc/rc.subr#32 integrate .. //depot/projects/ia64/etc/snmpd.config#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#63 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#7 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes.sp.ok#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#14 integrate .. //depot/projects/ia64/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/ia64/gnu/lib/libreadline/Makefile.inc#9 integrate .. //depot/projects/ia64/gnu/lib/libreadline/config.h#5 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#30 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#13 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#9 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#33 integrate .. //depot/projects/ia64/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/Makefile#5 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzip.c#4 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/gzip.h#4 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/inflate.c#4 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/match.S#4 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/unlzh.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/unpack.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/unzip.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zdiff#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/znew#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/apropos/apropos.man#9 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.man#8 integrate .. //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.man#3 integrate .. //depot/projects/ia64/include/Makefile#57 integrate .. //depot/projects/ia64/include/mqueue.h#2 integrate .. //depot/projects/ia64/include/objformat.h#2 delete .. //depot/projects/ia64/include/rpc/auth_kerb.h#3 integrate .. //depot/projects/ia64/include/tgmath.h#3 integrate .. //depot/projects/ia64/lib/Makefile#60 integrate .. //depot/projects/ia64/lib/bind/bind/config.h#5 integrate .. //depot/projects/ia64/lib/bind/config.h#6 integrate .. //depot/projects/ia64/lib/bind/dns/code.h#4 integrate .. //depot/projects/ia64/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/ia64/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/ia64/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/ia64/lib/libarchive/COPYING#3 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#24 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_check_magic.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.3#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_buffer.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#19 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_all.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_compress.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_string_sprintf.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_fd.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#10 integrate .. //depot/projects/ia64/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/ia64/lib/libarchive/libarchive-formats.5#10 integrate .. //depot/projects/ia64/lib/libarchive/libarchive.3#7 integrate .. //depot/projects/ia64/lib/libarchive/tar.5#12 integrate .. //depot/projects/ia64/lib/libc/amd64/SYS.h#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/_setjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/ldexp.c#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/modf.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#5 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#4 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/brk.S#4 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/exect.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/ptrace.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/reboot.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/sbrk.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/setlogin.S#4 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/vfork.S#4 integrate .. //depot/projects/ia64/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/ia64/lib/libc/compat-43/creat.2#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/creat.c#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/gethostid.3#5 integrate .. //depot/projects/ia64/lib/libc/compat-43/gethostid.c#5 integrate .. //depot/projects/ia64/lib/libc/compat-43/getwd.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/killpg.2#5 integrate .. //depot/projects/ia64/lib/libc/compat-43/killpg.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/sethostid.c#5 integrate .. //depot/projects/ia64/lib/libc/compat-43/setpgrp.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/setrgid.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/setruid.3#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/setruid.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigcompat.c#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigpause.2#5 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigsetmask.2#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigvec.2#8 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_close.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_conv.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_debug.c#4 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_delete.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_get.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_open.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_overflow.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_page.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_put.c#5 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_search.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_seq.c#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_split.c#6 integrate .. //depot/projects/ia64/lib/libc/db/btree/bt_utils.c#4 integrate .. //depot/projects/ia64/lib/libc/db/btree/btree.h#3 integrate .. //depot/projects/ia64/lib/libc/db/btree/extern.h#3 integrate .. //depot/projects/ia64/lib/libc/db/db/db.c#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/extern.h#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash.c#4 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash.h#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash_bigkey.c#4 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash_buf.c#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash_func.c#4 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash_log2.c#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/hash_page.c#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/ndbm.c#3 integrate .. //depot/projects/ia64/lib/libc/db/hash/page.h#3 integrate .. //depot/projects/ia64/lib/libc/db/man/btree.3#5 integrate .. //depot/projects/ia64/lib/libc/db/man/dbopen.3#9 integrate .. //depot/projects/ia64/lib/libc/db/man/hash.3#4 integrate .. //depot/projects/ia64/lib/libc/db/man/mpool.3#7 integrate .. //depot/projects/ia64/lib/libc/db/man/recno.3#4 integrate .. //depot/projects/ia64/lib/libc/db/mpool/mpool.c#5 integrate .. //depot/projects/ia64/lib/libc/db/recno/extern.h#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_close.c#4 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_delete.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_get.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_open.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_put.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_search.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_seq.c#4 integrate .. //depot/projects/ia64/lib/libc/db/recno/rec_utils.c#3 integrate .. //depot/projects/ia64/lib/libc/db/recno/recno.h#3 integrate .. //depot/projects/ia64/lib/libc/db/test/btree.tests/main.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/dbtest.c#4 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/driver2.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/tcreat3.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/tdel.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/thash4.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/tread2.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/tseq.c#3 integrate .. //depot/projects/ia64/lib/libc/db/test/hash.tests/tverify.c#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#37 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/ia64/lib/libc/gen/__xuname.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/_spinlock_stub.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/alarm.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/alarm.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/assert.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/clock.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/clock.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/crypt.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/ctermid.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/ctermid.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/daemon.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/daemon.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/devname.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/directory.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/disklabel.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/err.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/err.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/errlst.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/exec.3#10 integrate .. //depot/projects/ia64/lib/libc/gen/exec.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/fnmatch.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/fnmatch.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/frexp.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/fstab.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#11 integrate .. //depot/projects/ia64/lib/libc/gen/fts.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/getbootfile.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/getbootfile.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/getcwd.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getcwd.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/getdiskbyname.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getdomainname.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/getdomainname.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 05:33:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32BEC16A407; Fri, 23 Feb 2007 05:33:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBE9D16A402 for ; Fri, 23 Feb 2007 05:33:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA65913C4B2 for ; Fri, 23 Feb 2007 05:33:28 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N5XSu9010612 for ; Fri, 23 Feb 2007 05:33:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N5Wm6a010049 for perforce@freebsd.org; Fri, 23 Feb 2007 05:32:48 GMT (envelope-from marcel@freebsd.org) Date: Fri, 23 Feb 2007 05:32:48 GMT Message-Id: <200702230532.l1N5Wm6a010049@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 114848 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, 23 Feb 2007 05:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=114848 Change 114848 by marcel@marcel_cluster on 2007/02/23 05:32:32 IFC @114845 Affected files ... .. //depot/projects/powerpc/ObsoleteFiles.inc#3 integrate .. //depot/projects/powerpc/UPDATING#4 integrate .. //depot/projects/powerpc/bin/expr/expr.y#2 integrate .. //depot/projects/powerpc/contrib/bind9/CHANGES#2 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ#2 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/powerpc/contrib/bind9/README#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/version#2 integrate .. //depot/projects/powerpc/etc/defaults/rc.conf#3 integrate .. //depot/projects/powerpc/etc/devd.conf#2 integrate .. //depot/projects/powerpc/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/powerpc/etc/network.subr#2 integrate .. //depot/projects/powerpc/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/powerpc/etc/rc.d/dhclient#2 integrate .. //depot/projects/powerpc/etc/rc.d/hostname#2 integrate .. //depot/projects/powerpc/etc/rc.d/netif#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gzip/COPYING#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/ChangeLog#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/Makefile#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/NEWS#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/README#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/THANKS#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/TODO#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/algorithm.doc#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/bits.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/crypt.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/crypt.h#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/deflate.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/gzexe#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/gzexe.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/gzip.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/gzip.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/gzip.h#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/inflate.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/lzw.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/lzw.h#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/match.S#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/revision.h#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/tailor.h#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/trees.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/unlzh.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/unlzw.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/unpack.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/unzip.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/util.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zdiff#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zdiff.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zforce#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zforce.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zgrep#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zgrep.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zgrep.getopt#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zgrep.libz#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zip.c#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zmore#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/zmore.1#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/znew#2 delete .. //depot/projects/powerpc/gnu/usr.bin/gzip/znew.1#2 delete .. //depot/projects/powerpc/include/Makefile#2 integrate .. //depot/projects/powerpc/include/objformat.h#2 delete .. //depot/projects/powerpc/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/powerpc/include/tgmath.h#2 integrate .. //depot/projects/powerpc/lib/bind/bind/config.h#2 integrate .. //depot/projects/powerpc/lib/bind/config.h#2 integrate .. //depot/projects/powerpc/lib/bind/dns/code.h#2 integrate .. //depot/projects/powerpc/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/powerpc/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/powerpc/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/Makefile#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_all.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_empty.c#1 branch .. //depot/projects/powerpc/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/powerpc/lib/libc/gen/getobjformat.3#2 delete .. //depot/projects/powerpc/lib/libc/gen/getobjformat.c#2 delete .. //depot/projects/powerpc/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/powerpc/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/powerpc/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/powerpc/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/powerpc/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/sys/kse.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/quotactl.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/powerpc/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/powerpc/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/powerpc/lib/libelf/libelf_allocate.c#2 integrate .. //depot/projects/powerpc/lib/libkvm/kvm_getswapinfo.c#2 integrate .. //depot/projects/powerpc/lib/libwrap/Makefile#2 integrate .. //depot/projects/powerpc/lib/libypclnt/Makefile#2 integrate .. //depot/projects/powerpc/lib/libypclnt/ypclnt.3#1 branch .. //depot/projects/powerpc/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/powerpc/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/powerpc/release/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/Makefile.inc#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/i386/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/powerpc/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/powerpc/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/powerpc/release/doc/share/examples/Makefile.relnotesng#2 integrate .. //depot/projects/powerpc/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/powerpc/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/powerpc/release/doc/share/sgml/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate .. //depot/projects/powerpc/rescue/rescue/Makefile#2 integrate .. //depot/projects/powerpc/sbin/Makefile#2 integrate .. //depot/projects/powerpc/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/powerpc/sbin/dhclient/clparse.c#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/powerpc/sbin/dhclient/tables.c#2 integrate .. //depot/projects/powerpc/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/journal/Makefile#2 integrate .. //depot/projects/powerpc/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/powerpc/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/powerpc/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/af_inet6.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifgroup.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/powerpc/sbin/init/init.c#2 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/powerpc/sbin/kldload/kldload.8#2 integrate .. //depot/projects/powerpc/sbin/kldstat/kldstat.8#2 integrate .. //depot/projects/powerpc/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/powerpc/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/powerpc/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/powerpc/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/powerpc/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/powerpc/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/powerpc/sbin/mount/Makefile#2 integrate .. //depot/projects/powerpc/sbin/mount/mount.c#2 integrate .. //depot/projects/powerpc/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/powerpc/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/powerpc/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/powerpc/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/powerpc/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/powerpc/sbin/mount_nfs4/Makefile#2 delete .. //depot/projects/powerpc/sbin/mount_nfs4/mount_nfs4.8#2 delete .. //depot/projects/powerpc/sbin/mount_nfs4/mount_nfs4.c#2 delete .. //depot/projects/powerpc/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/powerpc/sbin/mount_unionfs/mount_unionfs.c#3 integrate .. //depot/projects/powerpc/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/powerpc/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/powerpc/share/dict/web2a#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#5 integrate .. //depot/projects/powerpc/share/man/man4/altq.4#3 integrate .. //depot/projects/powerpc/share/man/man4/an.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ata.4#3 integrate .. //depot/projects/powerpc/share/man/man4/ath.4#2 integrate .. //depot/projects/powerpc/share/man/man4/aue.4#2 integrate .. //depot/projects/powerpc/share/man/man4/awi.4#2 integrate .. //depot/projects/powerpc/share/man/man4/bce.4#3 integrate .. //depot/projects/powerpc/share/man/man4/bfe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/bge.4#2 integrate .. //depot/projects/powerpc/share/man/man4/dc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/de.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ed.4#2 integrate .. //depot/projects/powerpc/share/man/man4/em.4#2 integrate .. //depot/projects/powerpc/share/man/man4/enc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/fxp.4#3 integrate .. //depot/projects/powerpc/share/man/man4/hme.4#2 integrate .. //depot/projects/powerpc/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/icmp.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ipw.4#2 integrate .. //depot/projects/powerpc/share/man/man4/iwi.4#2 integrate .. //depot/projects/powerpc/share/man/man4/joy.4#3 integrate .. //depot/projects/powerpc/share/man/man4/kame.4#2 delete .. //depot/projects/powerpc/share/man/man4/kld.4#2 integrate .. //depot/projects/powerpc/share/man/man4/le.4#3 integrate .. //depot/projects/powerpc/share/man/man4/man4.arm/npe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/ep.4#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/powerpc/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/powerpc/share/man/man4/msk.4#2 integrate .. //depot/projects/powerpc/share/man/man4/mxge.4#2 integrate .. //depot/projects/powerpc/share/man/man4/my.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ng_deflate.4#2 integrate .. //depot/projects/powerpc/share/man/man4/nve.4#2 integrate .. //depot/projects/powerpc/share/man/man4/pim.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ral.4#2 integrate .. //depot/projects/powerpc/share/man/man4/re.4#2 integrate .. //depot/projects/powerpc/share/man/man4/rl.4#2 integrate .. //depot/projects/powerpc/share/man/man4/sctp.4#1 branch .. //depot/projects/powerpc/share/man/man4/sf.4#2 integrate .. //depot/projects/powerpc/share/man/man4/sis.4#2 integrate .. //depot/projects/powerpc/share/man/man4/sk.4#2 integrate .. //depot/projects/powerpc/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/powerpc/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ste.4#2 integrate .. //depot/projects/powerpc/share/man/man4/stge.4#2 integrate .. //depot/projects/powerpc/share/man/man4/tap.4#2 integrate .. //depot/projects/powerpc/share/man/man4/tcp.4#2 integrate .. //depot/projects/powerpc/share/man/man4/tun.4#2 integrate .. //depot/projects/powerpc/share/man/man4/uark.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ubsa.4#2 integrate .. //depot/projects/powerpc/share/man/man4/udav.4#2 integrate .. //depot/projects/powerpc/share/man/man4/ural.4#2 integrate .. //depot/projects/powerpc/share/man/man4/vge.4#2 integrate .. //depot/projects/powerpc/share/man/man4/vr.4#2 integrate .. //depot/projects/powerpc/share/man/man4/wi.4#2 integrate .. //depot/projects/powerpc/share/man/man4/xl.4#2 integrate .. //depot/projects/powerpc/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/powerpc/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/powerpc/share/man/man5/quota.user.5#2 integrate .. //depot/projects/powerpc/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/powerpc/share/man/man5/src.conf.5#2 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#4 integrate .. //depot/projects/powerpc/share/man/man9/VFS_VPTOFH.9#2 delete .. //depot/projects/powerpc/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/powerpc/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/powerpc/share/man/man9/disk.9#2 integrate .. //depot/projects/powerpc/share/man/man9/firmware.9#2 integrate .. //depot/projects/powerpc/share/man/man9/hashinit.9#3 integrate .. //depot/projects/powerpc/share/man/man9/ieee80211_ioctl.9#2 integrate .. //depot/projects/powerpc/share/man/man9/mbuf.9#2 integrate .. //depot/projects/powerpc/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/powerpc/share/man/man9/priv.9#3 integrate .. //depot/projects/powerpc/share/man/man9/sf_buf.9#1 branch .. //depot/projects/powerpc/share/man/man9/style.9#2 integrate .. //depot/projects/powerpc/share/man/man9/vm_map.9#2 integrate .. //depot/projects/powerpc/share/misc/bsd-family-tree#3 integrate .. //depot/projects/powerpc/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/powerpc/share/mk/bsd.own.mk#2 integrate .. //depot/projects/powerpc/share/syscons/keymaps/hr.iso.kbd#2 integrate .. //depot/projects/powerpc/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/powerpc/sys/amd64/include/clock.h#2 integrate .. //depot/projects/powerpc/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/powerpc/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/powerpc/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/powerpc/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/powerpc/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/powerpc/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/powerpc/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/powerpc/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/locore.S#2 integrate .. //depot/projects/powerpc/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/mem.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/powerpc/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/powerpc/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/powerpc/sys/arm/conf/EP80219#2 integrate .. //depot/projects/powerpc/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/powerpc/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/loader.8#5 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/powerpc/sys/coda/coda_vfsops.h#5 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/powerpc/sys/conf/NOTES#6 integrate .. //depot/projects/powerpc/sys/conf/files#8 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#6 integrate .. //depot/projects/powerpc/sys/conf/kmod.mk#5 integrate .. //depot/projects/powerpc/sys/conf/options#8 integrate .. //depot/projects/powerpc/sys/conf/options.arm#3 integrate .. //depot/projects/powerpc/sys/dev/aac/aac.c#5 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.h#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/powerpc/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/powerpc/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/powerpc/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/powerpc/sys/dev/exca/exca.c#3 integrate .. //depot/projects/powerpc/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/powerpc/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/powerpc/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/powerpc/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/powerpc/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/powerpc/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/powerpc/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/powerpc/sys/dev/mii/brgphyreg.h#5 integrate .. //depot/projects/powerpc/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/powerpc/sys/dev/mii/miidevs#7 integrate .. //depot/projects/powerpc/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/powerpc/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/powerpc/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/powerpc/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/powerpc/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/powerpc/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/pci/pci.c#8 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/powerpc/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/powerpc/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/powerpc/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/powerpc/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/powerpc/sys/dev/re/if_re.c#4 integrate .. //depot/projects/powerpc/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/driver.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/ad1816.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/mss.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/sb.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/midi.h#5 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/sequencer.h#5 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/powerpc/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/powerpc/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/powerpc/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/powerpc/sys/dev/syscons/fire/fire_saver.c#4 integrate .. //depot/projects/powerpc/sys/dev/syscons/logo/logo_saver.c#4 integrate .. //depot/projects/powerpc/sys/dev/syscons/rain/rain_saver.c#4 integrate .. //depot/projects/powerpc/sys/dev/syscons/warp/warp_saver.c#4 integrate .. //depot/projects/powerpc/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/powerpc/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/powerpc/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/uipaq.c#1 branch .. //depot/projects/powerpc/sys/dev/usb/umass.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/powerpc/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/powerpc/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/powerpc/sys/fs/cd9660/TODO#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/TODO.hibler#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_bmap.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_lookup.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_mount.h#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_node.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_node.h#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_rrip.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_rrip.h#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_util.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_vfsops.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/cd9660_vnops.c#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/iso.h#1 branch .. //depot/projects/powerpc/sys/fs/cd9660/iso_rrip.h#1 branch .. //depot/projects/powerpc/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/powerpc/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/powerpc/sys/fs/udf/udf.h#3 integrate .. //depot/projects/powerpc/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/powerpc/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/powerpc/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/umapfs/umap_vnops.c#5 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/powerpc/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/powerpc/sys/geom/geom_apple.c#2 delete .. //depot/projects/powerpc/sys/geom/geom_disk.c#3 integrate .. //depot/projects/powerpc/sys/geom/geom_gpt.c#3 delete .. //depot/projects/powerpc/sys/geom/geom_io.c#3 integrate .. //depot/projects/powerpc/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/powerpc/sys/geom/part/g_part.c#1 branch .. //depot/projects/powerpc/sys/geom/part/g_part.h#1 branch .. //depot/projects/powerpc/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/powerpc/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/powerpc/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/powerpc/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/powerpc/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/powerpc/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/powerpc/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/powerpc/sys/i386/i386/msi.c#2 integrate .. //depot/projects/powerpc/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/powerpc/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/powerpc/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/powerpc/sys/i386/include/clock.h#5 integrate .. //depot/projects/powerpc/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/powerpc/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/powerpc/sys/i386/isa/clock.c#5 integrate .. //depot/projects/powerpc/sys/i386/linux/linux.h#6 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/powerpc/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/powerpc/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/powerpc/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/powerpc/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/powerpc/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/powerpc/sys/isofs/cd9660/TODO#3 delete .. //depot/projects/powerpc/sys/isofs/cd9660/TODO.hibler#3 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_bmap.c#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_iconv.c#2 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_lookup.c#5 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_mount.h#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_node.c#5 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_node.h#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_rrip.c#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_rrip.h#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_util.c#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_vfsops.c#5 delete .. //depot/projects/powerpc/sys/isofs/cd9660/cd9660_vnops.c#5 delete .. //depot/projects/powerpc/sys/isofs/cd9660/iso.h#4 delete .. //depot/projects/powerpc/sys/isofs/cd9660/iso_rrip.h#4 delete .. //depot/projects/powerpc/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/powerpc/sys/kern/init_main.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_conf.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_fork.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_idle.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_jail.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_kse.c#3 integrate .. //depot/projects/powerpc/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/powerpc/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/powerpc/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/powerpc/sys/kern/kern_resource.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_sig.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_switch.c#6 integrate .. //depot/projects/powerpc/sys/kern/kern_thr.c#2 integrate .. //depot/projects/powerpc/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/powerpc/sys/kern/sched_core.c#3 integrate .. //depot/projects/powerpc/sys/kern/sched_ule.c#3 integrate .. //depot/projects/powerpc/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/powerpc/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#6 integrate .. //depot/projects/powerpc/sys/kern/sysv_ipc.c#6 integrate .. //depot/projects/powerpc/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/powerpc/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/powerpc/sys/kern/uipc_debug.c#1 branch .. //depot/projects/powerpc/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/powerpc/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/powerpc/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/powerpc/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/powerpc/sys/kern/vfs_default.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_export.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_init.c#4 integrate .. //depot/projects/powerpc/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/powerpc/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/kern/vnode_if.src#5 integrate .. //depot/projects/powerpc/sys/modules/Makefile#7 integrate .. //depot/projects/powerpc/sys/modules/ath/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/cd9660/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/cd9660_iconv/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/geom/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/msdosfs/Makefile#4 integrate .. //depot/projects/powerpc/sys/modules/uipaq/Makefile#1 branch .. //depot/projects/powerpc/sys/net/bpf.c#5 integrate .. //depot/projects/powerpc/sys/net/bpf_compat.h#4 delete .. //depot/projects/powerpc/sys/net/bpfdesc.h#5 integrate .. //depot/projects/powerpc/sys/net/if.c#5 integrate .. //depot/projects/powerpc/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/powerpc/sys/net/if_loop.c#5 integrate .. //depot/projects/powerpc/sys/net/if_ppp.c#5 integrate .. //depot/projects/powerpc/sys/net/if_tap.c#5 integrate .. //depot/projects/powerpc/sys/net/if_tun.c#5 integrate .. //depot/projects/powerpc/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/powerpc/sys/netatalk/at_control.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/powerpc/sys/netinet/if_ether.c#6 integrate .. //depot/projects/powerpc/sys/netinet/in.c#5 integrate .. //depot/projects/powerpc/sys/netinet/in.h#6 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/powerpc/sys/netinet/in_proto.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/powerpc/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_input.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/powerpc/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/powerpc/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#5 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.h#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp.h#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/powerpc/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/powerpc/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/powerpc/sys/netinet/udp.h#4 integrate .. //depot/projects/powerpc/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/netinet/udp_var.h#5 integrate .. //depot/projects/powerpc/sys/netinet6/ah_core.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/nd6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/powerpc/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/powerpc/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/powerpc/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/powerpc/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/powerpc/sys/pci/if_rl.c#5 integrate .. //depot/projects/powerpc/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/powerpc/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/powerpc/sys/powerpc/include/ipl.h#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/powerpc/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/powerpc/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/powerpc/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/powerpc/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/powerpc/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/powerpc/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/powerpc/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/powerpc/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/powerpc/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/powerpc/sys/sun4v/conf/.cvsignore#1 branch .. //depot/projects/powerpc/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/powerpc/sys/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/powerpc/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/powerpc/sys/sys/_label.h#2 delete .. //depot/projects/powerpc/sys/sys/apm.h#1 branch .. //depot/projects/powerpc/sys/sys/ata.h#5 integrate .. //depot/projects/powerpc/sys/sys/buf.h#5 integrate .. //depot/projects/powerpc/sys/sys/bufobj.h#2 integrate .. //depot/projects/powerpc/sys/sys/conf.h#5 integrate .. //depot/projects/powerpc/sys/sys/firmware.h#2 integrate .. //depot/projects/powerpc/sys/sys/lock.h#5 integrate .. //depot/projects/powerpc/sys/sys/mac.h#2 integrate .. //depot/projects/powerpc/sys/sys/mbuf.h#5 integrate .. //depot/projects/powerpc/sys/sys/mount.h#6 integrate .. //depot/projects/powerpc/sys/sys/param.h#6 integrate .. //depot/projects/powerpc/sys/sys/priv.h#2 integrate .. //depot/projects/powerpc/sys/sys/proc.h#7 integrate .. //depot/projects/powerpc/sys/sys/runq.h#6 integrate .. //depot/projects/powerpc/sys/sys/sched.h#2 integrate .. //depot/projects/powerpc/sys/sys/socketvar.h#5 integrate .. //depot/projects/powerpc/sys/sys/systm.h#6 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#6 integrate .. //depot/projects/powerpc/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/powerpc/sys/ufs/ffs/README.softupdates#3 delete .. //depot/projects/powerpc/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/powerpc/sys/vm/swap_pager.c#6 integrate .. //depot/projects/powerpc/sys/vm/swap_pager.h#4 integrate .. //depot/projects/powerpc/sys/vm/uma.h#4 integrate .. //depot/projects/powerpc/sys/vm/uma_core.c#4 integrate .. //depot/projects/powerpc/sys/vm/vm_contig.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_glue.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_object.c#7 integrate .. //depot/projects/powerpc/sys/vm/vm_page.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_page.h#5 integrate .. //depot/projects/powerpc/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/powerpc/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/powerpc/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/powerpc/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_BZIP2#1 branch .. //depot/projects/powerpc/tools/build/options/WITHOUT_BZIP2_SUPPORT#1 branch .. //depot/projects/powerpc/tools/regression/fstest/README#1 branch .. //depot/projects/powerpc/tools/regression/fstest/tests/chmod/00.t#2 integrate .. //depot/projects/powerpc/tools/regression/fstest/tests/mkdir/00.t#2 integrate .. //depot/projects/powerpc/tools/regression/fstest/tests/mkfifo/00.t#2 integrate .. //depot/projects/powerpc/tools/regression/fstest/tests/open/00.t#2 integrate .. //depot/projects/powerpc/tools/regression/netinet/ipsockopt/ipsockopt.c#2 integrate .. //depot/projects/powerpc/tools/sched/schedgraph.py#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/powerpc/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/powerpc/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/powerpc/usr.bin/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 integrate .. //depot/projects/powerpc/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate .. //depot/projects/powerpc/usr.bin/calendar/calendars/calendar.music#3 integrate .. //depot/projects/powerpc/usr.bin/ctags/C.c#2 integrate .. //depot/projects/powerpc/usr.bin/ctags/fortran.c#2 integrate .. //depot/projects/powerpc/usr.bin/ctags/tree.c#2 integrate .. //depot/projects/powerpc/usr.bin/getent/getent.c#2 integrate .. //depot/projects/powerpc/usr.bin/gzip/Makefile#1 branch .. //depot/projects/powerpc/usr.bin/gzip/gzexe#1 branch .. //depot/projects/powerpc/usr.bin/gzip/gzexe.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/gzip.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/gzip.c#1 branch .. //depot/projects/powerpc/usr.bin/gzip/unbzip2.c#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zdiff#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zdiff.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zforce#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zforce.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zmore#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zmore.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/znew#1 branch .. //depot/projects/powerpc/usr.bin/gzip/znew.1#1 branch .. //depot/projects/powerpc/usr.bin/gzip/zuncompress.c#1 branch .. //depot/projects/powerpc/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/powerpc/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/powerpc/usr.bin/ncplist/ncplist.c#2 integrate .. //depot/projects/powerpc/usr.bin/ncplogin/ncplogin.c#2 integrate .. //depot/projects/powerpc/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/powerpc/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/powerpc/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/powerpc/usr.bin/netstat/route.c#2 integrate .. //depot/projects/powerpc/usr.bin/objformat/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/objformat/objformat.1#2 delete .. //depot/projects/powerpc/usr.bin/objformat/objformat.c#2 delete .. //depot/projects/powerpc/usr.bin/objformat/objformat.sh#1 branch .. //depot/projects/powerpc/usr.bin/quota/quota.1#2 integrate .. //depot/projects/powerpc/usr.bin/quota/quota.c#2 integrate .. //depot/projects/powerpc/usr.bin/tar/tree.c#3 integrate .. //depot/projects/powerpc/usr.bin/tar/write.c#3 integrate .. //depot/projects/powerpc/usr.sbin/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/powerpc/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#4 integrate .. //depot/projects/powerpc/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/powerpc/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/powerpc/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/portald.h#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/pt_pipe.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/powerpc/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/powerpc/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pciconf/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/pciconf/cap.c#1 branch .. //depot/projects/powerpc/usr.sbin/pciconf/pciconf.8#2 integrate .. //depot/projects/powerpc/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pciconf/pciconf.h#1 branch .. //depot/projects/powerpc/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/stand.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/powerpc/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/powerpc/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/powerpc/usr.sbin/rpc.ypupdated/update.c#2 integrate .. //depot/projects/powerpc/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/powerpc/usr.sbin/vnconfig/Makefile#2 delete .. //depot/projects/powerpc/usr.sbin/vnconfig/vnconfig.c#2 delete Differences ... ==== //depot/projects/powerpc/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.68 2007/01/02 03:42:16 kientzle Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.73 2007/02/12 21:41:17 brueffer 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,18 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070212: kame.4 removed +OLD_FILES+=usr/share/man/man4/kame.4.gz +# 20070201: remove libmytinfo link +OLD_FILES+=usr/lib/libmytinfo.a +OLD_FILES+=usr/lib/libmytinfo.so +# 20070128: remove vnconfig +OLD_FILES+=usr/sbin/vnconfig +# 20070125: objformat bites the dust +OLD_FILES+=usr/bin/objformat +OLD_FILES+=usr/share/man/man1/objformat.1.gz +OLD_FILES+=usr/include/objformat.h +OLD_FILES+=usr/share/man/man3/getobjformat.3.gz # 20061201: remove symlink to *.so.4 libalias modules OLD_FILES+=usr/lib/libalias_cuseeme.so OLD_FILES+=usr/lib/libalias_dummy.so @@ -23,7 +35,7 @@ OLD_FILES+=usr/lib/libalias_pptp.so OLD_FILES+=usr/lib/libalias_skinny.so OLD_FILES+=usr/lib/libalias_smedia.so -# 20061201: remove old *.so.4 liablias modules +# 20061201: remove old *.so.4 libalias modules OLD_FILES+=lib/libalias_cuseeme.so.4 OLD_FILES+=lib/libalias_dummy.so.4 OLD_FILES+=lib/libalias_ftp.so.4 ==== //depot/projects/powerpc/UPDATING#4 (text+ko) ==== @@ -21,6 +21,46 @@ developers choose to disable these features on build machines to maximize performance. +20070218: + The following build error may appear when upgrading from an old + -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): + line 31: '(' expected at begin of node + context: " TruthValue ENUM ( + *** Error code 1 + If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It + should probably be a build tool). In the same module, you may + also get the error: + ...snmp_bridge/bridge_sys.c:39:27: + net/bridgestp.h: No such file or directory + If so, run "cp src/sys/net/bridgestp.h /usr/include/net". + +20070214: + The output of netstat -r has changed. Without -n, we now only + print a "network name" without the prefix length if the network + address and mask exactly match a Class A/B/C network, and an entry + exists in the nsswitch "networks" map. + With -n, we print the full unabbreviated CIDR network prefix in + the form "a.b.c.d/p". 0.0.0.0/0 is always printed as "default". + This change is in preparation for changes such as equal-cost + multipath, and to more generally assist operational deployment + of FreeBSD as a modern IPv4 router. + +20070210: + PIM has been turned on by default in the IPv4 multicast + routing code. The kernel option 'PIM' has now been removed. + PIM is now built by default if option 'MROUTING' is specified. + It may now be loaded into GENERIC kernels by loading the + ip_mroute.ko module. + +20070207: + Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing + has been removed. Its functionality may be achieved by explicitly + configuring gif(4) interfaces and using the 'phyint' keyword in + mrouted.conf. + XORP does not support source-routed IPv4 multicast tunnels nor the + integrated IPIP tunneling, therefore it is not affected by this + change. The __FreeBSD_version macro has been bumped to 700030. + 20061221: Support for PCI Message Signalled Interrupts has been re-enabled in the bge driver, only for those chips which are @@ -703,4 +743,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.470 2006/12/22 03:03:31 jdp Exp $ +$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $ ==== //depot/projects/powerpc/bin/expr/expr.y#2 (text+ko) ==== @@ -5,7 +5,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $ */ #include @@ -539,7 +539,7 @@ /* special case: first operand is 0, no overflow possible */ if (a == 0) return 0; - /* cerify that result of division matches second operand */ + /* verify that result of division matches second operand */ if (r / a != b) return 1; return 0; @@ -637,7 +637,7 @@ int eval; struct val *v; - /* coerce to both arguments to strings */ + /* coerce both arguments to strings */ to_string(a); to_string(b); ==== //depot/projects/powerpc/contrib/bind9/CHANGES#2 (text+ko) ==== @@ -1,4 +1,11 @@ + --- 9.3.4 released --- + +2126. [security] Serialise validation of type ANY responses. [RT #16555] + +2124. [security] It was possible to dereference a freed fetch + context. [RT #16584] + --- 9.3.3 released --- 2107. [bug] dighost.c: more cleanup of buffers. [RT #16499] ==== //depot/projects/powerpc/contrib/bind9/FAQ#2 (text+ko) ==== @@ -1,5 +1,9 @@ Frequently Asked Questions about BIND 9 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 05:36:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB5016A408; Fri, 23 Feb 2007 05:36:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 336D716A402 for ; Fri, 23 Feb 2007 05:36:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 238A513C4B7 for ; Fri, 23 Feb 2007 05:36:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N5aX6X013970 for ; Fri, 23 Feb 2007 05:36:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N5aWlc013965 for perforce@freebsd.org; Fri, 23 Feb 2007 05:36:32 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 23 Feb 2007 05:36:32 GMT Message-Id: <200702230536.l1N5aWlc013965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114849 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, 23 Feb 2007 05:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=114849 Change 114849 by mjacob@mjexp on 2007/02/23 05:35:33 Be a bit more restrictive about printing out 'bad' pdb entries during loop rescans. They're not bad so much as unstable, so don't print this stuff out unless ISP_LOGSANCFG is set. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#11 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#11 (text+ko) ==== @@ -2963,17 +2963,19 @@ /* * Check to make sure it's still a valid entry. The 24XX seems * to return a portid but not a WWPN/WWNN or role for devices - * which shift on a loop. + * which shift on a loop, or have a WWPN/WWNN but no portid. */ if (tmp.node_wwn == 0 || tmp.port_wwn == 0 || tmp.portid == 0) { - int a, b, c; - a = (tmp.node_wwn == 0); - b = (tmp.port_wwn == 0); - c = (tmp.portid == 0); - isp_prt(isp, ISP_LOGWARN, - "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c, - handle); - isp_dump_portdb(isp); + if (isp->isp_dblev & ISP_LOGSANCFG) { + int a, b, c; + a = !(tmp.node_wwn == 0); + b = !(tmp.port_wwn == 0); + c = !(tmp.portid == 0); + isp_prt(isp, ISP_LOGALL, + "bad pdb (%1d%1d%1d) @ handle 0x%x", + a, b, c, handle); + isp_dump_portdb(isp); + } continue; } From owner-p4-projects@FreeBSD.ORG Fri Feb 23 05:38:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8549516A408; Fri, 23 Feb 2007 05:38:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEE7516A406 for ; Fri, 23 Feb 2007 05:38:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9F23D13C48E for ; Fri, 23 Feb 2007 05:38:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N5caaa015607 for ; Fri, 23 Feb 2007 05:38:36 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N5caDd015602 for perforce@freebsd.org; Fri, 23 Feb 2007 05:38:36 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 23 Feb 2007 05:38:36 GMT Message-Id: <200702230538.l1N5caDd015602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114850 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, 23 Feb 2007 05:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114850 Change 114850 by mjacob@mjexp on 2007/02/23 05:37:40 Fix problems with softc being checked before being initialized right. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#13 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#13 (text+ko) ==== @@ -435,14 +435,11 @@ #if __FreeBSD_version < 500000 static void -isp_get_options(device_t dev, ispsoftc_t *isp) +isp_get_generic_options(device_t dev, ispsoftc_t *isp) { uint64_t wwn; int bitmap, unit; - callout_handle_init(&isp->isp_osinfo.ldt); - callout_handle_init(&isp->isp_osinfo.gdt); - unit = device_get_unit(dev); if (getenv_int("isp_disable", &bitmap)) { if (bitmap & (1 << unit)) { @@ -450,7 +447,6 @@ return; } } - if (getenv_int("isp_no_fwload", &bitmap)) { if (bitmap & (1 << unit)) isp->isp_confopts |= ISP_CFG_NORELOAD; @@ -467,6 +463,61 @@ if (bitmap & (1 << unit)) isp->isp_confopts &= ~ISP_CFG_NONVRAM; } + + bitmap = 0; + (void) getenv_int("isp_debug", &bitmap); + if (bitmap) { + isp->isp_dblev = bitmap; + } else { + isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR; + } + if (bootverbose) { + isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO; + } + + bitmap = 0; + if (getenv_int("role", &bitmap)) { + isp->isp_role = bitmap; + } else { + isp->isp_role = ISP_DEFAULT_ROLES; + } + +} + +static void +isp_get_pci_options(device_t dev, int *m1, int *m2) +{ + int bitmap; + int unit = device_get_unit(dev); + + *m1 = PCIM_CMD_MEMEN; + *m2 = PCIM_CMD_PORTEN; + if (getenv_int("isp_mem_map", &bitmap)) { + if (bitmap & (1 << unit)) { + *m1 = PCIM_CMD_MEMEN; + *m2 = PCIM_CMD_PORTEN; + } + } + bitmap = 0; + if (getenv_int("isp_io_map", &bitmap)) { + if (bitmap & (1 << unit)) { + *m1 = PCIM_CMD_PORTEN; + *m2 = PCIM_CMD_MEMEN; + } + } +} + +static void +isp_get_specific_options(device_t dev, ispsoftc_t *isp) +{ + + callout_handle_init(&isp->isp_osinfo.ldt); + callout_handle_init(&isp->isp_osinfo.gdt); + + if (IS_SCSI(isp)) { + return; + } + if (getenv_int("isp_fcduplex", &bitmap)) { if (bitmap & (1 << unit)) isp->isp_confopts |= ISP_CFG_FULL_DUPLEX; @@ -505,17 +556,6 @@ } bitmap = 0; - (void) getenv_int("isp_debug", &bitmap); - if (bitmap) { - isp->isp_dblev = bitmap; - } else { - isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR; - } - if (bootverbose) { - isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO; - } - - bitmap = 0; (void) getenv_int("isp_fabric_hysteresis", &bitmap); if (bitmap >= 0 && bitmap < 256) { isp->isp_osinfo.hysteresis = bitmap; @@ -538,8 +578,6 @@ } else { isp->isp_osinfo.gone_device_time = isp_gone_device_time; } - - #ifdef ISP_FW_CRASH_DUMP bitmap = 0; if (getenv_int("isp_fw_dump_enable", &bitmap)) { @@ -561,50 +599,16 @@ } } #endif - bitmap = 0; - if (getenv_int("role", &bitmap)) { - isp->isp_role = bitmap; - } else { - isp->isp_role = ISP_DEFAULT_ROLES; - } } - -static void -isp_get_pci_options(device_t dev, int *m1, int *m2) -{ - int bitmap; - int unit = device_get_unit(dev); - - *m1 = PCIM_CMD_MEMEN; - *m2 = PCIM_CMD_PORTEN; - if (getenv_int("isp_mem_map", &bitmap)) { - if (bitmap & (1 << unit)) { - *m1 = PCIM_CMD_MEMEN; - *m2 = PCIM_CMD_PORTEN; - } - } - bitmap = 0; - if (getenv_int("isp_io_map", &bitmap)) { - if (bitmap & (1 << unit)) { - *m1 = PCIM_CMD_PORTEN; - *m2 = PCIM_CMD_MEMEN; - } - } -} #else static void -isp_get_options(device_t dev, ispsoftc_t *isp) +isp_get_generic_options(device_t dev, ispsoftc_t *isp) { int tval; - const char *sptr; - - callout_handle_init(&isp->isp_osinfo.ldt); - callout_handle_init(&isp->isp_osinfo.gdt); /* * Figure out if we're supposed to skip this one. */ - tval = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), "disable", &tval) == 0 && tval) { @@ -637,8 +641,77 @@ "ignore_nvram", &tval) == 0 && tval != 0) { isp->isp_confopts |= ISP_CFG_NONVRAM; } + + tval = 0; + (void) resource_int_value(device_get_name(dev), device_get_unit(dev), + "debug", &tval); + if (tval) { + isp->isp_dblev = tval; + } else { + isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR; + } + if (bootverbose) { + isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO; + } + +} + +static void +isp_get_pci_options(device_t dev, int *m1, int *m2) +{ + int tval; + /* + * Which we should try first - memory mapping or i/o mapping? + * + * We used to try memory first followed by i/o on alpha, otherwise + * the reverse, but we should just try memory first all the time now. + */ + *m1 = PCIM_CMD_MEMEN; + *m2 = PCIM_CMD_PORTEN; + tval = 0; if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "prefer_iomap", &tval) == 0 && tval != 0) { + *m1 = PCIM_CMD_PORTEN; + *m2 = PCIM_CMD_MEMEN; + } + tval = 0; + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "prefer_memmap", &tval) == 0 && tval != 0) { + *m1 = PCIM_CMD_MEMEN; + *m2 = PCIM_CMD_PORTEN; + } +} + +static void +isp_get_specific_options(device_t dev, ispsoftc_t *isp) +{ + const char *sptr; + int tval; + + isp->isp_osinfo.default_id = -1; + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "iid", &tval) == 0) { + isp->isp_osinfo.default_id = tval; + isp->isp_confopts |= ISP_CFG_OWNLOOPID; + } + if (isp->isp_osinfo.default_id == -1) { + if (IS_FC(isp)) { + isp->isp_osinfo.default_id = 109; + } else { + isp->isp_osinfo.default_id = 7; + } + } + + callout_handle_init(&isp->isp_osinfo.ldt); + callout_handle_init(&isp->isp_osinfo.gdt); + + if (IS_SCSI(isp)) { + return; + } + + tval = 0; + if (resource_int_value(device_get_name(dev), device_get_unit(dev), "fullduplex", &tval) == 0 && tval != 0) { isp->isp_confopts |= ISP_CFG_FULL_DUPLEX; } @@ -661,7 +734,6 @@ } } #endif - sptr = 0; if (resource_string_value(device_get_name(dev), device_get_unit(dev), "topology", (const char **) &sptr) == 0 && sptr != 0) { @@ -718,34 +790,6 @@ isp->isp_osinfo.default_node_wwn = 0x400000007F000009ull; } - isp->isp_osinfo.default_id = -1; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "iid", &tval) == 0) { - isp->isp_osinfo.default_id = tval; - isp->isp_confopts |= ISP_CFG_OWNLOOPID; - } - if (isp->isp_osinfo.default_id == -1) { - if (IS_FC(isp)) { - isp->isp_osinfo.default_id = 109; - } else { - isp->isp_osinfo.default_id = 7; - } - } - - /* - * Set up logging levels. - */ - tval = 0; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), - "debug", &tval); - if (tval) { - isp->isp_dblev = tval; - } else { - isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR; - } - if (bootverbose) { - isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO; - } tval = 0; (void) resource_int_value(device_get_name(dev), device_get_unit(dev), @@ -774,33 +818,6 @@ isp->isp_osinfo.gone_device_time = isp_gone_device_time; } } - -static void -isp_get_pci_options(device_t dev, int *m1, int *m2) -{ - int tval; - /* - * Which we should try first - memory mapping or i/o mapping? - * - * We used to try memory first followed by i/o on alpha, otherwise - * the reverse, but we should just try memory first all the time now. - */ - *m1 = PCIM_CMD_MEMEN; - *m2 = PCIM_CMD_PORTEN; - - tval = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "prefer_iomap", &tval) == 0 && tval != 0) { - *m1 = PCIM_CMD_PORTEN; - *m2 = PCIM_CMD_MEMEN; - } - tval = 0; - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "prefer_memmap", &tval) == 0 && tval != 0) { - *m1 = PCIM_CMD_MEMEN; - *m2 = PCIM_CMD_PORTEN; - } -} #endif static int @@ -826,9 +843,9 @@ isp = &pcs->pci_isp; /* - * Set and Get Generic Options + * Get Generic Options */ - isp_get_options(dev, isp); + isp_get_generic_options(dev, isp); /* * Check to see if options have us disabled @@ -986,6 +1003,11 @@ isp->isp_revision = pci_get_revid(dev); isp->isp_dev = dev; + /* + * Now that we know who we are (roughly) get/set specific options + */ + isp_get_specific_options(dev, isp); + #if __FreeBSD_version >= 700000 /* * Try and find firmware for this device. From owner-p4-projects@FreeBSD.ORG Fri Feb 23 06:27:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0772616A404; Fri, 23 Feb 2007 06:27:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B3BF516A402 for ; Fri, 23 Feb 2007 06:27:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A286313C4A8 for ; Fri, 23 Feb 2007 06:27:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N6RhFm029675 for ; Fri, 23 Feb 2007 06:27:43 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N6Rfl8029672 for perforce@freebsd.org; Fri, 23 Feb 2007 06:27:41 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 23 Feb 2007 06:27:41 GMT Message-Id: <200702230627.l1N6Rfl8029672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114855 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, 23 Feb 2007 06:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=114855 Change 114855 by mjacob@mjexp on 2007/02/23 06:26:50 IFC Affected files ... .. //depot/projects/mjexp/UPDATING#7 integrate .. //depot/projects/mjexp/bin/expr/expr.y#2 integrate .. //depot/projects/mjexp/etc/devd.conf#3 integrate .. //depot/projects/mjexp/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/mjexp/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_bindx.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_connectx.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_freepaddrs.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_getaddrlen.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_getassocid.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_getpaddrs.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_opt_info.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_recvmsg.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_send.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_sendmsg.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/mjexp/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/mjexp/lib/libc/sys/ntp_adjtime.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_recvmsg.2#1 branch .. //depot/projects/mjexp/lib/libc/sys/sctp_generic_sendmsg.2#1 branch .. //depot/projects/mjexp/lib/libc/sys/sctp_peeloff.2#1 branch .. //depot/projects/mjexp/lib/libelf/libelf_allocate.c#2 integrate .. //depot/projects/mjexp/lib/libwrap/Makefile#2 integrate .. //depot/projects/mjexp/release/Makefile#6 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile.inc#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/mjexp/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/mjexp/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/mjexp/release/doc/share/sgml/Makefile#2 integrate .. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifgroup.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/mjexp/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/mjexp/sbin/mdconfig/mdconfig.8#2 integrate .. //depot/projects/mjexp/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/mjexp/sbin/mdmfs/mdmfs.8#5 integrate .. //depot/projects/mjexp/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/mjexp/share/dict/web2a#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#8 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#5 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/ndis.4#3 integrate .. //depot/projects/mjexp/share/man/man4/sctp.4#1 branch .. //depot/projects/mjexp/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/mjexp/share/man/man4/snd_sbc.4#2 integrate .. //depot/projects/mjexp/share/man/man4/vge.4#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#8 integrate .. //depot/projects/mjexp/share/man/man9/VFS_VPTOFH.9#2 delete .. //depot/projects/mjexp/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/mjexp/share/man/man9/firmware.9#3 integrate .. //depot/projects/mjexp/share/man/man9/mbuf.9#3 integrate .. //depot/projects/mjexp/share/man/man9/priv.9#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/mjexp/sys/arm/arm/locore.S#2 integrate .. //depot/projects/mjexp/sys/arm/conf/EP80219#4 integrate .. //depot/projects/mjexp/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/mjexp/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/mjexp/sys/conf/options.arm#4 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#12 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#7 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#11 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/mjexp/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/mjexp/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/mjexp/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/mjexp/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#5 integrate .. //depot/projects/mjexp/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/mjexp/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/mjexp/sys/geom/geom_disk.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/mjexp/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#6 integrate .. //depot/projects/mjexp/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/mjexp/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/mjexp/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/mjexp/sys/kern/vfs_default.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_init.c#3 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/mjexp/sys/net/if.c#5 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/mjexp/sys/net/if_ppp.c#5 integrate .. //depot/projects/mjexp/sys/netatalk/at_control.c#3 integrate .. //depot/projects/mjexp/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/mjexp/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/mjexp/sys/netinet/udp.h#2 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/mjexp/sys/netinet/udp_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/mjexp/sys/sys/mount.h#6 integrate .. //depot/projects/mjexp/sys/sys/priv.h#2 integrate .. //depot/projects/mjexp/sys/ufs/ffs/README.softupdates#2 delete .. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#7 integrate .. //depot/projects/mjexp/sys/vm/vm_page.h#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/mcast.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/mroute6.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/tree.c#3 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#6 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/install.cfg#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.8#2 integrate Differences ... ==== //depot/projects/mjexp/UPDATING#7 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070218: + The following build error may appear when upgrading from an old + -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): + line 31: '(' expected at begin of node + context: " TruthValue ENUM ( + *** Error code 1 + If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It + should probably be a build tool). In the same module, you may + also get the error: + ...snmp_bridge/bridge_sys.c:39:27: + net/bridgestp.h: No such file or directory + If so, run "cp src/sys/net/bridgestp.h /usr/include/net". + 20070214: The output of netstat -r has changed. Without -n, we now only print a "network name" without the prefix length if the network @@ -730,4 +743,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.473 2007/02/14 14:17:01 bms Exp $ +$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $ ==== //depot/projects/mjexp/bin/expr/expr.y#2 (text+ko) ==== @@ -5,7 +5,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $ */ #include @@ -539,7 +539,7 @@ /* special case: first operand is 0, no overflow possible */ if (a == 0) return 0; - /* cerify that result of division matches second operand */ + /* verify that result of division matches second operand */ if (r / a != b) return 1; return 0; @@ -637,7 +637,7 @@ int eval; struct val *v; - /* coerce to both arguments to strings */ + /* coerce both arguments to strings */ to_string(a); to_string(b); ==== //depot/projects/mjexp/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.34 2007/02/14 08:13:54 joerg Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -155,7 +155,8 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the -# moment, as pnpinfo isn't set in devd yet. +# moment, as the pnpinfo variable isn't set in devd yet. Individual +# variables within the bus supplied pnpinfo are set. nomatch 0 { # action "logger Unknown device: $pnpinfo $location $bus"; }; ==== //depot/projects/mjexp/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.15 2006/02/07 02:29:55 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.16 2007/02/20 18:10:13 emaste Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -961,18 +961,21 @@ err = td_thr_getgregs_p (&th, gregset); if (err != TD_OK) error ("%s: td_thr_getgregs %s", __func__, thread_db_err_str (err)); - err = td_thr_getfpregs_p (&th, &fpregset); +#ifdef PT_GETXMMREGS + err = td_thr_getxmmregs_p (&th, xmmregs); if (err != TD_OK) - error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err)); + { +#endif + err = td_thr_getfpregs_p (&th, &fpregset); + if (err != TD_OK) + error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err)); +#ifdef PT_GETXMMREGS + } +#endif supply_register (regno, old_value); } fill_gregset (gregset, regno); - fill_fpregset (&fpregset, regno); -#ifdef PT_GETXMMREGS - i387_fill_fxsave (xmmregs, regno); -#endif - err = td_thr_setgregs_p (&th, gregset); if (err != TD_OK) error ("Cannot store general-purpose registers for thread %d: Thread ID=%d, %s", @@ -980,11 +983,13 @@ thread_db_err_str (err)); #ifdef PT_GETXMMREGS + i387_fill_fxsave (xmmregs, regno); err = td_thr_setxmmregs_p (&th, xmmregs); if (err == TD_OK) return; #endif + fill_fpregset (&fpregset, regno); err = td_thr_setfpregs_p (&th, &fpregset); if (err != TD_OK) error ("Cannot store floating-point registers for thread %d: Thread ID=%d, %s", ==== //depot/projects/mjexp/lib/libc/net/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $ # machine-independent net sources .PATH: ${.CURDIR}/net @@ -51,7 +51,10 @@ inet.3 inet_net.3 \ inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \ inet6_rthdr_space.3 linkaddr.3 \ - nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 + nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \ + sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \ + sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ + sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ MLINKS+=addr2ascii.3 ascii2addr.3 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ @@ -81,6 +84,10 @@ inet.3 inet_network.3 inet.3 inet_ntoa.3 \ inet.3 inet_ntop.3 inet.3 inet_pton.3 \ inet.3 network.3 inet.3 ntoa.3 +MLINKS+= sctp_send.3 sctp_sendx.3 +MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 +MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 +MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_opt_init.3 inet6_opt_find.3 \ ==== //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.2 2006/12/16 06:03:43 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.5 2007/02/22 14:48:12 rrs Exp $"); #include #include #include @@ -54,14 +54,20 @@ (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) #endif + #define SCTP_CONTROL_VEC_SIZE_SND 8192 #define SCTP_CONTROL_VEC_SIZE_RCV 16384 +#define SCTP_STACK_BUF_SIZE 2048 +#define SCTP_SMALL_IOVEC_SIZE 2 #ifdef SCTP_DEBUG_PRINT_ADDRESS + +#define SCTP_STRING_BUF_SZ 256 + static void SCTPPrintAnAddress(struct sockaddr *a) { - char stringToPrint[256]; + char stringToPrint[SCTP_STRING_BUF_SZ]; u_short prt; char *srcaddr, *txt; @@ -79,8 +85,8 @@ txt = "IPv6 Address: "; } else if (a->sa_family == AF_LINK) { int i; - char tbuf[200]; - u_char adbuf[200]; + char tbuf[SCTP_STRING_BUF_SZ]; + u_char adbuf[SCTP_STRING_BUF_SZ]; struct sockaddr_dl *dl; dl = (struct sockaddr_dl *)a; @@ -101,10 +107,6 @@ printf(":"); } printf("\n"); - /* - * u_short sdl_route[16]; *//* source routing - * information - */ return; } else { return; @@ -164,7 +166,7 @@ int sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt) { - char buf[2048]; + char buf[SCTP_STACK_BUF_SIZE]; int i, ret, cnt, *aa; char *cpto; const struct sockaddr *at; @@ -298,14 +300,14 @@ asoc = id; siz = sizeof(sctp_assoc_t); if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE, - &asoc, &siz) != 0) { + &asoc, &siz) != 0) { errno = ENOMEM; return (-1); } /* size required is returned in 'asoc' */ - siz = (uint32_t) asoc; + siz = (size_t)asoc; siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -314,7 +316,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, - addrs, (socklen_t *) & siz) != 0) { + addrs, &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -370,7 +372,7 @@ } siz = size_of_addresses + sizeof(struct sockaddr_storage); siz += sizeof(struct sctp_getaddresses); - addrs = calloc((unsigned long)1, (unsigned long)siz); + addrs = calloc(1, siz); if (addrs == NULL) { errno = ENOMEM; return (-1); @@ -379,7 +381,7 @@ addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, - (socklen_t *) & siz) != 0) { + &siz) != 0) { free(addrs); errno = ENOMEM; return (-1); @@ -436,7 +438,7 @@ ssize_t sz; struct msghdr msg; struct sctp_sndrcvinfo *s_info; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; struct sockaddr *who = NULL; @@ -547,7 +549,7 @@ #else ssize_t sz; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; struct sctp_sndrcvinfo *s_info; char controlVector[SCTP_CONTROL_VEC_SIZE_SND]; struct cmsghdr *cmsg; @@ -595,6 +597,20 @@ int add_len, len, no_end_cx = 0; struct sockaddr *at; + +#ifdef SYS_sctp_generic_sendmsg + if (addrcnt < SCTP_SMALL_IOVEC_SIZE) { + socklen_t l; + + /* + * Quick way, we don't need to do a connectx so lets use the + * syscall directly. + */ + l = addrs->sa_len; + return (syscall(SYS_sctp_generic_sendmsg, sd, + msg, msg_len, addrs, l, sinfo, flags)); + } +#endif len = sizeof(int); at = addrs; cnt = 0; @@ -617,10 +633,6 @@ errno = EINVAL; return (-1); } - if (len > 2048) { - /* Never enough memory */ - return (E2BIG); - } buf = malloc(len); if (buf == NULL) { return (ENOMEM); @@ -693,7 +705,7 @@ { #ifdef SYS_sctp_generic_recvmsg - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; iov[0].iov_base = dbuf; iov[0].iov_len = len; @@ -704,7 +716,7 @@ ssize_t sz; int sinfo_found = 0; struct msghdr msg; - struct iovec iov[2]; + struct iovec iov[SCTP_SMALL_IOVEC_SIZE]; char controlVector[SCTP_CONTROL_VEC_SIZE_RCV]; struct cmsghdr *cmsg; @@ -826,3 +838,9 @@ } #endif + + +#undef SCTP_CONTROL_VEC_SIZE_SND +#undef SCTP_CONTROL_VEC_SIZE_RCV +#undef SCTP_STACK_BUF_SIZE +#undef SCTP_SMALL_IOVEC_SIZE ==== //depot/projects/mjexp/lib/libc/stdlib/malloc.c#4 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.139 2007/01/31 22:54:19 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.140 2007/02/22 19:10:30 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1029,8 +1029,8 @@ malloc_mutex_unlock(&brk_mtx); base_chunk = brk_cur; base_next_addr = base_chunk; - base_past_addr = (void *)((uintptr_t)base_chunk + - incr); + base_past_addr = (void *)((uintptr_t)base_chunk + + incr); #ifdef MALLOC_STATS base_total += incr; #endif @@ -1042,8 +1042,8 @@ #endif /* - * Don't worry about chunk alignment here, since base_chunk doesn't really - * need to be aligned. + * Don't worry about chunk alignment here, since base_chunk doesn't + * really need to be aligned. */ base_chunk = pages_map(NULL, chunk_size); if (base_chunk == NULL) @@ -1067,8 +1067,12 @@ malloc_mutex_lock(&base_mtx); - /* Make sure there's enough space for the allocation. */ - if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { + /* + * Make sure there's enough space for the allocation. + * base_chunk_alloc() does not guarantee that a newly allocated chunk + * is >= size, so loop here, rather than only trying once. + */ + while ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) { if (base_chunk_alloc(csize)) { ret = NULL; goto RETURN; @@ -1299,6 +1303,36 @@ } } + /* + * Try to over-allocate, but allow the OS to place the allocation + * anywhere. Beware of size_t wrap-around. + */ + if (size + chunk_size > size) { + if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { + size_t offset = CHUNK_ADDR2OFFSET(ret); + + /* + * Success. Clean up unneeded leading/trailing space. + */ + if (offset != 0) { + /* Leading space. */ + pages_unmap(ret, chunk_size - offset); + + ret = (void *)((uintptr_t)ret + (chunk_size - + offset)); + + /* Trailing space. */ + pages_unmap((void *)((uintptr_t)ret + size), + offset); + } else { + /* Trailing space only. */ + pages_unmap((void *)((uintptr_t)ret + size), + chunk_size); + } + goto RETURN; + } + } + #ifdef USE_BRK /* * Try to create allocations in brk, in order to make full use of @@ -1342,36 +1376,6 @@ } #endif - /* - * Try to over-allocate, but allow the OS to place the allocation - * anywhere. Beware of size_t wrap-around. - */ - if (size + chunk_size > size) { - if ((ret = pages_map(NULL, size + chunk_size)) != NULL) { - size_t offset = CHUNK_ADDR2OFFSET(ret); - - /* - * Success. Clean up unneeded leading/trailing space. - */ - if (offset != 0) { - /* Leading space. */ - pages_unmap(ret, chunk_size - offset); - - ret = (void *)((uintptr_t)ret + (chunk_size - - offset)); - - /* Trailing space. */ - pages_unmap((void *)((uintptr_t)ret + size), - offset); - } else { - /* Trailing space only. */ - pages_unmap((void *)((uintptr_t)ret + size), - chunk_size); - } - goto RETURN; - } - } - /* All strategies for allocation failed. */ ret = NULL; RETURN: ==== //depot/projects/mjexp/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.123 2007/02/22 14:32:38 rrs Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -84,6 +84,7 @@ 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 \ + sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ ==== //depot/projects/mjexp/lib/libc/sys/ntp_adjtime.2#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/lib/libc/sys/ntp_adjtime.2,v 1.2 2003/06/20 21:14:59 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.3 2007/02/17 01:54:00 trhodes Exp $ .\" .Dd April 1, 2003 .Dt NTP_ADJTIME 2 @@ -137,7 +137,7 @@ .El .Sh ERRORS The -.Fn ntp_gettime +.Fn ntp_adjtime system call may return .Er EPERM if the caller ==== //depot/projects/mjexp/lib/libelf/libelf_allocate.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2 2007/02/21 08:14:22 dumbbell Exp $"); #include @@ -191,7 +191,7 @@ d = _libelf_release_data(d); } - STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) { + STAILQ_FOREACH_SAFE(d, &s->s_rawdata, d_next, td) { assert((d->d_flags & LIBELF_F_MALLOCED) == 0); STAILQ_REMOVE(&s->s_rawdata, d, _Elf_Data, d_next); d = _libelf_release_data(d); ==== //depot/projects/mjexp/lib/libwrap/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libwrap/Makefile,v 1.18 2006/03/17 18:54:28 ru Exp $ +# $FreeBSD: src/lib/libwrap/Makefile,v 1.19 2007/02/20 23:12:04 n_hibma Exp $ # .include @@ -9,8 +9,10 @@ INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 -MLINKS= hosts_access.3 hosts_ctl.3 hosts_access.3 request_init.3 \ - hosts_access.3 request_set.3 +MLINKS= hosts_access.3 hosts_ctl.3 \ + hosts_access.3 request_init.3 \ + hosts_access.3 request_set.3 \ + hosts_access.3 hosts.allow.5 \ .PATH: ${.CURDIR}/../../contrib/tcp_wrappers ==== //depot/projects/mjexp/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.920 2007/02/01 15:12:44 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.921 2007/02/16 02:28:15 bmah Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -159,8 +159,8 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme relnotes errata -DIST_DOCS_ARCH_DEP= installation hardware +DIST_DOCS_ARCH_INDEP= hardware readme relnotes errata +DIST_DOCS_ARCH_DEP= installation .endif # Things which without too much trouble can be considered variables ==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ==== @@ -1,13 +1,30 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.10 2007/02/19 02:46:12 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR= amd64 -SUBDIR+= ia64 -SUBDIR+= i386 -SUBDIR+= pc98 -SUBDIR+= powerpc -SUBDIR+= sparc64 +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/hardware +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/hardware +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +# SGML content +SRCS+= article.sgml +SRCS+= ${DEV-AUTODIR}/catalog-auto +SRCS+= ${DEV-AUTODIR}/dev-auto.sgml + +CATALOGS+= -c ${DEV-AUTODIR}/catalog-auto + +URL_RELPREFIX?= ../../../.. + +HWNOTES_MI= 1 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/readme/article.sgml#3 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.38 2006/12/28 21:12:57 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.39 2007/02/16 04:07:31 bmah Exp $ 2000 @@ -340,13 +340,11 @@ - Several of these documents (in particular, - HARDWARE.TXT and - INSTALL.TXT) contain information that - is specific to a particular hardware architecture. For - example, the alpha hardware notes contain information not - applicable to the &i386;, and vice versa. The architecture - for which each document applies will be listed in that + There are various versions of + INSTALL.TXT, each containing information + specific to a particular hardware architecture. + The architecture + to which each document applies will be listed in that document's title. ==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.998 2007/02/10 19:55:18 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.999 2007/02/22 05:31:39 delphij Exp $ 2000 @@ -1759,7 +1759,8 @@ to 4.17. The GNU version of gzip has been - replaced with a version of gzip imported from NetBSD. + replaced with a modified version of gzip ported from NetBSD. + &merged; netcat has been updated from the version in a 4 February 2005 OpenBSD snapshot to the version ==== //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#3 (text+ko) ==== @@ -1,14 +1,14 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.14 2006/12/06 18:07:40 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.15 2007/02/16 02:22:02 bmah Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 -MULTITEXTS= installation hardware -UNITEXTS= readme relnotes errata +MULTITEXTS= installation +UNITEXTS= hardware readme relnotes errata IMAGEDIR= .imagedir RHOST= freefall.freebsd.org ==== //depot/projects/mjexp/release/doc/share/misc/man2hwnotes.pl#2 (text+ko) ==== @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.13 2006/07/28 20:23:03 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.14 2007/02/16 02:10:12 bmah Exp $ # # Parse the list of supported hardware out of section 4 manual pages @@ -40,7 +40,7 @@ # arguments to the .It command, only the argument will be printed. # Usage: -# man2hwnotes.pl [-l] [-d 0-6] [-a ] [-o ] +# man2hwnotes.pl [-cl] [-d 0-6] [-a ] [-o ] # [ ...] use strict; @@ -55,6 +55,7 @@ my %archlist; # Globals +my $compat_mode = 0; # Enable compat for old Hardware Notes style my $debuglevel = 0; my $only_list_out = 0; # Should only lists be generated in the output? my @out_lines; # Single lines @@ -62,10 +63,13 @@ # Getopt my %options = (); -if (!getopts("a:d:lo:",\%options)) { +if (!getopts("a:cd:lo:",\%options)) { die("$!: Invalid command line arguments in ", __LINE__, "\n"); } +if (defined($options{c})) { + $compat_mode = 1; +} if (defined($options{d})) { $debuglevel = $options{d}; } @@ -367,9 +371,17 @@ $entity_name = add_txt_ent(${$mdocvars}{parabuf}); ${$mdocvars}{parabuf} = ""; if(defined($archlist{${$mdocvars}{Nm}})) { - $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + if ($compat_mode) { + $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + } else { + $para_arch = '[' . $archlist{${$mdocvars}{Nm}} . '] '; + } + } + if ($compat_mode) { + $out = "&".$entity_name.";"; + } else { + $out = "".$para_arch."&".$entity_name.";"; } - $out = "&".$entity_name.";"; dlog(4, "Flushing parabuf"); add_sgmltag($mdocvars, $out); @@ -384,8 +396,12 @@ $entity_name = add_txt_ent(${$mdocvars}{parabuf}); ${$mdocvars}{parabuf} = ""; - if(defined($archlist{${$mdocvars}{Nm}})) { - $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + if ($compat_mode) { + if(defined($archlist{${$mdocvars}{Nm}})) { + $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + } + } else { + $listitem = "&".$entity_name.";"; } $listitem = "&".$entity_name.";"; dlog(4, "Adding '$listitem' to out_dev"); ==== //depot/projects/mjexp/release/doc/share/mk/doc.relnotes.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.13 2004/08/08 09:23:49 hrs Exp $ +# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.14 2007/02/16 02:10:12 bmah Exp $ DOC_PREFIX?= ${RELN_ROOT}/../../../doc @@ -43,9 +43,14 @@ CLEANFILES+= ${DEV-AUTODIR}/dev-auto.sgml ${DEV-AUTODIR}/catalog-auto MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl +.if defined(HWNOTES_MI) +MAN2HWNOTES_FLAGS= +.else +MAN2HWNOTES_FLAGS= -c +.endif # Dependency that the article makefiles can use to pull in # dev-auto.sgml. ${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.sgml: ${MAN4PAGES} \ ${ARCHLIST} ${MAN2HWNOTES_CMD} - cd ${RELN_ROOT}/share/sgml && make dev-auto.sgml + cd ${RELN_ROOT}/share/sgml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.sgml ==== //depot/projects/mjexp/release/doc/share/sgml/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.2 2004/08/08 09:23:49 hrs Exp $ +# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.3 2007/02/16 02:10:12 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,7 +6,7 @@ .include "${DOC_PREFIX}/share/mk/doc.project.mk" dev-auto.sgml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto - ${PERL} ${MAN2HWNOTES_CMD} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 14:06:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A401016A403; Fri, 23 Feb 2007 14:06:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 527D916A407 for ; Fri, 23 Feb 2007 14:06:32 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 410EB13C442 for ; Fri, 23 Feb 2007 14:06:32 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NE6WcZ096748 for ; Fri, 23 Feb 2007 14:06:32 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NE6TYE096745 for perforce@freebsd.org; Fri, 23 Feb 2007 14:06:29 GMT (envelope-from netchild@freebsd.org) Date: Fri, 23 Feb 2007 14:06:29 GMT Message-Id: <200702231406.l1NE6TYE096745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114864 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, 23 Feb 2007 14:06:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=114864 Change 114864 by netchild@netchild_magellan on 2007/02/23 14:05:47 IFC after MFp4. Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/driver.c#2 (text+ko) ==== @@ -18,12 +18,12 @@ * 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, WHETHERIN CONTRACT, STRICT + * 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 THEPOSSIBILITY OF + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/driver.c,v 1.20 2006/10/01 14:57:34 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/driver.c,v 1.21 2007/01/31 08:53:45 joel Exp $ */ #include ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright Luigi Rizzo, 1997,1998 - * Copyright by Hannu Savolainen 1994, 1995 + * Copyright (c) 1997,1998 Luigi Rizzo + * Copyright (c) 1994,1995 Hannu Savolainen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.39 2006/03/21 03:47:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.41 2007/02/23 13:47:33 netchild Exp $"); struct ad1816_info; ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ==== @@ -1,10 +1,34 @@ /*- - * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it) + * Copyright (c) 1997 Luigi Rizzo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * + * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.4 2007/02/02 13:44:09 joel Exp $ + */ + +/* * This file contains information and macro definitions for * the ad1816 chip - * - * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.2 2005/01/06 01:43:17 imp Exp $ */ /* AD1816 register macros */ ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright 1997,1998 Luigi Rizzo. + * Copyright (c) 1997,1998 Luigi Rizzo * * Derived from files in the Voxware 3.5 distribution, * Copyright by Hannu Savolainen 1994, under the same copyright @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.36 2006/01/16 20:01:33 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.38 2007/02/23 13:47:33 netchild Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.17 2006/05/12 05:04:43 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.18 2007/02/23 12:18:54 piso Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e @@ -316,7 +316,7 @@ } if (scp->irq != NULL) - bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, gusc_intr, scp, &ih); + bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL, gusc_intr, scp, &ih); bus_generic_attach(dev); return (0); @@ -419,11 +419,15 @@ static int gusc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, void **cookiep) + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp = (sc_p)device_get_softc(dev); devclass_t devclass; + if (filter != NULL) { + printf("gusc.c: we cannot use a filter here\n"); + return (EINVAL); + } devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { scp->midi_intr.intr = intr; @@ -434,7 +438,7 @@ scp->pcm_intr.arg = arg; return 0; } - return bus_generic_setup_intr(dev, child, irq, flags, intr, + return bus_generic_setup_intr(dev, child, irq, flags, filter, intr, arg, cookiep); } ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#3 (text+ko) ==== @@ -1,8 +1,8 @@ /*- * Copyright (c) 2001 George Reid * Copyright (c) 1999 Cameron Grant - * Copyright Luigi Rizzo, 1997,1998 - * Copyright by Hannu Savolainen 1994, 1995 + * Copyright (c) 1997,1998 Luigi Rizzo + * Copyright (c) 1994,1995 Hannu Savolainen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.105 2006/02/05 17:35:13 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.107 2007/02/23 13:47:33 netchild Exp $"); /* board-specific include files */ #include ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.h#2 (text+ko) ==== @@ -1,15 +1,6 @@ /*- - * file: mss.h - * - * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it) - * - * This file contains information and macro definitions for - * AD1848-compatible devices, used in the MSS/WSS compatible boards. - * - */ - -/*- * Copyright (c) 1999 Doug Rabson + * Copyright (c) 1997 Luigi Rizzo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.12 2005/01/06 01:43:17 imp Exp $ + * $FreeBSD: src/sys/dev/sound/isa/mss.h,v 1.14 2007/02/02 13:44:09 joel Exp $ + */ + +/* + * This file contains information and macro definitions for + * AD1848-compatible devices, used in the MSS/WSS compatible boards. */ /* ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb.h#2 (text+ko) ==== @@ -1,6 +1,29 @@ -/* - * file: sbcard.h - * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.15 2004/05/13 11:32:54 truckman Exp $ +/*- + * Copyright (c) 1997,1998 Luigi Rizzo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/sound/isa/sb.h,v 1.16 2007/02/02 13:33:35 joel Exp $ */ #ifndef SB_H ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright 1997,1998 Luigi Rizzo. + * Copyright (c) 1997,1998 Luigi Rizzo * * Derived from files in the Voxware 3.5 distribution, * Copyright by Hannu Savolainen 1994, under the same copyright @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.92 2005/11/14 18:16:59 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.94 2007/02/23 13:47:33 netchild Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 Cameron Grant - * Copyright 1997,1998 Luigi Rizzo. + * Copyright (c) 1997,1998 Luigi Rizzo * * Derived from files in the Voxware 3.5 distribution, * Copyright by Hannu Savolainen 1994, under the same copyright @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.81 2005/07/31 18:59:47 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.83 2007/02/23 13:47:33 netchild Exp $"); #define SB_DEFAULT_BUFSZ 4096 ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.45 2005/07/31 13:49:47 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.46 2007/02/23 12:18:54 piso Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 @@ -80,8 +80,8 @@ static int sbc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, - void **cookiep); + int flags, driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep); static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); @@ -503,13 +503,17 @@ static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *intr, void *arg, - void **cookiep) + int flags, driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; int i, ret; + if (filter != NULL) { + printf("sbc.c: we cannot use a filter here\n"); + return (EINVAL); + } sbc_lock(scp); i = 0; while (i < IRQ_MAX) { ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#2 (text) ==== @@ -1,6 +1,5 @@ /*- - * (c) 2003 Mathew Kanner - * + * Copyright (c) 2003 Mathew Kanner * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -43,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.19 2006/06/18 14:14:41 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.21 2007/01/28 20:38:07 joel Exp $"); #include #include @@ -931,11 +930,15 @@ return EBUSY; } midistat_isopen = 1; + mtx_unlock(&midistat_lock); - if (sbuf_new(&midistat_sbuf, NULL, 4096, 0) == NULL) { + if (sbuf_new(&midistat_sbuf, NULL, 4096, SBUF_AUTOEXTEND) == NULL) { error = ENXIO; + mtx_lock(&midistat_lock); goto out; } + + mtx_lock(&midistat_lock); midistat_bufptr = 0; error = (midistat_prepare(&midistat_sbuf) > 0) ? 0 : ENOMEM; @@ -974,9 +977,11 @@ } l = min(buf->uio_resid, sbuf_len(&midistat_sbuf) - midistat_bufptr); err = 0; - if (l > 0) + if (l > 0) { + mtx_unlock(&midistat_lock); err = uiomove(sbuf_data(&midistat_sbuf) + midistat_bufptr, l, buf); - else + mtx_lock(&midistat_lock); + } else l = 0; midistat_bufptr += l; mtx_unlock(&midistat_lock); ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.h#2 (text) ==== @@ -1,27 +1,29 @@ /*- - * (c) 2003 Mathew Kanner - * + * Copyright (c) 2003 Mathew Kanner + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.14 2006/05/27 16:32:05 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/midi/midi.h,v 1.15 2007/01/28 20:38:07 joel Exp $ */ #ifndef MIDI_H ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midiq.h#2 (text) ==== @@ -1,27 +1,29 @@ /*- - * (c) 2003 Mathew Kanner - * + * Copyright (c) 2003 Mathew Kanner + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/midiq.h,v 1.1 2006/05/27 16:32:05 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/midi/midiq.h,v 1.2 2007/01/28 20:38:07 joel Exp $ */ #ifndef MIDIQ_H ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.c#2 (text) ==== @@ -1,29 +1,31 @@ /*- - * (c) 2003 Mathew Kanner - * + * Copyright (c) 2003 Mathew Kanner + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/mpu401.c,v 1.1 2006/05/27 16:32:05 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/mpu401.c,v 1.2 2007/01/28 20:38:07 joel Exp $"); #include #include ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.h#2 (text) ==== @@ -1,27 +1,29 @@ /*- - * (c) 2003 Mathew Kanner - * + * Copyright (c) 2003 Mathew Kanner + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/mpu401.h,v 1.1 2006/05/27 16:32:05 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/midi/mpu401.h,v 1.2 2007/01/28 20:38:07 joel Exp $ */ #ifndef MPU401_H ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu_if.m#2 (text) ==== @@ -1,27 +1,29 @@ #- -# (c) 2003 Mathew Kanner +# Copyright (c) 2003 Mathew Kanner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. 2. -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# 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. # -# $FreeBSD: src/sys/dev/sound/midi/mpu_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $ +# $FreeBSD: src/sys/dev/sound/midi/mpu_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $ # #include ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/mpufoi_if.m#2 (text) ==== @@ -1,27 +1,29 @@ #- -# (c) 2003 Mathew Kanner +# Copyright (c) 2003 Mathew Kanner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. 2. -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# 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. # -# $FreeBSD: src/sys/dev/sound/midi/mpufoi_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $ +# $FreeBSD: src/sys/dev/sound/midi/mpufoi_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $ # #include ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.c#2 (text) ==== @@ -1,31 +1,36 @@ -/* - * The sequencer personality manager. - * (c) 2003 Mathew Kanner - * Copyright by Hannu Savolainen 1993 - * +/*- + * Copyright (c) 2003 Mathew Kanner + * Copyright (c) 1993 Hannu Savolainen + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. 2. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * The sequencer personality manager. + */ + #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.23 2006/10/15 08:23:48 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.24 2007/01/28 20:38:07 joel Exp $"); #include #include ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.h#2 (text) ==== @@ -1,7 +1,7 @@ /*- - * Include file for midi sequencer driver. - * (c) 2003 Mathew Kanner - * Copyright by Seigo Tanimura 1999. + * Copyright (c) 2003 Mathew Kanner + * Copyright (c) 1999 Seigo Tanimura + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,7 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.7 2006/05/27 16:32:05 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/midi/sequencer.h,v 1.8 2007/01/28 20:38:07 joel Exp $ + */ + +/* + * Include file for the midi sequence driver. */ #ifndef _SEQUENCER_H_ ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/synth_if.m#2 (text) ==== @@ -1,27 +1,29 @@ #- -# (c) 2003 Mathew Kanner +# Copyright (c) 2003 Mathew Kanner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. 2. -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# 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. # -# $FreeBSD: src/sys/dev/sound/midi/synth_if.m,v 1.1 2006/05/27 16:32:05 netchild Exp $ +# $FreeBSD: src/sys/dev/sound/midi/synth_if.m,v 1.2 2007/01/28 20:38:07 joel Exp $ # INTERFACE synth; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.22 2005/11/07 09:26:17 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.23 2007/02/23 13:47:34 netchild Exp $"); /* Debugging macro's */ #undef DEB ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.8 2006/11/26 12:24:04 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.9 2007/02/23 13:47:34 netchild Exp $"); #define ATI_IXP_DMA_RETRY_MAX 100 ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/dev/sound/pci/au88x0.c,v 1.10 2005/03/01 08:58:05 imp Exp $ + * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.11 2007/02/23 13:47:34 netchild Exp $ */ #include ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.32 2005/03/01 08:58:05 imp Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.33 2007/02/23 13:47:34 netchild Exp $"); /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.38 2006/11/26 12:24:04 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.39 2007/02/23 13:47:34 netchild Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.22 2005/03/01 08:58:05 imp Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.23 2007/02/23 13:47:34 netchild Exp $"); #define CS4281_DEFAULT_BUFSZ 16384 ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.34 2005/12/04 10:06:04 ru Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.35 2007/02/23 12:18:54 piso Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 @@ -82,7 +82,8 @@ struct resource *r); static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filter, driver_intr_t *intr, + void *arg, void **cookiep); static int csa_teardown_intr(device_t bus, device_t child, struct resource *irq, void *cookie); static driver_intr_t csa_intr; @@ -439,12 +440,17 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep) { sc_p scp; csa_res *resp; struct sndcard_func *func; + if (filter != NULL) { + printf("ata-csa.c: we cannot use a filter here\n"); + return (EINVAL); + } scp = device_get_softc(bus); resp = &scp->res; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.37 2006/02/05 17:34:13 netchild Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:37:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60FE816A405; Fri, 23 Feb 2007 16:37:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3AD9916A403 for ; Fri, 23 Feb 2007 16:37:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B70E13C467 for ; Fri, 23 Feb 2007 16:37:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGbh2J031631 for ; Fri, 23 Feb 2007 16:37:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGbgZm031628 for perforce@freebsd.org; Fri, 23 Feb 2007 16:37:42 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:37:42 GMT Message-Id: <200702231637.l1NGbgZm031628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114872 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, 23 Feb 2007 16:37:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114872 Change 114872 by millert@millert_macbook on 2007/02/23 16:37:01 In ipc_right_copyin() we have the source space locked so just get the task reference from it directly instead of calling current_task(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#7 (text+ko) ==== @@ -1120,7 +1120,7 @@ goto invalid_dest; ip_lock(port); if (ip_active(port)) { - task_t self = current_task(); + task_t self = space->is_task; tasklabel_lock(self); error = mac_port_check_send(&self->maclabel, &port->ip_label); From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:38:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A4D416A410; Fri, 23 Feb 2007 16:38:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00B7016A405 for ; Fri, 23 Feb 2007 16:38:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E57A613C4A3 for ; Fri, 23 Feb 2007 16:38:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGcit5031687 for ; Fri, 23 Feb 2007 16:38:44 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGcimm031684 for perforce@freebsd.org; Fri, 23 Feb 2007 16:38:44 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:38:44 GMT Message-Id: <200702231638.l1NGcimm031684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114873 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, 23 Feb 2007 16:38:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114873 Change 114873 by millert@millert_macbook on 2007/02/23 16:38:38 Check for NULL return from labelh_new() when called with canblock == 0. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#13 (text+ko) ==== @@ -118,6 +118,8 @@ ipc_labelh_t lh; lh = (ipc_labelh_t)zalloc_canblock(ipc_labelh_zone, canblock); + if (lh == NULL) + return (NULL); lh_lock_init(lh); lh->lh_port = ipc_port_alloc_kernel(); lh->lh_type = LABELH_TYPE_KERN; @@ -137,10 +139,12 @@ ipc_labelh_t lh; lh = labelh_new(0); - ip_lock(lh->lh_port); - mac_task_label_init(&lh->lh_label); - mac_task_label_copy(&old->lh_label, &lh->lh_label); - ip_unlock(lh->lh_port); + if (lh != NULL) { + ip_lock(lh->lh_port); + mac_task_label_init(&lh->lh_label); + mac_task_label_copy(&old->lh_label, &lh->lh_label); + ip_unlock(lh->lh_port); + } return (lh); } From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:46:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4926016A41B; Fri, 23 Feb 2007 16:46:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1942F16A411 for ; Fri, 23 Feb 2007 16:46:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6824E13C4C9 for ; Fri, 23 Feb 2007 16:46:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGktwn033178 for ; Fri, 23 Feb 2007 16:46:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGktFm033175 for perforce@freebsd.org; Fri, 23 Feb 2007 16:46:55 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:46:55 GMT Message-Id: <200702231646.l1NGktFm033175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114874 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, 23 Feb 2007 16:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=114874 Change 114874 by millert@millert_macbook on 2007/02/23 16:46:37 Add strdupa() for compatibility with selinux Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/secompat.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/strdupa.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ include ../../../Makeconfig LIB = secompat -OBJS = clearenv.o getline.o strndup.o +OBJS = clearenv.o getline.o strndup.o strdupa.o CFLAGS += -Wall ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/secompat.h#3 (text+ko) ==== @@ -3,6 +3,7 @@ ssize_t getline(char **, size_t *, FILE *); char *strndup(const char *, size_t); +char *strdupa(const char *); int clearenv(void); #endif /* _SECOMPAT_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:51:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF51F16A406; Fri, 23 Feb 2007 16:51:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A24CB16A402 for ; Fri, 23 Feb 2007 16:51:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 928F713C478 for ; Fri, 23 Feb 2007 16:51:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGp0OW041647 for ; Fri, 23 Feb 2007 16:51:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGp0mZ041641 for perforce@freebsd.org; Fri, 23 Feb 2007 16:51:00 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:51:00 GMT Message-Id: <200702231651.l1NGp0mZ041641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114875 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, 23 Feb 2007 16:51:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=114875 Change 114875 by millert@millert_macbook on 2007/02/23 16:50:50 Use strdupa() now that we have it in libsecompat Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#6 (text+ko) ==== @@ -177,16 +177,14 @@ "Warning! %s refers to a symbolic link, not following last component.\n", filename); char *p = NULL, *file_sep; - char *tmp_path; + char *tmp_path = strdupa(filename); size_t len = 0; - tmp_path = alloca(strlen(filename) + 1); if (!tmp_path) { fprintf(stderr, "strdupa on %s failed: %s\n", filename, strerror(errno)); return 1; } - strcpy(tmp_path, filename); file_sep = strrchr(tmp_path, '/'); if (file_sep == tmp_path) { file_sep++; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:55:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AE9D16A406; Fri, 23 Feb 2007 16:55:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69EA716A402 for ; Fri, 23 Feb 2007 16:55:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4C03A13C48E for ; Fri, 23 Feb 2007 16:55:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGt6df042943 for ; Fri, 23 Feb 2007 16:55:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGt6YY042937 for perforce@freebsd.org; Fri, 23 Feb 2007 16:55:06 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:55:06 GMT Message-Id: <200702231655.l1NGt6YY042937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114876 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, 23 Feb 2007 16:55:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=114876 Change 114876 by millert@millert_macbook on 2007/02/23 16:54:13 s/-ENOMEM/ENOMEM/ Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.c#4 (text+ko) ==== @@ -95,7 +95,7 @@ c_iter = netlbl_secattr_catmap_alloc(GFP_ATOMIC); if (c_iter == NULL) - return -ENOMEM; + return ENOMEM; *catmap = c_iter; c_iter->startbit = e_iter->startbit & ~(NETLBL_CATMAP_SIZE - 1); @@ -119,7 +119,7 @@ netlbl_export_failure: netlbl_secattr_catmap_free(*catmap); - return -ENOMEM; + return ENOMEM; } /** @@ -175,7 +175,7 @@ netlbl_import_failure: ebitmap_destroy(ebmap); - return -ENOMEM; + return ENOMEM; } #endif /* CONFIG_NETLABEL */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.h#4 (text+ko) ==== @@ -88,12 +88,12 @@ static inline int ebitmap_netlbl_export(struct ebitmap *ebmap, struct netlbl_lsm_secattr_catmap **catmap) { - return -ENOMEM; + return ENOMEM; } static inline int ebitmap_netlbl_import(struct ebitmap *ebmap, struct netlbl_lsm_secattr_catmap *catmap) { - return -ENOMEM; + return ENOMEM; } #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.h#4 (text+ko) ==== @@ -72,12 +72,12 @@ static inline int mls_export_netlbl_cat(struct context *context, struct netlbl_lsm_secattr *secattr) { - return -ENOMEM; + return ENOMEM; } static inline int mls_import_netlbl_cat(struct context *context, struct netlbl_lsm_secattr *secattr) { - return -ENOMEM; + return ENOMEM; } #endif From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:58:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39A0316A407; Fri, 23 Feb 2007 16:58:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CC63D16A402 for ; Fri, 23 Feb 2007 16:58:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BA60213C4B6 for ; Fri, 23 Feb 2007 16:58:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGwA1L043182 for ; Fri, 23 Feb 2007 16:58:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGwAB8043179 for perforce@freebsd.org; Fri, 23 Feb 2007 16:58:10 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:58:10 GMT Message-Id: <200702231658.l1NGwAB8043179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114877 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, 23 Feb 2007 16:58:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=114877 Change 114877 by millert@millert_macbook on 2007/02/23 16:57:09 Use stdint.h bit types instead of a mix of Linux and BSD ones. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_netlink.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#6 (text+ko) ==== @@ -49,9 +49,9 @@ } }; static const struct av_perm_to_string { - u16 tclass; - u16 nameidx; - u32 value; + uint16_t tclass; + uint16_t nameidx; + uint32_t value; } av_perm_to_string[] = { #define S_(c, v, s) { c, offsetof(union av_perm_to_string_data, L1(__LINE__)), v }, #include "av_perm_to_string.h" @@ -77,7 +77,7 @@ #undef S_ } }; -static const u16 class_to_string[] = { +static const uint16_t class_to_string[] = { #define S_(s) offsetof(union class_to_string_data, L1(__LINE__)), #include "class_to_string.h" #undef S_ @@ -112,7 +112,7 @@ struct { #define TB_(s) struct { #define TE_(s) } s##_part; -#define S_(s) u16 L1(__LINE__) +#define S_(s) uint16_t L1(__LINE__) #define L1(l) L2(l) #define L2(l) field_##l; #include "common_perm_to_string.h" @@ -122,7 +122,7 @@ #undef L1 #undef L2 }; - u16 data[0]; + uint16_t data[0]; } common_perm_to_string = { { #define TB_(s) { @@ -140,11 +140,11 @@ }; static const struct av_inherit { - u16 tclass; - u16 common_pts_idx; - u32 common_base; + uint16_t tclass; + uint16_t common_pts_idx; + uint32_t common_base; } av_inherit[] = { -#define S_(c, i, b) { c, offsetof(union common_perm_to_string, common_##i##_perm_to_string_part)/sizeof(u16), b }, +#define S_(c, i, b) { c, offsetof(union common_perm_to_string, common_##i##_perm_to_string_part)/sizeof(uint16_t), b }, #include "av_inherit.h" #undef S_ }; @@ -168,17 +168,17 @@ struct avc_cache { struct avc_node *slots[AVC_CACHE_SLOTS]; - u_int32_t lru_hint; /* LRU hint for reclaim scan */ - u_int32_t active_nodes; - u_int32_t latest_notif; /* latest revocation notification */ + uint32_t lru_hint; /* LRU hint for reclaim scan */ + uint32_t active_nodes; + uint32_t latest_notif; /* latest revocation notification */ }; struct avc_callback_node { - int (*callback) (u_int32_t event, security_id_t ssid, + int (*callback) (uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, access_vector_t * out_retained); - u_int32_t events; + uint32_t events; security_id_t ssid; security_id_t tsid; security_class_t tclass; @@ -406,7 +406,7 @@ { struct avc_node *prev, *cur; int try; - u_int32_t hvalue; + uint32_t hvalue; hvalue = avc_cache.lru_hint; for (try = 0; try < 2; try++) { @@ -801,8 +801,8 @@ */ static void avc_dump_av(security_class_t tclass, access_vector_t av) { - const u16 *common_pts_idx = 0; - u_int32_t common_base = 0, perm; + const uint16_t *common_pts_idx = 0; + uint32_t common_base = 0, perm; unsigned int i, i2; if (av == 0) { @@ -1014,12 +1014,12 @@ return rc; } -int avc_add_callback(int (*callback) (u_int32_t event, security_id_t ssid, +int avc_add_callback(int (*callback) (uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, access_vector_t * out_retained), - u_int32_t events, security_id_t ssid, + uint32_t events, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms) { @@ -1049,7 +1049,7 @@ return (x == y || x == SECSID_WILD || y == SECSID_WILD); } -static inline void avc_update_node(u_int32_t event, struct avc_node *node, +static inline void avc_update_node(uint32_t event, struct avc_node *node, access_vector_t perms) { switch (event) { @@ -1075,7 +1075,7 @@ } } -static int avc_update_cache(u_int32_t event, security_id_t ssid, +static int avc_update_cache(uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms) { @@ -1113,10 +1113,10 @@ * This should not be called directly; use the individual event * functions instead. */ -static int avc_control(u_int32_t event, security_id_t ssid, +static int avc_control(uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno, access_vector_t * out_retained) + uint32_t seqno, access_vector_t * out_retained) { struct avc_callback_node *c; access_vector_t tretained = 0, cretained = 0; @@ -1175,7 +1175,7 @@ */ int avc_ss_grant(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno) + uint32_t seqno) { return avc_control(AVC_CALLBACK_GRANT, ssid, tsid, tclass, perms, seqno, 0); @@ -1196,7 +1196,7 @@ */ int avc_ss_try_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, - access_vector_t perms, u_int32_t seqno, + access_vector_t perms, uint32_t seqno, access_vector_t * out_retained) { return avc_control(AVC_CALLBACK_TRY_REVOKE, @@ -1216,7 +1216,7 @@ */ int avc_ss_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno) + uint32_t seqno) { return avc_control(AVC_CALLBACK_REVOKE, ssid, tsid, tclass, perms, seqno, 0); @@ -1226,7 +1226,7 @@ * avc_ss_reset - Flush the cache and revalidate migrated permissions. * @seqno: policy sequence number */ -int avc_ss_reset(u_int32_t seqno) +int avc_ss_reset(uint32_t seqno) { int rc; @@ -1251,7 +1251,7 @@ */ int avc_ss_set_auditallow(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno, u_int32_t enable) + uint32_t seqno, uint32_t enable) { if (enable) return avc_control(AVC_CALLBACK_AUDITALLOW_ENABLE, @@ -1272,7 +1272,7 @@ */ int avc_ss_set_auditdeny(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno, u_int32_t enable) + uint32_t seqno, uint32_t enable) { if (enable) return avc_control(AVC_CALLBACK_AUDITDENY_ENABLE, @@ -1311,7 +1311,7 @@ access_vector_t string_to_av_perm(security_class_t tclass, const char *s) { - const u16 *common_pts_idx = 0; + const uint16_t *common_pts_idx = 0; access_vector_t perm, common_base = 0; unsigned int i; @@ -1348,7 +1348,7 @@ void print_access_vector(security_class_t tclass, access_vector_t av) { - const u16 *common_pts_idx = 0; + const uint16_t *common_pts_idx = 0; access_vector_t common_base = 0; unsigned int i, i2, perm; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#4 (text+ko) ==== @@ -11,13 +11,13 @@ #include #include #include +#include #include #include #include #include #include #ifdef __linux__ -#include #include #include "selinux_netlink.h" #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.h#3 (text+ko) ==== @@ -15,10 +15,6 @@ #include #include "dso.h" -typedef u_int32_t u32; -typedef u_int16_t u16; -typedef u_int8_t u8; - /* SID reference counter manipulation */ static inline int sid_inc_refcnt(security_id_t sid) { @@ -164,21 +160,21 @@ /* internal callbacks */ int avc_ss_grant(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno) hidden; + uint32_t seqno) hidden; int avc_ss_try_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, - access_vector_t perms, u_int32_t seqno, + access_vector_t perms, uint32_t seqno, access_vector_t * out_retained) hidden; int avc_ss_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno) hidden; -int avc_ss_reset(u_int32_t seqno) hidden; + uint32_t seqno) hidden; +int avc_ss_reset(uint32_t seqno) hidden; int avc_ss_set_auditallow(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno, u_int32_t enable) hidden; + uint32_t seqno, uint32_t enable) hidden; int avc_ss_set_auditdeny(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, - u_int32_t seqno, u_int32_t enable) hidden; + uint32_t seqno, uint32_t enable) hidden; /* netlink kernel message code */ extern int avc_netlink_trouble hidden; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.c#3 (text+ko) ==== @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "selinux_internal.h" #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_netlink.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ }; struct selnl_msg_policyload { - u_int32_t seqno; + uint32_t seqno; }; #endif /* _LINUX_SELINUX_NETLINK_H */ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 16:59:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA77F16A404; Fri, 23 Feb 2007 16:59:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B066016A400 for ; Fri, 23 Feb 2007 16:59:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8829F13C428 for ; Fri, 23 Feb 2007 16:59:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NGxCiE043223 for ; Fri, 23 Feb 2007 16:59:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NGxCNq043220 for perforce@freebsd.org; Fri, 23 Feb 2007 16:59:12 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 16:59:12 GMT Message-Id: <200702231659.l1NGxCNq043220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114878 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, 23 Feb 2007 16:59:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=114878 Change 114878 by millert@millert_macbook on 2007/02/23 16:58:16 Pull in SIZE_MAX from stdint.h, not limits.h Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_migscs.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_migscs.c#4 (text+ko) ==== @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:00:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E995616A402; Fri, 23 Feb 2007 17:00:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB75E16A406 for ; Fri, 23 Feb 2007 17:00:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9B18313C491 for ; Fri, 23 Feb 2007 17:00:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NH0EwG043370 for ; Fri, 23 Feb 2007 17:00:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NH0EPY043363 for perforce@freebsd.org; Fri, 23 Feb 2007 17:00:14 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:00:14 GMT Message-Id: <200702231700.l1NH0EPY043363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114879 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, 23 Feb 2007 17:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=114879 Change 114879 by millert@millert_macbook on 2007/02/23 16:59:26 Move SECURETTY_TYPES to the correct location in the list. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#5 (text+ko) ==== @@ -17,19 +17,19 @@ #define HOMEDIR_CONTEXTS 6 #define DEFAULT_CONTEXTS 7 #define USER_CONTEXTS 8 -#define SECURETTY_TYPES 9 -#define FAILSAFE_CONTEXT 10 -#define DEFAULT_TYPE 11 -#define BOOLEANS 12 -#define MEDIA_CONTEXTS 13 -#define REMOVABLE_CONTEXT 14 -#define CUSTOMIZABLE_TYPES 15 -#define USERS_DIR 16 -#define SEUSERS 17 -#define TRANSLATIONS 18 -#define NETFILTER_CONTEXTS 19 -#define FILE_CONTEXTS_HOMEDIR 20 -#define FILE_CONTEXTS_LOCAL 21 +#define FAILSAFE_CONTEXT 9 +#define DEFAULT_TYPE 10 +#define BOOLEANS 11 +#define MEDIA_CONTEXTS 12 +#define REMOVABLE_CONTEXT 13 +#define CUSTOMIZABLE_TYPES 14 +#define USERS_DIR 15 +#define SEUSERS 16 +#define TRANSLATIONS 17 +#define NETFILTER_CONTEXTS 18 +#define FILE_CONTEXTS_HOMEDIR 19 +#define FILE_CONTEXTS_LOCAL 20 +#define SECURETTY_TYPES 21 #define NEL 22 static char *file_paths[NEL]; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:00:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55DB316A503; Fri, 23 Feb 2007 17:00:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2541016A4A6 for ; Fri, 23 Feb 2007 17:00:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EE47113C4B3 for ; Fri, 23 Feb 2007 17:00:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NH0E48043386 for ; Fri, 23 Feb 2007 17:00:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NH0EHC043382 for perforce@freebsd.org; Fri, 23 Feb 2007 17:00:14 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:00:14 GMT Message-Id: <200702231700.l1NH0EHC043382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114880 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, 23 Feb 2007 17:00:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=114880 Change 114880 by millert@millert_macbook on 2007/02/23 17:00:01 g/c unused CURRENT_PROC_ENTRY define Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#4 (text+ko) ==== @@ -8,8 +8,6 @@ #include #include "selinux_internal.h" -#define CURRENT_PROC_ENTRY "/proc/self/attr/current" - int setcon_raw(security_context_t context) { mac_t label; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:01:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AAF616A403; Fri, 23 Feb 2007 17:01:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C521E16A402 for ; Fri, 23 Feb 2007 17:01:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B611F13C4A6 for ; Fri, 23 Feb 2007 17:01:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NH1Gop043767 for ; Fri, 23 Feb 2007 17:01:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NH1Gdq043763 for perforce@freebsd.org; Fri, 23 Feb 2007 17:01:16 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:01:16 GMT Message-Id: <200702231701.l1NH1Gdq043763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114881 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, 23 Feb 2007 17:01:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=114881 Change 114881 by millert@millert_macbook on 2007/02/23 17:01:03 Don't need to include sys/types.h Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/nodes.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ports.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/nodes.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ports.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:10:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72DBB16A402; Fri, 23 Feb 2007 17:10:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 38CFC16A400 for ; Fri, 23 Feb 2007 17:10:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2832913C4AA for ; Fri, 23 Feb 2007 17:10:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NHASiD046376 for ; Fri, 23 Feb 2007 17:10:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NHASiG046373 for perforce@freebsd.org; Fri, 23 Feb 2007 17:10:28 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:10:28 GMT Message-Id: <200702231710.l1NHASiG046373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114883 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, 23 Feb 2007 17:10:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114883 Change 114883 by millert@millert_macbook on 2007/02/23 17:10:05 g/c unused security_get_bools() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#7 (text+ko) ==== @@ -1960,51 +1960,6 @@ return (ENOENT); } -static __unused int security_get_bools(int *len, char ***names, int **values) -{ - int i, rc = ENOMEM; - - POLICY_RDLOCK; - *names = NULL; - *values = NULL; - - *len = policydb.p_bools.nprim; - if (!*len) { - rc = 0; - goto out; - } - - *names = kcalloc(*len, sizeof(char*), GFP_ATOMIC); - if (!*names) - goto err; - - *values = kcalloc(*len, sizeof(int), GFP_ATOMIC); - if (!*values) - goto err; - - for (i = 0; i < *len; i++) { - size_t name_len; - (*values)[i] = policydb.bool_val_to_struct[i]->state; - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = kmalloc(sizeof(char) * name_len, GFP_ATOMIC); - if (!(*names)[i]) - goto err; - strncpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; - } - rc = 0; -out: - POLICY_RDUNLOCK; - return rc; -err: - if (*names) { - for (i = 0; i < *len; i++) - kfree((*names)[i]); - } - kfree(*values); - goto out; -} - int security_commit_pending_bools(void) { u32 i; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:11:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3440816A406; Fri, 23 Feb 2007 17:11:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA82416A403 for ; Fri, 23 Feb 2007 17:11:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AAD8B13C474 for ; Fri, 23 Feb 2007 17:11:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NHBUxE046949 for ; Fri, 23 Feb 2007 17:11:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NHBUSw046942 for perforce@freebsd.org; Fri, 23 Feb 2007 17:11:30 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:11:30 GMT Message-Id: <200702231711.l1NHBUSw046942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114884 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, 23 Feb 2007 17:11:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=114884 Change 114884 by millert@millert_macbook on 2007/02/23 17:10:47 This is a kernel-only include; remove non-kernel portion. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#8 (text+ko) ==== @@ -47,19 +47,15 @@ */ #include /* NOTE: mach sys/types, not BSD one. */ -#ifdef KERNEL #include #include #include -#else -#include -#include -#endif typedef u_int64_t u64; typedef u_int64_t __le64; typedef u_int32_t u32; typedef u_int32_t __le32; +typedef u_int32_t __be32; typedef u_int16_t u16; typedef u_int16_t __le16; typedef u_int16_t __be16; @@ -91,19 +87,6 @@ #define likely(exp) __builtin_expect(!!(exp), 1) #define unlikely(exp) __builtin_expect(!!(exp), 0) -#if !defined(_KERNEL) && !defined(KERNEL) - -/* sedarwin uses same ss source files for userspace */ -#define kcalloc(nmemb, size, flags) calloc(nmemb, size) -#define kmalloc(size, flags) malloc(size) -#define kzalloc(size, flags) calloc(1, size) -#define kfree(v) free(v) -#define __get_free_page(flags) malloc(PAGE_SIZE) -#define GFP_ATOMIC 1 -#define GFP_KERNEL 2 - -#else /* _KERNEL */ - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define NIPQUAD(addr) \ @@ -170,8 +153,6 @@ } while (!OSCompareAndSwap(oldval, newval, ptr)); } -#endif /* _KERNEL */ - #define BUG() printf("BUG: %s:%d", __FILE__, __LINE__) #define BUG_ON(x) do { if (x) BUG(); } while(0) From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:11:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FC9616A414; Fri, 23 Feb 2007 17:11:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C7A516A405 for ; Fri, 23 Feb 2007 17:11:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0CA8013C478 for ; Fri, 23 Feb 2007 17:11:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NHBUww046959 for ; Fri, 23 Feb 2007 17:11:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NHBUpw046954 for perforce@freebsd.org; Fri, 23 Feb 2007 17:11:30 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 17:11:30 GMT Message-Id: <200702231711.l1NHBUpw046954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114885 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, 23 Feb 2007 17:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114885 Change 114885 by millert@millert_macbook on 2007/02/23 17:11:28 Don't include linux-compat.h in sebsd_syscalls.h now that there are no linux bit types used in it. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#5 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#3 (text+ko) ==== @@ -41,8 +41,6 @@ #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ -#include - /* * TBD: Should we really try to line up with SELinux? */ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 17:53:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF5D016A405; Fri, 23 Feb 2007 17:53:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 922CC16A403 for ; Fri, 23 Feb 2007 17:53:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C57D13C428 for ; Fri, 23 Feb 2007 17:53:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NHroTO053418 for ; Fri, 23 Feb 2007 17:53:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NHrY93053400 for perforce@freebsd.org; Fri, 23 Feb 2007 17:53:34 GMT (envelope-from jhb@freebsd.org) Date: Fri, 23 Feb 2007 17:53:34 GMT Message-Id: <200702231753.l1NHrY93053400@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 114889 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, 23 Feb 2007 17:53:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=114889 Change 114889 by jhb@jhb_mutex on 2007/02/23 17:53:09 IFC @114882. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#23 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#13 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#21 integrate .. //depot/projects/smpng/sys/amd64/isa/isa.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#10 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_st.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#13 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#6 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#8 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#11 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#41 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#35 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#18 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#57 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#26 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#97 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#13 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#16 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#17 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#12 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#17 integrate .. //depot/projects/smpng/sys/dev/aic/aic_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/aic/aic_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#24 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#21 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#19 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#28 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#13 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#21 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#87 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#77 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#18 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#65 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#66 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#35 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#35 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#11 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#26 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#88 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#28 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#17 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#50 integrate .. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#19 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#21 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#28 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#9 integrate .. //depot/projects/smpng/sys/dev/cy/cy_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/cy/cy_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#14 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#18 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#17 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#38 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#79 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#13 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#14 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#10 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#22 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#10 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#18 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#27 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#38 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#80 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#20 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#24 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#14 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#12 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#14 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#13 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/idt/idt_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#53 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#52 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#50 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#21 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#25 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#18 integrate .. //depot/projects/smpng/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/smpng/sys/dev/le/if_le_ledma.c#4 integrate .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#37 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#15 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#16 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#19 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#30 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#7 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#26 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#21 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#51 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#16 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#14 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#12 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#44 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#62 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#19 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#5 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#5 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#19 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#17 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#20 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#14 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcvar.h#5 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#30 integrate .. //depot/projects/smpng/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#26 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#19 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#51 integrate .. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#10 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#15 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#63 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#11 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#28 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#29 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#48 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#37 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#22 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#28 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#7 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#26 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#25 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#28 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#35 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#14 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#19 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#11 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#84 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#24 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#52 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#37 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/intr.h#4 integrate .. //depot/projects/smpng/sys/isa/isa_common.h#7 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#14 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#111 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#64 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#100 integrate .. //depot/projects/smpng/sys/net/if.c#90 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#79 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#15 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#7 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#9 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#44 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#69 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#45 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#63 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#46 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#35 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#46 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#40 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#71 integrate .. //depot/projects/smpng/sys/pci/intpm.c#15 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#10 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#47 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#24 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#10 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#16 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#12 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#12 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#37 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#8 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#14 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#18 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#41 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/smpng/sys/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/smpng/sys/sys/bus.h#29 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#20 integrate .. //depot/projects/smpng/sys/sys/param.h#110 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#10 integrate .. //depot/projects/smpng/sys/sys/systm.h#79 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#91 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#37 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.28 2007/02/23 12:18:25 piso Exp $ */ /* @@ -158,8 +158,8 @@ } int -intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -167,8 +167,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, handler, arg, - intr_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, filter, handler, + arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); mtx_lock_spin(&intr_table_lock); @@ -266,7 +266,7 @@ thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + if (ih->ih_filter == NULL) { thread = 1; continue; } @@ -274,9 +274,9 @@ ih->ih_handler, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_handler(frame); + ih->ih_filter(frame); else - ih->ih_handler(ih->ih_argument); + ih->ih_filter(ih->ih_argument); } /* ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#23 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.73 2007/02/23 12:18:25 piso Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -95,7 +95,8 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, + void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -417,7 +418,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { int error; @@ -437,7 +439,7 @@ return (error); error = intr_add_handler(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep); + rman_get_start(irq), filter, ihand, arg, flags, cookiep); return (error); } ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#13 (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/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.15 2007/02/23 12:18:26 piso Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -135,8 +135,9 @@ #else #define intr_add_cpu(apic_id) #endif -int intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep); +int intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/smpng/sys/amd64/isa/clock.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); /* * Routines to handle clock hardware. @@ -140,7 +140,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -157,6 +157,7 @@ } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + return (FILTER_HANDLED); } int @@ -211,11 +212,13 @@ * Stat clock ticks can still be lost, causing minor loss of accuracy * in the statistics, but the stat clock will no longer stop. */ -static void +static int rtcintr(struct trapframe *frame) { + int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { + flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -224,6 +227,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } + return(flag ? FILTER_HANDLED : FILTER_STRAY); } #include "opt_ddb.h" @@ -758,8 +762,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, + INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -792,8 +796,8 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + INTR_TYPE_CLK, NULL); writertc(RTC_STATUSB, rtc_statusb); rtcin(RTC_INTR); ==== //depot/projects/smpng/sys/amd64/isa/isa.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.148 2005/01/21 05:56:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.149 2007/02/23 12:18:26 piso Exp $"); /*- * Modifications for Intel architecture by Garrett A. Wollman. @@ -147,10 +147,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/smpng/sys/arm/arm/intr.c#14 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.14 2007/02/23 12:18:27 piso Exp $"); #include #include #include @@ -58,8 +58,8 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, - int irq, int flags, void **cookiep) +arm_setup_irqhandler(const char *name, driver_filter_t *filt, + void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; int error; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); } @@ -118,10 +118,10 @@ /* Execute fast handlers. */ thread = 0; TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) + if (ih->ih_filter == NULL) thread = 1; else - ih->ih_handler(ih->ih_argument ? + ih->ih_filter(ih->ih_argument ? ih->ih_argument : frame); } ==== //depot/projects/smpng/sys/arm/arm/nexus.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.10 2006/11/17 11:56:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -81,7 +81,7 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,13 +125,13 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int i; for (i = rman_get_start(res); i <= rman_get_end(res); i++) arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, i, flags, cookiep); + filt, intr, arg, i, flags, cookiep); return (0); } ==== //depot/projects/smpng/sys/arm/at91/at91.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -543,14 +543,14 @@ static int at91_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { struct at91_softc *sc = device_get_softc(dev); if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -192,7 +192,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_mci_intr, sc, &sc->intrhand); + NULL, at91_mci_intr, sc, &sc->intrhand); if (err) { AT91_MCI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/at91_pio.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -83,7 +83,7 @@ static int at91_pio_probe(device_t dev); static int at91_pio_attach(device_t dev); static int at91_pio_detach(device_t dev); -static void at91_pio_intr(void *); +static int at91_pio_intr(void *); /* helper routines */ static int at91_pio_activate(device_t dev); @@ -148,8 +148,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_pio_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_pio_intr, NULL, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); goto out; @@ -217,7 +217,7 @@ return; } -static void +static int at91_pio_intr(void *xsc) { struct at91_pio_softc *sc = xsc; @@ -232,7 +232,7 @@ AT91_PIO_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } static int ==== //depot/projects/smpng/sys/arm/at91/at91_rtc.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -110,8 +110,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, RTC_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_rtc_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_rtc_intr, NULL, sc, &sc->intrhand); if (err) { AT91_RTC_LOCK_DESTROY(sc); goto out; @@ -173,7 +173,7 @@ return; } -static void +static int at91_rtc_intr(void *xsc) { struct at91_rtc_softc *sc = xsc; @@ -188,7 +188,7 @@ AT91_RTC_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } /* ==== //depot/projects/smpng/sys/arm/at91/at91_spi.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -163,7 +163,7 @@ if (sc->irq_res == NULL) goto errout; err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_spi_intr, sc, &sc->intrhand); + NULL, at91_spi_intr, sc, &sc->intrhand); if (err != 0) goto errout; return (0); ==== //depot/projects/smpng/sys/arm/at91/at91_ssc.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -124,7 +124,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_ssc_intr, sc, &sc->intrhand); + NULL, at91_ssc_intr, sc, &sc->intrhand); if (err) { AT91_SSC_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/at91_st.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -183,7 +183,7 @@ WR4(ST_CR, ST_CR_WDRST); } -static void +static int clock_intr(void *arg) { struct trapframe *fp = arg; @@ -194,7 +194,9 @@ tot_count += 32768 / hz; #endif hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + return (FILTER_HANDLED); } + return (FILTER_STRAY); } void @@ -222,8 +224,8 @@ if (!irq) panic("Unable to allocate irq for the system timer"); else - bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clock_intr, NULL, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CLK, + clock_intr, NULL, NULL, &ih); WR4(ST_PIMR, rel_value); ==== //depot/projects/smpng/sys/arm/at91/at91_twi.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.8 2007/02/06 12:07:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.9 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -118,7 +118,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_twi_intr, sc, &sc->intrhand); + NULL, at91_twi_intr, sc, &sc->intrhand); if (err) { AT91_TWI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#13 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.18 2007/02/10 15:43:57 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.19 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -226,7 +226,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, - ate_intr, sc, &sc->intrhand); + NULL, ate_intr, sc, &sc->intrhand); if (err) { ether_ifdetach(ifp); ATE_LOCK_DESTROY(sc); ==== //depot/projects/smpng/sys/arm/include/intr.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.5 2005/06/09 12:26:19 cognet Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ * */ @@ -50,7 +50,7 @@ int arm_get_next_irq(void); void arm_mask_irq(uintptr_t); void arm_unmask_irq(uintptr_t); -void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, - void **); +void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*), + void *, int, int, void **); int arm_remove_irqhandler(void *); #endif /* _MACHINE_INTR_H */ ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#8 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.7 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -91,14 +91,14 @@ static int sa1110_activate_resource(device_t, device_t, int, int, struct resource *); static int sa1110_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); struct sa11x0_softc *sa11x0_softc; /* There can be only one. */ static int sa1110_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { int saved_cpsr; @@ -113,7 +113,7 @@ saved_cpsr = SetCPSR(I32_bit, I32_bit); SetCPSR(I32_bit, saved_cpsr & I32_bit); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); return (0); } ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.5 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.6 2007/02/23 12:18:28 piso Exp $"); #include #include @@ -67,9 +67,9 @@ static int saost_attach(device_t); int gettick(void); -static void clockintr(void *); +static int clockintr(void *); #if 0 -static void statintr(void *); +static int statintr(void *); #endif void rtcinit(void); @@ -141,7 +141,7 @@ } -static void +static int clockintr(arg) void *arg; { @@ -184,10 +184,11 @@ #if 0 mtx_unlock_spin(&clock_lock); #endif + return (FILTER_HANDLED); } #if 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 20:12:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90DA116A408; Fri, 23 Feb 2007 20:12:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6010616A405 for ; Fri, 23 Feb 2007 20:12:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4EB6A13C467 for ; Fri, 23 Feb 2007 20:12:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NKCNEE084035 for ; Fri, 23 Feb 2007 20:12:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NKCM5a084031 for perforce@freebsd.org; Fri, 23 Feb 2007 20:12:22 GMT (envelope-from jhb@freebsd.org) Date: Fri, 23 Feb 2007 20:12:22 GMT Message-Id: <200702232012.l1NKCM5a084031@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 114897 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, 23 Feb 2007 20:12:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=114897 Change 114897 by jhb@jhb_mutex on 2007/02/23 20:11:36 IFC @114896. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#24 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#24 integrate .. //depot/projects/smpng/sys/dev/ieee488/pcii.c#5 integrate .. //depot/projects/smpng/sys/dev/ieee488/tnt4882.c#3 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#12 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#14 integrate .. //depot/projects/smpng/sys/dev/si/si_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/si/si_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#38 integrate .. //depot/projects/smpng/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#84 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#43 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#14 integrate .. //depot/projects/smpng/sys/pci/ncr.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.28 2007/02/23 12:18:25 piso Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.29 2007/02/23 20:03:23 jhb Exp $ */ /* @@ -271,7 +271,7 @@ continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? frame : + ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) ih->ih_filter(frame); ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#24 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.24 2006/11/06 13:41:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.25 2007/02/23 19:27:49 imp Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -1631,7 +1631,7 @@ return (error); } - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, NULL, cnw_intr, sc, &sc->cnw_intrhand); if (error) { ==== //depot/projects/smpng/sys/dev/ieee488/pcii.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ieee488/pcii.c,v 1.7 2006/01/14 09:46:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ieee488/pcii.c,v 1.8 2007/02/23 19:30:55 imp Exp $"); #include #include @@ -149,7 +149,7 @@ return (error); error = bus_setup_intr(dev, sc->res[0], - INTR_TYPE_MISC | INTR_MPSAFE, + INTR_TYPE_MISC | INTR_MPSAFE, NULL, upd7210intr, &sc->upd7210, &sc->intr_handler); if (error) { bus_release_resources(dev, pcii_res_spec, sc->res); ==== //depot/projects/smpng/sys/dev/ieee488/tnt4882.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/dev/ieee488/tnt4882.c,v 1.2 2005/09/24 20:44:55 phk Exp $ + * $FreeBSD: src/sys/dev/ieee488/tnt4882.c,v 1.3 2007/02/23 19:30:55 imp Exp $ */ #include @@ -284,7 +284,7 @@ return (error); error = bus_setup_intr(dev, sc->res[2], INTR_TYPE_MISC | INTR_MPSAFE, - upd7210intr, &sc->upd7210, &sc->intr_handler); + NULL, upd7210intr, &sc->upd7210, &sc->intr_handler); /* Necessary magic for MITE */ bus_write_4(sc->res[0], 0xc0, rman_get_start(sc->res[1]) | 0x80); ==== //depot/projects/smpng/sys/dev/pdq/if_fpa.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.26 2005/11/11 07:36:13 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.27 2007/02/23 19:31:44 imp Exp $"); /* * DEC PDQ FDDI Controller; code for BSD derived operating systems @@ -157,7 +157,7 @@ goto bad; } - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, NULL, pdq_pci_ifintr, dev, &sc->irq_ih); if (error) { device_printf(dev, "Failed to setup interrupt handler.\n"); ==== //depot/projects/smpng/sys/dev/ppbus/ppi.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.40 2006/02/22 18:16:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.41 2007/02/23 19:32:21 imp Exp $"); #include "opt_ppb_1284.h" #include @@ -276,8 +276,9 @@ #ifdef PERIPH_1284 if (ppi->intr_resource) { /* register our interrupt handler */ - bus_setup_intr(ppidev, ppi->intr_resource, - INTR_TYPE_TTY, ppiintr, dev, &ppi->intr_cookie); + bus_setup_intr(ppidev, ppi->intr_resource, + INTR_TYPE_TTY, NULL, ppiintr, dev, + &ppi->intr_cookie); } #endif /* PERIPH_1284 */ } ==== //depot/projects/smpng/sys/dev/si/si_isa.c#8 (text+ko) ==== @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/si/si_isa.c,v 1.7 2005/01/06 01:43:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/si/si_isa.c,v 1.8 2007/02/23 19:33:07 imp Exp $"); #include "opt_debug_si.h" @@ -292,7 +292,7 @@ } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc,&ih); + NULL, si_intr, sc, &ih); if (error) { device_printf(dev, "couldn't activate interrupt\n"); goto fail; ==== //depot/projects/smpng/sys/dev/si/si_pci.c#7 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.8 2005/11/08 04:11:50 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/si/si_pci.c,v 1.9 2007/02/23 19:33:07 imp Exp $"); #include #include @@ -99,7 +99,7 @@ } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc, &ih); + NULL, si_intr, sc, &ih); if (error) { device_printf(dev, "could not activate interrupt\n"); goto fail; ==== //depot/projects/smpng/sys/dev/sound/isa/gusc.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.18 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.19 2007/02/23 19:40:13 ariff Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e @@ -316,7 +316,7 @@ } if (scp->irq != NULL) - bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL, gusc_intr, scp, &ih); + snd_setup_intr(dev, scp->irq, 0, gusc_intr, scp, &ih); bus_generic_attach(dev); return (0); @@ -418,16 +418,21 @@ } static int -gusc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) +gusc_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp = (sc_p)device_get_softc(dev); devclass_t devclass; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("gusc.c: we cannot use a filter here\n"); return (EINVAL); } +#endif devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { scp->midi_intr.intr = intr; @@ -438,8 +443,11 @@ scp->pcm_intr.arg = arg; return 0; } - return bus_generic_setup_intr(dev, child, irq, flags, filter, intr, - arg, cookiep); + return bus_generic_setup_intr(dev, child, irq, flags, +#if __FreeBSD_version >= 700031 + filter, +#endif + intr, arg, cookiep); } static device_t ==== //depot/projects/smpng/sys/dev/sound/isa/sbc.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.46 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.47 2007/02/23 19:40:13 ariff Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 @@ -80,7 +80,11 @@ static int sbc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, + int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep); static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); @@ -502,18 +506,23 @@ } static int -sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, +sbc_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; int i, ret; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("sbc.c: we cannot use a filter here\n"); return (EINVAL); } +#endif sbc_lock(scp); i = 0; while (i < IRQ_MAX) { ==== //depot/projects/smpng/sys/dev/sound/pci/csa.c#17 (text+ko) ==== @@ -48,7 +48,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.35 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.36 2007/02/23 19:40:13 ariff Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 @@ -82,8 +82,10 @@ struct resource *r); static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, - void *arg, void **cookiep); +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep); static int csa_teardown_intr(device_t bus, device_t child, struct resource *irq, void *cookie); static driver_intr_t csa_intr; @@ -440,17 +442,21 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, void *arg, - void **cookiep) +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp; csa_res *resp; struct sndcard_func *func; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("ata-csa.c: we cannot use a filter here\n"); return (EINVAL); } +#endif scp = device_get_softc(bus); resp = &scp->res; ==== //depot/projects/smpng/sys/dev/sound/pci/ds1.c#22 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.46 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.47 2007/02/23 19:41:16 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ */ /* stuff */ -static int ds_init(struct sc_info *, device_t); +static int ds_init(struct sc_info *); static void ds_intr(void *); /* talk to the card */ @@ -785,7 +785,7 @@ } static int -ds_init(struct sc_info *sc, device_t dev) +ds_init(struct sc_info *sc) { int i; u_int32_t *ci, r, pcs, rcs, ecs, ws, memsz, cb; @@ -833,7 +833,7 @@ memsz += (64 + 1) * 4; if (sc->regbase == NULL) { - if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + if (bus_dma_tag_create(bus_get_dma_tag(sc->dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, memsz, 1, memsz, 0, NULL, @@ -985,7 +985,7 @@ } sc->regbase = NULL; - if (ds_init(sc, dev) == -1) { + if (ds_init(sc) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } @@ -1053,7 +1053,7 @@ sc = pcm_getdevinfo(dev); - if (ds_init(sc, dev) == -1) { + if (ds_init(sc) == -1) { device_printf(dev, "unable to reinitialize the card\n"); return ENXIO; } ==== //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.8 2007/02/23 13:47:34 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.9 2007/02/23 19:41:16 ariff Exp $ */ #include @@ -385,7 +385,7 @@ static void emu_initefx(struct emu_sc_info *sc); static int emu_cardbus_init(struct emu_sc_info *sc); -static int emu_init(struct emu_sc_info *sc, device_t dev); +static int emu_init(struct emu_sc_info *sc); static int emu_uninit(struct emu_sc_info *sc); static int emu_read_ivar(device_t bus __unused, device_t dev, int ivar_index, uintptr_t * result); @@ -2338,7 +2338,7 @@ /* Probe and attach the card */ static int -emu_init(struct emu_sc_info *sc, device_t dev) +emu_init(struct emu_sc_info *sc) { uint32_t ch, tmp; uint32_t spdif_sr; @@ -2385,7 +2385,7 @@ emu_wrptr(sc, 0, SPBYPASS, 0xf00); /* What will happen if * we write 1 here? */ - if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(dev), + if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(sc->dev), /* alignment */ 2, /* boundary */ 0, /* lowaddr */ 1 << 31, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, @@ -2835,7 +2835,7 @@ i = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE); - if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) { + if ((sc->irq == NULL) || snd_setup_intr(dev, sc->irq, INTR_MPSAFE, emu_intr, sc, &sc->ih)) { device_printf(dev, "unable to map interrupt\n"); goto bad; } @@ -2854,7 +2854,7 @@ sc->root = device_get_sysctl_tree(dev); if (sc->root == NULL) goto bad; - if (emu_init(sc, dev) == -1) { + if (emu_init(sc) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } ==== //depot/projects/smpng/sys/dev/sound/pci/envy24.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.7 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.8 2007/02/23 19:41:16 ariff Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -2301,7 +2301,7 @@ } static int -envy24_alloc_resource(struct sc_info *sc, device_t dev) +envy24_alloc_resource(struct sc_info *sc) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2348,7 +2348,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, @@ -2395,7 +2396,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24_alloc_resource(sc, dev); + err = envy24_alloc_resource(sc); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.8 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.9 2007/02/23 19:41:16 ariff Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -2332,7 +2332,7 @@ } static int -envy24ht_alloc_resource(struct sc_info *sc, device_t dev) +envy24ht_alloc_resource(struct sc_info *sc) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2367,7 +2367,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, @@ -2414,7 +2415,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24ht_alloc_resource(sc, dev); + err = envy24ht_alloc_resource(sc); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/smpng/sys/dev/sound/pci/vibes.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.22 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.23 2007/02/23 19:39:06 ariff Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ @@ -762,7 +762,7 @@ sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); if (!sc->irq || - bus_setup_intr(dev, sc->irq, INTR_TYPE_AV, NULL, sv_intr, sc, &sc->ih)) { + snd_setup_intr(dev, sc->irq, 0, sv_intr, sc, &sc->ih)) { device_printf(dev, "sv_attach: Unable to map interrupt\n"); goto fail; } ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.c#38 (text+ko) ==== @@ -34,7 +34,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.109 2007/02/23 12:18:55 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.110 2007/02/23 19:40:13 ariff Exp $"); devclass_t pcm_devclass; @@ -129,7 +129,11 @@ #else flags = INTR_TYPE_AV; #endif - return bus_setup_intr(dev, res, flags, NULL, hand, param, cookiep); + return bus_setup_intr(dev, res, flags, +#if __FreeBSD_version >= 700031 + NULL, +#endif + hand, param, cookiep); } #ifndef PCM_DEBUG_MTX ==== //depot/projects/smpng/sys/dev/usb/slhci_pccard.c#3 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include "pccarddevs.h" -__FBSDID("$FreeBSD: src/sys/dev/usb/slhci_pccard.c,v 1.2 2005/09/22 05:06:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/slhci_pccard.c,v 1.3 2007/02/23 19:34:26 imp Exp $"); static void slhci_pccard_intr(void *arg); @@ -130,7 +130,7 @@ device_printf(dev, "Could not add USB device\n"); } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, slhci_pccard_intr, sc, &sc->ih); + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, NULL, slhci_pccard_intr, sc, &sc->ih); if (error) goto out; #if 1 ==== //depot/projects/smpng/sys/dev/wds/wd7000.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wds/wd7000.c,v 1.11 2006/12/11 18:28:31 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wds/wd7000.c,v 1.12 2007/02/23 19:34:52 imp Exp $"); /* All bugs are subject to removal without further notice */ @@ -542,7 +542,7 @@ if (wp->intr_r == NULL) goto bad; error = bus_setup_intr(dev, wp->intr_r, INTR_TYPE_CAM | INTR_ENTROPY, - (driver_intr_t *)wds_intr, (void *)wp, + NULL, (driver_intr_t *)wds_intr, (void *)wp, &wp->intr_cookie); if (error) goto bad; ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.23 2007/02/23 12:18:59 piso Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.24 2007/02/23 20:03:24 jhb Exp $ */ /* @@ -262,12 +262,12 @@ continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? frame : + ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) ih->ih_filter(frame); else - ih->ih_handler(ih->ih_argument); + ih->ih_filter(ih->ih_argument); } /* ==== //depot/projects/smpng/sys/kern/kern_linker.c#84 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.144 2006/11/06 13:42:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.145 2007/02/23 19:46:59 jhb Exp $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" @@ -403,8 +403,10 @@ linker_file_unload(lf, LINKER_UNLOAD_FORCE); return (error); } + KLD_UNLOCK(); linker_file_register_sysctls(lf); linker_file_sysinit(lf); + KLD_LOCK(); lf->flags |= LINKER_FILE_LINKED; *result = lf; return (0); @@ -502,7 +504,7 @@ KLD_LOCK_ASSERT(); TAILQ_FOREACH(lf, &linker_files, link) - if (lf->id == fileid) + if (lf->id == fileid && lf->flags & LINKER_FILE_LINKED) break; return (lf); } @@ -1033,21 +1035,25 @@ #endif KLD_LOCK(); - if (uap->fileid == 0) { - if (TAILQ_FIRST(&linker_files)) - td->td_retval[0] = TAILQ_FIRST(&linker_files)->id; - else - td->td_retval[0] = 0; - goto out; + if (uap->fileid == 0) + lf = TAILQ_FIRST(&linker_files); + else { + lf = linker_find_file_by_id(uap->fileid); + if (lf == NULL) { + error = ENOENT; + goto out; + } + lf = TAILQ_NEXT(lf, link); } - lf = linker_find_file_by_id(uap->fileid); - if (lf) { - if (TAILQ_NEXT(lf, link)) - td->td_retval[0] = TAILQ_NEXT(lf, link)->id; - else - td->td_retval[0] = 0; - } else - error = ENOENT; + + /* Skip partially loaded files. */ + while (lf != NULL && !(lf->flags & LINKER_FILE_LINKED)) + lf = TAILQ_NEXT(lf, link); + + if (lf) + td->td_retval[0] = lf->id; + else + td->td_retval[0] = 0; out: KLD_UNLOCK(); return (error); ==== //depot/projects/smpng/sys/net/if_bridge.c#43 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.92 2006/12/11 23:46:40 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.93 2007/02/23 19:37:55 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -532,13 +532,13 @@ int retry; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO); - BRIDGE_LOCK_INIT(sc); ifp = sc->sc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { free(sc, M_DEVBUF); return (ENOSPC); } + BRIDGE_LOCK_INIT(sc); sc->sc_brtmax = BRIDGE_RTABLE_MAX; sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT; ==== //depot/projects/smpng/sys/pci/if_mn.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_mn.c,v 1.48 2005/06/10 16:49:22 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_mn.c,v 1.49 2007/02/23 19:41:34 imp Exp $"); /* * Stuff to describe the MUNIC32X and FALC54 chips. @@ -1377,7 +1377,7 @@ return(ENXIO); } - error = bus_setup_intr(self, sc->irq, INTR_TYPE_NET, mn_intr, sc, &sc->intrhand); + error = bus_setup_intr(self, sc->irq, INTR_TYPE_NET, NULL, mn_intr, sc, &sc->intrhand); if (error) { printf("couldn't set up irq\n"); ==== //depot/projects/smpng/sys/pci/ncr.c#24 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.192 2006/11/02 00:54:38 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/ncr.c,v 1.193 2007/02/23 19:41:34 imp Exp $"); #define NCR_DATE "pl30 98/1/1" @@ -3764,7 +3764,7 @@ "interruptless mode: reduced performance.\n"); } else { bus_setup_intr(dev, np->irq_res, INTR_TYPE_CAM | INTR_ENTROPY, - ncr_intr, np, &np->irq_handle); + NULL, ncr_intr, np, &np->irq_handle); } /* From owner-p4-projects@FreeBSD.ORG Fri Feb 23 20:15:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0818B16A406; Fri, 23 Feb 2007 20:15:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D7B9616A404 for ; Fri, 23 Feb 2007 20:15:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C81E813C478 for ; Fri, 23 Feb 2007 20:15:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NKFVSu084604 for ; Fri, 23 Feb 2007 20:15:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NKFVqW084601 for perforce@freebsd.org; Fri, 23 Feb 2007 20:15:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 23 Feb 2007 20:15:31 GMT Message-Id: <200702232015.l1NKFVqW084601@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 114899 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, 23 Feb 2007 20:15:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114899 Change 114899 by jhb@jhb_mutex on 2007/02/23 20:15:10 Merge in changes from jhb_lock. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#35 integrate .. //depot/projects/smpng/sys/modules/crash2/crash2.c#19 integrate .. //depot/projects/smpng/sys/modules/evtest/evtest.c#23 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#35 (text+ko) ==== @@ -87,6 +87,71 @@ /* Events. */ static void +sleep_sx_recurse(void) +{ + sx_slock(&foo); + sx_slock(&foo); + printf("sleeping on recursed sx\n"); + sx_sleep(&load, &foo, PWAIT, "sxsslp", hz/10); + sx_sunlock(&foo); + sx_sunlock(&foo); +} +CRASH_EVENT("test recursive sx_sleep()", sleep_sx_recurse); + +static void +sleep_rw_recurse(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + rw_rlock(&baz); + printf("sleeping on recursed rwlock\n"); + rw_sleep(&load, &baz, PWAIT, "rwrslp", hz/10); + rw_runlock(&baz); + rw_runlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("test recursive rw_sleep()", sleep_rw_recurse); + +static void +pause_test(void) +{ + printf("sleeping for 5 seconds..\n"); + pause("pt", 5 * hz); + printf("awake..\n"); +} +CRASH_EVENT("test pause()", pause_test); + +static void +sleep_sx(void) +{ + sx_slock(&foo); + sx_sleep(&load, &foo, PWAIT, "sxsslp", hz/10); + if (sx_try_upgrade(&foo) == 0) + printf("bad juju, upgrade failed\n"); + else { + sx_sleep(&load, &foo, PWAIT, "sxxslp", hz/10); + sx_xunlock(&foo); + } +} +CRASH_EVENT("test sx_sleep()", sleep_sx); + +static void +sleep_rw(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + rw_sleep(&load, &baz, PWAIT, "rwrslp", hz/10); + if (rw_try_upgrade(&baz) == 0) + printf("bad juju, upgrade failed\n"); + else { + rw_sleep(&load, &baz, PWAIT, "rwwslp", hz/10); + rw_wunlock(&baz); + } + rw_destroy(&baz); +} +CRASH_EVENT("test rw_sleep()", sleep_rw); + +static void lock_destroyed_mtx(void) { @@ -170,7 +235,7 @@ #ifdef WITNESS static void -rw_sleep(void) +rw_tsleep(void) { rw_init(&baz, "baz"); rw_rlock(&baz); @@ -178,7 +243,7 @@ rw_runlock(&baz); rw_destroy(&baz); } -CRASH_EVENT("test sleeping with rw lock held", rw_sleep); +CRASH_EVENT("test sleeping with rw lock held", rw_tsleep); static void rw_order_sx(void) @@ -769,6 +834,8 @@ kthread_exit(0); break; } + /* Give sysctl time to finish. */ + pause("delay", hz / 5); if (ev < 0 || ev >= MAX_EVENT) { printf("crash: event %d is not defined!\n", event); continue; ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#19 (text+ko) ==== @@ -361,6 +361,8 @@ kthread_exit(0); break; } + /* Give sysctl time to finish. */ + pause("delay", hz / 5); if (ev < 0 || ev >= MAX_EVENT) { printf("crash2[%d]: event %d is not defined!\n", i, ev); continue; ==== //depot/projects/smpng/sys/modules/evtest/evtest.c#23 (text+ko) ==== @@ -300,6 +300,8 @@ while ((ev = event) == 0) cv_wait(&event_cv, &event_mtx); mtx_unlock(&event_mtx); + /* Give sysctl time to finish. */ + pause("delay", hz / 5); if (ev >= 1 && ev <= MAX_EVENT && events[ev].ei_help != NULL) printf("evtest: %s\n", events[ev].ei_help); switch (ev) { From owner-p4-projects@FreeBSD.ORG Fri Feb 23 20:23:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6859616A57F; Fri, 23 Feb 2007 20:23:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1200B16A55C for ; Fri, 23 Feb 2007 20:23:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F359613C4B8 for ; Fri, 23 Feb 2007 20:23:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NKNhx3086196 for ; Fri, 23 Feb 2007 20:23:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NKNhd2086192 for perforce@freebsd.org; Fri, 23 Feb 2007 20:23:43 GMT (envelope-from millert@freebsd.org) Date: Fri, 23 Feb 2007 20:23:43 GMT Message-Id: <200702232023.l1NKNhd2086192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114902 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, 23 Feb 2007 20:23:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=114902 Change 114902 by millert@millert_macbook on 2007/02/23 20:23:37 Update policy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#14 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#21 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#18 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.if#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#14 (text+ko) ==== @@ -138,3 +138,10 @@ # Read files in /tmp files_read_generic_tmp_files(WindowServer_t) + +# Search /var/vm +files_search_vm(WindowServer_t) + +# Read/write caches +darwin_allow_cache_manage(WindowServer_t) +allow WindowServer_t darwin_cache_t:dir { rw_dir_perms }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#21 (text+ko) ==== @@ -155,7 +155,6 @@ # Read prefs, etc darwin_allow_global_pref_manage(configd_t) -darwin_allow_global_pref_rw(configd_t) darwin_allow_host_pref_read(configd_t) darwin_allow_system_read(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#12 (text+ko) ==== @@ -48,6 +48,10 @@ # Talk to Coreaudiod allow coreservicesd_t coreaudiod_t:process taskforpid; +# Talk to automount +automount_allow_ipc(coreservicesd_t) +allow coreservicesd_t automount_t:process taskforpid; + # Talk to configd configd_allow_ipc(coreservicesd_t) allow coreservicesd_t configd_t:process taskforpid; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#10 (text+ko) ==== @@ -111,4 +111,4 @@ allow kextd_t console_device_t:chr_file { read write }; # Access cache files -allow kextd_t darwin_cache_t:dir { search getattr add_name }; +allow kextd_t darwin_cache_t:dir { search getattr add_name remove_name }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#18 (text+ko) ==== @@ -95,7 +95,7 @@ allow loginwindow_t coreservicesd_t:shm { read write }; # Read prefs -darwin_allow_global_pref_rw(loginwindow_t) +darwin_allow_global_pref_manage(loginwindow_t) darwin_allow_host_pref_read(loginwindow_t) # Read /private @@ -173,3 +173,7 @@ # Read default_t files_list_default(loginwindow_t) files_read_default_files(loginwindow_t) + +# Read /System/Library/StartupItems +allow configd_t darwin_startup_t:dir { read search getattr }; +allow configd_t darwin_startup_t:file { execute execute_no_trans read ioctl getattr }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#9 (text+ko) ==== @@ -60,4 +60,4 @@ # /var operations files_read_var_symlinks(notifyd_t) -allow notifyd_t var_t:file write; +allow notifyd_t var_t:file { read write }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.if#3 (text+ko) ==== @@ -27,25 +27,6 @@ ######################################## ## -## Execute automount in the caller domain. -## -## -## -## Domain allowed access. -## -## -# -interface(`automount_exec_config',` - gen_require(` - type automount_etc_t; - ') - - corecmd_search_sbin($1) - can_exec($1,automount_etc_t) -') - -######################################## -## ## Allow the domain to read state files in /proc. ## ## @@ -65,19 +46,19 @@ ######################################## ## -## Do not audit attempts to get the attributes -## of automount temporary directories. +## Allow Mach IP with configd ## ## -## -## Domain to not audit. -## +## +## Type to be used as a domain. +## ## # -interface(`automount_dontaudit_getattr_tmp_dirs',` - gen_require(` - type automount_tmp_t; - ') +interface(`automount_allow_ipc',` + #gen_require(` + #class mach_port all_mach_port_perms; + #)' - dontaudit $1 automount_tmp_t:dir getattr; + # Allow bidirection communication with automount + mach_allow_ipc(automount_t, $1) ') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.te#4 (text+ko) ==== @@ -8,21 +8,11 @@ type automount_t; type automount_exec_t; -init_daemon_domain(automount_t,automount_exec_t) +init_domain(automount_t,automount_exec_t) type automount_var_run_t; files_pid_file(automount_var_run_t) -type automount_etc_t; -files_config_file(automount_etc_t) - -type automount_lock_t; -files_lock_file(automount_lock_t) - -type automount_tmp_t; -files_tmp_file(automount_tmp_t) -files_mountpoint(automount_tmp_t) - ######################################## # # Local policy @@ -37,24 +27,10 @@ allow automount_t self:tcp_socket create_stream_socket_perms; allow automount_t self:udp_socket create_socket_perms; allow automount_t self:netlink_route_socket r_netlink_socket_perms; +allow automount_t self:socket rw_socket_perms; -allow automount_t automount_etc_t:file { getattr read }; -# because config files can be shell scripts -can_exec(automount_t, automount_etc_t) can_exec(automount_t, automount_exec_t) -allow automount_t automount_lock_t:file create_file_perms; -files_lock_filetrans(automount_t,automount_lock_t,file) - -allow automount_t automount_tmp_t:dir create_dir_perms; -allow automount_t automount_tmp_t:file create_file_perms; -files_tmp_filetrans(automount_t, automount_tmp_t, { file dir }) - -# Allow automount to create and delete directories in / and /home -allow automount_t automount_tmp_t:dir create_dir_perms; -files_home_filetrans(automount_t,automount_tmp_t,dir) -files_root_filetrans(automount_t,automount_tmp_t,dir) - allow automount_t automount_var_run_t:file create_file_perms; allow automount_t automount_var_run_t:dir rw_dir_perms; files_pid_filetrans(automount_t,automount_var_run_t,file) @@ -190,6 +166,51 @@ seutil_sigchld_newrole(automount_t) ') -optional_policy(` - udev_read_db(automount_t) -') +# Allow automount to talk to itself +mach_allow_message(automount_t, automount_t) + +# Allow automount to talk to the kernel +kernel_allow_ipc(automount_t) + +# Allow Mach IPC w/ init_t (launchd) +init_allow_ipc(automount_t) + +# Talk to configd +configd_allow_ipc(automount_t) + +# Talk to lookupd +lookupd_allow_ipc(automount_t) + +# Talk to securityd +securityd_allow_ipc(automount_t) + +# Talk to diskarbitrationd +diskarbitrationd_allow_ipc(automount_t) + +# Talk to notifyd +notifyd_allow_ipc(automount_t) +notifyd_allow_shm(automount_t) + +darwin_allow_system_read(automount_t) +frameworks_read(automount_t) +darwin_allow_private_read(automount_t) + +# Allow read access to /var +allow automount_t var_t:{file lnk_file} read; + +# Allow read access to resolv.conf +# XXX - should not be configd_var_run_t +allow automount_t configd_var_run_t:file read; + +# Talk to bootstrap server +init_allow_bootstrap(automount_t) + +# Use CoreServices +darwin_allow_CoreServices_read(automount_t) +allow automount_t coreservicesd_t:shm { read write }; + +# Mounting filesystems +allow automount_t fs_t:dir { search read mounton }; +allow automount_t nfs_t:dir { search read }; +allow automount_t volfs_t:dir { search read }; +allow automount_t fs_t:file { getattr read }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#6 (text+ko) ==== @@ -11,7 +11,9 @@ type ntpd_t; type ntpd_exec_t; -init_daemon_domain(ntpd_t,ntpd_exec_t) +init_domain(ntpd_t,ntpd_exec_t) + +# XXX - configd appears to run ntpd as well configd_domain(ntpd_t,ntpd_exec_t) type ntpd_log_t; @@ -24,7 +26,7 @@ files_pid_file(ntpd_var_run_t) type ntpdate_exec_t; -init_system_domain(ntpd_t,ntpdate_exec_t) +init_domain(ntpd_t,ntpdate_exec_t) ######################################## # ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#6 (text+ko) ==== @@ -35,8 +35,8 @@ ') allow $1 darwin_global_pref_t:file rw_file_perms; + allow $1 darwin_global_pref_t:file link_file_perms; allow $1 darwin_global_pref_t:dir rw_dir_perms; - allow $1 darwin_global_pref_t:file link_file_perms; ') @@ -56,6 +56,7 @@ ') allow $1 darwin_global_pref_t:file manage_file_perms; + allow $1 darwin_global_pref_t:dir rw_dir_perms; ') ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#16 (text+ko) ==== @@ -408,10 +408,6 @@ ') optional_policy(` - automount_exec_config(initrc_t) -') - -optional_policy(` bind_read_config(initrc_t) # for chmod in start script From owner-p4-projects@FreeBSD.ORG Fri Feb 23 21:54:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05C0316A405; Fri, 23 Feb 2007 21:54:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 998EC16A401 for ; Fri, 23 Feb 2007 21:54:42 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8827813C46B for ; Fri, 23 Feb 2007 21:54:42 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NLsgFE014453 for ; Fri, 23 Feb 2007 21:54:42 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NLsgjw014450 for perforce@freebsd.org; Fri, 23 Feb 2007 21:54:42 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 23 Feb 2007 21:54:42 GMT Message-Id: <200702232154.l1NLsgjw014450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114912 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, 23 Feb 2007 21:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114912 Change 114912 by mjacob@mjexp on 2007/02/23 21:54:39 Don't attempt to load illegal hard loop addresses into an ICB. This shows up on card restarts, and usually for 2200-2300 cards. What happens is that we start up, attempting to acquire a hard address. We end up instead being an F-port topology, which reports out a loop id of 0xff (or 0xffff for 2K Login f/w). Then, if we restart, we end up telling the card to go off an acquire this loop address, which the card then rejects. Bah. Compilation fixes from Solaris port. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#13 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#13 (text+ko) ==== @@ -1555,6 +1555,7 @@ fcparam *fcp; isp_icb_t local, *icbp = &local; mbreg_t mbs; + int ownloopid; uint64_t nwwn, pwwn; fcp = isp->isp_param; @@ -1630,25 +1631,17 @@ icbp->icb_retry_delay = fcp->isp_retry_delay; icbp->icb_retry_count = fcp->isp_retry_count; icbp->icb_hardaddr = fcp->isp_loopid; + ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0; if (icbp->icb_hardaddr > 125) { - /* - * We end up with these Loop IDs for F-Port topologies - */ - if (icbp->icb_hardaddr != 0xff && - icbp->icb_hardaddr != 0x800 && - icbp->icb_hardaddr != 0xffff) { - isp_prt(isp, ISP_LOGERR, - "bad hard address %u- resetting to zero", - icbp->icb_hardaddr); - icbp->icb_hardaddr = 0; - } + icbp->icb_hardaddr = 0; + ownloopid = 0; } /* * Our life seems so much better with 2200s and later with * the latest f/w if we set Hard Address. */ - if (ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { + if (ownloopid || ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { icbp->icb_fwoptions |= ICBOPT_HARD_ADDRESS; } @@ -1800,6 +1793,7 @@ isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_print_bytes(isp, "isp_fibre_init", sizeof (*icbp), icbp); return; } isp->isp_reqidx = 0; @@ -1818,6 +1812,7 @@ fcparam *fcp; isp_icb_2400_t local, *icbp = &local; mbreg_t mbs; + int ownloopid; uint64_t nwwn, pwwn; fcp = isp->isp_param; @@ -1886,21 +1881,12 @@ icbp->icb_fwoptions1 = fcp->isp_fwoptions; icbp->icb_hardaddr = fcp->isp_loopid; + ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0; if (icbp->icb_hardaddr > 125) { - /* - * We end up with these Loop IDs for F-Port topologies - */ - if (icbp->icb_hardaddr != 0xff && - icbp->icb_hardaddr != 0x800 && - icbp->icb_hardaddr != 0xffff) { - isp_prt(isp, ISP_LOGERR, - "bad hard address %u- resetting to zero", - icbp->icb_hardaddr); - icbp->icb_hardaddr = 0; - } + icbp->icb_hardaddr = 0; + ownloopid = 0; } - - if (isp->isp_confopts & ISP_CFG_OWNLOOPID) { + if (ownloopid) { icbp->icb_fwoptions1 |= ICB2400_OPT1_HARD_ADDRESS; } @@ -2280,7 +2266,6 @@ "isp_plogi_old: portid 0x%06x already logged in as %u", portid, mbs.param[1]); return (MBOX_PORT_ID_USED | (mbs.param[1] << 16)); - break; case MBOX_LOOP_ID_USED: isp_prt(isp, ISP_LOGDEBUG0, @@ -2963,19 +2948,17 @@ /* * Check to make sure it's still a valid entry. The 24XX seems * to return a portid but not a WWPN/WWNN or role for devices - * which shift on a loop, or have a WWPN/WWNN but no portid. + * which shift on a loop. */ if (tmp.node_wwn == 0 || tmp.port_wwn == 0 || tmp.portid == 0) { - if (isp->isp_dblev & ISP_LOGSANCFG) { - int a, b, c; - a = !(tmp.node_wwn == 0); - b = !(tmp.port_wwn == 0); - c = !(tmp.portid == 0); - isp_prt(isp, ISP_LOGALL, - "bad pdb (%1d%1d%1d) @ handle 0x%x", - a, b, c, handle); - isp_dump_portdb(isp); - } + int a, b, c; + a = (tmp.node_wwn == 0); + b = (tmp.port_wwn == 0); + c = (tmp.portid == 0); + isp_prt(isp, ISP_LOGWARN, + "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c, + handle); + isp_dump_portdb(isp); continue; } @@ -4576,7 +4559,6 @@ if ((IS_FC(isp) && mbox != ASYNC_RIO_RESP) || isp->isp_state != ISP_RUNSTATE) { goto out; - return; } } @@ -7523,11 +7505,11 @@ for (loops = 0; loops < 5000; loops++) { USEC_DELAY(10); tmp = ISP_READ(isp, BIU2400_FLASH_ADDR); - if ((tmp & (1 << 31)) != 0) { + if ((tmp & (1U << 31)) != 0) { break; } } - if (tmp & (1 << 31)) { + if (tmp & (1U << 31)) { tmp = ISP_READ(isp, BIU2400_FLASH_DATA); *rp = tmp; } else { From owner-p4-projects@FreeBSD.ORG Fri Feb 23 21:55:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9175716A405; Fri, 23 Feb 2007 21:55:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6FFEC16A400 for ; Fri, 23 Feb 2007 21:55:44 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6058913C47E for ; Fri, 23 Feb 2007 21:55:44 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NLti3v014563 for ; Fri, 23 Feb 2007 21:55:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NLth82014560 for perforce@freebsd.org; Fri, 23 Feb 2007 21:55:43 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 23 Feb 2007 21:55:43 GMT Message-Id: <200702232155.l1NLth82014560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114913 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, 23 Feb 2007 21:55:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=114913 Change 114913 by mjacob@mjexp on 2007/02/23 21:54:59 Compilation fixes from Solaris port. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#5 edit .. //depot/projects/mjexp/sys/dev/isp/ispreg.h#3 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/ispmbox.h#5 (text+ko) ==== @@ -643,7 +643,7 @@ uint16_t ms_flags; uint16_t ms_reserved1; /* low 8 bits */ uint16_t ms_time; - uint16_t ms_cmd_cnt; /* Command DSD count */; + uint16_t ms_cmd_cnt; /* Command DSD count */ uint16_t ms_tot_cnt; /* Total DSD Count */ uint8_t ms_type; /* MS type */ uint8_t ms_r_ctl; /* R_CTL */ ==== //depot/projects/mjexp/sys/dev/isp/ispreg.h#3 (text+ko) ==== @@ -409,14 +409,14 @@ /* BIU2400_HCCR definitions */ -#define HCCR_2400_CMD_NOP (0x0 << 28) -#define HCCR_2400_CMD_RESET (0x1 << 28) -#define HCCR_2400_CMD_CLEAR_RESET (0x2 << 28) -#define HCCR_2400_CMD_PAUSE (0x3 << 28) -#define HCCR_2400_CMD_RELEASE (0x4 << 28) -#define HCCR_2400_CMD_SET_HOST_INT (0x5 << 28) -#define HCCR_2400_CMD_CLEAR_HOST_INT (0x6 << 28) -#define HCCR_2400_CMD_CLEAR_RISC_INT (0xA << 28) +#define HCCR_2400_CMD_NOP 0x00000000 +#define HCCR_2400_CMD_RESET 0x10000000 +#define HCCR_2400_CMD_CLEAR_RESET 0x20000000 +#define HCCR_2400_CMD_PAUSE 0x30000000 +#define HCCR_2400_CMD_RELEASE 0x40000000 +#define HCCR_2400_CMD_SET_HOST_INT 0x50000000 +#define HCCR_2400_CMD_CLEAR_HOST_INT 0x60000000 +#define HCCR_2400_CMD_CLEAR_RISC_INT 0xA0000000 #define HCCR_2400_RISC_ERR(x) (((x) >> 12) & 0x7) /* RO */ #define HCCR_2400_RISC2HOST_INT (1 << 6) /* RO */ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 22:55:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80B7216A409; Fri, 23 Feb 2007 22:55:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5650216A407 for ; Fri, 23 Feb 2007 22:55:03 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3D05F13C494 for ; Fri, 23 Feb 2007 22:55:03 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NMt30A026525 for ; Fri, 23 Feb 2007 22:55:03 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NMt2vl026522 for perforce@freebsd.org; Fri, 23 Feb 2007 22:55:02 GMT (envelope-from netchild@freebsd.org) Date: Fri, 23 Feb 2007 22:55:02 GMT Message-Id: <200702232255.l1NMt2vl026522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114920 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, 23 Feb 2007 22:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=114920 Change 114920 by netchild@netchild_magellan on 2007/02/23 22:54:40 IFC after Ariffs sound changes. Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#3 integrate Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.18 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.19 2007/02/23 19:40:13 ariff Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e @@ -316,7 +316,7 @@ } if (scp->irq != NULL) - bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL, gusc_intr, scp, &ih); + snd_setup_intr(dev, scp->irq, 0, gusc_intr, scp, &ih); bus_generic_attach(dev); return (0); @@ -418,16 +418,21 @@ } static int -gusc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) +gusc_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp = (sc_p)device_get_softc(dev); devclass_t devclass; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("gusc.c: we cannot use a filter here\n"); return (EINVAL); } +#endif devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { scp->midi_intr.intr = intr; @@ -438,8 +443,11 @@ scp->pcm_intr.arg = arg; return 0; } - return bus_generic_setup_intr(dev, child, irq, flags, filter, intr, - arg, cookiep); + return bus_generic_setup_intr(dev, child, irq, flags, +#if __FreeBSD_version >= 700031 + filter, +#endif + intr, arg, cookiep); } static device_t ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.46 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.47 2007/02/23 19:40:13 ariff Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 @@ -80,7 +80,11 @@ static int sbc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, + int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep); static int sbc_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); @@ -502,18 +506,23 @@ } static int -sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter, driver_intr_t *intr, +sbc_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; int i, ret; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("sbc.c: we cannot use a filter here\n"); return (EINVAL); } +#endif sbc_lock(scp); i = 0; while (i < IRQ_MAX) { ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.35 2007/02/23 12:18:54 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.36 2007/02/23 19:40:13 ariff Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 @@ -82,8 +82,10 @@ struct resource *r); static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, - void *arg, void **cookiep); +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep); static int csa_teardown_intr(device_t bus, device_t child, struct resource *irq, void *cookie); static driver_intr_t csa_intr; @@ -440,17 +442,21 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, void *arg, - void **cookiep) +#if __FreeBSD_version >= 700031 + driver_filter_t *filter, +#endif + driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp; csa_res *resp; struct sndcard_func *func; +#if __FreeBSD_version >= 700031 if (filter != NULL) { printf("ata-csa.c: we cannot use a filter here\n"); return (EINVAL); } +#endif scp = device_get_softc(bus); resp = &scp->res; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.46 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.47 2007/02/23 19:41:16 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -157,7 +157,7 @@ */ /* stuff */ -static int ds_init(struct sc_info *, device_t); +static int ds_init(struct sc_info *); static void ds_intr(void *); /* talk to the card */ @@ -785,7 +785,7 @@ } static int -ds_init(struct sc_info *sc, device_t dev) +ds_init(struct sc_info *sc) { int i; u_int32_t *ci, r, pcs, rcs, ecs, ws, memsz, cb; @@ -833,7 +833,7 @@ memsz += (64 + 1) * 4; if (sc->regbase == NULL) { - if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + if (bus_dma_tag_create(bus_get_dma_tag(sc->dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, memsz, 1, memsz, 0, NULL, @@ -985,7 +985,7 @@ } sc->regbase = NULL; - if (ds_init(sc, dev) == -1) { + if (ds_init(sc) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } @@ -1053,7 +1053,7 @@ sc = pcm_getdevinfo(dev); - if (ds_init(sc, dev) == -1) { + if (ds_init(sc) == -1) { device_printf(dev, "unable to reinitialize the card\n"); return ENXIO; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.8 2007/02/23 13:47:34 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.9 2007/02/23 19:41:16 ariff Exp $ */ #include @@ -385,7 +385,7 @@ static void emu_initefx(struct emu_sc_info *sc); static int emu_cardbus_init(struct emu_sc_info *sc); -static int emu_init(struct emu_sc_info *sc, device_t dev); +static int emu_init(struct emu_sc_info *sc); static int emu_uninit(struct emu_sc_info *sc); static int emu_read_ivar(device_t bus __unused, device_t dev, int ivar_index, uintptr_t * result); @@ -2338,7 +2338,7 @@ /* Probe and attach the card */ static int -emu_init(struct emu_sc_info *sc, device_t dev) +emu_init(struct emu_sc_info *sc) { uint32_t ch, tmp; uint32_t spdif_sr; @@ -2385,7 +2385,7 @@ emu_wrptr(sc, 0, SPBYPASS, 0xf00); /* What will happen if * we write 1 here? */ - if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(dev), + if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(sc->dev), /* alignment */ 2, /* boundary */ 0, /* lowaddr */ 1 << 31, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, @@ -2835,7 +2835,7 @@ i = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE); - if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) { + if ((sc->irq == NULL) || snd_setup_intr(dev, sc->irq, INTR_MPSAFE, emu_intr, sc, &sc->ih)) { device_printf(dev, "unable to map interrupt\n"); goto bad; } @@ -2854,7 +2854,7 @@ sc->root = device_get_sysctl_tree(dev); if (sc->root == NULL) goto bad; - if (emu_init(sc, dev) == -1) { + if (emu_init(sc) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.7 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.8 2007/02/23 19:41:16 ariff Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -2301,7 +2301,7 @@ } static int -envy24_alloc_resource(struct sc_info *sc, device_t dev) +envy24_alloc_resource(struct sc_info *sc) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2348,7 +2348,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, @@ -2395,7 +2396,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24_alloc_resource(sc, dev); + err = envy24_alloc_resource(sc); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.8 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.9 2007/02/23 19:41:16 ariff Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -2332,7 +2332,7 @@ } static int -envy24ht_alloc_resource(struct sc_info *sc, device_t dev) +envy24ht_alloc_resource(struct sc_info *sc) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2367,7 +2367,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(sc->dev), + /*alignment*/4, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, @@ -2414,7 +2415,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24ht_alloc_resource(sc, dev); + err = envy24ht_alloc_resource(sc); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.22 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.23 2007/02/23 19:39:06 ariff Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ @@ -762,7 +762,7 @@ sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); if (!sc->irq || - bus_setup_intr(dev, sc->irq, INTR_TYPE_AV, NULL, sv_intr, sc, &sc->ih)) { + snd_setup_intr(dev, sc->irq, 0, sv_intr, sc, &sc->ih)) { device_printf(dev, "sv_attach: Unable to map interrupt\n"); goto fail; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.109 2007/02/23 12:18:55 piso Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.110 2007/02/23 19:40:13 ariff Exp $"); devclass_t pcm_devclass; @@ -129,7 +129,11 @@ #else flags = INTR_TYPE_AV; #endif - return bus_setup_intr(dev, res, flags, NULL, hand, param, cookiep); + return bus_setup_intr(dev, res, flags, +#if __FreeBSD_version >= 700031 + NULL, +#endif + hand, param, cookiep); } #ifndef PCM_DEBUG_MTX From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:22:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 025BD16A404; Fri, 23 Feb 2007 23:22:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C78C516A401 for ; Fri, 23 Feb 2007 23:22:13 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B577D13C428 for ; Fri, 23 Feb 2007 23:22:13 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNMDYY032091 for ; Fri, 23 Feb 2007 23:22:13 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNM5Sh032084 for perforce@freebsd.org; Fri, 23 Feb 2007 23:22:05 GMT (envelope-from netchild@freebsd.org) Date: Fri, 23 Feb 2007 23:22:05 GMT Message-Id: <200702232322.l1NNM5Sh032084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114926 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, 23 Feb 2007 23:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=114926 Change 114926 by netchild@netchild_magellan on 2007/02/23 23:21:16 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/linuxolator/src/sys/arm/include/intr.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#37 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#58 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/amd/amd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/linuxolator/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispmbox.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stg/tmc18c30_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/trm/trm.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/linuxolator/src/sys/i386/include/intr_machdep.h#6 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#31 integrate .. //depot/projects/linuxolator/src/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/intr.h#2 integrate .. //depot/projects/linuxolator/src/sys/isa/isa_common.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rman.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#11 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/linuxolator/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/pckbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_mn.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcn.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#6 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sis.c#4 integrate .. //depot/projects/linuxolator/src/sys/pci/if_ste.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_tl.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_vr.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_wb.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/linuxolator/src/sys/pci/intpm.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/ncr.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_none/mac_none.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/linuxolator/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/intr_machdep.h#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#5 integrate .. //depot/projects/linuxolator/src/sys/sys/bus.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#11 integrate .. //depot/projects/linuxolator/src/sys/sys/priv.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#8 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.h#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.29 2007/02/23 20:03:23 jhb Exp $ */ /* @@ -158,8 +158,8 @@ } int -intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -167,8 +167,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, handler, arg, - intr_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, filter, handler, + arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); mtx_lock_spin(&intr_table_lock); @@ -266,17 +266,17 @@ thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + if (ih->ih_filter == NULL) { thread = 1; continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? frame : + ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_handler(frame); + ih->ih_filter(frame); else - ih->ih_handler(ih->ih_argument); + ih->ih_filter(ih->ih_argument); } /* ==== //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.73 2007/02/23 12:18:25 piso Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -95,7 +95,8 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, + void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -417,7 +418,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { int error; @@ -437,7 +439,7 @@ return (error); error = intr_add_handler(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep); + rman_get_start(irq), filter, ihand, arg, flags, cookiep); return (error); } ==== //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#6 (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/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.15 2007/02/23 12:18:26 piso Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -135,8 +135,9 @@ #else #define intr_add_cpu(apic_id) #endif -int intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep); +int intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); /* * Routines to handle clock hardware. @@ -140,7 +140,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -157,6 +157,7 @@ } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + return (FILTER_HANDLED); } int @@ -211,11 +212,13 @@ * Stat clock ticks can still be lost, causing minor loss of accuracy * in the statistics, but the stat clock will no longer stop. */ -static void +static int rtcintr(struct trapframe *frame) { + int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { + flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -224,6 +227,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } + return(flag ? FILTER_HANDLED : FILTER_STRAY); } #include "opt_ddb.h" @@ -758,8 +762,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, + INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -792,8 +796,8 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + INTR_TYPE_CLK, NULL); writertc(RTC_STATUSB, rtc_statusb); rtcin(RTC_INTR); ==== //depot/projects/linuxolator/src/sys/amd64/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.148 2005/01/21 05:56:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.149 2007/02/23 12:18:26 piso Exp $"); /*- * Modifications for Intel architecture by Garrett A. Wollman. @@ -147,10 +147,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/linuxolator/src/sys/arm/arm/intr.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.14 2007/02/23 12:18:27 piso Exp $"); #include #include #include @@ -58,8 +58,8 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, - int irq, int flags, void **cookiep) +arm_setup_irqhandler(const char *name, driver_filter_t *filt, + void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; int error; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); } @@ -118,10 +118,10 @@ /* Execute fast handlers. */ thread = 0; TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) + if (ih->ih_filter == NULL) thread = 1; else - ih->ih_handler(ih->ih_argument ? + ih->ih_filter(ih->ih_argument ? ih->ih_argument : frame); } ==== //depot/projects/linuxolator/src/sys/arm/arm/nexus.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.10 2006/11/17 11:56:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -81,7 +81,7 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,13 +125,13 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int i; for (i = rman_get_start(res); i <= rman_get_end(res); i++) arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, i, flags, cookiep); + filt, intr, arg, i, flags, cookiep); return (0); } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -543,14 +543,14 @@ static int at91_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { struct at91_softc *sc = device_get_softc(dev); if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -192,7 +192,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_mci_intr, sc, &sc->intrhand); + NULL, at91_mci_intr, sc, &sc->intrhand); if (err) { AT91_MCI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -83,7 +83,7 @@ static int at91_pio_probe(device_t dev); static int at91_pio_attach(device_t dev); static int at91_pio_detach(device_t dev); -static void at91_pio_intr(void *); +static int at91_pio_intr(void *); /* helper routines */ static int at91_pio_activate(device_t dev); @@ -148,8 +148,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_pio_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_pio_intr, NULL, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); goto out; @@ -217,7 +217,7 @@ return; } -static void +static int at91_pio_intr(void *xsc) { struct at91_pio_softc *sc = xsc; @@ -232,7 +232,7 @@ AT91_PIO_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } static int ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_rtc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -110,8 +110,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, RTC_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_rtc_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_rtc_intr, NULL, sc, &sc->intrhand); if (err) { AT91_RTC_LOCK_DESTROY(sc); goto out; @@ -173,7 +173,7 @@ return; } -static void +static int at91_rtc_intr(void *xsc) { struct at91_rtc_softc *sc = xsc; @@ -188,7 +188,7 @@ AT91_RTC_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } /* ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -163,7 +163,7 @@ if (sc->irq_res == NULL) goto errout; err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_spi_intr, sc, &sc->intrhand); + NULL, at91_spi_intr, sc, &sc->intrhand); if (err != 0) goto errout; return (0); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_ssc.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -124,7 +124,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_ssc_intr, sc, &sc->intrhand); + NULL, at91_ssc_intr, sc, &sc->intrhand); if (err) { AT91_SSC_LOCK_DESTROY(sc); goto out; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_st.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -183,7 +183,7 @@ WR4(ST_CR, ST_CR_WDRST); } -static void +static int clock_intr(void *arg) { struct trapframe *fp = arg; @@ -194,7 +194,9 @@ tot_count += 32768 / hz; #endif hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + return (FILTER_HANDLED); } + return (FILTER_STRAY); } void @@ -222,8 +224,8 @@ if (!irq) panic("Unable to allocate irq for the system timer"); else - bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clock_intr, NULL, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CLK, + clock_intr, NULL, NULL, &ih); WR4(ST_PIMR, rel_value); ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.8 2007/02/06 12:07:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.9 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -118,7 +118,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_twi_intr, sc, &sc->intrhand); + NULL, at91_twi_intr, sc, &sc->intrhand); if (err) { AT91_TWI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#7 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.18 2007/02/10 15:43:57 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.19 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -226,7 +226,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, - ate_intr, sc, &sc->intrhand); + NULL, ate_intr, sc, &sc->intrhand); if (err) { ether_ifdetach(ifp); ATE_LOCK_DESTROY(sc); ==== //depot/projects/linuxolator/src/sys/arm/include/intr.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.5 2005/06/09 12:26:19 cognet Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ * */ @@ -50,7 +50,7 @@ int arm_get_next_irq(void); void arm_mask_irq(uintptr_t); void arm_unmask_irq(uintptr_t); -void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, - void **); +void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*), + void *, int, int, void **); int arm_remove_irqhandler(void *); #endif /* _MACHINE_INTR_H */ ==== //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.7 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -91,14 +91,14 @@ static int sa1110_activate_resource(device_t, device_t, int, int, struct resource *); static int sa1110_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); struct sa11x0_softc *sa11x0_softc; /* There can be only one. */ static int >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:32:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB5F416A402; Fri, 23 Feb 2007 23:32:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87BF616A400 for ; Fri, 23 Feb 2007 23:32:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6029713C441 for ; Fri, 23 Feb 2007 23:32:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNWR0Q034278 for ; Fri, 23 Feb 2007 23:32:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNWRDe034274 for perforce@freebsd.org; Fri, 23 Feb 2007 23:32:27 GMT (envelope-from sam@freebsd.org) Date: Fri, 23 Feb 2007 23:32:27 GMT Message-Id: <200702232332.l1NNWRDe034274@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 114928 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, 23 Feb 2007 23:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=114928 Change 114928 by sam@sam_ebb on 2007/02/23 23:32:14 correct signed'ness of radiotap stuff Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#17 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#17 (text+ko) ==== @@ -156,8 +156,8 @@ u_int8_t wr_rate; u_int16_t wr_chan_freq; u_int16_t wr_chan_flags; - u_int8_t wr_antsignal; - u_int8_t wr_antnoise; + int8_t wr_antsignal; + int8_t wr_antnoise; u_int8_t wr_antenna; }; From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:35:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BABBE16A406; Fri, 23 Feb 2007 23:35:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 84F9816A403 for ; Fri, 23 Feb 2007 23:35:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 744EE13C4A3 for ; Fri, 23 Feb 2007 23:35:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNZWW3034846 for ; Fri, 23 Feb 2007 23:35:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNZW1M034843 for perforce@freebsd.org; Fri, 23 Feb 2007 23:35:32 GMT (envelope-from sam@freebsd.org) Date: Fri, 23 Feb 2007 23:35:32 GMT Message-Id: <200702232335.l1NNZW1M034843@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 114930 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, 23 Feb 2007 23:35:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=114930 Change 114930 by sam@sam_ebb on 2007/02/23 23:34:40 Cleanups: o nuke sc_half_rates and sc_quarter_rates; don't need 'em o fix type punning that gcc 4.x barfs on o kill trailing whitespace o remove redundant merge cruft and one fix: o properly reclaim tx frags on error Obtained from: netbsd (tx frag reclaim fix) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#134 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#53 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#134 (text+ko) ==== @@ -430,7 +430,7 @@ if (!ath_tx_setup(sc, WME_AC_BE, HAL_WME_AC_BE) || !ath_tx_setup(sc, WME_AC_VI, HAL_WME_AC_VI) || !ath_tx_setup(sc, WME_AC_VO, HAL_WME_AC_VO)) { - /* + /* * Not enough hardware tx queues to properly do WME; * just punt and assign them all to the same h/w queue. * We could do a better job of this if, for example, @@ -446,7 +446,7 @@ sc->sc_ac2q[WME_AC_VO] = sc->sc_ac2q[WME_AC_BK]; } - /* + /* * Special case certain configurations. Note the * CAB queue is handled by these specially so don't * include them when checking the txq setup mask. @@ -883,6 +883,7 @@ struct ifnet *ifp = sc->sc_ifp; u_int32_t *state; u_int32_t len; + void *sp; if_printf(ifp, "hardware error; resetting\n"); /* @@ -890,8 +891,9 @@ * are caused by DMA errors. Collect h/w state from * the hal so we can diagnose what's going on. */ - if (ath_hal_getfatalstate(sc->sc_ah, &state, &len)) { + if (ath_hal_getfatalstate(sc->sc_ah, &sp, &len)) { KASSERT(len >= 6*sizeof(u_int32_t), ("len %u bytes", len)); + state = sp; if_printf(ifp, "0x%08x 0x%08x 0x%08x, 0x%08x 0x%08x 0x%08x\n", state[0], state[1] , state[2], state[3], state[4], state[5]); @@ -1182,14 +1184,14 @@ sc->sc_diversity = ath_hal_getdiversity(ah); sc->sc_calinterval = 1; sc->sc_caltries = 0; + if (ath_startrecv(sc) != 0) /* restart recv */ + if_printf(ifp, "%s: unable to start recv logic\n", __func__); /* * We may be doing a reset in response to an ioctl * that changes the channel so update any state that * might change as a result. */ ath_chan_change(sc, ic->ic_curchan); - if (ath_startrecv(sc) != 0) /* restart recv */ - if_printf(ifp, "%s: unable to start recv logic\n", __func__); if (ic->ic_state == IEEE80211_S_RUN) ath_beacon_config(sc); /* restart beacons */ ath_intrset(sc, sc->sc_imask); @@ -1622,7 +1624,7 @@ break; } STAILQ_INIT(&frags); - /* + /* * Find the node for the destination so we can do * things like power save and fast frames aggregation. */ @@ -1702,7 +1704,7 @@ goto bad; } /* - * Check for fragmentation. If this has frame + * Check for fragmentation. If this frame * has been broken up verify we have enough * buffers to send all the fragments so all * go out or none... @@ -2924,7 +2926,7 @@ if (bs.bs_sleepduration > bs.bs_dtimperiod) bs.bs_sleepduration = roundup(bs.bs_sleepduration, bs.bs_dtimperiod); - DPRINTF(sc, ATH_DEBUG_BEACON, + DPRINTF(sc, ATH_DEBUG_BEACON, "%s: tsf %ju tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n" , __func__ , tsf, tsftu @@ -3510,7 +3512,7 @@ bf->bf_daddr, PA2DESC(sc, ds->ds_link), rs); #ifdef ATH_DEBUG if (sc->sc_debug & ATH_DEBUG_RECV_DESC) - ath_printrxbuf(bf, 0, status == HAL_OK); + ath_printrxbuf(bf, 0, status == HAL_OK); #endif if (status == HAL_EINPROGRESS) break; @@ -3843,7 +3845,7 @@ ath_hal_gettxqueueprops(ah, txq->axq_qnum, &qi); qi.tqi_aifs = wmep->wmep_aifsn; qi.tqi_cwmin = ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmin); - qi.tqi_cwmax = ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmax); + qi.tqi_cwmax = ATH_EXPONENT_TO_VALUE(wmep->wmep_logcwmax); qi.tqi_burstTime = ATH_TXOP_TO_US(wmep->wmep_txopLimit); if (!ath_hal_settxqueueprops(ah, txq->axq_qnum, &qi)) { @@ -4032,7 +4034,7 @@ bf->bf_nseg = ATH_TXDESC+1; } else if (error != 0) { sc->sc_stats.ast_tx_busdma++; - m_freem(m0); + ath_freetx(m0); return error; } /* @@ -4044,7 +4046,7 @@ sc->sc_stats.ast_tx_linear++; m = ath_defrag(m0, M_DONTWAIT, ATH_TXDESC); if (m == NULL) { - m_freem(m0); + ath_freetx(m0); sc->sc_stats.ast_tx_nombuf++; return ENOMEM; } @@ -4054,14 +4056,14 @@ BUS_DMA_NOWAIT); if (error != 0) { sc->sc_stats.ast_tx_busdma++; - m_freem(m0); + ath_freetx(m0); return error; } KASSERT(bf->bf_nseg <= ATH_TXDESC, ("too many segments after defrag; nseg %u", bf->bf_nseg)); } else if (bf->bf_nseg == 0) { /* null packet, discard */ sc->sc_stats.ast_tx_nodata++; - m_freem(m0); + ath_freetx(m0); return EIO; } DPRINTF(sc, ATH_DEBUG_XMIT, "%s: m %p len %u\n", @@ -4498,7 +4500,7 @@ &sc->sc_tx_th, sc->sc_tx_th_len, m0); } - /* + /* * Determine if a tx interrupt should be generated for * this descriptor. We take a tx interrupt to reap * descriptors when the h/w hits an EOL condition or @@ -5145,8 +5147,6 @@ DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: rfgain change\n", __func__); sc->sc_stats.ast_per_rfgain++; - DPRINTF(sc, ATH_DEBUG_CALIBRATE, - "%s: rfgain change\n", __func__); ath_reset(sc->sc_ifp); } if (!ath_hal_calibrate(ah, &sc->sc_curchan, &iqCalDone)) { @@ -5155,10 +5155,13 @@ __func__, sc->sc_curchan.channel); sc->sc_stats.ast_per_calfail++; } + /* + * Calibrate noise floor data again in case of change. + */ ath_hal_process_noisefloor(ah); /* * Poll more frequently when the IQ calibration is in - * progress to speedup loading the final settings. + * progress to speedup loading the final settings. * We temper this aggressive polling with an exponential * back off after 4 tries up to ath_calinterval. */ @@ -5590,7 +5593,7 @@ ath_hal_gettxpowlimit(ah, &txpow); ic->ic_txpowlimit = sc->sc_curtxpow = txpow; } - /* + /* * Fetch max tx power level for status requests. */ ath_hal_getmaxtxpow(sc->sc_ah, &txpow); @@ -5885,8 +5888,6 @@ sc->sc_stats.ast_rx_packets = ifp->if_ipackets; ieee80211_getsignal(ic, &sc->sc_stats.ast_rx_rssi, &sc->sc_stats.ast_rx_noise); - sc->sc_stats.ast_rx_noise = - ath_hal_getchannoise(sc->sc_ah, &sc->sc_curchan); sc->sc_stats.ast_tx_rate = sc->sc_hwmap[sc->sc_txrate].ieeerate; ATH_UNLOCK(sc); /* ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#53 (text+ko) ==== @@ -230,8 +230,6 @@ #define IEEE80211_MODE_HALF (IEEE80211_MODE_MAX+0) #define IEEE80211_MODE_QUARTER (IEEE80211_MODE_MAX+1) const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX+2]; - const HAL_RATE_TABLE *sc_half_rates; /* half rate table */ - const HAL_RATE_TABLE *sc_quarter_rates;/* quarter rate table */ const HAL_RATE_TABLE *sc_currates; /* current rate table */ enum ieee80211_phymode sc_curmode; /* current phy mode */ HAL_OPMODE sc_opmode; /* current operating mode */ @@ -450,7 +448,7 @@ ((*(_ah)->ah_getDiagState)((_ah), (_id), \ (_indata), (_insize), (_outdata), (_outsize))) #define ath_hal_getfatalstate(_ah, _outdata, _outsize) \ - ath_hal_getdiagstate(_ah, 29, NULL, 0, (void **)(_outdata), _outsize) + ath_hal_getdiagstate(_ah, 29, NULL, 0, (_outdata), _outsize) #define ath_hal_setuptxqueue(_ah, _type, _irq) \ ((*(_ah)->ah_setupTxQueue)((_ah), (_type), (_irq))) #define ath_hal_resettxqueue(_ah, _q) \ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:44:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B89C16A406; Fri, 23 Feb 2007 23:44:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 11BA816A404 for ; Fri, 23 Feb 2007 23:44:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 022F913C467 for ; Fri, 23 Feb 2007 23:44:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNihrr036360 for ; Fri, 23 Feb 2007 23:44:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNihbm036357 for perforce@freebsd.org; Fri, 23 Feb 2007 23:44:43 GMT (envelope-from sam@freebsd.org) Date: Fri, 23 Feb 2007 23:44:43 GMT Message-Id: <200702232344.l1NNihbm036357@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 114931 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, 23 Feb 2007 23:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=114931 Change 114931 by sam@sam_ebb on 2007/02/23 23:43:44 expand ic_flags to 32-bits; it'll be required to handle 11n (there is a hole in the channel struct that'll be used eventually to support dfs) Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#17 (text+ko) ==== @@ -105,12 +105,13 @@ * Channels are specified by frequency and attributes. */ struct ieee80211_channel { + u_int32_t ic_flags; /* see below */ u_int16_t ic_freq; /* setting in Mhz */ - u_int16_t ic_flags; /* see below */ u_int8_t ic_ieee; /* IEEE channel number */ int8_t ic_maxregpower; /* maximum regulatory tx power in dBm */ int8_t ic_maxpower; /* maximum tx power in .5 dBm */ int8_t ic_minpower; /* minimum tx power in .5 dBm */ + /* NB: hole, to be used for dfs */ }; #define IEEE80211_CHAN_MAX 255 @@ -121,18 +122,18 @@ /* bits 0-3 are for private use by drivers */ /* channel attributes */ -#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */ -#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */ -#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */ -#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */ -#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */ -#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */ -#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */ -#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */ -#define IEEE80211_CHAN_GSM 0x1000 /* 900 MHz spectrum channel */ -#define IEEE80211_CHAN_STURBO 0x2000 /* 11a static turbo channel only */ -#define IEEE80211_CHAN_HALF 0x4000 /* Half rate channel */ -#define IEEE80211_CHAN_QUARTER 0x8000 /* Quarter rate channel */ +#define IEEE80211_CHAN_TURBO 0x00010 /* Turbo channel */ +#define IEEE80211_CHAN_CCK 0x00020 /* CCK channel */ +#define IEEE80211_CHAN_OFDM 0x00040 /* OFDM channel */ +#define IEEE80211_CHAN_2GHZ 0x00080 /* 2 GHz spectrum channel. */ +#define IEEE80211_CHAN_5GHZ 0x00100 /* 5 GHz spectrum channel */ +#define IEEE80211_CHAN_PASSIVE 0x00200 /* Only passive scan allowed */ +#define IEEE80211_CHAN_DYN 0x00400 /* Dynamic CCK-OFDM channel */ +#define IEEE80211_CHAN_GFSK 0x00800 /* GFSK channel (FHSS PHY) */ +#define IEEE80211_CHAN_GSM 0x01000 /* 900 MHz spectrum channel */ +#define IEEE80211_CHAN_STURBO 0x02000 /* 11a static turbo channel only */ +#define IEEE80211_CHAN_HALF 0x04000 /* Half rate channel */ +#define IEEE80211_CHAN_QUARTER 0x08000 /* Quarter rate channel */ /* * Useful combinations of channel characteristics. @@ -183,6 +184,8 @@ (((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0) #define IEEE80211_IS_CHAN_5GHZ(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0) +#define IEEE80211_IS_CHAN_PASSIVE(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0) #define IEEE80211_IS_CHAN_OFDM(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0) #define IEEE80211_IS_CHAN_CCK(_c) \ @@ -204,8 +207,6 @@ (((_c)->ic_flags & (IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HALF)) == 0) #define IEEE80211_IS_CHAN_GSM(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_GSM) != 0) -#define IEEE80211_IS_CHAN_PASSIVE(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0) /* ni_chan encoding for FH phy */ #define IEEE80211_FH_CHANMOD 80 From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:44:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E71916A502; Fri, 23 Feb 2007 23:44:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED06316A4C0 for ; Fri, 23 Feb 2007 23:44:44 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FDCE13C46B for ; Fri, 23 Feb 2007 23:44:44 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNiio5036367 for ; Fri, 23 Feb 2007 23:44:44 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNiiMN036363 for perforce@freebsd.org; Fri, 23 Feb 2007 23:44:44 GMT (envelope-from netchild@freebsd.org) Date: Fri, 23 Feb 2007 23:44:44 GMT Message-Id: <200702232344.l1NNiiMN036363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114932 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, 23 Feb 2007 23:44:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=114932 Change 114932 by netchild@netchild_magellan on 2007/02/23 23:43:57 Backout the sysv sem stuff. It never worked. This makes it more easy to provide diffs from p4 (no nedd to handedit the diff anymore). Discussed with: rdivacky Affected files ... .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#11 edit .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#7 edit .. //depot/projects/linuxolator/src/sys/sys/proc.h#12 edit .. //depot/projects/linuxolator/src/sys/sys/sem.h#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/kern_fork.c#11 (text+ko) ==== @@ -421,7 +421,6 @@ p2->p_state = PRS_NEW; /* protect against others */ p2->p_pid = trypid; AUDIT_ARG(pid, p2->p_pid); - p2->p_semundo = NULL; LIST_INSERT_HEAD(&allproc, p2, p_list); LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash); sx_xunlock(&allproc_lock); ==== //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -103,7 +102,8 @@ static struct semid_kernel *sema; /* semaphore id pool */ static struct mtx *sema_mtx; /* semaphore id pool mutexes*/ static struct sem *sem; /* semaphore pool */ -SLIST_HEAD(, sem_undo) semu_list; /* list of active undo structures */ +SLIST_HEAD(, sem_undo) semu_list; /* list of active undo structures */ +static int *semu; /* undo structure pool */ static eventhandler_tag semexit_tag; #define SEMUNDO_MTX sem_mtx @@ -119,6 +119,20 @@ }; /* + * Undo structure (one per process) + */ +struct sem_undo { + SLIST_ENTRY(sem_undo) un_next; /* ptr to next active undo structure */ + struct proc *un_proc; /* owner of this structure */ + short un_cnt; /* # of active entries */ + struct undo { + short un_adjval; /* adjust on exit values */ + short un_num; /* semaphore # */ + int un_id; /* semid */ + } un_ent[1]; /* undo entries */ +}; + +/* * Configuration parameters */ #ifndef SEMMNI @@ -130,6 +144,9 @@ #ifndef SEMUME #define SEMUME 10 /* max # of undo entries per process */ #endif +#ifndef SEMMNU +#define SEMMNU 30 /* # of undo structures in system */ +#endif /* shouldn't need tuning */ #ifndef SEMMAP @@ -168,6 +185,7 @@ SEMMAP, /* # of entries in semaphore map */ SEMMNI, /* # of semaphore identifiers */ SEMMNS, /* # of semaphores in system */ + SEMMNU, /* # of undo structures in system */ SEMMSL, /* max # of semaphores per id */ SEMOPM, /* max # of operations per semop call */ SEMUME, /* max # of undo entries per process */ @@ -182,6 +200,8 @@ "Number of semaphore identifiers"); SYSCTL_INT(_kern_ipc, OID_AUTO, semmns, CTLFLAG_RDTUN, &seminfo.semmns, 0, "Maximum number of semaphores in the system"); +SYSCTL_INT(_kern_ipc, OID_AUTO, semmnu, CTLFLAG_RDTUN, &seminfo.semmnu, 0, + "Maximum number of undo structures in the system"); SYSCTL_INT(_kern_ipc, OID_AUTO, semmsl, CTLFLAG_RW, &seminfo.semmsl, 0, "Max semaphores per id"); SYSCTL_INT(_kern_ipc, OID_AUTO, semopm, CTLFLAG_RDTUN, &seminfo.semopm, 0, @@ -205,6 +225,7 @@ TUNABLE_INT_FETCH("kern.ipc.semmap", &seminfo.semmap); TUNABLE_INT_FETCH("kern.ipc.semmni", &seminfo.semmni); TUNABLE_INT_FETCH("kern.ipc.semmns", &seminfo.semmns); + TUNABLE_INT_FETCH("kern.ipc.semmnu", &seminfo.semmnu); TUNABLE_INT_FETCH("kern.ipc.semmsl", &seminfo.semmsl); TUNABLE_INT_FETCH("kern.ipc.semopm", &seminfo.semopm); TUNABLE_INT_FETCH("kern.ipc.semume", &seminfo.semume); @@ -217,6 +238,7 @@ M_WAITOK); sema_mtx = malloc(sizeof(struct mtx) * seminfo.semmni, M_SEM, M_WAITOK | M_ZERO); + semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, M_WAITOK); for (i = 0; i < seminfo.semmni; i++) { sema[i].u.sem_base = 0; @@ -228,6 +250,10 @@ } for (i = 0; i < seminfo.semmni; i++) mtx_init(&sema_mtx[i], "semid", NULL, MTX_DEF); + for (i = 0; i < seminfo.semmnu; i++) { + struct sem_undo *suptr = SEMU(i); + suptr->un_proc = NULL; + } SLIST_INIT(&semu_list); mtx_init(&sem_mtx, "sem", NULL, MTX_DEF); semexit_tag = EVENTHANDLER_REGISTER(process_exit, semexit_myhook, NULL, @@ -249,6 +275,7 @@ #endif free(sem, M_SEM); free(sema, M_SEM); + free(semu, M_SEM); for (i = 0; i < seminfo.semmni; i++) mtx_destroy(&sema_mtx[i]); mtx_destroy(&sem_mtx); @@ -328,18 +355,66 @@ semu_alloc(td) struct thread *td; { + int i; struct sem_undo *suptr; + struct sem_undo **supptr; + int attempt; + + SEMUNDO_LOCKASSERT(MA_OWNED); + /* + * Try twice to allocate something. + * (we'll purge an empty structure after the first pass so + * two passes are always enough) + */ + + for (attempt = 0; attempt < 2; attempt++) { + /* + * Look for a free structure. + * Fill it in and return it if we find one. + */ + + for (i = 0; i < seminfo.semmnu; i++) { + suptr = SEMU(i); + if (suptr->un_proc == NULL) { + SLIST_INSERT_HEAD(&semu_list, suptr, un_next); + suptr->un_cnt = 0; + suptr->un_proc = td->td_proc; + return(suptr); + } + } - suptr = malloc(seminfo.semusz, M_SEM, M_WAITOK); - refcount_init(&suptr->refcount, 1); + /* + * We didn't find a free one, if this is the first attempt + * then try to free a structure. + */ - SLIST_INSERT_HEAD(&semu_list, suptr, un_next); + if (attempt == 0) { + /* All the structures are in use - try to free one */ + int did_something = 0; - PROC_LOCK(td->td_proc); - td->td_proc->p_semundo = suptr; - PROC_UNLOCK(td->td_proc); + SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list, + un_next) { + if (suptr->un_cnt == 0) { + suptr->un_proc = NULL; + did_something = 1; + *supptr = SLIST_NEXT(suptr, un_next); + break; + } + } - return (suptr); + /* If we didn't free anything then just give-up */ + if (!did_something) + return(NULL); + } else { + /* + * The second pass failed even though we freed + * something after the first pass! + * This is IMPOSSIBLE! + */ + panic("semu_alloc - second attempt failed"); + } + } + return (NULL); } /* @@ -353,6 +428,7 @@ int semid, semnum; int adjval; { + struct proc *p = td->td_proc; struct sem_undo *suptr; struct undo *sunptr; int i; @@ -363,12 +439,18 @@ suptr = *supptr; if (suptr == NULL) { - suptr = td->td_proc->p_semundo; - + SLIST_FOREACH(suptr, &semu_list, un_next) { + if (suptr->un_proc == p) { + *supptr = suptr; + break; + } + } if (suptr == NULL) { if (adjval == 0) return(0); suptr = semu_alloc(td); + if (suptr == NULL) + return(ENOSPC); *supptr = suptr; } } @@ -1211,8 +1293,18 @@ struct proc *p; { struct sem_undo *suptr; + struct sem_undo **supptr; - suptr = p->p_semundo; + /* + * Go through the chain of undo vectors looking for one + * associated with this process. + */ + SEMUNDO_LOCK(); + SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list, un_next) { + if (suptr->un_proc == p) + break; + } + SEMUNDO_UNLOCK(); if (suptr == NULL) return; @@ -1244,7 +1336,7 @@ DPRINTF(( "semexit: %p id=%d num=%d(adj=%d) ; sem=%d\n", - td->td_proc, suptr->un_ent[ix].un_id, + suptr->un_proc, suptr->un_ent[ix].un_id, suptr->un_ent[ix].un_num, suptr->un_ent[ix].un_adjval, semakptr->u.sem_base[semnum].semval)); @@ -1270,13 +1362,8 @@ * Deallocate the undo vector. */ DPRINTF(("removing vector\n")); - refcount_release(&p->p_semundo->refcount); - if (p->p_semundo->refcount == 0) - free(p->p_semundo, M_SEM); - PROC_LOCK(p); - p->p_semundo = SLIST_NEXT(suptr, un_next); - PROC_UNLOCK(p); - refcount_acquire(&p->p_semundo->refcount); + suptr->un_proc = NULL; + *supptr = SLIST_NEXT(suptr, un_next); } static int ==== //depot/projects/linuxolator/src/sys/sys/proc.h#12 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include /* XXX. */ #include -#include #include #include #include @@ -574,7 +573,6 @@ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ struct auditinfo *p_au; /* (c) Process audit properties. */ - struct sem_undo *p_semundo; /* (c) Process sysv semundo struct. */ }; #define p_session p_pgrp->pg_session ==== //depot/projects/linuxolator/src/sys/sys/sem.h#5 (text+ko) ==== @@ -87,6 +87,7 @@ int semmap, /* # of entries in semaphore map */ semmni, /* # of semaphore identifiers */ semmns, /* # of semaphores in system */ + semmnu, /* # of undo structures in system */ semmsl, /* max # of semaphores per id */ semopm, /* max # of operations per semop call */ semume, /* max # of undo entries per process */ @@ -113,20 +114,6 @@ */ void semexit(struct proc *p); -/* - * Undo structure (one per process) - */ -struct sem_undo { - SLIST_ENTRY(sem_undo) un_next; /* ptr to next active undo structure */ - short un_cnt; /* # of active entries */ - u_int refcount; /* reference counting */ - struct undo { - short un_adjval; /* adjust on exit values */ - short un_num; /* semaphore # */ - int un_id; /* semid */ - } un_ent[1]; /* undo entries */ -}; - #else /* ! _KERNEL */ __BEGIN_DECLS From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:52:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C40916A402; Fri, 23 Feb 2007 23:52:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 450DD16A400 for ; Fri, 23 Feb 2007 23:52:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3584C13C442 for ; Fri, 23 Feb 2007 23:52:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNqtWF037570 for ; Fri, 23 Feb 2007 23:52:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNqsoF037566 for perforce@freebsd.org; Fri, 23 Feb 2007 23:52:54 GMT (envelope-from sam@freebsd.org) Date: Fri, 23 Feb 2007 23:52:54 GMT Message-Id: <200702232352.l1NNqsoF037566@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 114933 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, 23 Feb 2007 23:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=114933 Change 114933 by sam@sam_ebb on 2007/02/23 23:52:33 Cleanup ic_modecaps: use bit twiddling macros instead of explicit mask operations. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#41 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#48 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#21 (text+ko) ==== @@ -2678,7 +2678,7 @@ scan_type = IWI_SCAN_TYPE_BROADCAST; ix = 0; - if (ic->ic_modecaps & IEEE80211_MODE_5GHZ) { + if (isset(ic->ic_modecaps, IEEE80211_MODE_5GHZ)) { start = ix; for (i = 0; i <= IEEE80211_CHAN_MAX; i++) { c = &ic->ic_channels[i]; @@ -2702,7 +2702,7 @@ ix++; } } - if (ic->ic_modecaps & IEEE80211_MODE_2GHZ) { + if (isset(ic->ic_modecaps, IEEE80211_MODE_2GHZ)) { start = ix; for (i = 0; i <= IEEE80211_CHAN_MAX; i++) { c = &ic->ic_channels[i]; ==== //depot/projects/wifi/sys/net80211/ieee80211.c#41 (text+ko) ==== @@ -148,7 +148,7 @@ ieee80211_chan_init(struct ieee80211com *ic) { #define DEFAULTRATES(m, def) do { \ - if ((ic->ic_modecaps & (1<ic_sup_rates[m].rs_nrates == 0) \ + if (isset(ic->ic_modecaps, m) && ic->ic_sup_rates[m].rs_nrates == 0) \ ic->ic_sup_rates[m] = def; \ } while (0) struct ieee80211_channel *c; @@ -157,7 +157,7 @@ KASSERT(0 < ic->ic_nchans && ic->ic_nchans < IEEE80211_CHAN_MAX, ("invalid number of channels specified: %u", ic->ic_nchans)); memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail)); - ic->ic_modecaps = 1<ic_modecaps, IEEE80211_MODE_AUTO); for (i = 0; i < ic->ic_nchans; i++) { c = &ic->ic_channels[i]; KASSERT(c->ic_flags != 0, ("channel with no flags")); @@ -168,19 +168,19 @@ * Identify mode capabilities. */ if (IEEE80211_IS_CHAN_A(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_11A); if (IEEE80211_IS_CHAN_B(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_11B); if (IEEE80211_IS_CHAN_ANYG(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_11G); if (IEEE80211_IS_CHAN_FHSS(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_FH); if (IEEE80211_IS_CHAN_108A(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_TURBO_A); if (IEEE80211_IS_CHAN_108G(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_TURBO_G); if (IEEE80211_IS_CHAN_ST(c)) - ic->ic_modecaps |= 1<ic_modecaps, IEEE80211_MODE_STURBO_A); } /* initialize candidate channels to all available */ memcpy(ic->ic_chan_active, ic->ic_chan_avail, @@ -474,7 +474,7 @@ IFM_IEEE80211_11A | IFM_IEEE80211_TURBO, IFM_IEEE80211_11G | IFM_IEEE80211_TURBO, }; - if ((ic->ic_modecaps & (1<ic_modecaps, mode)) continue; mopt = mopts[mode]; ADD(ic, IFM_AUTO, mopt); /* e.g. 11a auto */ @@ -565,7 +565,7 @@ struct ieee80211_rateset *rs; for (mode = IEEE80211_MODE_11A; mode < IEEE80211_MODE_MAX; mode++) { - if ((ic->ic_modecaps & (1<ic_modecaps, mode)) continue; if_printf(ifp, "%s rates: ", ieee80211_phymode_name[mode]); rs = &ic->ic_sup_rates[mode]; @@ -681,7 +681,7 @@ * In autoselect mode search for the rate. */ for (i = IEEE80211_MODE_11A; i < IEEE80211_MODE_MAX; i++) { - if ((ic->ic_modecaps & (1<ic_modecaps, i) && findrate(ic, i, rate) != -1) return 1; } @@ -787,7 +787,7 @@ if (newopmode == IEEE80211_M_HOSTAP && newphymode == IEEE80211_MODE_AUTO) { for (j = IEEE80211_MODE_11A; j < IEEE80211_MODE_MAX; j++) - if (ic->ic_modecaps & (1<ic_modecaps, j)) { newphymode = j; break; } ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#48 (text+ko) ==== @@ -111,7 +111,7 @@ u_int32_t ic_flags; /* state flags */ u_int32_t ic_flags_ext; /* extended state flags */ u_int32_t ic_caps; /* capabilities */ - u_int16_t ic_modecaps; /* set of mode capabilities */ + u_int8_t ic_modecaps[2]; /* set of mode capabilities */ u_int16_t ic_curmode; /* current mode */ struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX]; u_int16_t ic_bintval; /* beacon interval */ From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:58:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A53CB16A405; Fri, 23 Feb 2007 23:58:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C71216A403 for ; Fri, 23 Feb 2007 23:58:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3CEF513C491 for ; Fri, 23 Feb 2007 23:58:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NNw17j038113 for ; Fri, 23 Feb 2007 23:58:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NNw1m3038110 for perforce@freebsd.org; Fri, 23 Feb 2007 23:58:01 GMT (envelope-from sam@freebsd.org) Date: Fri, 23 Feb 2007 23:58:01 GMT Message-Id: <200702232358.l1NNw1m3038110@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 114934 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, 23 Feb 2007 23:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=114934 Change 114934 by sam@sam_ebb on 2007/02/23 23:57:19 Correct refcnt handling for sending a null data frame; looks to have been mis-merged a while ago. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#65 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#65 (text+ko) ==== @@ -339,6 +339,10 @@ /* * Send a null data frame to the specified node. + * + * NB: the caller is assumed to have setup a node reference + * for use; this is necessary to deal with a race condition + * when probing for inactive stations. */ int ieee80211_send_nulldata(struct ieee80211_node *ni) @@ -351,10 +355,11 @@ MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { /* XXX debug msg */ + ieee80211_unref_node(&ni); ic->ic_stats.is_tx_nobuf++; return ENOMEM; } - m->m_pkthdr.rcvif = (void *) ieee80211_ref_node(ni); + m->m_pkthdr.rcvif = (void *) ni; wh = mtod(m, struct ieee80211_frame *); ieee80211_send_setup(ic, ni, wh, From owner-p4-projects@FreeBSD.ORG Fri Feb 23 23:59:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A515A16A405; Fri, 23 Feb 2007 23:59:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D65B16A400 for ; Fri, 23 Feb 2007 23:59:40 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id 1B89913C478 for ; Fri, 23 Feb 2007 23:59:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l1NNxYHJ075527; Fri, 23 Feb 2007 18:59:34 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: Alexander Leidinger Date: Fri, 23 Feb 2007 18:59:30 -0500 User-Agent: KMail/1.6.2 References: <200702232344.l1NNiiMN036363@repoman.freebsd.org> In-Reply-To: <200702232344.l1NNiiMN036363@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200702231859.31954.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.88.6/2633/Fri Feb 23 16:55:39 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114932 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, 23 Feb 2007 23:59:41 -0000 On Friday 23 February 2007 06:44 pm, Alexander Leidinger wrote: > http://perforce.freebsd.org/chv.cgi?CH=114932 > > Change 114932 by netchild@netchild_magellan on 2007/02/23 23:43:57 > > Backout the sysv sem stuff. It never worked. This makes it more > easy to provide diffs from p4 (no nedd to handedit the diff > anymore). > Discussed with: rdivacky Thanks!!! Jung-uk Kim From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:02:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92FBF16A405; Sat, 24 Feb 2007 00:02:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D51416A402 for ; Sat, 24 Feb 2007 00:02:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4B69A13C428 for ; Sat, 24 Feb 2007 00:02:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O027fk038938 for ; Sat, 24 Feb 2007 00:02:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O027Gw038930 for perforce@freebsd.org; Sat, 24 Feb 2007 00:02:07 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:02:07 GMT Message-Id: <200702240002.l1O027Gw038930@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 114935 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, 24 Feb 2007 00:02:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=114935 Change 114935 by sam@sam_ebb on 2007/02/24 00:01:25 promote KEY_UNDEFINED macro to IEEE80211_KEY_UNDEFINED Obtained from: netbsd Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#19 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#13 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#66 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#19 (text+ko) ==== @@ -90,7 +90,7 @@ } static int null_key_set(struct ieee80211com *ic, const struct ieee80211_key *k, - const u_int8_t mac[IEEE80211_ADDR_LEN]) + const u_int8_t mac[IEEE80211_ADDR_LEN]) { return 1; } @@ -521,7 +521,7 @@ */ wh = mtod(m, struct ieee80211_frame *); if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) { + IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, "[%s] no default transmit key (%s) deftxkey %u\n", @@ -577,7 +577,7 @@ ivp = mtod(m, const u_int8_t *) + hdrlen; /* XXX contig */ keyid = ivp[IEEE80211_WEP_IVLEN]; if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) + IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) k = &ic->ic_nw_keys[keyid >> 6]; else k = &ni->ni_ucastkey; ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#13 (text+ko) ==== @@ -169,6 +169,9 @@ }; extern const struct ieee80211_cipher ieee80211_cipher_none; +#define IEEE80211_KEY_UNDEFINED(k) \ + ((k)->wk_cipher == &ieee80211_cipher_none) + void ieee80211_crypto_register(const struct ieee80211_cipher *); void ieee80211_crypto_unregister(const struct ieee80211_cipher *); int ieee80211_crypto_available(u_int cipher); ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#66 (text+ko) ==== @@ -584,7 +584,6 @@ #undef TO_BE_RECLAIMED } -#define KEY_UNDEFINED(k) ((k).wk_cipher == &ieee80211_cipher_none) /* * Return the transmit key to use in sending a unicast frame. * If a unicast key is set we use that. When no unicast key is set @@ -593,9 +592,9 @@ static __inline struct ieee80211_key * ieee80211_crypto_getucastkey(struct ieee80211com *ic, struct ieee80211_node *ni) { - if (KEY_UNDEFINED(ni->ni_ucastkey)) { + if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE || - KEY_UNDEFINED(ic->ic_nw_keys[ic->ic_def_txkey])) + IEEE80211_KEY_UNDEFINED(&ic->ic_nw_keys[ic->ic_def_txkey])) return NULL; return &ic->ic_nw_keys[ic->ic_def_txkey]; } else { @@ -612,7 +611,7 @@ ieee80211_crypto_getmcastkey(struct ieee80211com *ic, struct ieee80211_node *ni) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE || - KEY_UNDEFINED(ic->ic_nw_keys[ic->ic_def_txkey])) + IEEE80211_KEY_UNDEFINED(&ic->ic_nw_keys[ic->ic_def_txkey])) return NULL; return &ic->ic_nw_keys[ic->ic_def_txkey]; } @@ -827,7 +826,8 @@ if (eh.ether_type != htons(ETHERTYPE_PAE) || ((ic->ic_flags & IEEE80211_F_WPA) && (ic->ic_opmode == IEEE80211_M_STA ? - !KEY_UNDEFINED(*key) : !KEY_UNDEFINED(ni->ni_ucastkey)))) { + !IEEE80211_KEY_UNDEFINED(key) : + !IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)))) { wh->i_fc[1] |= IEEE80211_FC1_WEP; if (!ieee80211_crypto_enmic(ic, key, m, txfrag)) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT, From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:06:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAFED16A402; Sat, 24 Feb 2007 00:06:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 66D1016A401 for ; Sat, 24 Feb 2007 00:06:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5795313C441 for ; Sat, 24 Feb 2007 00:06:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O06E5k040793 for ; Sat, 24 Feb 2007 00:06:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O06DOq040790 for perforce@freebsd.org; Sat, 24 Feb 2007 00:06:13 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:06:13 GMT Message-Id: <200702240006.l1O06DOq040790@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 114936 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, 24 Feb 2007 00:06:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=114936 Change 114936 by sam@sam_ebb on 2007/02/24 00:06:02 add portability shim for crypto modules to improve portability Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#22 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#11 (text+ko) ==== @@ -635,32 +635,4 @@ /* * Module glue. */ -static int -ccmp_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - ieee80211_crypto_register(&ccmp); - return 0; - case MOD_UNLOAD: - case MOD_QUIESCE: - if (nrefs) { - printf("wlan_ccmp: still in use (%u dynamic refs)\n", - nrefs); - return EBUSY; - } - if (type == MOD_UNLOAD) - ieee80211_crypto_unregister(&ccmp); - return 0; - } - return EINVAL; -} - -static moduledata_t ccmp_mod = { - "wlan_ccmp", - ccmp_modevent, - 0 -}; -DECLARE_MODULE(wlan_ccmp, ccmp_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan_ccmp, 1); -MODULE_DEPEND(wlan_ccmp, wlan, 1, 1, 1); +IEEE80211_CRYPTO_MODULE(ccmp, 1); ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#14 (text+ko) ==== @@ -976,32 +976,4 @@ /* * Module glue. */ -static int -tkip_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - ieee80211_crypto_register(&tkip); - return 0; - case MOD_UNLOAD: - case MOD_QUIESCE: - if (nrefs) { - printf("wlan_tkip: still in use (%u dynamic refs)\n", - nrefs); - return EBUSY; - } - if (type == MOD_UNLOAD) - ieee80211_crypto_unregister(&tkip); - return 0; - } - return EINVAL; -} - -static moduledata_t tkip_mod = { - "wlan_tkip", - tkip_modevent, - 0 -}; -DECLARE_MODULE(wlan_tkip, tkip_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan_tkip, 1); -MODULE_DEPEND(wlan_tkip, wlan, 1, 1, 1); +IEEE80211_CRYPTO_MODULE(tkip, 1); ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#11 (text+ko) ==== @@ -479,32 +479,4 @@ /* * Module glue. */ -static int -wep_modevent(module_t mod, int type, void *unused) -{ - switch (type) { - case MOD_LOAD: - ieee80211_crypto_register(&wep); - return 0; - case MOD_UNLOAD: - case MOD_QUIESCE: - if (nrefs) { - printf("wlan_wep: still in use (%u dynamic refs)\n", - nrefs); - return EBUSY; - } - if (type == MOD_UNLOAD) - ieee80211_crypto_unregister(&wep); - return 0; - } - return EINVAL; -} - -static moduledata_t wep_mod = { - "wlan_wep", - wep_modevent, - 0 -}; -DECLARE_MODULE(wlan_wep, wep_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); -MODULE_VERSION(wlan_wep, 1); -MODULE_DEPEND(wlan_wep, wlan, 1, 1, 1); +IEEE80211_CRYPTO_MODULE(wep, 1); ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#22 (text+ko) ==== @@ -219,6 +219,36 @@ void ieee80211_sysctl_detach(struct ieee80211com *); void ieee80211_load_module(const char *); + +#define IEEE80211_CRYPTO_MODULE(name, version) \ +static int \ +name##_modevent(module_t mod, int type, void *unused) \ +{ \ + switch (type) { \ + case MOD_LOAD: \ + ieee80211_crypto_register(&name); \ + return 0; \ + case MOD_UNLOAD: \ + case MOD_QUIESCE: \ + if (nrefs) { \ + printf("wlan_##name: still in use (%u dynamic refs)\n",\ + nrefs); \ + return EBUSY; \ + } \ + if (type == MOD_UNLOAD) \ + ieee80211_crypto_unregister(&name); \ + return 0; \ + } \ + return EINVAL; \ +} \ +static moduledata_t name##_mod = { \ + "wlan_##name", \ + name##_modevent, \ + 0 \ +}; \ +DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\ +MODULE_VERSION(wlan_##name, version); \ +MODULE_DEPEND(wlan_##name, wlan, 1, 1, 1) #endif /* _KERNEL */ /* XXX this stuff belongs elsewhere */ From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:10:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2061A16A404; Sat, 24 Feb 2007 00:10:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E796B16A400 for ; Sat, 24 Feb 2007 00:10:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D8B3813C48D for ; Sat, 24 Feb 2007 00:10:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0AJnC041038 for ; Sat, 24 Feb 2007 00:10:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0AJ9W041035 for perforce@freebsd.org; Sat, 24 Feb 2007 00:10:19 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:10:19 GMT Message-Id: <200702240010.l1O0AJ9W041035@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 114937 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, 24 Feb 2007 00:10:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=114937 Change 114937 by sam@sam_ebb on 2007/02/24 00:09:25 inline comes before type (to appears gcc 4.x) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#89 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#89 (text+ko) ==== @@ -1405,33 +1405,33 @@ (((const u_int8_t *)(p))[2] << 16) | \ (((const u_int8_t *)(p))[3] << 24))) -static int __inline +static __inline int iswpaoui(const u_int8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI); } -static int __inline +static __inline int iswmeoui(const u_int8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI); } -static int __inline +static __inline int iswmeparam(const u_int8_t *frm) { return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && frm[6] == WME_PARAM_OUI_SUBTYPE; } -static int __inline +static __inline int iswmeinfo(const u_int8_t *frm) { return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && frm[6] == WME_INFO_OUI_SUBTYPE; } -static int __inline +static __inline int isatherosoui(const u_int8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:16:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27A6616A405; Sat, 24 Feb 2007 00:16:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D0D8316A402 for ; Sat, 24 Feb 2007 00:16:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C10B013C47E for ; Sat, 24 Feb 2007 00:16:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0GBfs042398 for ; Sat, 24 Feb 2007 00:16:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0GBsK042395 for perforce@freebsd.org; Sat, 24 Feb 2007 00:16:11 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:16:11 GMT Message-Id: <200702240016.l1O0GBsK042395@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 114939 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, 24 Feb 2007 00:16:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=114939 Change 114939 by sam@sam_ebb on 2007/02/24 00:15:27 change ieee80211_fix_rate to take a rate set instead of implicitly using ni_rates; for 11n we're going to supply something different Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#90 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#82 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#47 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#30 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#90 (text+ko) ==== @@ -954,7 +954,7 @@ memcpy(rs->rs_rates + rs->rs_nrates, xrates+2, nxrates); rs->rs_nrates += nxrates; } - return ieee80211_fix_rate(ni, flags); + return ieee80211_fix_rate(ni, rs, flags); } static void ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#82 (text+ko) ==== @@ -404,7 +404,7 @@ if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) return 0; } - rate = ieee80211_fix_rate(ni, + rate = ieee80211_fix_rate(ni, &ni->ni_rates, IEEE80211_F_JOIN | IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); if (rate & IEEE80211_RATE_BASIC) return 0; @@ -445,7 +445,7 @@ if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= 0x04; } - rate = ieee80211_fix_rate(ni, + rate = ieee80211_fix_rate(ni, &ni->ni_rates, IEEE80211_F_JOIN | IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); if (rate & IEEE80211_RATE_BASIC) fail |= 0x08; @@ -565,7 +565,8 @@ * Delete unusable rates; we've already checked * that the negotiated rate set is acceptable. */ - ieee80211_fix_rate(ic->ic_bss, IEEE80211_F_DODEL | IEEE80211_F_JOIN); + ieee80211_fix_rate(ic->ic_bss, &ic->ic_bss->ni_rates, + IEEE80211_F_DODEL | IEEE80211_F_JOIN); ic->ic_bsschan = selbs->ni_chan; ic->ic_curchan = ic->ic_bsschan; ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#47 (text+ko) ==== @@ -346,21 +346,20 @@ } int -ieee80211_fix_rate(struct ieee80211_node *ni, int flags) +ieee80211_fix_rate(struct ieee80211_node *ni, + struct ieee80211_rateset *nrs, int flags) { #define RV(v) ((v) & IEEE80211_RATE_VAL) struct ieee80211com *ic = ni->ni_ic; int i, j, rix, error; int okrate, badrate, fixedrate; const struct ieee80211_rateset *srs; - struct ieee80211_rateset *nrs; u_int8_t r; error = 0; okrate = badrate = 0; fixedrate = IEEE80211_FIXED_RATE_NONE; srs = ieee80211_get_suprates(ic, ni->ni_chan); - nrs = &ni->ni_rates; for (i = 0; i < nrs->rs_nrates; ) { if (flags & IEEE80211_F_DOSORT) { /* ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#30 (text+ko) ==== @@ -185,7 +185,8 @@ #define IEEE80211_F_DONEGO 0x00000004 /* calc negotiated rate */ #define IEEE80211_F_DODEL 0x00000008 /* delete ignore rate */ #define IEEE80211_F_JOIN 0x00000010 /* sta joining our bss */ -int ieee80211_fix_rate(struct ieee80211_node *, int); +int ieee80211_fix_rate(struct ieee80211_node *, + struct ieee80211_rateset *, int); /* * WME/WMM support. From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:20:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAA4816A404; Sat, 24 Feb 2007 00:20:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6F90C16A401 for ; Sat, 24 Feb 2007 00:20:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6038013C467 for ; Sat, 24 Feb 2007 00:20:18 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0KIhr042578 for ; Sat, 24 Feb 2007 00:20:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0KIeg042575 for perforce@freebsd.org; Sat, 24 Feb 2007 00:20:18 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:20:18 GMT Message-Id: <200702240020.l1O0KIeg042575@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 114940 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, 24 Feb 2007 00:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114940 Change 114940 by sam@sam_ebb on 2007/02/24 00:19:28 split up rate set checks so we uniquely identify whether the basic rate set was wrong or this was an 11b station trying to join a purge bss Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 (text+ko) ==== @@ -2630,14 +2630,17 @@ rate = ieee80211_setup_rates(ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); + if (rate & IEEE80211_RATE_BASIC) { + ratesetmismatch(ni, wh, reassoc, resp, "basic", rate); + return; + } /* * If constrained to 11g-only stations reject an * 11b-only station. We cheat a bit here by looking * at the max negotiated xmit rate and assuming anyone * with a best rate <24Mb/s is an 11b station. */ - if ((rate & IEEE80211_RATE_BASIC) || - ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48)) { + if ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48) { ratesetmismatch(ni, wh, reassoc, resp, "11g", rate); return; } From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:25:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 969B316A405; Sat, 24 Feb 2007 00:25:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 23C9B16A401 for ; Sat, 24 Feb 2007 00:25:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1460F13C474 for ; Sat, 24 Feb 2007 00:25:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0POnA043924 for ; Sat, 24 Feb 2007 00:25:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0POgb043921 for perforce@freebsd.org; Sat, 24 Feb 2007 00:25:24 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:25:24 GMT Message-Id: <200702240025.l1O0POgb043921@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 114941 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, 24 Feb 2007 00:25:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=114941 Change 114941 by sam@sam_ebb on 2007/02/24 00:24:41 discard deauth and disassoc frames that aren't from the ap we're associated to; these can be received, for example, if the interface is in promiscuous mode Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#92 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#92 (text+ko) ==== @@ -2861,6 +2861,11 @@ ic->ic_stats.is_rx_deauth++; IEEE80211_NODE_STAT(ni, rx_deauth); + if (!IEEE80211_ADDR_EQ(wh->i_addr1, ic->ic_myaddr)) { + /* NB: can happen when in promiscuous mode */ + ic->ic_stats.is_rx_mgtdiscard++; + break; + } IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, "[%s] recv deauthenticate (reason %d)\n", ether_sprintf(ni->ni_macaddr), reason); @@ -2898,6 +2903,11 @@ ic->ic_stats.is_rx_disassoc++; IEEE80211_NODE_STAT(ni, rx_disassoc); + if (!IEEE80211_ADDR_EQ(wh->i_addr1, ic->ic_myaddr)) { + /* NB: can happen when in promiscuous mode */ + ic->ic_stats.is_rx_mgtdiscard++; + break; + } IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, "[%s] recv disassociate (reason %d)\n", ether_sprintf(ni->ni_macaddr), reason); From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:27:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C6E416A405; Sat, 24 Feb 2007 00:27:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3138616A402 for ; Sat, 24 Feb 2007 00:27:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 21A9A13C491 for ; Sat, 24 Feb 2007 00:27:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0RSsh044032 for ; Sat, 24 Feb 2007 00:27:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0RR6N044029 for perforce@freebsd.org; Sat, 24 Feb 2007 00:27:27 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:27:27 GMT Message-Id: <200702240027.l1O0RR6N044029@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 114942 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, 24 Feb 2007 00:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=114942 Change 114942 by sam@sam_ebb on 2007/02/24 00:27:26 rename IEEE80211_NODE_PS_CHANGED; it's not used right now so this has no effect Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#41 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#41 (text+ko) ==== @@ -102,7 +102,7 @@ #define IEEE80211_NODE_XR 0x0008 /* Atheros WME enable */ #define IEEE80211_NODE_AR 0x0010 /* AR capable */ #define IEEE80211_NODE_BOOST 0x0080 -#define IEEE80211_NODE_PS_CHANGED 0x0200 /* PS state change */ +#define IEEE80211_NODE_PSUPDATE 0x0200 /* PS state change */ u_int16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:29:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 907EA16A403; Sat, 24 Feb 2007 00:29:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6B4D216A401 for ; Sat, 24 Feb 2007 00:29:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C4E713C441 for ; Sat, 24 Feb 2007 00:29:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0TWwn044175 for ; Sat, 24 Feb 2007 00:29:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0TW5r044172 for perforce@freebsd.org; Sat, 24 Feb 2007 00:29:32 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:29:32 GMT Message-Id: <200702240029.l1O0TW5r044172@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 114944 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, 24 Feb 2007 00:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=114944 Change 114944 by sam@sam_ebb on 2007/02/24 00:29:29 more gcc 4.x cruft Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#48 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#48 (text+ko) ==== @@ -512,11 +512,11 @@ ieee80211_set11gbasicrates(struct ieee80211_rateset *rs, enum ieee80211_phymode mode) { static const struct ieee80211_rateset basic[] = { - { 0 }, /* IEEE80211_MODE_AUTO */ + { .rs_nrates = 0 }, /* IEEE80211_MODE_AUTO */ { 3, { 12, 24, 48 } }, /* IEEE80211_MODE_11A */ { 2, { 2, 4 } }, /* IEEE80211_MODE_11B */ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_11G (mixed b/g) */ - { 0 }, /* IEEE80211_MODE_FH */ + { .rs_nrates = 0 }, /* IEEE80211_MODE_FH */ /* IEEE80211_MODE_PUREG (not yet) */ { 7, { 2, 4, 11, 22, 12, 24, 48 } }, }; From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:31:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E08416A403; Sat, 24 Feb 2007 00:31:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 737A616A401 for ; Sat, 24 Feb 2007 00:31:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6417C13C4A7 for ; Sat, 24 Feb 2007 00:31:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0VZss044854 for ; Sat, 24 Feb 2007 00:31:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0VZnj044851 for perforce@freebsd.org; Sat, 24 Feb 2007 00:31:35 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:31:35 GMT Message-Id: <200702240031.l1O0VZnj044851@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 114945 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, 24 Feb 2007 00:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=114945 Change 114945 by sam@sam_ebb on 2007/02/24 00:31:30 argh, commit what's in my code base Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#42 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#42 (text+ko) ==== @@ -101,8 +101,8 @@ #define IEEE80211_NODE_FF 0x0004 /* Fast Frame capable */ #define IEEE80211_NODE_XR 0x0008 /* Atheros WME enable */ #define IEEE80211_NODE_AR 0x0010 /* AR capable */ +#define IEEE80211_NODE_PSUPDATE 0x0020 /* power save state change */ #define IEEE80211_NODE_BOOST 0x0080 -#define IEEE80211_NODE_PSUPDATE 0x0200 /* PS state change */ u_int16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:32:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 858D716A406; Sat, 24 Feb 2007 00:32:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6295616A405 for ; Sat, 24 Feb 2007 00:32:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3B41F13C4A3 for ; Sat, 24 Feb 2007 00:32:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0WbWf045184 for ; Sat, 24 Feb 2007 00:32:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0Wa9h045181 for perforce@freebsd.org; Sat, 24 Feb 2007 00:32:36 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:32:36 GMT Message-Id: <200702240032.l1O0Wa9h045181@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 114946 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, 24 Feb 2007 00:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=114946 Change 114946 by sam@sam_ebb on 2007/02/24 00:31:52 explicitly define array size Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#67 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#67 (text+ko) ==== @@ -1625,7 +1625,7 @@ static struct ieee80211_channel * findchannel(struct ieee80211com *ic, int ieee, int mode) { - static const u_int chanflags[] = { + static const u_int chanflags[IEEE80211_MODE_MAX] = { 0, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:35:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FD0016A406; Sat, 24 Feb 2007 00:35:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8BBA16A404 for ; Sat, 24 Feb 2007 00:35:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C71DF13C467 for ; Sat, 24 Feb 2007 00:35:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0ZffY045790 for ; Sat, 24 Feb 2007 00:35:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0ZfMh045787 for perforce@freebsd.org; Sat, 24 Feb 2007 00:35:41 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:35:41 GMT Message-Id: <200702240035.l1O0ZfMh045787@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 114947 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, 24 Feb 2007 00:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=114947 Change 114947 by sam@sam_ebb on 2007/02/24 00:35:23 add IEEE80211_F_DOBRS for future addition of basic rate set compliance checking Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#31 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#31 (text+ko) ==== @@ -184,7 +184,8 @@ #define IEEE80211_F_DOFRATE 0x00000002 /* use fixed rate */ #define IEEE80211_F_DONEGO 0x00000004 /* calc negotiated rate */ #define IEEE80211_F_DODEL 0x00000008 /* delete ignore rate */ -#define IEEE80211_F_JOIN 0x00000010 /* sta joining our bss */ +#define IEEE80211_F_DOBRS 0x00000010 /* check basic rate set */ +#define IEEE80211_F_JOIN 0x00000020 /* sta joining our bss */ int ieee80211_fix_rate(struct ieee80211_node *, struct ieee80211_rateset *, int); From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:35:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94C6E16A4FD; Sat, 24 Feb 2007 00:35:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3EB7416A412 for ; Sat, 24 Feb 2007 00:35:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2C52A13C46B for ; Sat, 24 Feb 2007 00:35:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0ZgbK045797 for ; Sat, 24 Feb 2007 00:35:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0Zfkk045793 for perforce@freebsd.org; Sat, 24 Feb 2007 00:35:41 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:35:41 GMT Message-Id: <200702240035.l1O0Zfkk045793@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 114948 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, 24 Feb 2007 00:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=114948 Change 114948 by sam@sam_ebb on 2007/02/24 00:35:37 more explicit array sizes Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#15 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#2 (text+ko) ==== @@ -118,7 +118,7 @@ IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER) /* XXX what about auto? */ /* flag set of channels to be excluded */ - static const int skipflags[] = { + static const int skipflags[IEEE80211_MODE_MAX] = { CHAN_UNINTERESTING, /* MODE_AUTO */ CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ, /* MODE_11A */ CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ, /* MODE_11B */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#5 (text+ko) ==== @@ -163,7 +163,7 @@ ss->ss_chans[ss->ss_last++] = c; } } else { - static const u_int chanflags[] = { + static const u_int chanflags[IEEE80211_MODE_MAX] = { 0, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#15 (text+ko) ==== @@ -337,13 +337,13 @@ } return NULL; } -static const u_int chanflags[] = { +static const u_int chanflags[IEEE80211_MODE_MAX] = { IEEE80211_CHAN_B, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ IEEE80211_CHAN_G, /* IEEE80211_MODE_11G */ IEEE80211_CHAN_FHSS, /* IEEE80211_MODE_FH */ - IEEE80211_CHAN_A, /* IEEE80211_MODE_TURBO_A */ /* for turbo mode look for AP in normal channel */ + IEEE80211_CHAN_A, /* IEEE80211_MODE_TURBO_A (check base channel)*/ IEEE80211_CHAN_G, /* IEEE80211_MODE_TURBO_G */ IEEE80211_CHAN_ST, /* IEEE80211_MODE_STURBO_A */ }; From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:39:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AD4716A402; Sat, 24 Feb 2007 00:39:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 084EF16A400 for ; Sat, 24 Feb 2007 00:39:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D500513C49D for ; Sat, 24 Feb 2007 00:39:47 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0dlw2047443 for ; Sat, 24 Feb 2007 00:39:47 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0dlfN047440 for perforce@freebsd.org; Sat, 24 Feb 2007 00:39:47 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:39:47 GMT Message-Id: <200702240039.l1O0dlfN047440@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 114949 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, 24 Feb 2007 00:39:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=114949 Change 114949 by sam@sam_ebb on 2007/02/24 00:38:47 #undef macros at end of use Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#83 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#83 (text+ko) ==== @@ -1117,6 +1117,8 @@ return ni; } +#undef IS_PSPOLL +#undef IS_CTL /* * Return a reference to the appropriate node for sending From owner-p4-projects@FreeBSD.ORG Sat Feb 24 00:44:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BFDC16A404; Sat, 24 Feb 2007 00:44:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 38D0816A402 for ; Sat, 24 Feb 2007 00:44:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29E9413C428 for ; Sat, 24 Feb 2007 00:44:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0iulL048972 for ; Sat, 24 Feb 2007 00:44:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0it0k048969 for perforce@freebsd.org; Sat, 24 Feb 2007 00:44:55 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 00:44:55 GMT Message-Id: <200702240044.l1O0it0k048969@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 114951 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, 24 Feb 2007 00:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=114951 Change 114951 by sam@sam_ebb on 2007/02/24 00:44:23 Correct check for last node reference being in the rx keyix slot (not tx/primary slot). Need to review this more carefully. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#84 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#84 (text+ko) ==== @@ -1276,7 +1276,7 @@ /* * Check for a last reference in the key mapping table. */ - keyix = ni->ni_ucastkey.wk_keyix; + keyix = ni->ni_ucastkey.wk_rxkeyix; if (keyix < nt->nt_keyixmax && nt->nt_keyixmap[keyix] == ni) { IEEE80211_DPRINTF(ni->ni_ic, IEEE80211_MSG_NODE, From owner-p4-projects@FreeBSD.ORG Sat Feb 24 05:34:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43D8B16A402 for ; Sat, 24 Feb 2007 05:34:28 +0000 (UTC) (envelope-from rambabu322005@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.185]) by mx1.freebsd.org (Postfix) with ESMTP id D2CDD13C481 for ; Sat, 24 Feb 2007 05:34:27 +0000 (UTC) (envelope-from rambabu322005@gmail.com) Received: by nf-out-0910.google.com with SMTP id k27so851153nfc for ; Fri, 23 Feb 2007 21:34:25 -0800 (PST) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=od/+OGsKPc/wdqmK0R1b+CVv8D7hAwbS/LdLp0aHfahNXh5IGqCHBm1/aPF9yOyQ74yb7dDypj+7nc89cYxPuqIGvBmPuow4GPRWGWPs5UqCtxcjguskwd1bAQDfy/v++WLShPXOpoelLi7PryfnvSzeAST3BJtHIJzkcYaT0rE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=ZTx2O+Jd1si+DjbbbtgYU+XX+vRdjSFaBDrpccze5B6gJ0vD6oBuQ+bnQb+tC2vghGPjDEF1+jq/1wSCbWCQ6BqBJ3ergYU8woL4R98+d9aW6mOVBuKnfz/6/rl4UrS/B7doCktE4g4aHrThBfKFmVQ3OJfLx/SLepeUu2FRY1Y= Received: by 10.78.180.18 with SMTP id c18mr251011huf.1172293568041; Fri, 23 Feb 2007 21:06:08 -0800 (PST) Received: by 10.78.83.6 with HTTP; Fri, 23 Feb 2007 21:06:07 -0800 (PST) Message-ID: <678bdd030702232106o6018bd15t70313d95edb7db8d@mail.gmail.com> Date: Fri, 23 Feb 2007 21:06:07 -0800 From: "ramu babu" To: p4-projects@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Subject: (no subject) 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, 24 Feb 2007 05:34:28 -0000 i need very urgently the project on OPTIMAL LOCATION FACTS DEVICES please healp me sir. From owner-p4-projects@FreeBSD.ORG Sat Feb 24 11:14:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1DB416A405; Sat, 24 Feb 2007 11:14:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8EE2716A403; Sat, 24 Feb 2007 11:14:54 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id 07FD013C4AC; Sat, 24 Feb 2007 11:14:53 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l1OBEqY4062590 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 24 Feb 2007 12:14:52 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l1OBEqMC062588; Sat, 24 Feb 2007 12:14:52 +0100 (CET) Date: Sat, 24 Feb 2007 12:14:52 +0100 From: Divacky Roman To: Alexander Leidinger Message-ID: <20070224111452.GA62564@stud.fit.vutbr.cz> References: <200702232344.l1NNiiMN036363@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200702232344.l1NNiiMN036363@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114932 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, 24 Feb 2007 11:14:55 -0000 On Fri, Feb 23, 2007 at 11:44:44PM +0000, Alexander Leidinger wrote: > http://perforce.freebsd.org/chv.cgi?CH=114932 > > Change 114932 by netchild@netchild_magellan on 2007/02/23 23:43:57 > > Backout the sysv sem stuff. It never worked. This makes it more > easy to provide diffs from p4 (no nedd to handedit the diff > anymore). > Discussed with: rdivacky thnx From owner-p4-projects@FreeBSD.ORG Sat Feb 24 15:02:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B6B16A404; Sat, 24 Feb 2007 15:02:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD85E16A402 for ; Sat, 24 Feb 2007 15:02:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9BBFB13C474 for ; Sat, 24 Feb 2007 15:02:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OF2rYR045814 for ; Sat, 24 Feb 2007 15:02:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OF2qen045810 for perforce@freebsd.org; Sat, 24 Feb 2007 15:02:52 GMT (envelope-from jhb@freebsd.org) Date: Sat, 24 Feb 2007 15:02:52 GMT Message-Id: <200702241502.l1OF2qen045810@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 114972 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, 24 Feb 2007 15:02:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=114972 Change 114972 by jhb@jhb_zion on 2007/02/24 15:02:19 IFC @114971. Affected files ... .. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#79 integrate .. //depot/projects/smpng/sys/conf/files#198 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#28 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#54 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#38 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#51 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#22 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#26 integrate .. //depot/projects/smpng/sys/dev/isp/ispreg.h#10 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#20 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#31 integrate .. //depot/projects/smpng/sys/dev/pdq/if_fea.c#11 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#15 integrate .. //depot/projects/smpng/sys/dev/si/si_eisa.c#6 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#30 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#45 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#43 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#12 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#13 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#13 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#15 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#17 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#32 integrate .. //depot/projects/smpng/sys/modules/ip_mroute_mod/Makefile#8 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#52 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#39 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#18 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#47 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#28 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#19 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#42 integrate .. //depot/projects/smpng/sys/pc98/cbus/olpt.c#3 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#64 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#46 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#60 integrate Differences ... ==== //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#6 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.16 2006/04/11 17:36:08 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.17 2007/02/23 21:07:44 remko Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -472,7 +472,7 @@ twiddle: push %ax # Save push %bx # Save mov twiddle_index,%al # Load index - mov twiddle_chars,%bx # Address table + mov $twiddle_chars,%bx # Address table inc %al # Next and $3,%al # char mov %al,twiddle_index # Save index for next call ==== //depot/projects/smpng/sys/compat/linux/linux_emul.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.15 2007/02/02 08:58:16 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.17 2007/02/23 22:39:26 netchild Exp $"); #include "opt_compat.h" @@ -168,26 +168,29 @@ /* reparent all procs that are not a thread leader to initproc */ if (em->shared->group_pid != p->p_pid) { - sx_xlock(&proctree_lock); - wakeup(initproc); + child_clear_tid = em->child_clear_tid; + EMUL_UNLOCK(&emul_lock); + sx_xlock(&proctree_lock); + wakeup(initproc); PROC_LOCK(p); proc_reparent(p, initproc); p->p_sigparent = SIGCHLD; PROC_UNLOCK(p); - sx_xunlock(&proctree_lock); + sx_xunlock(&proctree_lock); + } else { + child_clear_tid = em->child_clear_tid; + EMUL_UNLOCK(&emul_lock); } - child_clear_tid = em->child_clear_tid; - - EMUL_UNLOCK(&emul_lock); - EMUL_SHARED_WLOCK(&emul_shared_lock); LIST_REMOVE(em, threads); em->shared->refs--; - if (em->shared->refs == 0) + if (em->shared->refs == 0) { + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); + } else + EMUL_SHARED_WUNLOCK(&emul_shared_lock); if (child_clear_tid != NULL) { struct linux_sys_futex_args cup; @@ -272,9 +275,11 @@ PROC_UNLOCK(p); em->shared->refs--; - if (em->shared->refs == 0) + if (em->shared->refs == 0) { + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); + } else + EMUL_SHARED_WUNLOCK(&emul_shared_lock); free(em, M_LINUX); } ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#79 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.206 2007/02/01 13:33:33 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.207 2007/02/23 22:39:26 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1642,6 +1642,7 @@ struct proc *p = td->td_proc; char comm[LINUX_MAX_COMM_LEN]; struct linux_emuldata *em; + int pdeath_signal; #ifdef DEBUG if (ldebug(prctl)) @@ -1661,10 +1662,11 @@ case LINUX_PR_GET_PDEATHSIG: em = em_find(p, EMUL_DOLOCK); KASSERT(em != NULL, ("prctl: emuldata not found.\n")); - error = copyout(&em->pdeath_signal, + pdeath_signal = em->pdeath_signal; + EMUL_UNLOCK(&emul_lock); + error = copyout(&pdeath_signal, (void *)(register_t)args->arg2, - sizeof(em->pdeath_signal)); - EMUL_UNLOCK(&emul_lock); + sizeof(pdeath_signal)); break; case LINUX_PR_SET_NAME: /* ==== //depot/projects/smpng/sys/conf/files#198 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1177 2007/02/15 01:28:22 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1178 2007/02/24 11:38:47 bms Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1760,7 +1760,7 @@ netinet/ip_input.c optional inet netinet/ip_ipsec.c optional ipsec netinet/ip_ipsec.c optional fast_ipsec -netinet/ip_mroute.c optional mrouting +netinet/ip_mroute.c optional mrouting inet | mrouting inet6 netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet @@ -1815,7 +1815,7 @@ netinet6/ip6_forward.c optional inet6 netinet6/ip6_id.c optional inet6 netinet6/ip6_input.c optional inet6 -netinet6/ip6_mroute.c optional inet6 +netinet6/ip6_mroute.c optional mrouting inet6 netinet6/ip6_output.c optional inet6 netinet6/ipcomp_core.c optional ipsec netinet6/ipcomp_input.c optional ipsec ==== //depot/projects/smpng/sys/dev/fdc/fdc.c#28 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.315 2007/02/23 12:18:40 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.316 2007/02/23 23:06:10 jhb Exp $"); #include "opt_fdc.h" @@ -790,7 +790,7 @@ if (fdc->flags & FDC_NEEDS_RESET) { fdc->flags &= ~FDC_NEEDS_RESET; fdc_reset(fdc); - msleep(fdc, NULL, PRIBIO, "fdcrst", hz); + tsleep(fdc, PRIBIO, "fdcrst", hz); /* Discard results */ for (i = 0; i < 4; i++) fdc_sense_int(fdc, &st0, &cyl); @@ -855,7 +855,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -867,7 +867,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, 1, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -956,7 +956,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -967,7 +967,7 @@ fd->track = 0; /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } /* @@ -983,7 +983,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, descyl, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -994,7 +994,7 @@ } /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } fd->track = cylinder; @@ -1080,7 +1080,7 @@ } /* Wait for interrupt */ - i = msleep(fdc, NULL, PRIBIO, "fddata", hz); + i = tsleep(fdc, PRIBIO, "fddata", hz); /* PIO if the read looks good */ if (i == 0 && (fdc->flags & FDC_NODMA) && (bp->bio_cmd & BIO_READ)) @@ -1279,7 +1279,7 @@ fd_enqueue(fd, bp); do { - msleep(bp, NULL, PRIBIO, "fdwait", hz); + tsleep(bp, PRIBIO, "fdwait", hz); } while (!(bp->bio_flags & BIO_DONE)); error = bp->bio_error; ==== //depot/projects/smpng/sys/dev/isp/isp.c#54 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.138 2007/02/23 05:39:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.139 2007/02/23 21:59:21 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1555,6 +1555,7 @@ fcparam *fcp; isp_icb_t local, *icbp = &local; mbreg_t mbs; + int ownloopid; uint64_t nwwn, pwwn; fcp = isp->isp_param; @@ -1630,25 +1631,17 @@ icbp->icb_retry_delay = fcp->isp_retry_delay; icbp->icb_retry_count = fcp->isp_retry_count; icbp->icb_hardaddr = fcp->isp_loopid; + ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0; if (icbp->icb_hardaddr > 125) { - /* - * We end up with these Loop IDs for F-Port topologies - */ - if (icbp->icb_hardaddr != 0xff && - icbp->icb_hardaddr != 0x800 && - icbp->icb_hardaddr != 0xffff) { - isp_prt(isp, ISP_LOGERR, - "bad hard address %u- resetting to zero", - icbp->icb_hardaddr); - icbp->icb_hardaddr = 0; - } + icbp->icb_hardaddr = 0; + ownloopid = 0; } /* * Our life seems so much better with 2200s and later with * the latest f/w if we set Hard Address. */ - if (ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { + if (ownloopid || ISP_FW_NEWER_THAN(isp, 2, 2, 5)) { icbp->icb_fwoptions |= ICBOPT_HARD_ADDRESS; } @@ -1800,6 +1793,7 @@ isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_print_bytes(isp, "isp_fibre_init", sizeof (*icbp), icbp); return; } isp->isp_reqidx = 0; @@ -1818,6 +1812,7 @@ fcparam *fcp; isp_icb_2400_t local, *icbp = &local; mbreg_t mbs; + int ownloopid; uint64_t nwwn, pwwn; fcp = isp->isp_param; @@ -1886,21 +1881,12 @@ icbp->icb_fwoptions1 = fcp->isp_fwoptions; icbp->icb_hardaddr = fcp->isp_loopid; + ownloopid = (isp->isp_confopts & ISP_CFG_OWNLOOPID) != 0; if (icbp->icb_hardaddr > 125) { - /* - * We end up with these Loop IDs for F-Port topologies - */ - if (icbp->icb_hardaddr != 0xff && - icbp->icb_hardaddr != 0x800 && - icbp->icb_hardaddr != 0xffff) { - isp_prt(isp, ISP_LOGERR, - "bad hard address %u- resetting to zero", - icbp->icb_hardaddr); - icbp->icb_hardaddr = 0; - } + icbp->icb_hardaddr = 0; + ownloopid = 0; } - - if (isp->isp_confopts & ISP_CFG_OWNLOOPID) { + if (ownloopid) { icbp->icb_fwoptions1 |= ICB2400_OPT1_HARD_ADDRESS; } @@ -2280,7 +2266,6 @@ "isp_plogi_old: portid 0x%06x already logged in as %u", portid, mbs.param[1]); return (MBOX_PORT_ID_USED | (mbs.param[1] << 16)); - break; case MBOX_LOOP_ID_USED: isp_prt(isp, ISP_LOGDEBUG0, @@ -2963,19 +2948,17 @@ /* * Check to make sure it's still a valid entry. The 24XX seems * to return a portid but not a WWPN/WWNN or role for devices - * which shift on a loop, or have a WWPN/WWNN but no portid. + * which shift on a loop. */ if (tmp.node_wwn == 0 || tmp.port_wwn == 0 || tmp.portid == 0) { - if (isp->isp_dblev & ISP_LOGSANCFG) { - int a, b, c; - a = !(tmp.node_wwn == 0); - b = !(tmp.port_wwn == 0); - c = !(tmp.portid == 0); - isp_prt(isp, ISP_LOGALL, - "bad pdb (%1d%1d%1d) @ handle 0x%x", - a, b, c, handle); - isp_dump_portdb(isp); - } + int a, b, c; + a = (tmp.node_wwn == 0); + b = (tmp.port_wwn == 0); + c = (tmp.portid == 0); + isp_prt(isp, ISP_LOGWARN, + "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c, + handle); + isp_dump_portdb(isp); continue; } @@ -4576,7 +4559,6 @@ if ((IS_FC(isp) && mbox != ASYNC_RIO_RESP) || isp->isp_state != ISP_RUNSTATE) { goto out; - return; } } @@ -7523,11 +7505,11 @@ for (loops = 0; loops < 5000; loops++) { USEC_DELAY(10); tmp = ISP_READ(isp, BIU2400_FLASH_ADDR); - if ((tmp & (1 << 31)) != 0) { + if ((tmp & (1U << 31)) != 0) { break; } } - if (tmp & (1 << 31)) { + if (tmp & (1U << 31)) { tmp = ISP_READ(isp, BIU2400_FLASH_DATA); *rp = tmp; } else { ==== //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#38 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.99 2007/02/15 17:21:30 luigi Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.100 2007/02/23 23:13:46 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -492,6 +492,12 @@ bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, \ busdma_lock_mutex, &Giant, z) #endif +#if __FreeBSD_version < 700031 +#define isp_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define isp_setup_intr bus_setup_intr +#endif /* Should be BUS_SPACE_MAXSIZE, but MAXPHYS is larger than BUS_SPACE_MAXSIZE */ #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1) ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#51 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.136 2007/02/23 12:18:44 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.137 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -1170,7 +1170,8 @@ locksetup++; #endif - if (bus_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, &pcs->ih)) { + if (isp_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, + &pcs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; } ==== //depot/projects/smpng/sys/dev/isp/isp_sbus.c#22 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.28 2007/02/23 12:18:44 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.29 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -311,7 +311,7 @@ goto bad; } - if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, + if (isp_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, NULL, isp_sbus_intr, isp, &sbs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; ==== //depot/projects/smpng/sys/dev/isp/ispmbox.h#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.57 2006/12/17 16:59:19 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.58 2007/02/23 21:59:21 mjacob Exp $ */ /*- * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters. * @@ -643,7 +643,7 @@ uint16_t ms_flags; uint16_t ms_reserved1; /* low 8 bits */ uint16_t ms_time; - uint16_t ms_cmd_cnt; /* Command DSD count */; + uint16_t ms_cmd_cnt; /* Command DSD count */ uint16_t ms_tot_cnt; /* Total DSD Count */ uint8_t ms_type; /* MS type */ uint8_t ms_r_ctl; /* R_CTL */ ==== //depot/projects/smpng/sys/dev/isp/ispreg.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.27 2006/11/02 03:21:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispreg.h,v 1.28 2007/02/23 21:59:21 mjacob Exp $ */ /*- * Machine Independent (well, as best as possible) register * definitions for Qlogic ISP SCSI adapters. @@ -409,14 +409,14 @@ /* BIU2400_HCCR definitions */ -#define HCCR_2400_CMD_NOP (0x0 << 28) -#define HCCR_2400_CMD_RESET (0x1 << 28) -#define HCCR_2400_CMD_CLEAR_RESET (0x2 << 28) -#define HCCR_2400_CMD_PAUSE (0x3 << 28) -#define HCCR_2400_CMD_RELEASE (0x4 << 28) -#define HCCR_2400_CMD_SET_HOST_INT (0x5 << 28) -#define HCCR_2400_CMD_CLEAR_HOST_INT (0x6 << 28) -#define HCCR_2400_CMD_CLEAR_RISC_INT (0xA << 28) +#define HCCR_2400_CMD_NOP 0x00000000 +#define HCCR_2400_CMD_RESET 0x10000000 +#define HCCR_2400_CMD_CLEAR_RESET 0x20000000 +#define HCCR_2400_CMD_PAUSE 0x30000000 +#define HCCR_2400_CMD_RELEASE 0x40000000 +#define HCCR_2400_CMD_SET_HOST_INT 0x50000000 +#define HCCR_2400_CMD_CLEAR_HOST_INT 0x60000000 +#define HCCR_2400_CMD_CLEAR_RISC_INT 0xA0000000 #define HCCR_2400_RISC_ERR(x) (((x) >> 12) & 0x7) /* RO */ #define HCCR_2400_RISC2HOST_INT (1 << 6) /* RO */ ==== //depot/projects/smpng/sys/dev/mpt/mpt.h#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.37 2007/01/05 22:49:05 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.38 2007/02/23 23:13:46 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -258,6 +258,13 @@ }; void mpt_map_rquest(void *, bus_dma_segment_t *, int, int); +/* **************************** NewBUS interrupt Crock ************************/ +#if __FreeBSD_version < 700031 +#define mpt_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define mpt_setup_intr bus_setup_intr +#endif /**************************** Kernel Thread Support ***************************/ #if __FreeBSD_version > 500005 ==== //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#31 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.48 2007/02/23 12:18:46 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.49 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -563,7 +563,7 @@ mpt_disable_ints(mpt); /* Register the interrupt handler */ - if (bus_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, + if (mpt_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, mpt, &mpt->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; ==== //depot/projects/smpng/sys/dev/pdq/if_fea.c#11 (text+ko) ==== @@ -21,7 +21,7 @@ * (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/sys/dev/pdq/if_fea.c,v 1.29 2005/11/11 07:36:13 ru Exp $ + * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.30 2007/02/23 20:11:25 piso Exp $ */ /* @@ -235,7 +235,7 @@ } error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - pdq_eisa_ifintr, dev, &sc->irq_ih); + NULL, pdq_eisa_ifintr, dev, &sc->irq_ih); if (error) { device_printf(dev, "Failed to setup interrupt handler.\n"); error = ENXIO; ==== //depot/projects/smpng/sys/dev/ppc/ppc.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.54 2007/02/23 16:25:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.55 2007/02/23 23:05:31 jhb Exp $"); #include "opt_ppc.h" @@ -71,7 +71,7 @@ #define DEVTOSOFTC(dev) ((struct ppc_data *)device_get_softc(dev)) devclass_t ppc_devclass; -const char ppc_driver_name[] = "ppc"; +const char ppc_driver_name[] = "ppc"; static char *ppc_models[] = { "SMC-like", "SMC FDC37C665GT", "SMC FDC37C666GT", "PC87332", "PC87306", ==== //depot/projects/smpng/sys/dev/si/si_eisa.c#6 (text+ko) ==== @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/si/si_eisa.c,v 1.6 2005/01/06 01:43:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/si/si_eisa.c,v 1.7 2007/02/23 20:11:27 piso Exp $"); #include #include @@ -102,7 +102,7 @@ } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc,&ih); + NULL, si_intr, sc,&ih); if (error) { device_printf(dev, "couldn't activate interrupt"); goto fail; ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#30 (text+ko) ==== @@ -173,7 +173,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.74 2006/11/06 13:41:56 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wl/if_wl.c,v 1.75 2007/02/23 20:11:27 piso Exp $"); /* * NOTE: @@ -573,7 +573,7 @@ printf(", Freq %d MHz",sc->freq24); /* 2.4 Gz */ printf("\n"); /* 2.4 Gz */ - bus_setup_intr(device, sc->res_irq, INTR_TYPE_NET, wlintr, sc, &sc->intr_cookie); + bus_setup_intr(device, sc->res_irq, INTR_TYPE_NET, NULL, wlintr, sc, &sc->intr_cookie); if (bootverbose) wldump(sc); ==== //depot/projects/smpng/sys/geom/geom_dev.c#42 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.90 2006/06/18 22:01:15 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.91 2007/02/23 23:06:10 jhb Exp $"); #include #include @@ -416,7 +416,7 @@ /* Wait for the cows to come home */ while (cp->nstart != cp->nend) - msleep(&dev, NULL, PRIBIO, "gdevorphan", hz / 10); + tsleep(&dev, PRIBIO, "gdevorphan", hz / 10); if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) g_access(cp, -cp->acr, -cp->acw, -cp->ace); ==== //depot/projects/smpng/sys/geom/geom_io.c#45 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.72 2007/01/28 23:36:07 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.73 2007/02/23 23:06:10 jhb Exp $"); #include #include @@ -492,7 +492,7 @@ g_bioq_unlock(&g_bio_run_down); if (pace > 0) { CTR1(KTR_GEOM, "g_down pacing self (pace %d)", pace); - msleep(&error, NULL, PRIBIO, "g_down", hz/10); + tsleep(&error, PRIBIO, "g_down", hz/10); pace--; } error = g_io_check(bp); ==== //depot/projects/smpng/sys/i386/linux/linux_machdep.c#43 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.70 2007/02/15 00:54:40 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.71 2007/02/23 22:39:26 netchild Exp $"); #include #include @@ -435,6 +435,10 @@ if ((args->flags & 0xffffff00) == THREADING_FLAGS) ff |= RFTHREAD; + if (args->flags & CLONE_PARENT_SETTID) + if (args->parent_tidptr == NULL) + return (EINVAL); + error = fork1(td, ff, 0, &p2); if (error) return (error); @@ -453,17 +457,6 @@ em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ - if (args->flags & CLONE_PARENT_SETTID) { - if (args->parent_tidptr == NULL) { - EMUL_UNLOCK(&emul_lock); - return (EINVAL); - } - error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); - if (error) { - EMUL_UNLOCK(&emul_lock); - return (error); - } - } if (args->flags & CLONE_THREAD) { /* XXX: linux mangles pgrp and pptr somehow @@ -489,6 +482,12 @@ EMUL_UNLOCK(&emul_lock); + if (args->flags & CLONE_PARENT_SETTID) { + error = copyout(&p2->p_pid, args->parent_tidptr, sizeof(p2->p_pid)); + if (error) + printf(LMSG("copyout failed!")); + } + PROC_LOCK(p2); p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); @@ -507,34 +506,37 @@ struct segment_descriptor sd; error = copyin((void *)td->td_frame->tf_esi, &info, sizeof(struct l_user_desc)); - if (error) - return (error); + if (error) { + printf(LMSG("copyin failed!")); + } else { - idx = info.entry_number; + idx = info.entry_number; - /* - * looks like we're getting the idx we returned - * in the set_thread_area() syscall - */ - if (idx != 6 && idx != 3) - return (EINVAL); + /* + * looks like we're getting the idx we returned + * in the set_thread_area() syscall + */ + if (idx != 6 && idx != 3) { + printf(LMSG("resetting idx!")); + idx = 3; + } - /* this doesnt happen in practice */ - if (idx == 6) { - /* we might copy out the entry_number as 3 */ - info.entry_number = 3; - error = copyout(&info, (void *) td->td_frame->tf_esi, sizeof(struct l_user_desc)); - if (error) - return (error); - } + /* this doesnt happen in practice */ + if (idx == 6) { + /* we might copy out the entry_number as 3 */ + info.entry_number = 3; + error = copyout(&info, (void *) td->td_frame->tf_esi, sizeof(struct l_user_desc)); + if (error) + printf(LMSG("copyout failed!")); + } - a[0] = LDT_entry_a(&info); - a[1] = LDT_entry_b(&info); + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); - memcpy(&sd, &a, sizeof(a)); + memcpy(&sd, &a, sizeof(a)); #ifdef DEBUG - if (ldebug(clone)) - printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, + if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, type: %i, dpl: %i, p: %i, xx: %i, def32: %i, gran: %i\n", sd.sd_lobase, sd.sd_hibase, sd.sd_lolimit, sd.sd_hilimit, @@ -546,9 +548,10 @@ sd.sd_gran); #endif - /* set %gs */ - td2->td_pcb->pcb_gsd = sd; - td2->td_pcb->pcb_gs = GSEL(GUGS_SEL, SEL_UPL); + /* set %gs */ + td2->td_pcb->pcb_gsd = sd; + td2->td_pcb->pcb_gs = GSEL(GUGS_SEL, SEL_UPL); + } } #ifdef DEBUG ==== //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.10 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.11 2007/02/23 20:11:26 piso Exp $"); #include #include @@ -243,7 +243,7 @@ /* setup the interrupt */ if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))iavc_isa_intr, + NULL, (void(*)(void*))iavc_isa_intr, sc, &ih)) { printf("iavc%d: irq setup failed\n", unit); ==== //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.11 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.12 2007/02/23 20:11:26 piso Exp $"); #include #include @@ -250,7 +250,7 @@ /* setup the interrupt */ if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))iavc_pci_intr, + NULL, (void(*)(void*))iavc_pci_intr, sc, &ih)) { printf("iavc%d: irq setup failed\n", unit); return(ENXIO); ==== //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.17 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.18 2007/02/24 02:28:07 piso Exp $"); #include "opt_i4b.h" @@ -540,7 +540,7 @@ goto fail; } - error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, avma1pp_intr, sc, &ih); + error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, NULL, avma1pp_intr, sc, &ih); if (error) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq); ==== //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.17 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.18 2007/02/23 20:11:26 piso Exp $"); #include "opt_i4b.h" @@ -495,7 +495,7 @@ goto fail; } - error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, avma1pp2_intr, sc, &ih); + error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, NULL, avma1pp2_intr, sc, &ih); if (error) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq); ==== //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.12 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.13 2007/02/23 20:11:26 piso Exp $"); #include "opt_i4b.h" @@ -516,7 +516,7 @@ /* not needed */ sc->sc_irq = rman_get_start(sc->sc_resources.irq); bus_setup_intr(dev,sc->sc_resources.irq,INTR_TYPE_NET, - (void(*)(void*))avm_pnp_intr, sc,&ih); + NULL, (void(*)(void*))avm_pnp_intr, sc,&ih); sc->sc_unit = unit; /* end of new-bus stuff */ ==== //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.10 2005/01/06 22:18:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.11 2007/02/23 20:11:26 piso Exp $"); #include #include @@ -206,7 +206,7 @@ /* setup interrupt routine now to avvoid stray * * interrupts. */ - bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, (void(*)(void*)) + bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, NULL, (void(*)(void*)) HFC_INTR, sc, &dummy); flag = 1; @@ -298,7 +298,7 @@ /* setup interrupt routine now to avvoid stray * * interrupts. */ - bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, (void(*)(void*)) + bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, NULL, (void(*)(void*)) HFC_INTR, sc, &dummy); flag = 1; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 24 16:18:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1848516A403; Sat, 24 Feb 2007 16:18:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E103216A401 for ; Sat, 24 Feb 2007 16:18:28 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CF11513C428 for ; Sat, 24 Feb 2007 16:18:28 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OGISD2059865 for ; Sat, 24 Feb 2007 16:18:28 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OGISVs059862 for perforce@freebsd.org; Sat, 24 Feb 2007 16:18:28 GMT (envelope-from netchild@freebsd.org) Date: Sat, 24 Feb 2007 16:18:28 GMT Message-Id: <200702241618.l1OGISVs059862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114975 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, 24 Feb 2007 16:18:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=114975 Change 114975 by netchild@netchild_magellan on 2007/02/24 16:18:14 - Split out the linux aio stuff into its own module. - Let the linker find the symbols itself instead of guessing the location. Submitted by: Li, Xiao My modifications based upon his submission: - Some files.* + NOTES glue to be able to compile this stuff into the kernel (the files.* stuff is underdocumented, reviews welcome). - amd64 part - aio compilation fixes for non-linux kernel parts TODO: - run test this stuff (i386 + amd64) - review the complete linuxaio code Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#5 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#19 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#9 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#19 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#11 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#5 edit .. //depot/projects/linuxolator/src/sys/conf/files.amd64#10 edit .. //depot/projects/linuxolator/src/sys/conf/files.i386#9 edit .. //depot/projects/linuxolator/src/sys/conf/files.pc98#7 edit .. //depot/projects/linuxolator/src/sys/conf/options.amd64#2 edit .. //depot/projects/linuxolator/src/sys/conf/options.i386#2 edit .. //depot/projects/linuxolator/src/sys/conf/options.pc98#2 edit .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#7 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#15 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#9 edit .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#18 edit .. //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#7 edit .. //depot/projects/linuxolator/src/sys/modules/Makefile#8 edit .. //depot/projects/linuxolator/src/sys/modules/aio/Makefile#5 edit .. //depot/projects/linuxolator/src/sys/modules/linux/Makefile#5 edit .. //depot/projects/linuxolator/src/sys/modules/linuxaio/Makefile#1 add .. //depot/projects/linuxolator/src/sys/pc98/conf/NOTES#4 edit .. //depot/projects/linuxolator/src/sys/sys/aio.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -608,9 +608,12 @@ # and PSEUDOFS) options LINPROCFS -#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 +# Enable the linux-like sys filesystem support (requires COMPAT_LINUX32 # and PSEUDOFS) -options LINSYSFS +options LINSYSFS + +# Enable the linux aio support (requires COMPAT_LINUX32 and VFS_AIO) +options LINUXAIO # # SysVR4 ABI emulation ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#19 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#9 (text+ko) ==== @@ -111,6 +111,11 @@ DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); +DUMMY(io_setup); +DUMMY(io_destroy); +DUMMY(io_getevents); +DUMMY(io_submit); +DUMMY(io_cancel); #define DUMMY_XATTR(s) \ int \ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#19 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#11 (text+ko) ==== @@ -44,9 +44,6 @@ #include #include #include -#include -#include -#include #include #ifdef COMPAT_LINUX32 @@ -193,13 +190,13 @@ */ #define LINUX_AIO_LOCK(p) { \ if ((p)->p_aioinfo == NULL) \ - p_aio_init_aioinfo(p); \ + aio_init_aioinfo(p); \ mtx_lock((struct mtx *)((p)->p_aioinfo)); \ } #define LINUX_AIO_UNLOCK(p) { \ if ((p)->p_aioinfo == NULL) \ - p_aio_init_aioinfo(p); \ + aio_init_aioinfo(p); \ mtx_unlock((struct mtx *)((p)->p_aioinfo)); \ } @@ -208,48 +205,36 @@ static eventhandler_tag linux_aio_exit_tag; /* - * XXX - * Calling external function/variable declared with "static" is DANGEROUS !!! - * Compiler may use register to transfer calling arguments for optimization, - * which is NOT a normal calling way and can cause kernel crash. + * To backup pointers to the dummy implementation of these + * system calls faked by the macro DUMMY() in linux_dummy.c. + */ +#define PREPARE_DUMMY_SYSCALL_BACKUP(s) \ + static sy_call_t *p_dummy_linux_ ## s +#define SHOW_REAL_SYSCALL(s) { \ + p_dummy_linux_ ## s = linux_sysent[LINUX_SYS_linux_ ## s].sy_call; \ + linux_sysent[LINUX_SYS_linux_ ## s].sy_call = \ + (sy_call_t *)(linux_ ## s); \ +} +/* + * The concept of "scope": the functions linux_io_xxx defined in this file + * always mask/screen/override/prevent homonymous functions defined in + * any other files. */ +#define RESTORE_DUMMY_SYSCALL(s) { \ + linux_sysent[LINUX_SYS_linux_ ## s].sy_call = p_dummy_linux_ ## s; \ +} -#define NATIVE_AIO_MODULE_NAME "aio" -static struct mod_depend native_aio_module_depend = {1, 1, 1}; -static linker_file_t native_aio_module_handle = NULL; +PREPARE_DUMMY_SYSCALL_BACKUP(io_setup); +PREPARE_DUMMY_SYSCALL_BACKUP(io_destroy); +PREPARE_DUMMY_SYSCALL_BACKUP(io_getevents); +PREPARE_DUMMY_SYSCALL_BACKUP(io_submit); +PREPARE_DUMMY_SYSCALL_BACKUP(io_cancel); -/* Mirror of sysctls in /sys/kern/vfs_aio.c */ -#define NATIVE_AIO_SYSCTL_CAPACITY_PROC "vfs.aio.max_aio_queue_per_proc" -static int native_aio_capacity_proc; -#define NATIVE_AIO_SYSCTL_CAPACITY_SYS "vfs.aio.max_aio_queue" -static int native_aio_capacity_sys; - -/* For declaration of aio_aqueue(), defined in /sys/kern/vfs_aio.c */ -struct aioliojob; - -/* Functions in /sys/kern/vfs_aio.c, XXX defined with "static" */ -#define GET_INTERNAL_FUNC_POINTER(s) { \ - * ((caddr_t *) & p_ ## s) = linker_file_lookup_symbol( \ - native_aio_module_handle, #s, FALSE); \ - if (p_ ## s == NULL) \ - break; \ -} -static void (*p_aio_init_aioinfo) (struct proc *p); -static int (*p_aio_aqueue) (struct thread *td, struct aiocb *job, - struct aioliojob *lio, int type, int osigev); - -/* System calls in /sys/kern/vfs_aio.c */ -#define DEFINE_SYSCALL_POINTER_VARIABLE(s) \ - static int (* p_ ## s) (struct thread *, struct s ## _args *) -#define GET_SYSCALL_POINTER(s) { \ - * ((sy_call_t **) & p_ ## s) = sysent[SYS_ ## s].sy_call; \ - if ((sy_call_t *) p_ ## s == (sy_call_t *)lkmressys) \ - break; \ -} -DEFINE_SYSCALL_POINTER_VARIABLE(aio_return); -DEFINE_SYSCALL_POINTER_VARIABLE(aio_suspend); -DEFINE_SYSCALL_POINTER_VARIABLE(aio_cancel); -DEFINE_SYSCALL_POINTER_VARIABLE(aio_error); +/* + * Substantially defined in linux_sysent.c. + * Also declared in linux_sysvec.c. + */ +extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; static int user_mem_rw_verify(void *p, size_t s) { @@ -331,7 +316,8 @@ if (isuserland) { nerr = copyin(piocb, &localcb, sizeof(localcb)); pcb = &localcb; - } else + } + else pcb = piocb; DPPRINTF("Dump struct aiocb (%p, %s): %s", @@ -419,85 +405,6 @@ return (nerr); } -static int link_to_native_aio_module(struct thread *td) -{ - int nerr; - - if (native_aio_module_handle != NULL) { - /* Linking has been done successfully. */ - return (0); - } - - nerr = linker_reference_module(NATIVE_AIO_MODULE_NAME, - &native_aio_module_depend, &native_aio_module_handle); - if (nerr) - return (nerr); - - do { - nerr = EINVAL; - - /* Kernel internal functions */ - GET_INTERNAL_FUNC_POINTER(aio_init_aioinfo); - GET_INTERNAL_FUNC_POINTER(aio_aqueue); - - /* System calls */ - GET_SYSCALL_POINTER(aio_return); - GET_SYSCALL_POINTER(aio_suspend); - GET_SYSCALL_POINTER(aio_cancel); - GET_SYSCALL_POINTER(aio_error); - - nerr = 0; - } while (0); - - if (nerr) { - linker_release_module(NULL, NULL, native_aio_module_handle); - native_aio_module_handle = NULL; - - printf(LMSG("Unable to link to the native module \"" - NATIVE_AIO_MODULE_NAME "\".")); - - return (nerr); - } - - return (0); -} - -#define LINK_TO_NATIVE_AIO_MODULE() \ - if (link_to_native_aio_module(td)) { \ - printf(LMSG("Please load the module \"" \ - NATIVE_AIO_MODULE_NAME "\" " \ - "to provide FreeBSD " \ - "native Asynchronous I/O support.")); \ - return (ENOSYS); \ -} - -static int mirror_native_aio_sysctl(struct thread *td) -{ - int nerr = 0; - size_t l; - - l = sizeof(native_aio_capacity_proc); - nerr = kernel_sysctlbyname(td, NATIVE_AIO_SYSCTL_CAPACITY_PROC, - &native_aio_capacity_proc, &l, NULL, 0, - NULL ,0); - if (nerr) - return (nerr); - - l = sizeof(native_aio_capacity_sys); - nerr = kernel_sysctlbyname(td, NATIVE_AIO_SYSCTL_CAPACITY_SYS, - &native_aio_capacity_sys, &l, NULL, 0, - NULL ,0); - if (nerr) - return (nerr); - - DPRINTF(NATIVE_AIO_SYSCTL_CAPACITY_PROC "=%d, " - NATIVE_AIO_SYSCTL_CAPACITY_SYS "=%d", - native_aio_capacity_proc, - native_aio_capacity_sys); - - return (nerr); -} - /* Linux system call io_setup(2) */ int linux_io_setup(struct thread *td, struct linux_io_setup_args *args) { @@ -508,27 +415,17 @@ int nerr = 0, nr, nrall, nq, arg_nr_reqs; DARGPRINTF("%u, %p", args->nr_reqs, args->ctxp); - LINK_TO_NATIVE_AIO_MODULE(); - nerr = mirror_native_aio_sysctl(td); - if (nerr) { - printf(LMSG("linux_io_setup(): Unable to query sysctls " - NATIVE_AIO_SYSCTL_CAPACITY_PROC - " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS - " .")); - return (nerr); - } /* Signed integer is a little safer than unsigned */ arg_nr_reqs = args->nr_reqs; if (arg_nr_reqs <= 0) return (EINVAL); - if (arg_nr_reqs > native_aio_capacity_proc - || arg_nr_reqs > native_aio_capacity_sys) { + if (arg_nr_reqs > max_aio_queue_per_proc + || arg_nr_reqs > max_aio_queue_count) { printf(LMSG("linux_io_setup(): Please increase sysctls " - NATIVE_AIO_SYSCTL_CAPACITY_PROC - " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS - " .")); + "vfs.aio.max_aio_queue_per_proc " + "and/or vfs.aio.max_aio_queue. ")); return (ENOMEM); } @@ -568,12 +465,12 @@ nq, nr, nrall); /* Check whether there are enough resources for requested queue */ - if (arg_nr_reqs > native_aio_capacity_proc - nr - || arg_nr_reqs > native_aio_capacity_sys - nrall) { + if (arg_nr_reqs > max_aio_queue_per_proc - nr + || arg_nr_reqs > max_aio_queue_count - nrall) { printf(LMSG("linux_io_setup(): " "Please increase sysctls " - NATIVE_AIO_SYSCTL_CAPACITY_PROC - " and/or " NATIVE_AIO_SYSCTL_CAPACITY_SYS " ." + "vfs.aio.max_aio_queue_per_proc " + "and/or vfs.aio.max_aio_queue. " "Besides %d queues of %d requests totally " "for this process, and %d requests' queues " "totally for the whole system, " @@ -632,7 +529,6 @@ struct aio_return_args aioretargs; DARGPRINTF("%lx", (unsigned long)args->ctx); - LINK_TO_NATIVE_AIO_MODULE(); p = td->td_proc; @@ -684,7 +580,7 @@ /* Cancel FreeBSD native clone */ cancelargs.fd = preq->req_linux.aio_fildes; cancelargs.aiocbp = preq->req_pbsd; - p_aio_cancel(td, &cancelargs); + aio_cancel(td, &cancelargs); DPRINTF("aio_cancel() returned %ld", (long)td->td_retval[0]); if (td->td_retval[0] == AIO_NOTCANCELED) printf(LMSG("linux_io_destroy(): Asynchronous IO " @@ -698,7 +594,7 @@ if (td->td_retval[0] == AIO_ALLDONE) { aioretargs.aiocbp = preq->req_pbsd; - p_aio_return(td, &aioretargs); + aio_return(td, &aioretargs); DPRINTF("aio_return(%p) returned %ld", aioretargs.aiocbp, (long)td->td_retval[0]); @@ -754,7 +650,6 @@ (unsigned long) args->ctx_id, (long)args->min_nr, (long)args->nr, args->events, args->timeout); - LINK_TO_NATIVE_AIO_MODULE(); if (args->nr <= 0) return (EINVAL); @@ -821,7 +716,7 @@ } else { /* Deal with the request queue */ i = 0; /* * This variable's value will be the return value - * of linux_io_getevents() + * of linux_io_getevents() */ nerr = user_malloc(td, (void **)&u_aiocbp, @@ -839,14 +734,14 @@ /* Collecting finished requests and waiting for queued requests */ LINUX_AIO_REQ_FOREACH_SAFE(pctx, preq, ptmpreq) { - + /* Collect all finished requests */ if (i >= args->nr) /* Full */ break; aioerrargs.aiocbp = preq->req_pbsd; - p_aio_error(td, &aioerrargs); + aio_error(td, &aioerrargs); aio_ret = td->td_retval[0]; td->td_retval[0] = 0; @@ -865,7 +760,7 @@ LINUX_AIO_REQ_UNHOOK(pctx, preq); aioretargs.aiocbp = preq->req_pbsd; - aio_err = p_aio_return(td, &aioretargs); + aio_err = aio_return(td, &aioretargs); aio_ret = td->td_retval[0]; td->td_retval[0] = 0; @@ -947,7 +842,7 @@ LINUX_AIO_REQ_FOREACH(pctx, preq) { copyout(&(preq->req_pbsd), &(u_aiocbp[j]), sizeof(preq->req_pbsd)); - j++; + j ++; } MPASS(j == pctx->ctx_nreq_cur); aiosusargs.aiocbp = u_aiocbp; @@ -961,7 +856,7 @@ aiosusargs.timeout = NULL; } - aio_err = p_aio_suspend(td, &aiosusargs); + aio_err = aio_suspend(td, &aiosusargs); DPRINTF("aio_suspend(%p, %d, %p) returned %ld", aiosusargs.aiocbp, aiosusargs.nent, aiosusargs.timeout, (long)aio_err); @@ -991,7 +886,7 @@ pctx); break; } - } /* + } /* * End of collecting finished requests * and waiting for queued requests */ @@ -1026,9 +921,7 @@ struct linux_iocb *porig; struct aiocb iocb, *piocb; - DARGPRINTF("%lx, %ld, %p", (unsigned long)args->ctx_id, - (long)args->nr, args->iocbpp); - LINK_TO_NATIVE_AIO_MODULE(); + DARGPRINTF("%lx, %ld, %p", (unsigned long)args->ctx_id, (long)args->nr, args->iocbpp); if (args->nr <= 0) return (EINVAL); @@ -1072,7 +965,7 @@ LINUX_AIO_UNLOCK(p); /* XXX Interlaced, seamless */ for (i = 0; pctx->ctx_nreq_cur < pctx->ctx_nreq_max && i < args->nr; - i++) { + i ++) { /* Get user space Linux control block */ nerr = copyin(&(args->iocbpp[i]), &porig, sizeof(porig)); if (nerr != 0) @@ -1094,7 +987,7 @@ DUMP_FREEBSD_AIOCB(piocb, 1); /* Submit user space control block */ - nerr = p_aio_aqueue(td, piocb, NULL, iocb.aio_lio_opcode, 0); + nerr = aio_aqueue(td, piocb, NULL, iocb.aio_lio_opcode, 0); if (nerr != 0) { user_free(td, piocb, sizeof(*piocb)); break; @@ -1139,9 +1032,7 @@ struct linux_io_event evt; struct aio_cancel_args aiocnclargs; - DARGPRINTF("%lx, %p, %p", (unsigned long)args->ctx_id, - args->iocb, args->result); - LINK_TO_NATIVE_AIO_MODULE(); + DARGPRINTF("%lx, %p, %p", (unsigned long)args->ctx_id, args->iocb, args->result); nerr = copyin(args->iocb, &lcb, sizeof(lcb)); if (nerr != 0) @@ -1205,7 +1096,7 @@ /* Cancel FreeBSD native clone */ aiocnclargs.fd = preq->req_linux.aio_fildes; aiocnclargs.aiocbp = preq->req_pbsd; - p_aio_cancel(td, &aiocnclargs); + aio_cancel(td, &aiocnclargs); DPRINTF("aio_cancel() returned %ld", (long)td->td_retval[0]); if (td->td_retval[0] == AIO_CANCELED) { @@ -1308,6 +1199,17 @@ linux_aio_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_aio_proc_rundown, NULL, EVENTHANDLER_PRI_ANY); + + /* + * Backup pointers to the dummy implementation of these + * system calls faked by the macro DUMMY() in linux_dummy.c. + * And then, show real system calls. + */ + SHOW_REAL_SYSCALL(io_setup); + SHOW_REAL_SYSCALL(io_destroy); + SHOW_REAL_SYSCALL(io_getevents); + SHOW_REAL_SYSCALL(io_submit); + SHOW_REAL_SYSCALL(io_cancel); break; case MOD_UNLOAD: LINUX_AIO_CTX_LIST_LOCK(); @@ -1321,15 +1223,16 @@ mtx_destroy(&linux_aio_context_list_mtx); uma_zdestroy(linux_aio_request_zone); uma_zdestroy(linux_aio_context_zone); - if (native_aio_module_handle != NULL) { - /* - * linker_release_module() cannot be used here. - * It tries to hold "kld_sx", conflicting against - * module_unload(). - */ - linker_file_unload(native_aio_module_handle, - LINKER_UNLOAD_NORMAL); - } + + /* + * Restore pointers to the dummy implementation of these + * system calls faked by the macro DUMMY() in linux_dummy.c. + */ + RESTORE_DUMMY_SYSCALL(io_setup); + RESTORE_DUMMY_SYSCALL(io_destroy); + RESTORE_DUMMY_SYSCALL(io_getevents); + RESTORE_DUMMY_SYSCALL(io_submit); + RESTORE_DUMMY_SYSCALL(io_cancel); break; case MOD_SHUTDOWN: break; @@ -1347,3 +1250,5 @@ }; DECLARE_MODULE(linuxaio, linux_aio_mod, SI_SUB_VFS, SI_ORDER_ANY); +MODULE_DEPEND(linuxaio, aio, 1, 1, 1); +MODULE_DEPEND(linuxaio, linux, 1, 1, 1); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#5 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/conf/files.amd64#10 (text+ko) ==== @@ -233,6 +233,7 @@ amd64/linux32/linux32_machdep.c optional compat_linux32 amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 +compat/linux/linux_aio.c optional linuxaio compat_linux32 vfs_aio compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 ==== //depot/projects/linuxolator/src/sys/conf/files.i386#9 (text+ko) ==== @@ -85,6 +85,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_aio.c optional linuxaio compat_linux aio compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux ==== //depot/projects/linuxolator/src/sys/conf/files.pc98#7 (text+ko) ==== @@ -55,6 +55,7 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_aio.c optional linuxaio compat_linux vfs_aio compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux compat/linux/linux_futex.c optional compat_linux ==== //depot/projects/linuxolator/src/sys/conf/options.amd64#2 (text+ko) ==== @@ -19,6 +19,7 @@ #DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h +LINUXAIO opt_dontuse.h NDISAPI opt_dontuse.h CLK_CALIBRATION_LOOP opt_clock.h ==== //depot/projects/linuxolator/src/sys/conf/options.i386#2 (text+ko) ==== @@ -26,6 +26,7 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h +LINUXAIO opt_dontuse.h NDISAPI opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h ==== //depot/projects/linuxolator/src/sys/conf/options.pc98#2 (text+ko) ==== @@ -25,6 +25,7 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h +LINUXAIO opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h ==== //depot/projects/linuxolator/src/sys/i386/conf/NOTES#7 (text+ko) ==== @@ -1133,9 +1133,12 @@ # and PSEUDOFS) options LINPROCFS -#Enable the linux-like sys filesystem support (requires COMPAT_LINUX +# Enable the linux-like sys filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -options LINSYSFS +options LINSYSFS + +# Enable the linux aio support (requires COMPAT_LINUX and VFS_AIO) +options LINUXAIO # # SysVR4 ABI emulation ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#15 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#9 (text+ko) ==== @@ -101,6 +101,11 @@ DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); +DUMMY(io_setup); +DUMMY(io_destroy); +DUMMY(io_getevents); +DUMMY(io_submit); +DUMMY(io_cancel); #define DUMMY_XATTR(s) \ int \ ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#18 (text+ko) ==== ==== //depot/projects/linuxolator/src/sys/kern/vfs_aio.c#7 (text+ko) ==== @@ -139,8 +139,8 @@ SYSCTL_INT(_vfs_aio, OID_AUTO, target_aio_procs, CTLFLAG_RW, &target_aio_procs, 0, "Preferred number of ready kernel threads for async IO"); -static int max_queue_count = MAX_AIO_QUEUE; -SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue, CTLFLAG_RW, &max_queue_count, 0, +int max_aio_queue_count = MAX_AIO_QUEUE; +SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue, CTLFLAG_RW, &max_aio_queue_count, 0, "Maximum number of aio requests to queue, globally"); static int num_queue_count = 0; @@ -172,7 +172,7 @@ SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_per_proc, CTLFLAG_RW, &max_aio_per_proc, 0, "Maximum active aio requests per process (stored in the process)"); -static int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC; +int max_aio_queue_per_proc = MAX_AIO_QUEUE_PER_PROC; SYSCTL_INT(_vfs_aio, OID_AUTO, max_aio_queue_per_proc, CTLFLAG_RW, &max_aio_queue_per_proc, 0, "Maximum queued aio requests per process (stored in the process)"); @@ -257,19 +257,6 @@ struct thread *aiothread; /* (*) the AIO thread */ }; -/* - * data-structure for lio signal management - */ -struct aioliojob { - int lioj_flags; /* (a) listio flags */ - int lioj_count; /* (a) listio flags */ - int lioj_finished_count; /* (a) listio flags */ - struct sigevent lioj_signal; /* (a) signal on all I/O done */ - TAILQ_ENTRY(aioliojob) lioj_list; /* (a) lio list */ - struct knlist klist; /* (a) list of knotes */ - ksiginfo_t lioj_ksi; /* (a) Realtime signal info */ -}; - #define LIOJ_SIGNAL 0x1 /* signal on all done (lio) */ #define LIOJ_SIGNAL_POSTED 0x2 /* signal has been posted */ #define LIOJ_KEVENT_POSTED 0x4 /* kevent triggered */ @@ -313,13 +300,10 @@ static TAILQ_HEAD(,aiocblist) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; -void aio_init_aioinfo(struct proc *p); static void aio_onceonly(void); static int aio_free_entry(struct aiocblist *aiocbe); static void aio_process(struct aiocblist *aiocbe); static int aio_newproc(int *); -int aio_aqueue(struct thread *td, struct aiocb *job, - struct aioliojob *lio, int type, int osigev); static void aio_physwakeup(struct buf *bp); static void aio_proc_rundown(void *arg, struct proc *p); static void aio_proc_rundown_exec(void *arg, struct proc *p, struct image_params *imgp); @@ -1347,7 +1331,7 @@ suword(&job->_aiocb_private.error, 0); suword(&job->_aiocb_private.kernelinfo, -1); - if (num_queue_count >= max_queue_count || + if (num_queue_count >= max_aio_queue_count || ki->kaio_count >= ki->kaio_qallowed_count) { suword(&job->_aiocb_private.error, EAGAIN); return (EAGAIN); ==== //depot/projects/linuxolator/src/sys/modules/Makefile#8 (text+ko) ==== @@ -138,6 +138,7 @@ ${_linprocfs} \ ${_linsysfs} \ ${_linux} \ + ${_linuxaio} \ lmc \ lpt \ mac_biba \ @@ -371,6 +372,7 @@ _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux +_linuxaio= linuxaio _mse= mse .if ${MK_NCP} != "no" _ncp= ncp @@ -479,6 +481,7 @@ _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux +_linuxaio= linuxaio _mly= mly _mxge= mxge _ndis= ndis @@ -498,8 +501,8 @@ .if ${MACHINE_ARCH} == "ia64" # Modules not enabled on ia64 (as compared to i386) include: -# aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv -# nsp oltr pecoff s3 sbni stg vesa +# aac acpi aout apm atspeaker drm ibcs2 linsysfs linprocfs linux +# linuxaio ncv nsp oltr pecoff s3 sbni stg vesa # acpi is not enabled because it is broken as a module on ia64 _aic= aic #_ar= ar not 64-bit clean ==== //depot/projects/linuxolator/src/sys/modules/aio/Makefile#5 (text+ko) ==== @@ -5,6 +5,7 @@ KMOD= aio SRCS= vfs_aio.c opt_vfs_aio.h vnode_if.h -EXPORT_SYMS= aio_init_aioinfo aio_aqueue +EXPORT_SYMS= aio_init_aioinfo aio_aqueue max_aio_queue_count \ + max_aio_queue_per_proc .include ==== //depot/projects/linuxolator/src/sys/modules/linux/Makefile#5 (text+ko) ==== @@ -8,7 +8,7 @@ .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} KMOD= linux -SRCS= linux_aio.c linux${SFX}_dummy.c linux_emul.c linux_file.c \ +SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \ ==== //depot/projects/linuxolator/src/sys/pc98/conf/NOTES#4 (text+ko) ==== @@ -695,6 +695,9 @@ # and PSEUDOFS) options LINSYSFS +# Enable the linux aio support (requires COMPAT_LINUX and VFS_AIO) +options LINUXAIO + # # SysVR4 ABI emulation # ==== //depot/projects/linuxolator/src/sys/sys/aio.h#2 (text+ko) ==== @@ -23,6 +23,12 @@ #include #include +#ifdef _KERNEL +#include +#include +#include +#endif + /* * Returned by aio_cancel: */ @@ -135,6 +141,28 @@ extern void (*aio_swake)(struct socket *, struct sockbuf *); +/* To be used by the Linux AIO module */ +extern int max_aio_queue_count; +extern int max_aio_queue_per_proc; + +/* + * data-structure for lio signal management + */ +struct aioliojob { + int lioj_flags; /* (a) listio flags */ + int lioj_count; /* (a) listio flags */ + int lioj_finished_count; /* (a) listio flags */ + struct sigevent lioj_signal; /* (a) signal on all I/O done */ + TAILQ_ENTRY(aioliojob) lioj_list; /* (a) lio list */ + struct knlist klist; /* (a) list of knotes */ + ksiginfo_t lioj_ksi; /* (a) Realtime signal info */ +}; + +/* To be used by the Linux AIO module */ +extern void aio_init_aioinfo(struct proc *p); +extern int aio_aqueue(struct thread *td, struct aiocb *job, + struct aioliojob *lio, int type, int osigev); + #endif #endif From owner-p4-projects@FreeBSD.ORG Sat Feb 24 16:39:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8218516A403; Sat, 24 Feb 2007 16:39:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3295416A400 for ; Sat, 24 Feb 2007 16:39:56 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 189A013C4A8 for ; Sat, 24 Feb 2007 16:39:56 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OGdtMV062968 for ; Sat, 24 Feb 2007 16:39:55 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OGdtbi062965 for perforce@freebsd.org; Sat, 24 Feb 2007 16:39:55 GMT (envelope-from netchild@freebsd.org) Date: Sat, 24 Feb 2007 16:39:55 GMT Message-Id: <200702241639.l1OGdtbi062965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114977 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, 24 Feb 2007 16:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=114977 Change 114977 by netchild@netchild_magellan on 2007/02/24 16:39:29 Whitespace commit: Fix grammar, spelling and punctuation. Submitted by: "Scot Hetzel" Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#20 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#41 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#38 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#14 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#13 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#59 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#3 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/imgact_linux.c#2 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#16 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#32 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#20 (text+ko) ==== @@ -785,7 +785,7 @@ /* * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user-space descriptor to machine one + * these convert linux user space descriptor to machine one */ #define LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#41 (text+ko) ==== @@ -483,7 +483,9 @@ td2 = FIRST_THREAD_IN_PROC(p2); - /* make it run */ + /* + * Make this runnable after we are finished with it. + */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); @@ -581,7 +583,7 @@ * kernel threads. Unfortunately despite the existence of the * CLONE_THREAD flag, version of linuxthreads package used in * most popular distros as of beginning of 2005 doesn't make - * any use of it. Therefore, this detection relay fully on + * any use of it. Therefore, this detection relies on * empirical observation that linuxthreads sets certain * combination of flags, so that we can make more or less * precise detection and notify the FreeBSD kernel that several @@ -869,7 +871,7 @@ * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of * the region. It them maps the top SGROWSIZ bytes, - * and autgrows the region down, up to the limit + * and auto grows the region down, up to the limit * in addr. * * If we don't use the MAP_STACK option, the effect @@ -1040,7 +1042,7 @@ } /* - * Linux has two extra args, restart and oldmask. We dont use these, + * Linux has two extra args, restart and oldmask. We don't use these, * but it seems that "restart" is actually a context pointer that * enables the signal to happen with a different register set. */ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#38 (text+ko) ==== @@ -212,7 +212,7 @@ error = linux_sys_futex(FIRST_THREAD_IN_PROC(p), &cup); /* * this cannot happen at the moment and if this happens it - * probably mean there is a userspace bug + * probably means there is a user space bug */ if (error) printf(LMSG("futex stuff in proc_exit failed.\n")); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#14 (text+ko) ==== @@ -195,7 +195,7 @@ char *fullpath = "unknown"; char *freepath = NULL; - /* dont do anything if the pathname is absolute */ + /* don't do anything if the pathname is absolute */ if (*filename == '/') { *newpath= filename; return (0); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#13 (text+ko) ==== @@ -208,9 +208,9 @@ FUTEX_SYSTEM_LOCK; /* - * XXX: Linux is able cope with different addresses + * XXX: Linux is able to cope with different addresses * corresponding to the same mapped memory in the sleeping - * and the waker process. + * and waker process(es). */ #ifdef DEBUG if (ldebug(sys_futex)) @@ -283,7 +283,7 @@ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { - /* XXX: we dont handle the EFAULT yet */ + /* XXX: we don't handle the EFAULT yet */ if (op_ret != -EFAULT) { futex_put(f); futex_put(f2); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#59 (text+ko) ==== @@ -836,7 +836,7 @@ args->pid, (void *)args->status, args->options); #endif /* - * this is necessary because the test in kern_wait doesnt work + * this is necessary because the test in kern_wait doesn't work * because we mess with the options here */ if (args->options & ~(WUNTRACED | WNOHANG | WCONTINUED | __WCLONE)) @@ -1428,10 +1428,9 @@ /* * The FreeBSD native getpid(2), getgid(2) and getuid(2) also modify - * td->td_retval[1] when COMPAT_43 is defined. This - * globbers registers that are assumed to be preserved. The following - * lightweight syscalls fixes this. See also linux_getgid16() and - * linux_getuid16() in linux_uid16.c. + * td->td_retval[1] when COMPAT_43 is defined. This clobbers registers that + * are assumed to be preserved. The following lightweight syscalls fixes + * this. See also linux_getgid16() and linux_getuid16() in linux_uid16.c * * linux_getpid() - MP SAFE * linux_getgid() - MP SAFE ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#3 (text+ko) ==== @@ -199,10 +199,9 @@ /* * The FreeBSD native getgid(2) and getuid(2) also modify td->td_retval[1] - * when COMPAT_43 is defined. This globbers registers that - * are assumed to be preserved. The following lightweight syscalls fixes - * this. See also linux_getpid(2), linux_getgid(2) and linux_getuid(2) in - * linux_misc.c + * when COMPAT_43 is defined. This clobbers registers that are assumed to + * be preserved. The following lightweight syscalls fixes this. See also + * linux_getpid(2), linux_getgid(2) and linux_getuid(2) in linux_misc.c * * linux_getgid16() - MP SAFE * linux_getuid16() - MP SAFE ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -58,12 +58,11 @@ const char linux_emul_path[] = "/compat/linux"; /* - * Search an alternate path before passing pathname arguments on - * to system calls. Useful for keeping a separate 'emulation tree'. + * Search an alternate path before passing pathname arguments on to + * system calls. Useful for keeping a separate 'emulation tree'. * - * If cflag is set, we check if an attempt can be made to create - * the named file, i.e. we check if the directory it should - * be in exists. + * If cflag is set, we check if an attempt can be made to create the + * named file, i.e. we check if the directory it should be in exists. */ int linux_emul_convpath(td, path, pathseg, pbuf, cflag) ==== //depot/projects/linuxolator/src/sys/i386/linux/imgact_linux.c#2 (text+ko) ==== @@ -124,7 +124,7 @@ /* * Check if file_offset page aligned,. - * Currently we cannot handle misalinged file offsets, + * Currently we cannot handle misaligned file offsets, * and so we read in the entire image (what a waste). */ if (file_offset & PAGE_MASK) { ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#16 (text+ko) ==== @@ -745,7 +745,7 @@ /* * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user-space descriptor to machine one + * these convert linux user space descriptor to machine one */ #define LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#32 (text+ko) ==== @@ -125,7 +125,7 @@ if (error == 0) error = kern_execve(td, &eargs, NULL); if (error == 0) - /* linux process can exec fbsd one, dont attempt + /* linux process can exec fbsd one, don't attempt * to create emuldata for such process using * linux_proc_init, this leads to a panic on KASSERT * because such process has p->p_emuldata == NULL @@ -401,8 +401,8 @@ /* * XXX: in linux sharing of fs info (chroot/cwd/umask) * and open files is independant. in fbsd its in one - * structure but in reality it doesnt make any problems - * because both this flags are set at once usually. + * structure but in reality it doesn't cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; @@ -412,7 +412,7 @@ * kernel threads. Unfortunately despite the existence of the * CLONE_THREAD flag, version of linuxthreads package used in * most popular distros as of beginning of 2005 doesn't make - * any use of it. Therefore, this detection relay fully on + * any use of it. Therefore, this detection relies on * empirical observation that linuxthreads sets certain * combination of flags, so that we can make more or less * precise detection and notify the FreeBSD kernel that several @@ -709,7 +709,7 @@ * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of * the region. It them maps the top SGROWSIZ bytes, - * and autgrows the region down, up to the limit + * and auto grows the region down, up to the limit * in addr. * * If we don't use the MAP_STACK option, the effect @@ -952,7 +952,7 @@ } /* - * Linux has two extra args, restart and oldmask. We dont use these, + * Linux has two extra args, restart and oldmask. We don't use these, * but it seems that "restart" is actually a context pointer that * enables the signal to happen with a different register set. */ @@ -1093,18 +1093,21 @@ idx = info.entry_number; /* - * Semantics of linux version: every thread in the system has array - * of 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This - * syscall loads one of the selected tls decriptors with a value - * and also loads GDT descriptors 6, 7 and 8 with the content of the per-thread - * descriptors. + * Semantics of linux version: every thread in the system has array of + * 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This + * syscall loads one of the selected tls decriptors with a value and + * also loads GDT descriptors 6, 7 and 8 with the content of the + * per-thread descriptors. + * + * Semantics of fbsd version: I think we can ignore that linux has 3 + * per-thread descriptors and use just the 1st one. The tls_array[] + * is used only in set/get-thread_area() syscalls and for loading the + * GDT descriptors. In fbsd we use just one GDT descriptor for TLS so + * we will load just one. * - * Semantics of fbsd version: I think we can ignore that linux has 3 per-thread - * descriptors and use just the 1st one. The tls_array[] is used only in - * set/get-thread_area() syscalls and for loading the GDT descriptors. In fbsd - * we use just one GDT descriptor for TLS so we will load just one. - * XXX: this doesnt work when user-space process tries to use more then 1 TLS segment - * comment in the linux sources says wine might do that. + * XXX: this doesn't work when a user space process tries to use more + * than 1 TLS segment. Comment in the linux sources says wine might do + * this. */ /* @@ -1117,8 +1120,9 @@ /* * we have to copy out the GDT entry we use - * FreeBSD uses GDT entry #3 for storing %gs so load that - * XXX: what if userspace program doesnt check this value and tries + * FreeBSD uses GDT entry #3 for storing %gs so load that + * + * XXX: what if a user space program doesn't check this value and tries * to use 6, 7 or 8? */ idx = info.entry_number = 3; From owner-p4-projects@FreeBSD.ORG Sat Feb 24 17:12:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D980A16A404; Sat, 24 Feb 2007 17:12:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B713B16A401 for ; Sat, 24 Feb 2007 17:12:48 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A511313C441 for ; Sat, 24 Feb 2007 17:12:48 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OHCmnk078356 for ; Sat, 24 Feb 2007 17:12:48 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OHCkYM078351 for perforce@freebsd.org; Sat, 24 Feb 2007 17:12:46 GMT (envelope-from netchild@freebsd.org) Date: Sat, 24 Feb 2007 17:12:46 GMT Message-Id: <200702241712.l1OHCkYM078351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114984 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, 24 Feb 2007 17:12:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=114984 Change 114984 by netchild@netchild_magellan on 2007/02/24 17:12:15 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#21 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#42 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#39 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#60 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files#20 integrate .. //depot/projects/linuxolator/src/sys/dev/exca/exca.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#17 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#33 integrate .. //depot/projects/linuxolator/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/modules/ip_mroute_mod/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sis.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/if_sisreg.h#3 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#21 (text+ko) ==== @@ -27,7 +27,7 @@ * (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/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#42 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.34 2007/02/24 16:49:24 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#39 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.17 2007/02/23 22:39:26 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.18 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#60 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.207 2007/02/23 22:39:26 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_uid16.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.20 2006/11/06 13:41:49 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.21 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_util.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.31 2006/08/15 12:54:29 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.32 2007/02/24 16:49:24 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1177 2007/02/15 01:28:22 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1178 2007/02/24 11:38:47 bms Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1760,7 +1760,7 @@ netinet/ip_input.c optional inet netinet/ip_ipsec.c optional ipsec netinet/ip_ipsec.c optional fast_ipsec -netinet/ip_mroute.c optional mrouting +netinet/ip_mroute.c optional mrouting inet | mrouting inet6 netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet @@ -1815,7 +1815,7 @@ netinet6/ip6_forward.c optional inet6 netinet6/ip6_id.c optional inet6 netinet6/ip6_input.c optional inet6 -netinet6/ip6_mroute.c optional inet6 +netinet6/ip6_mroute.c optional mrouting inet6 netinet6/ip6_output.c optional inet6 netinet6/ipcomp_core.c optional ipsec netinet6/ipcomp_input.c optional ipsec ==== //depot/projects/linuxolator/src/sys/dev/exca/exca.c#4 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.26 2007/02/15 07:22:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/exca/exca.c,v 1.27 2007/02/24 15:56:06 imp Exp $"); #include #include @@ -766,7 +766,7 @@ void exca_insert(struct exca_softc *exca) { - if (exca->pccarddev != NULL) { + if (device_is_attached(exca->pccarddev)) { if (CARD_ATTACH_CARD(exca->pccarddev) != 0) device_printf(exca->dev, "PC Card card activation failed\n"); ==== //depot/projects/linuxolator/src/sys/dev/fdc/fdc.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.315 2007/02/23 12:18:40 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.316 2007/02/23 23:06:10 jhb Exp $"); #include "opt_fdc.h" @@ -790,7 +790,7 @@ if (fdc->flags & FDC_NEEDS_RESET) { fdc->flags &= ~FDC_NEEDS_RESET; fdc_reset(fdc); - msleep(fdc, NULL, PRIBIO, "fdcrst", hz); + tsleep(fdc, PRIBIO, "fdcrst", hz); /* Discard results */ for (i = 0; i < 4; i++) fdc_sense_int(fdc, &st0, &cyl); @@ -855,7 +855,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -867,7 +867,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, 1, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -956,7 +956,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -967,7 +967,7 @@ fd->track = 0; /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } /* @@ -983,7 +983,7 @@ retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, descyl, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -994,7 +994,7 @@ } /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } fd->track = cylinder; @@ -1080,7 +1080,7 @@ } /* Wait for interrupt */ - i = msleep(fdc, NULL, PRIBIO, "fddata", hz); + i = tsleep(fdc, PRIBIO, "fddata", hz); /* PIO if the read looks good */ if (i == 0 && (fdc->flags & FDC_NODMA) && (bp->bio_cmd & BIO_READ)) @@ -1279,7 +1279,7 @@ fd_enqueue(fd, bp); do { - msleep(bp, NULL, PRIBIO, "fdwait", hz); + tsleep(bp, PRIBIO, "fdwait", hz); } while (!(bp->bio_flags & BIO_DONE)); error = bp->bio_error; ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.99 2007/02/15 17:21:30 luigi Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.100 2007/02/23 23:13:46 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -492,6 +492,12 @@ bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, \ busdma_lock_mutex, &Giant, z) #endif +#if __FreeBSD_version < 700031 +#define isp_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define isp_setup_intr bus_setup_intr +#endif /* Should be BUS_SPACE_MAXSIZE, but MAXPHYS is larger than BUS_SPACE_MAXSIZE */ #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1) ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.136 2007/02/23 12:18:44 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.137 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -1170,7 +1170,8 @@ locksetup++; #endif - if (bus_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, &pcs->ih)) { + if (isp_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, + &pcs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; } ==== //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.28 2007/02/23 12:18:44 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.29 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -311,7 +311,7 @@ goto bad; } - if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, + if (isp_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, NULL, isp_sbus_intr, isp, &sbs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; ==== //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.37 2007/01/05 22:49:05 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.38 2007/02/23 23:13:46 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -258,6 +258,13 @@ }; void mpt_map_rquest(void *, bus_dma_segment_t *, int, int); +/* **************************** NewBUS interrupt Crock ************************/ +#if __FreeBSD_version < 700031 +#define mpt_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define mpt_setup_intr bus_setup_intr +#endif /**************************** Kernel Thread Support ***************************/ #if __FreeBSD_version > 500005 ==== //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#8 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.48 2007/02/23 12:18:46 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.49 2007/02/23 23:13:46 mjacob Exp $"); #include #include @@ -563,7 +563,7 @@ mpt_disable_ints(mpt); /* Register the interrupt handler */ - if (bus_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, + if (mpt_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, mpt, &mpt->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; ==== //depot/projects/linuxolator/src/sys/geom/geom_dev.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.90 2006/06/18 22:01:15 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_dev.c,v 1.91 2007/02/23 23:06:10 jhb Exp $"); #include #include @@ -416,7 +416,7 @@ /* Wait for the cows to come home */ while (cp->nstart != cp->nend) - msleep(&dev, NULL, PRIBIO, "gdevorphan", hz / 10); + tsleep(&dev, PRIBIO, "gdevorphan", hz / 10); if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) g_access(cp, -cp->acr, -cp->acw, -cp->ace); ==== //depot/projects/linuxolator/src/sys/geom/geom_io.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.72 2007/01/28 23:36:07 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.73 2007/02/23 23:06:10 jhb Exp $"); #include #include @@ -492,7 +492,7 @@ g_bioq_unlock(&g_bio_run_down); if (pace > 0) { CTR1(KTR_GEOM, "g_down pacing self (pace %d)", pace); - msleep(&error, NULL, PRIBIO, "g_down", hz/10); + tsleep(&error, PRIBIO, "g_down", hz/10); pace--; } error = g_io_check(bp); ==== //depot/projects/linuxolator/src/sys/i386/linux/imgact_linux.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.54 2005/04/01 20:00:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.55 2007/02/24 16:49:24 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/i386/linux/linux.h,v 1.74 2007/02/15 00:54:40 jkim Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.75 2007/02/24 16:49:24 netchild Exp $ */ #ifndef _I386_LINUX_LINUX_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.71 2007/02/23 22:39:26 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.72 2007/02/24 16:49:25 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ *---------------------------------------------------------------------------*/ #include -__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.17 2005/01/06 22:18:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.18 2007/02/24 02:28:07 piso Exp $"); #include "opt_i4b.h" @@ -540,7 +540,7 @@ goto fail; } - error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, avma1pp_intr, sc, &ih); + error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, NULL, avma1pp_intr, sc, &ih); if (error) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq); ==== //depot/projects/linuxolator/src/sys/ia64/isa/isa.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/sys/ia64/isa/isa.c,v 1.3 2004/03/17 21:45:55 jmg Exp $ + * $FreeBSD: src/sys/ia64/isa/isa.c,v 1.4 2007/02/24 16:56:22 piso Exp $ */ /* @@ -155,10 +155,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/linuxolator/src/sys/modules/ip_mroute_mod/Makefile#3 (text+ko) ==== @@ -1,13 +1,26 @@ -# $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.14 2007/02/09 01:42:43 bms Exp $ +# $FreeBSD: src/sys/modules/ip_mroute_mod/Makefile,v 1.15 2007/02/24 11:38:47 bms Exp $ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 KMOD= ip_mroute -SRCS= ip_mroute.c opt_mac.h opt_mrouting.h + +SRCS= ip_mroute.c +SRCS+= opt_inet.h opt_mac.h opt_mrouting.h +SRCS+= opt_inet6.h + +.if !defined(MK_INET6_SUPPORT) || ${MK_INET6_SUPPORT} != "no" +SRCS+= ip6_mroute.c +.endif .if !defined(KERNBUILDDIR) +opt_inet.h: + echo "#define INET 1" > ${.TARGET} opt_mrouting.h: - echo "#define MROUTING 1" > ${.TARGET} + echo "#define MROUTING 1" > ${.TARGET} +.if !defined(MK_INET6_SUPPORT) || ${MK_INET6_SUPPORT} != "no" +opt_inet6.h: + echo "#define INET6 1" > ${.TARGET} +.endif .endif .include ==== //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#8 (text+ko) ==== @@ -52,9 +52,11 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.129 2007/02/10 23:15:28 bms Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.130 2007/02/24 11:38:46 bms Exp $ */ +#include "opt_inet.h" +#include "opt_inet6.h" #include "opt_mac.h" #include "opt_mrouting.h" @@ -92,6 +94,12 @@ #include #include #include +#ifdef INET6 +#include +#include +#include +#include +#endif #include #include @@ -217,6 +225,19 @@ .pr_usrreqs = &rip_usrreqs }; static const struct encaptab *pim_encap_cookie; + +#ifdef INET6 +/* ip6_mroute.c glue */ +extern struct in6_protosw in6_pim_protosw; +static const struct encaptab *pim6_encap_cookie; + +extern int X_ip6_mrouter_set(struct socket *, struct sockopt *); +extern int X_ip6_mrouter_get(struct socket *, struct sockopt *); +extern int X_ip6_mrouter_done(void); +extern int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); +extern int X_mrt6_ioctl(int, caddr_t); +#endif + static int pim_encapcheck(const struct mbuf *, int, int, void *); /* @@ -2737,7 +2758,7 @@ } /* - * pim_encapcheck() is called by the encap4_input() path at runtime to + * pim_encapcheck() is called by the encap[46]_input() path at runtime to * determine if a packet is for PIM; allowing PIM to be dynamically loaded * into the kernel. */ @@ -2995,6 +3016,10 @@ return; } +/* + * XXX: This is common code for dealing with initialization for both + * the IPv4 and IPv6 multicast forwarding paths. It could do with cleanup. + */ static int ip_mroute_modevent(module_t mod, int type, void *unused) { @@ -3006,6 +3031,7 @@ ip_mrouter_reset(); TUNABLE_ULONG_FETCH("net.inet.pim.squelch_wholepkt", &pim_squelch_wholepkt); + pim_encap_cookie = encap_attach_func(AF_INET, IPPROTO_PIM, pim_encapcheck, &in_pim_protosw, NULL); if (pim_encap_cookie == NULL) { @@ -3015,13 +3041,40 @@ mtx_destroy(&mrouter_mtx); return (EINVAL); } + +#ifdef INET6 + pim6_encap_cookie = encap_attach_func(AF_INET6, IPPROTO_PIM, + pim_encapcheck, (struct protosw *)&in6_pim_protosw, NULL); + if (pim6_encap_cookie == NULL) { + printf("ip_mroute: unable to attach pim6 encap\n"); + if (pim_encap_cookie) { + encap_detach(pim_encap_cookie); + pim_encap_cookie = NULL; + } + VIF_LOCK_DESTROY(); + MFC_LOCK_DESTROY(); + mtx_destroy(&mrouter_mtx); + return (EINVAL); + } +#endif + ip_mcast_src = X_ip_mcast_src; ip_mforward = X_ip_mforward; ip_mrouter_done = X_ip_mrouter_done; ip_mrouter_get = X_ip_mrouter_get; ip_mrouter_set = X_ip_mrouter_set; + +#ifdef INET6 + ip6_mforward = X_ip6_mforward; + ip6_mrouter_done = X_ip6_mrouter_done; + ip6_mrouter_get = X_ip6_mrouter_get; + ip6_mrouter_set = X_ip6_mrouter_set; + mrt6_ioctl = X_mrt6_ioctl; +#endif + ip_rsvp_force_done = X_ip_rsvp_force_done; ip_rsvp_vif = X_ip_rsvp_vif; + legal_vif_num = X_legal_vif_num; mrt_ioctl = X_mrt_ioctl; rsvp_input_p = X_rsvp_input; @@ -3036,29 +3089,49 @@ * just loaded and then unloaded w/o starting up a user * process we still need to cleanup. */ - if (ip_mrouter) + if (ip_mrouter +#ifdef INET6 + || ip6_mrouter +#endif + ) return EINVAL; +#ifdef INET6 + if (pim6_encap_cookie) { + encap_detach(pim6_encap_cookie); + pim6_encap_cookie = NULL; + } + X_ip6_mrouter_done(); + ip6_mforward = NULL; + ip6_mrouter_done = NULL; + ip6_mrouter_get = NULL; + ip6_mrouter_set = NULL; + mrt6_ioctl = NULL; +#endif + if (pim_encap_cookie) { encap_detach(pim_encap_cookie); pim_encap_cookie = NULL; } - X_ip_mrouter_done(); ip_mcast_src = NULL; ip_mforward = NULL; ip_mrouter_done = NULL; ip_mrouter_get = NULL; ip_mrouter_set = NULL; + ip_rsvp_force_done = NULL; ip_rsvp_vif = NULL; + legal_vif_num = NULL; mrt_ioctl = NULL; rsvp_input_p = NULL; + VIF_LOCK_DESTROY(); MFC_LOCK_DESTROY(); mtx_destroy(&mrouter_mtx); break; + default: return EOPNOTSUPP; } ==== //depot/projects/linuxolator/src/sys/netinet6/in6.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.c,v 1.67 2006/12/16 14:15:31 bz Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.c,v 1.68 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /*- @@ -334,7 +334,7 @@ switch (cmd) { case SIOCGETSGCNT_IN6: case SIOCGETMIFCNT_IN6: - return (mrt6_ioctl(cmd, data)); + return (mrt6_ioctl ? mrt6_ioctl(cmd, data) : EOPNOTSUPP); } switch(cmd) { ==== //depot/projects/linuxolator/src/sys/netinet6/in6_proto.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.40 2006/11/03 15:23:15 rrs Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.41 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */ /*- @@ -335,7 +335,7 @@ .pr_domain = &inet6domain, .pr_protocol = IPPROTO_PIM, .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, - .pr_input = pim6_input, + .pr_input = encap6_input, .pr_output = rip6_output, .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs ==== //depot/projects/linuxolator/src/sys/netinet6/ip6_input.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.89 2006/12/12 12:17:57 bz Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.90 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /*- @@ -696,7 +696,8 @@ * ip6_mforward() returns a non-zero value, the packet * must be discarded, else it may be accepted below. */ - if (ip6_mrouter && ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) { + if (ip6_mrouter && ip6_mforward && + ip6_mforward(ip6, m->m_pkthdr.rcvif, m)) { ip6stat.ip6s_cantforward++; m_freem(m); return; ==== //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.39 2006/12/12 12:17:57 bz Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.40 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $ */ /*- @@ -96,6 +96,7 @@ #include #include #include +#include #include #include #include @@ -114,6 +115,7 @@ #include #include #include +#include #include #include @@ -130,6 +132,18 @@ static int register_send __P((struct ip6_hdr *, struct mif6 *, struct mbuf *)); +extern struct domain inet6domain; +struct ip6protosw in6_pim_protosw = { + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_PIM, + .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, + .pr_input = pim6_input, + .pr_output = rip6_output, + .pr_ctloutput = rip6_ctloutput, + .pr_usrreqs = &rip6_usrreqs +}; + /* * Globals. All but ip6_mrouter, ip6_mrtproto and mrt6stat could be static, * except for netstat or debugging purposes. @@ -137,14 +151,32 @@ struct socket *ip6_mrouter = NULL; int ip6_mrouter_ver = 0; int ip6_mrtproto = IPPROTO_PIM; /* for netstat only */ + +SYSCTL_DECL(_net_inet6); +SYSCTL_DECL(_net_inet6_ip6); +SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); + struct mrt6stat mrt6stat; +SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW, + &mrt6stat, mrt6stat, + "Multicast Routing Statistics (struct mrt6stat, netinet6/ip6_mroute.h)"); #define NO_RTE_FOUND 0x1 #define RTE_FOUND 0x2 struct mf6c *mf6ctable[MF6CTBLSIZ]; +SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mf6ctable, CTLFLAG_RD, + &mf6ctable, sizeof(mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]", + "Multicast Forwarding Table (struct *mf6ctable[MF6CTBLSIZ], " + "netinet6/ip6_mroute.h)"); + u_char n6expire[MF6CTBLSIZ]; + static struct mif6 mif6table[MAXMIFS]; +SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mif6table, CTLFLAG_RD, + &mif6table, sizeof(mif6table), "S,vif[MAXMIFS]", + "Multicast Interfaces (struct mif[MAXMIFS], netinet6/ip6_mroute.h)"); + #ifdef MRT6DEBUG u_int mrt6debug = 0; /* debug level */ #define DEBUG_MFC 0x02 @@ -187,6 +219,10 @@ static mifi_t reg_mif_num = (mifi_t)-1; static struct pim6stat pim6stat; +SYSCTL_STRUCT(_net_inet6_pim, PIM6CTL_STATS, stats, CTLFLAG_RD, + &pim6stat, pim6stat, + "PIM Statistics (struct pim6stat, netinet6/pim_var.h)"); + static int pim6; /* @@ -261,13 +297,17 @@ static struct callout expire_upcalls_ch; +int X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m); +int X_ip6_mrouter_done(void); +int X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt); +int X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt); +int X_mrt6_ioctl(int cmd, caddr_t data); + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ int -ip6_mrouter_set(so, sopt) - struct socket *so; - struct sockopt *sopt; +X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) { int error = 0; int optval; @@ -290,7 +330,7 @@ error = ip6_mrouter_init(so, optval, sopt->sopt_name); break; case MRT6_DONE: - error = ip6_mrouter_done(); + error = X_ip6_mrouter_done(); break; case MRT6_ADD_MIF: error = sooptcopyin(sopt, &mifc, sizeof(mifc), sizeof(mifc)); @@ -335,9 +375,7 @@ * Handle MRT getsockopt commands */ int -ip6_mrouter_get(so, sopt) - struct socket *so; - struct sockopt *sopt; +X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt) { int error = 0; @@ -356,9 +394,7 @@ * Handle ioctl commands to obtain information from the cache */ int -mrt6_ioctl(cmd, data) - int cmd; - caddr_t data; +X_mrt6_ioctl(int cmd, caddr_t data) { switch (cmd) { case SIOCGETSGCNT_IN6: @@ -478,7 +514,7 @@ * Disable multicast routing */ int -ip6_mrouter_done() +X_ip6_mrouter_done(void) { mifi_t mifi; int i; @@ -993,10 +1029,7 @@ */ int -ip6_mforward(ip6, ifp, m) - struct ip6_hdr *ip6; - struct ifnet *ifp; - struct mbuf *m; +X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) { struct mf6c *rt; struct mif6 *mifp; ==== //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.9 2006/09/29 16:16:41 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.10 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $ */ /*- @@ -268,10 +268,10 @@ #define MAX_UPQ6 4 /* max. no of pkts in upcall Q */ -int ip6_mrouter_set __P((struct socket *so, struct sockopt *sopt)); -int ip6_mrouter_get __P((struct socket *so, struct sockopt *sopt)); -int ip6_mrouter_done __P((void)); -int mrt6_ioctl __P((int, caddr_t)); +extern int (*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt); +extern int (*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt); +extern int (*ip6_mrouter_done)(void); +extern int (*mrt6_ioctl)(int, caddr_t); #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_MROUTE_H_ */ ==== //depot/projects/linuxolator/src/sys/netinet6/ip6_var.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_var.h,v 1.36 2005/10/21 15:45:13 suz Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_var.h,v 1.37 2007/02/24 11:38:47 bms Exp $ */ /* $KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $ */ /*- @@ -353,7 +353,9 @@ struct ip6aux *ip6_findaux __P((struct mbuf *)); void ip6_delaux __P((struct mbuf *)); -int ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *)); +extern int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, + struct mbuf *); + int ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *, u_int32_t *)); void ip6_savecontrol __P((struct inpcb *, struct mbuf *, struct mbuf **)); ==== //depot/projects/linuxolator/src/sys/netinet6/raw_ip6.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.64 2006/07/21 17:11:14 rwatson Exp $ + * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.65 2007/02/24 11:38:47 bms Exp $ */ /*- @@ -122,6 +122,18 @@ struct rip6stat rip6stat; /* + * Hooks for multicast forwarding. + */ + +struct socket *ip6_mrouter; + +int (*ip6_mrouter_set)(struct socket *, struct sockopt *); +int (*ip6_mrouter_get)(struct socket *, struct sockopt *); +int (*ip6_mrouter_done)(void); +int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *); +int (*mrt6_ioctl)(int, caddr_t); + +/* * Setup generic address and protocol structures * for raw_input routine, then pass them along with * mbuf chain. @@ -507,7 +519,8 @@ case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: - error = ip6_mrouter_get(so, sopt); + error = ip6_mrouter_get ? ip6_mrouter_get(so, sopt) : + EOPNOTSUPP; break; case IPV6_CHECKSUM: error = ip6_raw_ctloutput(so, sopt); @@ -527,7 +540,8 @@ case MRT6_ADD_MFC: case MRT6_DEL_MFC: case MRT6_PIM: - error = ip6_mrouter_set(so, sopt); + error = ip6_mrouter_set ? ip6_mrouter_set(so, sopt) : + EOPNOTSUPP; break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 24 18:05:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 526D316A410; Sat, 24 Feb 2007 18:05:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2436F16A405; Sat, 24 Feb 2007 18:05:12 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14]) by mx1.freebsd.org (Postfix) with ESMTP id A0B5913C4CE; Sat, 24 Feb 2007 18:05:11 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.8/8.13.7) with ESMTP id l1OI5Apq094307 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 24 Feb 2007 19:05:10 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l1OI5AHU094306; Sat, 24 Feb 2007 19:05:10 +0100 (CET) Date: Sat, 24 Feb 2007 19:05:10 +0100 From: Divacky Roman To: Alexander Leidinger Message-ID: <20070224180510.GA94176@stud.fit.vutbr.cz> References: <200702241618.l1OGISVs059862@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200702241618.l1OGISVs059862@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114975 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, 24 Feb 2007 18:05:12 -0000 On Sat, Feb 24, 2007 at 04:18:28PM +0000, Alexander Leidinger wrote: > http://perforce.freebsd.org/chv.cgi?CH=114975 > > Change 114975 by netchild@netchild_magellan on 2007/02/24 16:18:14 > > - Split out the linux aio stuff into its own module. > - Let the linker find the symbols itself instead of guessing the > location. > > Submitted by: Li, Xiao > > My modifications based upon his submission: > - Some files.* + NOTES glue to be able to compile this stuff into > the kernel (the files.* stuff is underdocumented, reviews welcome). > - amd64 part > - aio compilation fixes for non-linux kernel parts > > TODO: > - run test this stuff (i386 + amd64) > - review the complete linuxaio code this looks good. what remains to do before this can be commited to cvs? From owner-p4-projects@FreeBSD.ORG Sat Feb 24 19:17:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77F5D16A401; Sat, 24 Feb 2007 19:17:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 390EA16A403 for ; Sat, 24 Feb 2007 19:17:41 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id EC12513C461 for ; Sat, 24 Feb 2007 19:17:40 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from outgoing.leidinger.net (p54A5F3ED.dip.t-dialin.net [84.165.243.237]) by redbull.bpaserver.net (Postfix) with ESMTP id DDFEC2E12B; Sat, 24 Feb 2007 20:00:46 +0100 (CET) Received: from Magellan.Leidinger.net (Magellan.Leidinger.net [192.168.1.1]) by outgoing.leidinger.net (Postfix) with ESMTP id 2BD175B4817; Sat, 24 Feb 2007 20:00:44 +0100 (CET) Date: Sat, 24 Feb 2007 20:00:43 +0100 From: Alexander Leidinger To: Divacky Roman Message-ID: <20070224200043.29357421@Magellan.Leidinger.net> In-Reply-To: <20070224180510.GA94176@stud.fit.vutbr.cz> References: <200702241618.l1OGISVs059862@repoman.freebsd.org> <20070224180510.GA94176@stud.fit.vutbr.cz> Organization: FreeBSD X-Mailer: Claws Mail 2.7.2 (GTK+ 2.10.9; i686-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.764, required 8, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14, SARE_FROM_SPAM_WORD3 0.10) X-BPAnet-MailScanner-From: netchild@freebsd.org X-Spam-Status: No Cc: Perforce Change Reviews Subject: Re: PERFORCE change 114975 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, 24 Feb 2007 19:17:41 -0000 Quoting Divacky Roman (Sat, 24 Feb 2007 19:05:10 +0100): > On Sat, Feb 24, 2007 at 04:18:28PM +0000, Alexander Leidinger wrote: > > http://perforce.freebsd.org/chv.cgi?CH=114975 > > > > Change 114975 by netchild@netchild_magellan on 2007/02/24 16:18:14 > > > > - Split out the linux aio stuff into its own module. > > - Let the linker find the symbols itself instead of guessing the > > location. > > > > Submitted by: Li, Xiao > > > > My modifications based upon his submission: > > - Some files.* + NOTES glue to be able to compile this stuff into > > the kernel (the files.* stuff is underdocumented, reviews welcome). > > - amd64 part > > - aio compilation fixes for non-linux kernel parts > > > > TODO: > > - run test this stuff (i386 + amd64) > > - review the complete linuxaio code > > this looks good. what remains to do before this can be commited to cvs? Except what is listed in the TODO: a review by another commiter. Bye, Alexander. -- ...and that is how we know the Earth to be banana-shaped. http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Sat Feb 24 20:03:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A36A16A405; Sat, 24 Feb 2007 20:03:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 549A416A400 for ; Sat, 24 Feb 2007 20:03:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 44C9213C467 for ; Sat, 24 Feb 2007 20:03:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OK3Olp009706 for ; Sat, 24 Feb 2007 20:03:24 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OK3N8J009703 for perforce@freebsd.org; Sat, 24 Feb 2007 20:03:23 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 24 Feb 2007 20:03:23 GMT Message-Id: <200702242003.l1OK3N8J009703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114990 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, 24 Feb 2007 20:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=114990 Change 114990 by mjacob@mjexp on 2007/02/24 20:02:27 Implemnentation of about 2/3 of the changes recommened by Pavel's review. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#13 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#13 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -51,9 +52,19 @@ SYSCTL_UINT(_kern_geom_multipath, OID_AUTO, debug, CTLFLAG_RW, &g_multipath_debug, 0, "Debug level"); +static enum { + GKT_NIL, + GKT_RUN, + GKT_DIE +} g_multipath_kt_state; +static struct bio_queue_head gmtbq; +static struct mtx gmtbq_mtx; + static void g_multipath_orphan(struct g_consumer *); static void g_multipath_start(struct bio *); static void g_multipath_done(struct bio *); +static void g_multipath_done_error(struct bio *); +static void g_multipath_kt(void *); static int g_multipath_destroy(struct g_geom *); static int @@ -61,13 +72,17 @@ static g_taste_t g_multipath_taste; static g_ctl_req_t g_multipath_config; +static g_init_t g_multipath_init; +static g_fini_t g_multipath_fini; struct g_class g_multipath_class = { - .name = G_MULTIPATH_CLASS_NAME, - .version = G_VERSION, - .ctlreq = g_multipath_config, - .taste = g_multipath_taste, - .destroy_geom = g_multipath_destroy_geom + .name = G_MULTIPATH_CLASS_NAME, + .version = G_VERSION, + .ctlreq = g_multipath_config, + .taste = g_multipath_taste, + .destroy_geom = g_multipath_destroy_geom, + .init = g_multipath_init, + .fini = g_multipath_fini }; #define MP_BAD 0x1 @@ -130,73 +145,98 @@ static void g_multipath_done(struct bio *bp) { + if (bp->bio_error == ENXIO || bp->bio_error == EIO) { + mtx_lock(&gmtbq_mtx); + bioq_insert_tail(&gmtbq, bp); + wakeup(&g_multipath_kt_state); + mtx_unlock(&gmtbq_mtx); + } else { + g_std_done(bp); + } +} + +static void +g_multipath_done_error(struct bio *bp) +{ struct bio *pbp = bp->bio_parent; struct g_geom *gp = pbp->bio_to->geom; struct g_multipath_softc *sc = gp->softc; - int dofail; + struct g_consumer *cp = bp->bio_from; + struct g_provider *pp = cp->provider; - KASSERT(sc != NULL, ("NULL sc")); + /* + * If we had a failure, we have to check first to see + * whether the consumer it failed on was the currently + * active consumer (i.e., this is the first in perhaps + * a number of failures). If so, we then switch consumers + * to the next available consumer. + */ - if (bp->bio_error == ENXIO || bp->bio_error == EIO) { - dofail = 1; - } else { - dofail = 0; + g_topology_lock(); + cp->index |= MP_BAD; + if (cp->nend == cp->nstart && pp->nend == pp->nstart) { + cp->index |= MP_POSTED; + g_post_event(g_mpd, cp, M_NOWAIT, NULL); } - - if (dofail) { - struct g_consumer *cp = bp->bio_from; + if (cp == sc->cp_active) { struct g_consumer *lcp; - struct g_provider *pp = cp->provider; - - /* - * If we had a failure, we have to check first to see - * whether the consumer it failed on was the currently - * active consumer (i.e., this is the first in perhaps - * a number of failures). If so, we then switch consumers - * to the next available consumer. - */ - g_topology_lock(); - cp->index |= MP_BAD; - if (cp->nend == cp->nstart && pp->nend == pp->nstart) { - cp->index |= MP_POSTED; - g_post_event(g_mpd, cp, M_NOWAIT, NULL); + printf("GEOM_MULTIPATH: %s failed in %s\n", + pp->name, sc->sc_name); + sc->cp_active = NULL; + LIST_FOREACH(lcp, &gp->consumer, consumer) { + if ((lcp->index & MP_BAD) == 0) { + sc->cp_active = lcp; + break; + } } - if (cp == sc->cp_active) { - printf("GEOM_MULTIPATH: %s failed in %s\n", - pp->name, sc->sc_name); - sc->cp_active = NULL; - LIST_FOREACH(lcp, &gp->consumer, consumer) { - if ((lcp->index & MP_BAD) == 0) { - sc->cp_active = lcp; - break; - } - } - if (sc->cp_active == NULL) { - printf("GEOM_MULTIPATH: out of providers\n"); - g_topology_unlock(); - goto out; - } + if (sc->cp_active == NULL) { + printf("GEOM_MULTIPATH: out of providers for %s\n", + sc->sc_name); + return; + } else { printf("GEOM_MULTIPATH: %s now active path in %s\n", sc->cp_active->provider->name, sc->sc_name); } - g_topology_unlock(); + } + g_topology_unlock(); + + /* + * If we can fruitfully restart the I/O, do so. + */ + if (sc->cp_active) { + g_destroy_bio(bp); + pbp->bio_children--; + g_multipath_start(pbp); + } else { + g_std_done(bp); + } +} - /* - * If we can fruitfully restart the I/O, do so. - */ - if (sc->cp_active) { - g_destroy_bio(bp); - pbp->bio_children--; - g_multipath_start(pbp); - return; +static void +g_multipath_kt(void *arg) +{ + g_multipath_kt_state = GKT_RUN; + mtx_lock(&gmtbq_mtx); + while (g_multipath_kt_state == GKT_RUN) { + for (;;) { + struct bio *bp; + bp = bioq_takefirst(&gmtbq); + if (bp == NULL) { + break; + } + mtx_unlock(&gmtbq_mtx); + g_multipath_done_error(bp); + mtx_lock(&gmtbq_mtx); } + msleep(&g_multipath_kt_state, &gmtbq_mtx,PRIBIO, + "gkt:wait", hz / 10); } -out: - g_std_done(bp); + mtx_unlock(&gmtbq_mtx); + wakeup(&g_multipath_kt_state); + kthread_exit(0); } - static int g_multipath_access(struct g_provider *pp, int dr, int dw, int de) { @@ -231,7 +271,6 @@ struct g_multipath_softc *sc; struct g_geom *gp; struct g_provider *pp; - char name[64]; g_topology_assert(); @@ -260,16 +299,15 @@ memcpy(sc->sc_uuid, md->md_uuid, sizeof (sc->sc_uuid)); memcpy(sc->sc_name, md->md_name, sizeof (sc->sc_name)); - snprintf(name, sizeof(name), "multipath/%s", md->md_name); - pp = g_new_providerf(gp, name); + pp = g_new_providerf(gp, "multipath/%s", md->md_name); if (pp == NULL) { goto fail; } /* limit the provider to not have it stomp on metadata */ pp->mediasize = md->md_size - md->md_sectorsize; pp->sectorsize = md->md_sectorsize; + sc->pp = pp; g_error_provider(pp, 0); - sc->pp = pp; return (gp); fail: if (gp != NULL) { @@ -288,6 +326,8 @@ struct g_consumer *cp, *nxtcp; int error; + g_topology_assert(); + sc = gp->softc; KASSERT(sc, ("no softc")); @@ -311,7 +351,8 @@ } error = g_attach(cp, pp); if (error != 0) { - printf("cannot attach %s to %s", pp->name, sc->sc_name); + printf("GEOM_MULTIPATH: cannot attach %s to %s", + pp->name, sc->sc_name); g_destroy_consumer(cp); return (error); } @@ -369,6 +410,29 @@ return (g_multipath_destroy(gp)); } +static void +g_multipath_init(struct g_class *mp) +{ + bioq_init(&gmtbq); + mtx_init(&gmtbq_mtx, "gmtbq", NULL, MTX_DEF); + if (kthread_create(g_multipath_kt, mp, NULL, 0, 0, "g_mp_kt") == 0) { + g_multipath_kt_state = GKT_RUN; + } +} + +static void +g_multipath_fini(struct g_class *mp) +{ + if (g_multipath_kt_state == GKT_RUN) { + mtx_lock(&gmtbq_mtx); + g_multipath_kt_state = GKT_DIE; + wakeup(&g_multipath_kt_state); + msleep(&g_multipath_kt_state, &gmtbq_mtx, PRIBIO, + "gmp:fini", 0); + mtx_unlock(&gmtbq_mtx); + } +} + static int g_multipath_read_metadata(struct g_consumer *cp, struct g_multipath_metadata *md) @@ -602,9 +666,9 @@ return; } if (pp0->mediasize != pp1->mediasize) { - gctl_error(req, "Provider %s is %zu; Provider %s is %zu", - pp0->name, (size_t) pp0->mediasize, - pp1->name, (size_t) pp1->mediasize); + gctl_error(req, "Provider %s is %jd; Provider %s is %jd", + pp0->name, (intmax_t) pp0->mediasize, + pp1->name, (intmax_t) pp1->mediasize); return; } if (pp0->sectorsize != pp1->sectorsize) { From owner-p4-projects@FreeBSD.ORG Sat Feb 24 20:13:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6524116A404; Sat, 24 Feb 2007 20:13:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 188F016A402 for ; Sat, 24 Feb 2007 20:13:47 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 07D7713C461 for ; Sat, 24 Feb 2007 20:13:47 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OKDl4x011175 for ; Sat, 24 Feb 2007 20:13:47 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OKDbNq011158 for perforce@freebsd.org; Sat, 24 Feb 2007 20:13:37 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 24 Feb 2007 20:13:37 GMT Message-Id: <200702242013.l1OKDbNq011158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 114991 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, 24 Feb 2007 20:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=114991 Change 114991 by mjacob@mjexp on 2007/02/24 20:12:48 IFC Affected files ... .. //depot/projects/mjexp/UPDATING#8 integrate .. //depot/projects/mjexp/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/mjexp/etc/periodic/weekly/310.locate#2 integrate .. //depot/projects/mjexp/share/man/man4/ppbus.4#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#9 integrate .. //depot/projects/mjexp/share/man/man9/sleep.9#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/mjexp/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/mjexp/sys/arm/arm/intr.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/mjexp/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/mjexp/sys/arm/include/intr.h#2 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/mjexp/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#9 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/mjexp/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/mjexp/sys/conf/files#13 integrate .. //depot/projects/mjexp/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/mjexp/sys/dev/aac/aac.c#3 integrate .. //depot/projects/mjexp/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/mjexp/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/mjexp/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/mjexp/sys/dev/amd/amd.c#5 integrate .. //depot/projects/mjexp/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/mjexp/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/asr/asr.c#5 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/mjexp/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/mjexp/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/mjexp/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/mjexp/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/mjexp/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/mjexp/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/mjexp/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/mjexp/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/mjexp/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/mjexp/sys/dev/cy/cy.c#2 integrate .. //depot/projects/mjexp/sys/dev/cy/cy_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/mjexp/sys/dev/de/if_de.c#2 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/mjexp/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.c#4 integrate .. //depot/projects/mjexp/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/mjexp/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/mjexp/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/exca/exca.c#3 integrate .. //depot/projects/mjexp/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/mjexp/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/mjexp/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/mjexp/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/mjexp/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/mjexp/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/mjexp/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/mjexp/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/mjexp/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#5 integrate .. //depot/projects/mjexp/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#14 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/mjexp/sys/dev/isp/ispreg.h#4 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/mjexp/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/mjexp/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/mjexp/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/mjexp/sys/dev/mly/mly.c#5 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/mjexp/sys/dev/mse/mse.c#2 integrate .. //depot/projects/mjexp/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/mjexp/sys/dev/my/if_my.c#3 integrate .. //depot/projects/mjexp/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/mjexp/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/mjexp/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/mjexp/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/mjexp/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/mjexp/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/mjexp/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/mjexp/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/mjexp/sys/dev/puc/puc.c#2 integrate .. //depot/projects/mjexp/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/mjexp/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/mjexp/sys/dev/rc/rc.c#2 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#7 integrate .. //depot/projects/mjexp/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/mjexp/sys/dev/safe/safe.c#2 integrate .. //depot/projects/mjexp/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/mjexp/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/mjexp/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/mjexp/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/sio/sio.c#2 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/mjexp/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/mjexp/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/mjexp/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/mjexp/sys/dev/stg/tmc18c30_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/mjexp/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/mjexp/sys/dev/trm/trm.c#5 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/mjexp/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/mjexp/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/mjexp/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/mjexp/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/mjexp/sys/dev/vx/if_vx_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/mjexp/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/mjexp/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/mjexp/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/mjexp/sys/geom/geom_dev.c#2 integrate .. //depot/projects/mjexp/sys/geom/geom_io.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#6 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#5 integrate .. //depot/projects/mjexp/sys/i386/isa/isa.c#2 integrate .. //depot/projects/mjexp/sys/i386/isa/npx.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#7 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_isa.c#2 integrate .. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/mjexp/sys/ia64/include/intr.h#2 integrate .. //depot/projects/mjexp/sys/ia64/isa/isa.c#2 integrate .. //depot/projects/mjexp/sys/isa/isa_common.h#2 integrate .. //depot/projects/mjexp/sys/kern/bus_if.m#2 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_linker.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#7 integrate .. //depot/projects/mjexp/sys/kern/subr_bus.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_rman.c#3 integrate .. //depot/projects/mjexp/sys/modules/ip_mroute_mod/Makefile#3 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#6 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/mjexp/sys/netinet6/in6.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/mjexp/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/mjexp/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/mjexp/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/mjexp/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_mn.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_pcn.c#4 integrate .. //depot/projects/mjexp/sys/pci/if_rl.c#5 integrate .. //depot/projects/mjexp/sys/pci/if_sf.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_sis.c#4 integrate .. //depot/projects/mjexp/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/mjexp/sys/pci/if_ste.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_tl.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_vr.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_wb.c#2 integrate .. //depot/projects/mjexp/sys/pci/if_xl.c#3 integrate .. //depot/projects/mjexp/sys/pci/intpm.c#3 integrate .. //depot/projects/mjexp/sys/pci/ncr.c#4 integrate .. //depot/projects/mjexp/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/mjexp/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/mjexp/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_none/mac_none.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/mjexp/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/mjexp/sys/sys/bus.h#2 integrate .. //depot/projects/mjexp/sys/sys/interrupt.h#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#9 integrate .. //depot/projects/mjexp/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/mjexp/sys/sys/systm.h#7 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/mjexp/usr.bin/tip/tip/value.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bluetooth/sdpd/server.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/mjexp/UPDATING#8 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070224: + The IPv6 multicast forwarding code may now be loaded into GENERIC + kernels by loading the ip_mroute.ko module. + The module build heeds the MK_INET6_SUPPORT make.conf option; it + may be set to "no" to omit building the IPv6 support. + 20070218: The following build error may appear when upgrading from an old -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage): @@ -743,4 +749,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $ +$FreeBSD: src/UPDATING,v 1.475 2007/02/24 11:41:05 bms Exp $ ==== //depot/projects/mjexp/etc/periodic/security/800.loginfail#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/mjexp/etc/periodic/weekly/310.locate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $ +# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $ # # If there is a global system configuration file, suck it in. @@ -23,7 +23,7 @@ chmod 644 $locdb || rc=3 cd / - echo /usr/libexec/locate.updatedb | nice -5 su -fm nobody || rc=3 + echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3 chmod 444 $locdb || rc=3;; *) rc=0;; ==== //depot/projects/mjexp/share/man/man4/ppbus.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/ppbus.4,v 1.23 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.24 2007/02/23 16:50:17 schweikh Exp $ .\" .Dd March 1, 1998 .Dt PPBUS 4 @@ -281,7 +281,7 @@ one, current and available modes are separated. .Pp With this level of abstraction a particular chipset may commute from any -native mode the any other mode emulated with extended modes without +native mode to any other mode emulated with extended modes without disturbing upper layers. For example, most chipsets support NIBBLE mode as native and emulated with ECP and/or EPP. @@ -307,7 +307,7 @@ returned each time the driver requests the ppbus. .Ss Bus allocation and interrupts ppbus allocation is mandatory not to corrupt I/O of other devices. -An other +Another usage of ppbus allocation is to reserve the port and receive incoming interrupts. .Pp ==== //depot/projects/mjexp/share/man/man9/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.292 2007/02/16 14:27:59 pjd Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.293 2007/02/23 16:22:09 jhb Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -997,6 +997,7 @@ signal.9 trapsignal.9 MLINKS+=sleep.9 msleep.9 \ sleep.9 msleep_spin.9 \ + sleep.9 pause.9 \ sleep.9 tsleep.9 \ sleep.9 wakeup.9 \ sleep.9 wakeup_one.9 ==== //depot/projects/mjexp/share/man/man9/sleep.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (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/sleep.9,v 1.49 2006/09/18 15:24:20 ru Exp $ +.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.50 2007/02/23 16:22:09 jhb Exp $ .\" .Dd April 17, 2006 .Os @@ -31,6 +31,7 @@ .Sh NAME .Nm msleep , .Nm msleep_spin , +.Nm pause , .Nm tsleep , .Nm wakeup .Nd wait for events @@ -39,12 +40,14 @@ .In sys/systm.h .In sys/proc.h .Ft int -.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo" -.Ft int .Fn msleep "void *chan" "struct mtx *mtx" "int priority" "const char *wmesg" "int timo" .Ft int .Fn msleep_spin "void *chan" "struct mtx *mtx" "const char *wmesg" "int timo" .Ft void +.Fn pause "const char *wmesg" "int timo" +.Ft int +.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo" +.Ft void .Fn wakeup "void *chan" .Ft void .Fn wakeup_one "void *chan" @@ -53,6 +56,7 @@ .Fn tsleep , .Fn msleep , .Fn msleep_spin , +.Fn pause , .Fn wakeup , and .Fn wakeup_one @@ -61,12 +65,13 @@ external event, it is put to sleep by .Fn tsleep , .Fn msleep , +.Fn msleep_spin , or -.Fn msleep_spin . +.Fn pause . The parameter .Fa chan is an arbitrary address that uniquely identifies the event on which -the thread is being asleep. +the thread is being put to sleep. All threads sleeping on a single .Fa chan are woken up later by @@ -184,6 +189,16 @@ and .Dv PCATCH flags. +.Pp +The +.Fn pause +function is a wrapper around +.Fn tsleep +that suspends execution of the current thread for the indicated timeout. +The thread can not be awakened early by signals or calls to +.Fn wakeup +or +.Fn wakeup_one. .Sh RETURN VALUES See above. .Sh SEE ALSO @@ -211,6 +226,10 @@ and the .Fn msleep_spin function appeared in +.Fx 6.2 . +.The +.Fn pause +function appeared in .Fx 7.0 . .Pp The ==== //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.29 2007/02/23 20:03:23 jhb Exp $ */ /* @@ -158,8 +158,8 @@ } int -intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -167,8 +167,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, handler, arg, - intr_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, filter, handler, + arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); mtx_lock_spin(&intr_table_lock); @@ -266,17 +266,17 @@ thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + if (ih->ih_filter == NULL) { thread = 1; continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? frame : + ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_handler(frame); + ih->ih_filter(frame); else - ih->ih_handler(ih->ih_argument); + ih->ih_filter(ih->ih_argument); } /* ==== //depot/projects/mjexp/sys/amd64/amd64/nexus.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.73 2007/02/23 12:18:25 piso Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -95,7 +95,8 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, + void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -417,7 +418,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { int error; @@ -437,7 +439,7 @@ return (error); error = intr_add_handler(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep); + rman_get_start(irq), filter, ihand, arg, flags, cookiep); return (error); } ==== //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#6 (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/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.15 2007/02/23 12:18:26 piso Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -135,8 +135,9 @@ #else #define intr_add_cpu(apic_id) #endif -int intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep); +int intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/mjexp/sys/amd64/isa/clock.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); /* * Routines to handle clock hardware. @@ -140,7 +140,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -157,6 +157,7 @@ } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + return (FILTER_HANDLED); } int @@ -211,11 +212,13 @@ * Stat clock ticks can still be lost, causing minor loss of accuracy * in the statistics, but the stat clock will no longer stop. */ -static void +static int rtcintr(struct trapframe *frame) { + int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { + flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -224,6 +227,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } + return(flag ? FILTER_HANDLED : FILTER_STRAY); } #include "opt_ddb.h" @@ -758,8 +762,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, + INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -792,8 +796,8 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + INTR_TYPE_CLK, NULL); writertc(RTC_STATUSB, rtc_statusb); rtcin(RTC_INTR); ==== //depot/projects/mjexp/sys/amd64/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.148 2005/01/21 05:56:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.149 2007/02/23 12:18:26 piso Exp $"); /*- * Modifications for Intel architecture by Garrett A. Wollman. @@ -147,10 +147,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/mjexp/sys/amd64/linux32/linux.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * (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/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -783,7 +783,7 @@ /* * macros which does the same thing as those in linux include/asm-um/ldt-i386.h - * these convert linux user-space descriptor to machine one + * these convert linux user space descriptor to machine one */ #define LDT_entry_a(info) \ ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) ==== //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.34 2007/02/24 16:49:24 netchild Exp $"); #include #include @@ -568,8 +568,8 @@ /* * XXX: in linux sharing of fs info (chroot/cwd/umask) * and open files is independant. in fbsd its in one - * structure but in reality it doesnt make any problems - * because both this flags are set at once usually. + * structure but in reality it doesn't cause any problems + * because both of these flags are usually set together. */ if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; @@ -579,7 +579,7 @@ * kernel threads. Unfortunately despite the existence of the * CLONE_THREAD flag, version of linuxthreads package used in * most popular distros as of beginning of 2005 doesn't make - * any use of it. Therefore, this detection relay fully on + * any use of it. Therefore, this detection relies on * empirical observation that linuxthreads sets certain * combination of flags, so that we can make more or less * precise detection and notify the FreeBSD kernel that several @@ -833,7 +833,7 @@ * Our mmap with MAP_STACK takes addr as the maximum * downsize limit on BOS, and as len the max size of * the region. It them maps the top SGROWSIZ bytes, - * and autgrows the region down, up to the limit + * and auto grows the region down, up to the limit * in addr. * * If we don't use the MAP_STACK option, the effect ==== //depot/projects/mjexp/sys/arm/arm/intr.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.14 2007/02/23 12:18:27 piso Exp $"); #include #include #include @@ -58,8 +58,8 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, - int irq, int flags, void **cookiep) +arm_setup_irqhandler(const char *name, driver_filter_t *filt, + void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; int error; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); } @@ -118,10 +118,10 @@ /* Execute fast handlers. */ thread = 0; TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) + if (ih->ih_filter == NULL) thread = 1; else - ih->ih_handler(ih->ih_argument ? + ih->ih_filter(ih->ih_argument ? ih->ih_argument : frame); } ==== //depot/projects/mjexp/sys/arm/arm/nexus.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.10 2006/11/17 11:56:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -81,7 +81,7 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,13 +125,13 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int i; for (i = rman_get_start(res); i <= rman_get_end(res); i++) arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, i, flags, cookiep); + filt, intr, arg, i, flags, cookiep); return (0); } ==== //depot/projects/mjexp/sys/arm/at91/at91.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -543,14 +543,14 @@ static int at91_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { struct at91_softc *sc = device_get_softc(dev); if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); ==== //depot/projects/mjexp/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include #include @@ -192,7 +192,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_mci_intr, sc, &sc->intrhand); + NULL, at91_mci_intr, sc, &sc->intrhand); if (err) { AT91_MCI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/mjexp/sys/arm/at91/at91_pio.c#3 (text) ==== @@ -23,7 +23,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 24 20:16:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D5816A406; Sat, 24 Feb 2007 20:16:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69FB816A400 for ; Sat, 24 Feb 2007 20:16:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4424413C4A3 for ; Sat, 24 Feb 2007 20:16:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OKGp0D011692 for ; Sat, 24 Feb 2007 20:16:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OKGpDe011689 for perforce@freebsd.org; Sat, 24 Feb 2007 20:16:51 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 20:16:51 GMT Message-Id: <200702242016.l1OKGpDe011689@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 114992 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, 24 Feb 2007 20:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=114992 Change 114992 by sam@sam_ebb on 2007/02/24 20:16:23 oops, get the module name right Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#23 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#23 (text+ko) ==== @@ -242,7 +242,7 @@ return EINVAL; \ } \ static moduledata_t name##_mod = { \ - "wlan_##name", \ + "wlan_" #name, \ name##_modevent, \ 0 \ }; \ From owner-p4-projects@FreeBSD.ORG Sat Feb 24 22:44:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E86916A40B; Sat, 24 Feb 2007 22:44:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0A4E716A408 for ; Sat, 24 Feb 2007 22:44:59 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EF18013C47E for ; Sat, 24 Feb 2007 22:44:58 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1OMiwWD047952 for ; Sat, 24 Feb 2007 22:44:58 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1OMiwbM047949 for perforce@freebsd.org; Sat, 24 Feb 2007 22:44:58 GMT (envelope-from gabor@freebsd.org) Date: Sat, 24 Feb 2007 22:44:58 GMT Message-Id: <200702242244.l1OMiwbM047949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 114994 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, 24 Feb 2007 22:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=114994 Change 114994 by gabor@gabor_server on 2007/02/24 22:44:46 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#2 integrate .. //depot/projects/soc2006/gabor_destdir/COPYRIGHT#2 integrate .. //depot/projects/soc2006/gabor_destdir/GIDs#2 integrate .. //depot/projects/soc2006/gabor_destdir/KNOBS#2 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#2 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#2 integrate .. //depot/projects/soc2006/gabor_destdir/Makefile#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.local.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.lua.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.php.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.python.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.wx.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildenv#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/buildscript#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/clean-chroot#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/cleanup-chroots#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackages#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackagestats#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dosetupnode#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/flushsquid#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/makeduds#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/pdispatch#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/portbuild#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/processlogs#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/processonelog#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/reportload#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/chkversion.pl#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/rmport#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/tindex#2 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#2 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#2 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#2 (text+ko) ==== @@ -10,6 +10,51 @@ All ports committers are allowed to commit to this file. +20070130: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * DEPENDS variable was removed, please use other *_DEPENDS variables instead. + + * A new pkg-plist keyword is available, @stopdaemon. It will call forcestop + on all rc.subr scripts installed by the port on deinstall, efectively + stopping services on deinstall/upgrade. + + * rc.subr script suffix is now available in Makefile as RC_SUBR_SUFFIX. + + * New variable USE_CDRTOOLS was introduced. It replaced direct dependencies + on sysutils/cdrtools port. It now automatically support switching to + cdrtools-cjk port when user specified WITH_CJK. All ports were converted. + + * USE_DOS2UNIX, infrastructure for converting DOS to UNIX line feeds, was + enhanced by a new variable DOS2UNIX_REGEX. It allows to specify a find + -iregex parameter to limit touched files by file extensions. + + * Support for partially translated manpages was added. For examples of + usage, please refer to Porter's Handbook. + + * USE_TCL/USE_TK variables were changed to provide runtime dependency. New + variables USE_TCL_BUILD and USE_TK_BUILD were added. All unintuitive + quirks of these variables were fixed. + + * USE_LDCONFIG was fixed to work properly for ports, that specify @cwd in the + pkg-plists. + + * Old bsd.java.mk version 1.0 macros were removed. + + * New category: ports-mgmt + + * New virtual category: gnustep + + * Unused picobsd category was removed. + +20070118: +AUTHOR: maho@FreeBSD.org +We'd like to ask all ports maintainers, who are using Fortran77 (f77 in base), +to switch to Fortran90/95 (gfortran42, lang/gcc42). Please refer to +http://people.freebsd.org/~maho/gfortran/gfortran.html +for details. + 20061014: AUTHOR: gnome@FreeBSD.org The following changes have been introduced to the GNOME porting process @@ -1203,7 +1248,7 @@ Copyright information: -Copyright 2004 FreeBSD Foundation All Rights Reserved. +Copyright 2004-2007 FreeBSD Foundation All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this @@ -1227,4 +1272,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.62 2006/10/14 09:31:38 marcus Exp $ +$FreeBSD: ports/CHANGES,v 1.65 2007/01/31 14:07:23 pav Exp $ ==== //depot/projects/soc2006/gabor_destdir/COPYRIGHT#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: ports/COPYRIGHT,v 1.2 2006/01/15 22:11:50 erwin Exp $ +# $FreeBSD: ports/COPYRIGHT,v 1.3 2007/01/01 00:53:56 erwin Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as the FreeBSD Ports Collection is distributed under the following terms: -Copyright (C) 1994-2006 The FreeBSD Project. All rights reserved. +Copyright (C) 1994-2007 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/soc2006/gabor_destdir/GIDs#2 (text+ko) ==== @@ -1,5 +1,6 @@ -$FreeBSD: ports/GIDs,v 1.18 2006/11/16 08:58:31 alexbl Exp $ +$FreeBSD: ports/GIDs,v 1.28 2007/02/17 09:57:35 dinoex Exp $ # Please keep this file sorted by GID! +smmsp:*:25: bind:*:53: rdfdb:*:55: spamd:*:58: @@ -11,6 +12,7 @@ dialer:*:68: network:*:69: pgsql:*:70: +ircd:*:72: simscan:*:74: audit:*:77: virtuoso:*:79: @@ -47,20 +49,26 @@ _symon:*:115: smokeping:*:117: ircproxyd:*:118: +mythtv:*:119: +pdns:*:120 fetchmail:*:124 postfix:*:125: maildrop:*:126: vchat:*:128: _bgpd:*:130: _ospfd:*:131: +dovecot:*:143: rbldns:*:153: sfs:*:171: agk:*:172: polipo:*:173: +nagios:*:181: moinmoin:*:192: +cups:*:193: sympa:*:200: dspam:*:202: bs:*:220: +fcron:*:247: _tor:*:256: _dns-proxy-tor:*:257: _trans-proxy-tor:*:258: @@ -71,6 +79,7 @@ smx:*:264: haclient:*:275: mrtg:*:279: +_sphinx:*:312: dkfilter:*:325: wildfire:*:340: ldap:*:389: ==== //depot/projects/soc2006/gabor_destdir/KNOBS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.19 2006/10/09 18:51:50 alepulver Exp $ +# $FreeBSD: ports/KNOBS,v 1.20 2006/12/01 01:03:01 pav Exp $ # # Rules to adding knobs: # @@ -102,6 +102,7 @@ TREMOR Tremor (integer-only Vorbis) audio support UNIXODBC Use UNIXODBC as the ODBC driver VORBIS OGG/Vorbis audio support +WX wxWindows support X11 Support for X11 X264 H.264/AVC (MPEG4 part 10) multimedia codec XINE XINE multimedia support ==== //depot/projects/soc2006/gabor_destdir/LEGAL#2 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.509 2006/11/09 08:55:13 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.524 2007/02/20 21:47:23 nox Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -148,7 +148,6 @@ with fee diablo-latte-freebsd*-*-* java/diablo-jre15 License does not allow distribution with fee -dist10.tar.gz audio/mp3encode Condition is not clear divx4linux-*.tgz multimedia/linux-divx4linux4 Unsure of licensing issues divx4linux-*.tar.gz multimedia/linux-divx4linux Unsure of licensing issues djbdns* dns/djbdns No license -- see @@ -264,6 +263,8 @@ goPod-* misc/*gopod Unclear legal status in EU countries grande-KXL-*.tar.gz games/grande Possible copyright infringement graphviz-* graphics/graphviz Needs license before fetching + +groupoffice-com-* www/groupoffice Free for personal use only GTL-* misc/gtl Non-commercial use only, license forbids redistribution hcfmdm/* comms/hcfmdm No redistribution allowed @@ -357,7 +358,8 @@ jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted john-* security/john Crypto; export-controlled -jpgraph-* graphics/jpgraph Not for commercial use +jpgraph-1.* graphics/jpgraph Not for commercial use +jpgraph-2.* graphics/jpgraph2 Not for commercial use jre*i_ELF.*.tar.gz java/jre License does not allow distribution with fee jre118_v3-glibc-* java/linux-blackdown-jre11 License does not allow @@ -376,9 +378,9 @@ libdvdcss-*.tar.bz2 multimedia/libdvdcss CSS code may violate the DMCA libidea-* security/libidea Crypto; export-controlled libots-*.alpha.rpm lang/compaq-cc Distribution not allowed -libSDLx11.so.tar.gz multimedia/mtv No redistribution LimeWireOther.zip net-p2p/limewire No redistribution allowed Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed +Linux_MegaCli_* sysutils/linux-megacli Redistribution not allowed rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software l0phtcrack/* security/l0phtcrack Parts are under GPL, so @@ -424,17 +426,16 @@ MPlayer* multimedia/mplayer Restricted binary distribution msql-* databases/msql Not free for commercial organizations MT-* www/MT No redistribution -mtv-*.tar.gz multimedia/mtv No redistribution mupad/* math/mupad Unsure of selling for profit mypaedia-* japanese/mypaedia-fpw The original dictionary is not free mysqlman.tar.gz databases/mysqlman Not redistributable, license agreement required ncftpd-* ftp/ncftpd 30 day evaluation license -netbeans-* java/netbeans Restrictive copyright +netbeans3-* java/netbeans3 Restrictive copyright +netbeans4-* java/netbeans4 Restrictive copyright NetComponents-* java/netcomponents No redistribution except as part of a substantially different product netshow_linux.gz multimedia/netshow Commercial software -nfbtr* textproc/nfbtrans Unclear copyright status nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for @@ -557,6 +558,7 @@ swing1_1_1* java/jfc Do not distribute without value-added application systemc-2*.tgz cad/systemc License agreement required. +scv-1.0p2-sysc* cad/scv License agreement required. tcetest_* games/linux-enemyterritory-tce Redistribution limited texcm-ttf-20010117/* x11-fonts/texcm-ttf Cannot be sold or distributed with any commercial product @@ -566,8 +568,6 @@ tolkien-ttf-* x11-fonts/tolkien-ttf Shareware. Commercial usage or redistribution requires license. -tools-for-freebsd-* emulators/vmware-tools2 Not sure if we can - redistribute this tracker-*.tgz audio/tracker Non-redistributable beta triangle-*/* math/triangle No commercial use without prior arrangement with the author @@ -583,6 +583,7 @@ Japanese version of Windows and EPSON printer specified by EULA +tonicpoint-* graphics/tonicpoint-viewer Free for non-profit tuc-* converters/tuc Author does not allow CD-ROM distribution tutorial.zip java/java-tutorial This software is under license @@ -607,7 +608,6 @@ Commodore Business Machines vwnc7.3.1/* lang/visualworks Do not redistribute vje30/* japanese/vje30 Commercial software -VMware-*.tar.gz emulators/vmware2 Not sure if we can redistribute this vmware-freebsd-tools.* emulators/vmware-guestd3 Not sure if we can redistribute this vmware-freebsd-tools.* emulators/vmware-guestd4 Not sure if we can redistribute this [RESTRICTED] @@ -631,6 +631,8 @@ codecs is unknown xchada01.lzh games/xchadance Contains commercial character data +xds-[0-9]* lang/xds Redistribution is forbidden +xds-c-* lang/xds-c Redistribution is forbidden xephem-* astro/xephem Personal use only xev*.tar.gz games/xbat Possible copyright infringement XFrisk-*.tar.gz games/xfrisk Possible trademark infringement ==== //depot/projects/soc2006/gabor_destdir/MOVED#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1189 2006/11/24 22:23:36 erwin Exp $ +# $FreeBSD: ports/MOVED,v 1.1306 2007/02/23 22:50:13 mezz Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -151,7 +151,6 @@ math/xmgr||2003-01-19|removed, obsoleted, successor is grace x11/libhelp||2003-01-19|removed, didn't compile on current motif, only used by xmgr devel/gnustep-devel|devel/gnustep|2003-01-20|merged -devel/gnustep-devel|devel/gnustep|2003-01-20|merged x11-toolkits/gnustep-gui-devel|x11-toolkits/gnustep-gui|2003-01-20|merged x11-toolkits/gnustep-xgps|x11-toolkits/gnustep-back|2003-01-20|full substitute devel/ruby-unit|devel/ruby-testunit|2003-01-23|succeeded @@ -773,7 +772,6 @@ deskutils/loserjabber|deskutils/logjam2|2004-02-07|Renamed to Logjam x11/wmbsdbatt|sysutils/wmbsdbatt|2004-02-09|Moved to more appropriate category converters/ktnef|deskutils/kdepim3|2004-02-09|ktnef is now included in kdepim -lang/g95|lang/gfortran|2004-02-11|change to appropreate name www/mozilla-firebird|www/firefox|2004-02-11|Project changed names x11-wm/mosfet-liquid||2004-02-13|obsolete mail/mozilla-thunderbird|mail/thunderbird|2004-02-14|Name change to fit the project @@ -937,7 +935,6 @@ x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33 mail/ksig|misc/ksig|2004-03-09|ksig is now a part of the kdeaddons ports mail/exim-old|mail/exim|2004-03-09|No security maintenance from author, successor is exim -sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author textproc/dico|french/dico|2004-03-14|better category x11-fonts/Xft|x11-fonts/libXft|2004-03-16|port renamed devel/ulex|devel/ocaml-ulex|2004-03-19|port renamed @@ -1942,7 +1939,6 @@ devel/php4-pear||2005-12-09|Obsoleted by devel/pear port devel/php5-pear||2005-12-09|Obsoleted by devel/pear port archivers/pear-Archive_Tar||2005-12-09|Obsoleted by devel/pear port -devel/pear-Console_Getopt||2005-12-09|Obsoleted by devel/pear port devel/pear-XML_RPC||2005-12-09|Obsoleted by devel/pear port devel/pear-PEAR|devel/pear|2005-12-09|New pear bootstrap code databases/php5-dbx||2005-12-09|Unsupported in PHP 5.1 @@ -2017,7 +2013,6 @@ biology/flip||2006-01-14|Mastersite disappeared chinese/MT||2006-01-14|Does not work with MT 3 chinese/chinput2||2006-01-14|Mastersite disappeared -chinese/wangttf||2006-01-14|Mastersite disappeared comms/vpb2||2006-01-14|Mastersite disappeared deskutils/journal||2006-01-14|Mastersite disappeared devel/decompyle||2006-01-14|Mastersite disappeared @@ -2231,7 +2226,6 @@ security/nessus-libnasl-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources security/nessus-libraries-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources security/nessus-plugins-devel||2006-04-17|Has expired: Development version of nessus is no longer available in sources -audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-polyp80|2006-04-21|The port name has been changed to match its correct name devel/cvspadm||2006-04-24|Development ceased, please use devel/cvsdadm editors/jed-devel||2006-04-24|No more development version for a while, please, use editors/jed sysutils/gdesklets-multitail||2006-04-24|Project is too long dead @@ -2239,26 +2233,22 @@ java/diablo-jre13||2006-04-24|Removed due to security problems and no longer being distributed audio/gstreamer-plugins-artsd|audio/gstreamer-plugins-artsd80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-audiofile|audio/gstreamer-plugins-audiofile80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-cdaudio|audio/gstreamer-plugins-cdaudio80|2006-04-29|Not part of gstreamer 0.10 yet sysutils/gstreamer-plugins-cdio|sysutils/gstreamer-plugins-cdio80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-dirac|multimedia/gstreamer-plugins-dirac80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-gdkpixbuf|graphics/gstreamer-plugins-gdkpixbuf80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-hermes|graphics/gstreamer-plugins-hermes80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-jack|audio/gstreamer-plugins-jack80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-libfame|multimedia/gstreamer-plugins-libfame80|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-libmng|graphics/gstreamer-plugins-libmng80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-mikmod|audio/gstreamer-plugins-mikmod80|2006-04-29|Not part of gstreamer 0.10 yet -multimedia/gstreamer-plugins-mpeg2enc|multimedia/gstreamer-plugins-mpeg2enc80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-mplex|multimedia/gstreamer-plugins-mplex80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-nas|audio/gstreamer-plugins-nas80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-polypaudio80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout80|2006-04-29|Not part of gstreamer 0.10 yet +audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed +audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout2|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-smoothwave|audio/gstreamer-plugins-smoothwave80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-sndfile|audio/gstreamer-plugins-sndfile80|2006-04-29|Not part of gstreamer 0.10 yet -graphics/gstreamer-plugins-swfdec|graphics/gstreamer-plugins-swfdec80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-x264|multimedia/gstreamer-plugins-x26480|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-jpeg-mmx|graphics/gstreamer-plugins-jpeg-mmx80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-polyp|audio/gstreamer-plugins-polyp80|2006-04-29|Not part of gstreamer 0.10 yet +audio/gstreamer-plugins-polyp|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed www/evolution-caldav||2006-04-29|Now included in evolution-data-server and evolution graphics/mrsidviewer||2006-04-30|Removed (distribution no longer available from vendor) graphics/kimdaba|graphics/kphotoalbum|2006-04-30|renamed @@ -2517,7 +2507,6 @@ chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed databases/php5-filepro||2006-11-06|Removed in 5.2 branch -databases/php5-pdo||2006-11-08|Removed deskutils/offix-trash||2006-11-09|Has expired: development ceased in 1996 devel/mingw||2006-11-09|Has expired: use mingw32-* ports instead devel/mingw-binutils||2006-11-09|Has expired: use mingw32-* ports instead @@ -2548,3 +2537,306 @@ print/pecl-panda||2006-11-22|Has expired: Project is dead and does not work mail/dbmail-devel|mail/dbmail21|2006-11-23|Renamed net/ripetools|net/ripe-whois|2006-11-24|Has expired: project no longer exists +devel/sge||2006-11-26|Removed +mail/pantomime-ssl|mail/pantomime|2006-12-01|Removed +x11-toolkits/p5-Gtk2-PodViewer|x11-toolkits/p5-Gtk2-Ex-PodViewer|2006-12-03|CPAN module renamed +audio/xmms-rateplug||2006-12-04|Has expired: Project disappeared from the internet +chinese/iiimf-le-chewing||2006-12-04|Has expired: fails to install (dependency problem) +deskutils/mhc-xemacs21-mule||2006-12-04|Has expired: hangs during build +devel/alleyoop||2006-12-04|Has expired: Does not compile +devel/hs-crypto||2006-12-04|Has expired: is incompatible with current GHC, needs updating +editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14 +emulators/vmware2||2006-12-04|Has expired: Unfetchable +finance/ccard||2006-12-04|Has expired: Project disappeared from the internet +devel/autoconf26|devel/autoconf261|2006-12-07|Move to correct location +www/mozilla-bonobo||2006-12-12|Has expired: "Does not build with new Mozilla" +www/p5-ldap-abook||2006-12-12|Has expired: Arbitrary command execution vulnerability in CGI script +x11-wm/tpager||2006-12-12|Has expired: Unmaintained and disappears from MASTER_SITE on a regular basis +x11/XFree86-aoutlibs||2006-12-12|Has expired: Requires a.out ld.so and support libraries +x11/linux-XFree86-libs||2006-12-12|Has expired: superseeded by linux-xorg-libs port +www/mod_v2h||2006-12-12|Has expired: No longer available for download, the website is gone +www/mod_injection||2006-12-12|Has expired: No longer available for download, the website is gone +www/nspostgres||2006-12-12|Has expired: Use www/aolserver with WITH_NSPOSTGRES=1 instead. +www/fxhtml||2006-12-12|Has expired: crusty old a.out binary, not useful any more +www/jakarta-tomcat3||2006-12-12|Has expired: Please use www/tomcat55 instead +shells/mudsh||2006-12-12|Has expired: Project disappeared from the internet +print/py-freetype||2006-12-12|Has expired: Project has disappeared and is no longer fetchable +palm/syncal||2006-12-12|Has expired: Does not build with new pilot-link +net/tn3270||2006-12-12|Has expired: dumps core. Please use net/c3270 instead +multimedia/dvdwizard||2006-12-12|Has expired: has an incomplete dependency list +print/latex-bibtopic||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-bibunits||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-booktabs||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-index||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-layouts||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-subfig||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-xcolor||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-lineno||2006-12-12|Has expired: is already included in the teTeX distribution +print/latex-pict2e||2006-12-12|Has expired: is already included in the teTeX distribution +multimedia/gstreamer-plugins-mpeg2enc80||2006-12-12|Has expired: Obsolete version, use gstreamer 0.10 instead +lang/gcc30||2006-12-12|Has expired: "This port is no longer in use by anything in the ports collection and will be removed in the future. Use a later release instead." +lang/egcs||2006-12-12|Has expired: "This port is no longer in use by anything in the ports collection and will be removed in the future. Use a later release of gcc instead" +graphics/php4-ming||2006-12-12|Has expired: doesn't work with new version of ming library +graphics/dvipng||2006-12-12|Has expired: is already included in the teTeX distribution +audio/gdesklets-xmms||2006-12-12|Has expired: Disappeared from the internet +games/flightgear-l410||2006-12-12|Has expired: is incompatible with the latest FlightGear release +www/frontpage||2006-12-12|Has expired: Microsoft Frontpage Extensions have reached their End-of-Life +portuguese/frontpage-pt_BR||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ar||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-de||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-es||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-fr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-he||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-it||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ja||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-ko||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-nl||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-sv||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-th||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/frontpage-zh||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/mod_frontpage||2006-12-12|Removed: Depends on dead www/frontpage +www/mod_frontpage-rtr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +www/mod_frontpage2-rtr||2006-12-12|Removed: Microsoft Frontpage Extensions have reached their End-of-Life +net/wais||2006-12-12|Has expired: Imported 12 years ago; never completed +www/w3c-httpd||2006-12-12|Has expired: Does not compile +multimedia/gstreamer-plugins-dirac80||2006-12-13|Has expired: Obsolete version, use gstreamer 0.10 instead +devel/ruby-pcsc-lite||2006-12-14|Has expired: Does not compile with new pcsc-lite. Port is broken since 2005/04/20. +audio/alsaplayer||2006-12-14|Has expired: Remote code execution: http://vuxml.FreeBSD.org/9855ac8e-2aec-11db-a6e2-000e0c2e438a.html. Last version 0.99.76 is more than 3 years old. +sysutils/kdar||2006-12-14|Has expired: Does not compile with dar-2.3.0 +net-im/ymessenger||2006-12-14|Has expired: is a dynamically linked binary linked to old version of gtkhtml no longer in ports +audio/ac3dec||2006-12-14|Dead outside FreeBSD and replaced by liba52 +net-p2p/mldonkey-sancho||2006-12-14|Removed due to developer's request +net/gmdns||2006-12-14|Dead, unmaintain and nothing use it +devel/stlport-icc||2006-12-20|Has expired: does not work with stlport 4.6.2 +security/gnupg-devel|security/gnupg|2006-12-21|gnupg-devel has been released as Gnupg 2.0 +devel/javasvn|devel/svnkit|2006-12-23|JavaSVN has been renamed to SVNKit +deskutils/etoile|deskutils/etoile-dictionaryreader|2006-12-25|renamed to etoile-dictionaryreader +devel/p5-Inline-C2XS|devel/p5-InlineX-C2XS|2006-12-26|Project rename the module into the InlineX namespace +www/etoile-grr|www/etoile-mollusk|2006-12-29|Project moved +deskutils/etoile-etoileextensionskit|www/etoile-ui|2006-12-29|Project splitted in new modules +deskutils/etoile-preferenceskit|www/etoile-panekit|2006-12-29|Project splitted in new modules +deskutils/etoile-workspaceswitcher||2006-12-29|Project dopped +mail/sylpheed-claws-att_remover|mail/claws-mail-att_remover|2006-12-31|Project renamed upstream +mail/sylpheed-claws-cachesaver|mail/claws-mail-cachesaver|2006-12-31|Project renamed upstream +mail/sylpheed-claws-etpan_privacy|mail/claws-mail-etpan_privacy|2006-12-31|Project renamed upstream +mail/sylpheed-claws-fetchinfo|mail/claws-mail-fetchinfo|2006-12-31|Project renamed upstream +mail/sylpheed-claws-gtkhtml2_viewer|mail/claws-mail-gtkhtml2_viewer|2006-12-31|Project renamed upstream +mail/sylpheed-claws-maildir|mail/claws-mail-maildir|2006-12-31|Project renamed upstream +mail/sylpheed-claws-mailmbox|mail/claws-mail-mailmbox|2006-12-31|Project renamed upstream +mail/sylpheed-claws-newmail|mail/claws-mail-newmail|2006-12-31|Project renamed upstream +mail/sylpheed-claws-notification|mail/claws-mail-notification|2006-12-31|Project renamed upstream +mail/sylpheed-claws-perl|mail/claws-mail-perl|2006-12-31|Project renamed upstream +mail/sylpheed-claws-rssyl|mail/claws-mail-rssyl|2006-12-31|Project renamed upstream +mail/sylpheed-claws-smime|mail/claws-mail-smime|2006-12-31|Project renamed upstream +mail/sylpheed-claws-synce|mail/claws-mail-synce|2006-12-31|Project renamed upstream +mail/sylpheed-claws-vcalendar|mail/claws-mail-vcalendar|2006-12-31|Project renamed upstream +mail/sylpheed-claws|mail/claws-mail|2006-12-31|Removed: renamed to claws-mail +devel/pear-Console_Getopt||2007-01-01|Obsoleted by devel/pear port +databases/ruby-libgda||2007-01-01|No longer include in the tarball +multimedia/ruby-gst||2007-01-01|No longer include in the tarball +audio/autools||2007-01-05|Has expired: is unfetchable and the project homepage disappeared +www/mediawiki13||2007-01-05|Removed: No longer supported, please upgrade your wiki installation +www/mediawiki15||2007-01-05|Removed: No longer supported, please upgrade your wiki installation +ftp/gwget||2007-01-05|Has expired: fails to install +multimedia/bsdav||2007-01-05|Has expired: does not work. We need to import bktv patches from OpenBSD to make it work +multimedia/pitivi||2007-01-05|Has expired: Installs files during "make all" +misc/gnomesword||2007-01-05|Has expired: Configure fails +graphics/opendx-samples||2007-01-05|Has expired: Changes permissions on installed file usr/local/dx/java/server/nets +graphics/panorama||2007-01-05|Has expired: segfaults on startup (GUI only, render binary still works) +graphics/qtutils||2007-01-05|Has expired: Does not build +net-p2p/gnome-btdownload||2007-01-05|Has expired: does not run with BitTorrent 4.x yet +print/ec-fonts-mftraced||2007-01-05|Has expired: Installs files before 'make install' +print/yatex-xemacs-mule||2007-01-05|Has expired: hangs during build +security/gnu-crypto||2007-01-05|Has expired: Does not compile +www/linux-beonex||2007-01-05|Has expired: Security issues. From http://www.beonex.com/ 'The currently available Beonex Communicator 0.8 builds have several known security bugs' +misc/instant-workstation||2007-01-05|Has expired: Incomplete pkg-plist +lang/yap||2007-01-05|Has expired: Does not compile +lang/tensile||2007-01-05|Has expired: "Coredump during build on FreeBSD >= 6.x" +japanese/gauche-kakasi||2007-01-05|Has expired: deinstalls file not installed by this port +japanese/migemo-xemacs21-mule||2007-01-05|Has expired: Incomplete pkg-plist +www/rt3-elixus||2007-01-05|Has expired: Broken due the new mod_perl2 API +comms/vpb-driver||2007-01-05|Has expired: leaves files behind on deinstall +irc/xchat-ecl-plugin||2007-01-05|Has expired: Does not build +french/gnome-verbiste||2007-01-05|Has expired: does not install +devel/kasm||2007-01-05|Has expired: Buggy and unmaintained, use devel/hptools instead +devel/py-getargs||2007-01-05|Has expired: distfile and homepage disappeared +devel/pyumlgraph||2007-01-05|Has expired: distfile and homepage disappeared +editors/beaver||2007-01-05|Has expired: distfile disappeared from homepage +editors/dte||2007-01-05|Has expired: distfile and homepage disappeared +graphics/teddy||2007-01-05|Has expired: No new releases in the past 4 years +net/arla||2007-01-05|Has expired: "does not compile" +sysutils/lsmlib||2007-01-05|Has expired: distfile and homepage disappeared +security/ifd-gpr400||2007-01-05|Has expired: distfile and homepage disappeared +science/mmtk||2007-01-05|Has expired: distfile and homepage disappeared +print/xtem||2007-01-05|Has expired: distfile and homepage disappeared +net/mrt||2007-01-05|Has expired: distfile and homepage disappeared +net/tund||2007-01-05|Has expired: distfile disappeared and has no homepage +net/xbms||2007-01-05|Has expired: distfile and homepage disappeared +print/bibcard||2007-01-05|Has expired: distfile and homepage disappeared +misc/afbackup||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-client||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +misc/afbackup-server||2007-01-05|Has expired: Uses unregistered uid that conflicts with other ports +lang/forth||2007-01-05|Has expired: obsoleted by lang/pfe; use of this port is pretty much senseless +ftp/jmirror||2007-01-05|Has expired: distfile disappeared and has no homepage +devel/libformat||2007-01-05|Has expired: distfile and homepage disappeared +editors/ooodict-all||2007-01-05|Has expired: Size mismatch +mail/distribute||2007-01-05|Has expired: Does not install +net-im/gaim-rss-reader||2007-01-05|Has expired: Requires update to work with Gaim 0.82.1 +sysutils/slay||2007-01-05|Has expired: Author doesn't see it as needed anymore +www/emp||2007-01-05|Has expired: project is shutting down +textproc/nfbtrans||2007-01-05|Has expired: Unfetchable +comms/ecu||2007-01-05|Has expired: is unfetchable and project homepage disappeared +net/citadel||2007-01-05|Has expired: http://www.FreeBSD.org/ports/portaudit/4c005a5e-2541-4d95-80a0-00c76919aa66.html +multimedia/mtv||2007-01-05|Has expired: No new releases in the past 5 years +mail/py-email2||2007-01-08|Has expired: Only usable python versions schedualed to expire +net/ruby-radius||2007-01-08|Has expired: distfile disappeared from homepage +devel/versuch|net/versuch|2007-01-12|Removed duplicate port +german/tvbrowser|misc/tvbrowser|2007-01-13|move to misc/tvbrowser +chinese/xcin||2007-01-17|Has expired: dead project, see http://lists.linux.org.tw/pipermail/xcin/2005-November/004300.html +x11-wm/wmi||2007-01-17|Has expired: This port is unsupported by the author. Please use x11-wm/wmii instead. +www/abcache||2007-01-17|Has expired: "is a dead project and the distfile disappeared" +devel/rubygem-event-loop||2007-01-17|Has expired: replaced by devel/ruby-event-loop which gets around issues caused by the rubygems system +games/hlserver-opera||2007-01-17|Has expired: distfile and homepage disappeared +games/mythserver||2007-01-17|Has expired: distfile disappeared +games/nwnusers||2007-01-17|Has expired: Does not make any sense any more. (NWN 2 is out there) +games/urban-sounds||2007-01-17|Has expired: distfile and homepage disappeared +games/urban||2007-01-17|Has expired: distfile and homepage disappeared +games/x3eyes||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xeji||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xemeraldia||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xlifegame||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xpilotmon||2007-01-17|Has expired: distfile disappeared and has no homepage +games/xsok||2007-01-17|Has expired: distfile disappeared and has no homepage +database/grass-i18n|database/grass|2007-01-18|Deprecated because i18n extension has been merged +net-mgmt/apan||2007-01-19|Has expired: Does not install +ftp/vcheck||2007-01-19|Has expired: distfile disappeared and has no homepage +deskutils/xfce4-calendar|deskutils/orage|2007-01-22|got obsolete by xfce 4.4 update +deskutils/xfce4-taskbar-plugin||2007-01-22|got obsolete by xfce 4.4 update +deskutils/xfce4-windowlist-plugin||2007-01-22|got obsolete by xfce 4.4 update +games/xfce4-toys||2007-01-22|got obsolete by xfce 4.4 update +misc/xfce4-iconbox||2007-01-22|got obsolete by xfce 4.4 update +sysutils/xfce4-showdesktop-plugin|deskutils/orage|2007-01-22|got obsolete by xfce 4.4 update +x11/xfce4-trigger-launcher||2007-01-22|got obsolete by xfce 4.4 update +x11-fm/xfce4-fm||2007-01-22|got obsolete by xfce 4.4 update +x11-wm/xfce4-systray||2007-01-22|got obsolete by xfce 4.4 update +russian/rispell||2007-01-23|Has expired: does not work with current textproc/ispell, use rus-ispell port istead +audio/mp3encode||2007-01-25|Has expired: is unfetchable and has no homepage +biology/coalesce||2007-01-25|Has expired: Not supported by the authors. Last version is from 1995. Use biology/fluctuate instead. +devel/leoarg||2007-01-25|Has expired: distfile and homepage disappeared +misc/dirtree||2007-01-25|distfile and homepage disappeared +misc/argparse||2007-01-25|distfile and homepage disappeared +audio/gstreamer-plugins-wavpack80||2007-01-25|does not build with current wavpack and got obsolete by 0.10.x version +net-mgmt/pfpro||2007-01-26|Has expired: Does not compile +emulators/vx68k||2007-01-26|Has expired: distfile disappeared from homepage +emulators/libvm68k||2007-01-26|Has expired: distfile disappeared from homepage +textproc/ruby-text-format||2007-01-26|Has expired: distfile and homepage disappeared +www/flashplugin||2007-01-27|Obsolete, broken +lang/python21||2007-01-26|Has expired: Version branch long since retired +lang/python22||2007-01-26|Has expired: Version branch long since retired +audio/lopster|net-p2p/lopster|2007-01-28|Moved to better category +net/p5-Spread||2007-01-29|Has expired: Spread comes with its own Perl library +lang/glade-gpl||2007-01-31|Removed +graphics/linux_glx||2007-02-02|Removed as part of obsolete XFree86 3.X +graphics/mesagl||2007-02-02|Removed as part of obsolete XFree86 3.X +graphics/xpm||2007-02-02|Removed as part of obsolete XFree86 3.X +x11/XFree86||2007-02-02|Removed this obsolete old version of XFree86 +x11/XFree86-contrib||2007-02-02|Removed this obsolete old version of XFree86 +sysutils/unidesc|sysutils/uniutils|2007-02-04|Renamed by the author +devel/portcheckout|ports-mgmt/portcheckout|2007-02-05|Moved to a new category +devel/portlint|ports-mgmt/portlint|2007-02-05|Moved to a new category +devel/portmk|ports-mgmt/portmk|2007-02-05|Moved to a new category +devel/porttools|ports-mgmt/porttools|2007-02-05|Moved to a new category +misc/instant-tinderbox|ports-mgmt/instant-tinderbox|2007-02-05|Moved to a new category +misc/porteasy|ports-mgmt/porteasy|2007-02-05|Moved to a new category +misc/portell|ports-mgmt/portell|2007-02-05|Moved to a new category +misc/portless|ports-mgmt/portless|2007-02-05|Moved to a new category +misc/tinderbox|ports-mgmt/tinderbox|2007-02-05|Moved to a new category +security/jailaudit|ports-mgmt/jailaudit|2007-02-05|Moved to a new category +security/portaudit|ports-mgmt/portaudit|2007-02-05|Moved to a new category +security/portaudit-db|ports-mgmt/portaudit-db|2007-02-05|Moved to a new category +security/vulnerability-test-port|ports-mgmt/vulnerability-test-port|2007-02-05|Moved to a new category +sysutils/barry|ports-mgmt/barry|2007-02-05|Moved to a new category +sysutils/bpm|ports-mgmt/bpm|2007-02-05|Moved to a new category +sysutils/kports|ports-mgmt/kports|2007-02-05|Moved to a new category +sysutils/managepkg|ports-mgmt/managepkg|2007-02-05|Moved to a new category +sysutils/newportsversioncheck|ports-mgmt/newportsversioncheck|2007-02-05|Moved to a new category +sysutils/pib|ports-mgmt/pib|2007-02-05|Moved to a new category +sysutils/pkgfe|ports-mgmt/pkgfe|2007-02-05|Moved to a new category +sysutils/pkg-orphan|ports-mgmt/pkg-orphan|2007-02-05|Moved to a new category +sysutils/pkg_cutleaves|ports-mgmt/pkg_cutleaves|2007-02-05|Moved to a new category +sysutils/pkg_install|ports-mgmt/pkg_install|2007-02-05|Moved to a new category +sysutils/pkg_install-devel|ports-mgmt/pkg_install-devel|2007-02-05|Moved to a new category +sysutils/pkg_remove|ports-mgmt/pkg_remove|2007-02-05|Moved to a new category +sysutils/pkg_rmleaves|ports-mgmt/pkg_rmleaves|2007-02-05|Moved to a new category +sysutils/pkg_trackinst|ports-mgmt/pkg_trackinst|2007-02-05|Moved to a new category +sysutils/pkg_tree|ports-mgmt/pkg_tree|2007-02-05|Moved to a new category +sysutils/portbrowser|ports-mgmt/portbrowser|2007-02-05|Moved to a new category +sysutils/portconf|ports-mgmt/portconf|2007-02-05|Moved to a new category +sysutils/portdowngrade|ports-mgmt/portdowngrade|2007-02-05|Moved to a new category +sysutils/portcheck|ports-mgmt/portcheck|2007-02-05|Moved to a new category +sysutils/portmanager|ports-mgmt/portmanager|2007-02-05|Moved to a new category +sysutils/portmaster|ports-mgmt/portmaster|2007-02-05|Moved to a new category +sysutils/portscout|ports-mgmt/portscout|2007-02-05|Moved to a new category +sysutils/portsearch|ports-mgmt/portsearch|2007-02-05|Moved to a new category +sysutils/portsman|ports-mgmt/portsman|2007-02-05|Moved to a new category +sysutils/portsnap|ports-mgmt/portsnap|2007-02-05|Moved to a new category +sysutils/portsopt|ports-mgmt/portsopt|2007-02-05|Moved to a new category +sysutils/portupgrade|ports-mgmt/portupgrade|2007-02-05|Moved to a new category +sysutils/portupgrade-devel|ports-mgmt/portupgrade-devel|2007-02-05|Moved to a new category +sysutils/port-authoring-tools|ports-mgmt/port-authoring-tools|2007-02-05|Moved to a new category +sysutils/port-maintenance-tools|ports-mgmt/port-maintenance-tools|2007-02-05|Moved to a new category +sysutils/psearch|ports-mgmt/psearch|2007-02-05|Moved to a new category +sysutils/p5-FreeBSD-Portindex|ports-mgmt/p5-FreeBSD-Portindex|2007-02-05|Moved to a new category +sysutils/qtpkg|ports-mgmt/qtpkg|2007-02-05|Moved to a new category +textproc/p5-FreeBSD-Ports|ports-mgmt/p5-FreeBSD-Ports|2007-02-05|Moved to a new category +sysutils/pkg_replace|ports-mgmt/pkg_replace|2007-02-05|Moved to a new category +archivers/py-bzip2||2007-02-05|Included with all current python versions in ports tree +devel/py-logging||2007-02-05|Included with all current python versions in ports tree +misc/qt4-codecs-tw|chinese/qt4-codecs-tw|2007-02-06|Accidentally added to wrong category +www/squid26|www/squid|2007-02-07|Squid 2.6 is now mainstream version +irc/xchat-systray-plugin||2007-02-07|Has expired: Functionality is now included in xchat +net/nicmond||2007-02-07|Has expired: Disappeared from the internet +www/caudium10||2007-02-07|Has expired: Please use www/caudium12 +net/openldap22-client||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-sasl-client||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-sasl-server||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +net/openldap22-server||2007-02-07|Removed: OpenLDAP 2.2.x is no longer supported by developers +databases/ruby-sqlite3|databases/rubygem-sqlite3|2007-02-08|Moved to rubygem version +databases/pecl-PDO|databases/php5-pdo|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_DBLIB|databases/php5-pdo_dblib|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_MYSQL|databases/php5-pdo_mysql|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_OCI|databases/php5-pdo_oci|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_ODBC|databases/php5-pdo_odbc|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_PGSQL|databases/php5-pdo_pgsql|2007-02-09|PHP5 bundled version is newer +databases/pecl-PDO_SQLITE|databases/php5-pdo_sqlite|2007-02-09|PHP5 bundled version is newer +math/pear-Structures_Graph|devel/pear|2007-02-09|Included in base pear installation +lang/cli||2007-02-10|Port was broken with no sign of a fix +misc/moviedb||2007-02-10|Port was broken with no sign of a fix +devel/cl-asdf-cmucl||2007-02-10|Port was broken with no sign of a fix +graphics/libdjvu++||2007-02-10|Port was broken with no sign of a fix +graphics/dri-devel||2007-02-10|Expired port +devel/cl-infix-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +devel/cl-split-sequence-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +devel/cl-uffi-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +textproc/cl-meta-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +textproc/cl-ppcre-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +www/cl-lml-cmucl||2007-02-10|Depended on removed port devel/cl-asdf-cmucl +emulators/vmware-tools2||2007-02-12|Has expired: Unfetchable +lang/ruby16||2007-02-13|Port passed expiry date and was removed. +lang/ruby16-shim-ruby18||2007-02-13|Port passed expiry date and was removed. +lang/ruby16_static||2007-02-13|Port passed expiry date and was removed. +lang/ruby18_static||2007-02-13|Port passed expiry date and was removed. +devel/Subversive|devel/subversive|2007-02-16|Normalize port name +www/ruby-mnogosearch||2007-02-17|Has expired: distfile and homepage disappeared +textproc/p5-Pod-LaTeX||2007-02-18|Has expired: Incorrect pkg-plist +editors/emacs20-mule-devel||2007-02-18|Has expired: homepage and patchfiles disappeared +irc/sircd||2007-02-18|Has expired: No upgrade since 02-02-2002. Developer unavailable. Website gone. +math/vtk43-headers||2007-02-18|Has expired: Please use vtk 4.4 or 5.x. +math/vtk43||2007-02-18|Has expired: Please use vtk 4.4 or 5.x. +textproc/ruby-htmlcompact||2007-02-18|Has expired: distfile and homepage disappeared +textproc/ruby-rwv2||2007-02-18|Has expired: distfile disappeared and has no homepage +net/happystats||2007-02-18|Has expired: Disappeared from the internet +www/drupal-pubcookie||2007-02-19|Has expired: No maintainer +lang/tcc||2007-02-19|Has expired: is unusable; tcc -run works, but little else +www/p5-HTML||2007-02-23|Has expired: project no longer exists +audio/speex-devel|audio/speex|2007-02-23|Merged into audio/speex ==== //depot/projects/soc2006/gabor_destdir/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/Makefile,v 1.96 2006/02/11 02:26:30 kris Exp $ +# $FreeBSD: ports/Makefile,v 1.98 2007/01/31 15:37:18 pav Exp $ # SUBDIR += accessibility @@ -43,6 +43,7 @@ SUBDIR += news SUBDIR += palm SUBDIR += polish +SUBDIR += ports-mgmt SUBDIR += portuguese SUBDIR += print SUBDIR += russian @@ -139,7 +140,11 @@ @awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE} CVS?= cvs +.if ${OSVERSION} >= 601101 +SUP?= csup +.else SUP?= cvsup +.endif PORTSNAP?= portsnap PORTSNAP_FLAGS?= -p ${.CURDIR} .if defined(SUPHOST) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.24 2006/07/05 02:18:08 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.25 2006/12/04 01:07:25 ade Exp $ # # Please view me with 4 column tabs! # @@ -51,7 +51,7 @@ # - Extra arguments passed to automake during configure step # # ACLOCAL_ARGS=... -# - Arguments passed to aclocal during configure step +# - Arguments passed to aclocal during configure step # # AUTOCONF_ARGS=... # - Extra arguments passed to autoconf during configure step ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.database.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.17 2006/12/06 16:48:56 girgen Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -152,6 +152,7 @@ PGSQL74_LIBVER= 3 PGSQL80_LIBVER= 4 PGSQL81_LIBVER= 4 +PGSQL82_LIBVER= 5 # Setting/finding PostgreSQL version we want. .if exists(${LOCALBASE}/bin/pg_config) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.59 2006/08/14 13:24:18 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.61 2007/02/06 20:58:06 anray Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -115,7 +115,7 @@ # Emacs-22.x .elif (${EMACS_PORT_NAME} == "emacs22") EMACS_NAME= emacs -EMACS_VER= 22.0.50 +EMACS_VER= 22.0.93 EMACS_MAJOR_VER= 22 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -149,7 +149,7 @@ # XEmacs-21.x .elif (${EMACS_PORT_NAME} == "xemacs21") EMACS_NAME= xemacs -EMACS_VER= 21.4.19 +EMACS_VER= 21.4.20 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} @@ -166,7 +166,7 @@ # XEmacs-21.x with Mule .elif (${EMACS_PORT_NAME} == "xemacs21-mule") EMACS_NAME= xemacs -EMACS_VER= 21.4.19 +EMACS_VER= 21.4.20 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#2 (text+ko) ==== @@ -18,10 +18,10 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.9 2006/09/30 19:25:45 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.11 2007/01/29 09:27:04 pav Exp $ # -GCC_Include_MAINTAINER= portmgr@FreeBSD.org +GCC_Include_MAINTAINER= gerald@FreeBSD.org # # All GCC versions supported by the ports framework. @@ -133,10 +133,11 @@ . if ${_USE_GCC} == ${_GCCVERSION_${v}_V} . if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} # If Fortran support is requested, regardless of the value of USE_GCC -# we need to use lang/gfortran, which is based on lang/gcc41 right now. +# we use lang/gcc42 which is the first release which features the new +# Fortran frontend and has Fortran enabled by default. . if defined(WITH_FORTRAN) -V:= 41 -_GCC_BUILD_DEPENDS:= gfortran +V:= 42 +_GCC_BUILD_DEPENDS:= gcc42 _GCC_PORT_DEPENDS:= gfortran${V} .else V:= ${_GCCVERSION_${v}_V:S/.//} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.136 2006/10/31 09:11:23 jylefort Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.139 2007/02/04 22:25:07 tmclaugh Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $ # @@ -56,18 +56,19 @@ oaf orbit pygnome pygtk # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver \ - gail gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop \ - gnomedocutils gnomemenus gnomepanel gnomespeech gnomevfs2 \ - gtk20 gtkhtml3 gtksourceview libartlgpl2 libbonobo \ +_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ + gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ + gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ + gtkhtml3 gtksharp10 gtksharp20 gtksourceview libartlgpl2 libbonobo \ libbonoboui libgailgnome libgda2 libgda3 libglade2 libgnome \ libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \ libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \ libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \ orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop +GNOME_MAKEFILEIN?= Makefile.in SCROLLKEEPER_DIR= /var/db/scrollkeeper -gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" -type f | ${XARGS} ${REINPLACE_CMD} -e \ +gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \ s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \ s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ @@ -114,7 +115,8 @@ --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \ --with-help-dir=${TARGETDIR}/share/gnome/help \ --disable-gtk-doc \ - --with-gconf-source=${GCONF_CONFIG_SOURCE} + --with-gconf-source=${GCONF_CONFIG_SOURCE} \ + --mandir=${PREFIX}/man gnomeprefix_USE_GNOME_IMPL=gnomehier .if !defined(WITHOUT_HACK) gnomeprefix_PREFIX=${LOCALBASE} @@ -469,6 +471,7 @@ evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc evolutiondataserver_USE_GNOME_IMPL=libgnomeui +desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils desktopfileutils_DETECT= ${LOCALBASE}/bin/update-desktop-database desktopfileutils_USE_GNOME_IMPL=glib20 @@ -496,6 +499,21 @@ pygnomedesktop_RUN_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautiluscdburner metacity +gtksharp10_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc +gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10 +gtksharp10_RUN_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10 +gtksharp10_USE_GNOME_IMPL= gtk20 + +gtksharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc +gtksharp20_BUILD_DEPENDS= ${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20 +gtksharp20_RUN_DEPENDS= ${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20 +gtksharp20_USE_GNOME_IMPL= gtk20 + +gnomesharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc +gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 +gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 +gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte + # End component definition section # This section defines tests for optional software. These work off four ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.36 2006/11/20 03:47:08 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.42 2007/01/30 04:25:35 kris Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -73,28 +73,37 @@ # depends on a shared lib in System directrory # # USE_GNUSTEP_SYSTEM_BUNDLES+= EtoileMenus:x11-themes/etoile-etoilemenus -# depends on Bundles installed in System directrory at build and runtime +# depends on Bundles installed in System directrory # # USE_GNUSTEP_SYSTEM_THEMES+= Camaelon:x11-themes/etoile-camaelon -# depends on Themes installed in System directrory at build and runtime +# depends on Themes installed in System directrory # # USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime # depends on a shared lib in Local directrory # # USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:audio/cddb-bundle -# depends on Bundles installed in Local directrory at build and runtime +# depends on Bundles installed in Local directrory # # USE_GNUSTEP_LOCAL_THEMES+= WildMenus:x11-themes/etoile-wildmenus -# depends on Themes installed in Local directrory at build and runtime +# depends on Themes installed in Local directrory # # USE_GNUSTEP_SYSTEM_APPS+= ProjectCenter:devel/projectcenter.app -# depends on Application installed in System directrory at runtime +# depends on Application installed in System directrory # # USE_GNUSTEP_LOCAL_APPS+= Ink:misc/gnustep-examples -# depends on Application installed in Local directrory at runtime +# depends on Application installed in Local directrory +# +# USE_GNUSTEP_SYSTEM_TOOLS+= resizer:deskutils/gworkspace +# depends on Tool installed in System directrory # # USE_GNUSTEP_LOCAL_TOOLS+= zillion:net/zillion -# depends on Tool installed in Local directrory at runtime +# depends on Tool installed in Local directrory +# +# USE_GNUSTEP_SYSTEM_SERVICES+= thumbnailer:deskutils/gworkspace +# depends on Services installed in System directrory +# +# USE_GNUSTEP_LOCAL_SERVICES+= LaTeX:textproc/latex-service +# depends on Services installed in Local directrory # # --------------------------------------------------------------------------- .if !defined(_POSTMKINCLUDED) @@ -107,16 +116,16 @@ BUILD_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 24 23:04:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1CA116A406; Sat, 24 Feb 2007 23:04:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C304A16A404 for ; Sat, 24 Feb 2007 23:04:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B5AC113C474 for ; Sat, 24 Feb 2007 23:04:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1ON4NtW052008 for ; Sat, 24 Feb 2007 23:04:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1ON4NL6052001 for perforce@freebsd.org; Sat, 24 Feb 2007 23:04:23 GMT (envelope-from sam@freebsd.org) Date: Sat, 24 Feb 2007 23:04:23 GMT Message-Id: <200702242304.l1ON4NL6052001@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 114995 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, 24 Feb 2007 23:04:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=114995 Change 114995 by sam@sam_ebb on 2007/02/24 23:04:21 change ieee80211_find_rxnode_withkey to use the same keyix when adding an entry to the keyix map that's used when reclaiming the entry on free Submitted by: sephe Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#85 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#85 (text+ko) ==== @@ -1100,7 +1100,7 @@ * If the station has a unicast key cache slot * assigned update the key->node mapping table. */ - keyix = ni->ni_ucastkey.wk_keyix; + keyix = ni->ni_ucastkey.wk_rxkeyix; /* XXX can keyixmap[keyix] != NULL? */ if (keyix < nt->nt_keyixmax && nt->nt_keyixmap[keyix] == NULL) { From owner-p4-projects@FreeBSD.ORG Sat Feb 24 23:12:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1325116A404; Sat, 24 Feb 2007 23:12:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D493416A400 for ; Sat, 24 Feb 2007 23:12:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C665B13C442 for ; Sat, 24 Feb 2007 23:12:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1ONCYos053461 for ; Sat, 24 Feb 2007 23:12:34 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1ONCYHd053458 for perforce@freebsd.org; Sat, 24 Feb 2007 23:12:34 GMT (envelope-from gabor@freebsd.org) Date: Sat, 24 Feb 2007 23:12:34 GMT Message-Id: <200702242312.l1ONCYHd053458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 114996 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, 24 Feb 2007 23:12:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=114996 Change 114996 by gabor@gabor_server on 2007/02/24 23:11:44 Roll back current DESTDIR implementation, step 1. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#3 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#2 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#3 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#3 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#3 (text+ko) ==== @@ -110,9 +110,9 @@ GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY} GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome gnomeprefix_CONFIGURE_ENV=GTKDOC="false" -gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \ +gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ --datadir=${TARGETDIR}/share/gnome \ - --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \ + --with-html-dir=${GNOME_HTML_DIR} \ --with-help-dir=${TARGETDIR}/share/gnome/help \ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.mail.mk#2 (text+ko) ==== @@ -51,9 +51,9 @@ .endif .if defined(QMAIL_SLAVEPORT) -QMAIL_DEPENDS= ${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L} +QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L} .else -QMAIL_DEPENDS= ${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail +QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail .endif .if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#3 (text+ko) ==== @@ -1162,10 +1162,10 @@ # Get __FreeBSD_version .if !defined(OSVERSION) -.if exists(${DESTDIR}/usr/include/sys/param.h) -OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h -.elif exists(${DESTDIR}/usr/src/sys/sys/param.h) -OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h +.if exists(/usr/include/sys/param.h) +OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h +.elif exists(/usr/src/sys/sys/param.h) +OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif @@ -1234,7 +1234,7 @@ .endif # where 'make config' records user configuration options -PORT_DBDIR?= ${DESTDIR}/var/db/ports +PORT_DBDIR?= /var/db/ports LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 @@ -1346,9 +1346,9 @@ LOCALBASE_REL:= ${LOCALBASE} X11BASE_REL:= ${X11BASE} LINUXBASE_REL:= ${LINUXBASE} -LOCALBASE:= ${DESTDIR}${LOCALBASE_REL} -X11BASE:= ${DESTDIR}${X11BASE_REL} -LINUXBASE:= ${DESTDIR}${LINUXBASE_REL} +LOCALBASE:= ${LOCALBASE_REL} +X11BASE:= ${X11BASE_REL} +LINUXBASE:= ${LINUXBASE_REL} DISTDIR?= ${PORTSDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} INDEXDIR?= ${PORTSDIR} @@ -1358,7 +1358,7 @@ INDEXFILE?= INDEX .endif -TARGETDIR:= ${DESTDIR}${PREFIX} +TARGETDIR:= ${PREFIX} .if defined(USE_LINUX_RPM) .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" @@ -1404,23 +1404,12 @@ .endif .if defined(USE_LINUX_PREFIX) -.if !defined(DESTDIR) LDCONFIG_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD} .else -LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} -LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} -LDCONFIG_PLIST_UNEXEC_CMD?= ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} -.endif -.else -.if !defined(DESTDIR) LDCONFIG_CMD?= ${LDCONFIG} -m ${LDCONFIG_RUNLIST} LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG} -m ${LDCONFIG_PLIST} -.else -LDCONFIG_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST} -LDCONFIG_PLIST_EXEC_CMD?= ${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST} -.endif LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R .endif @@ -1476,8 +1465,8 @@ SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} .if ${PERL_LEVEL} < 500600 -PERL5= ${DESTDIR}/usr/bin/perl${PERL_VERSION} -PERL= ${DESTDIR}/usr/bin/perl +PERL5= /usr/bin/perl${PERL_VERSION} +PERL= /usr/bin/perl .else PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} PERL= ${LOCALBASE}/bin/perl @@ -1624,11 +1613,9 @@ BUILD_WRKSRC?= ${WRKSRC} INSTALL_WRKSRC?=${WRKSRC} -PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ - DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} +PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ - DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ - DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} + DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} PLIST_REINPLACE+= dirrmtry stopdaemon PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! @@ -2124,7 +2111,7 @@ MAKE_FLAGS?= -f MAKEFILE?= Makefile -MAKE_ENV+= TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \ +MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" @@ -2324,11 +2311,7 @@ # Does the pkg_create tool support conflict checking? # XXX Slow? .if !defined(PKGINSTALLVER) -.if !defined(DESTDIR) PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' -.else -PKGINSTALLVER!= ${CHROOT} ${DESTDIR} ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' -.endif .endif .if ${PKGINSTALLVER} < 20030417 DISABLE_CONFLICTS= YES @@ -2355,7 +2338,7 @@ .endif .endif # where pkg_add records its dirty deeds. -PKG_DBDIR?= ${DESTDIR}/var/db/pkg +PKG_DBDIR?= /var/db/pkg MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp @@ -2878,14 +2861,14 @@ WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \ SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \ PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \ - X11BASE=${X11BASE} DESTDIR=${DESTDIR} TARGETDIR=${DESTDIR} + X11BASE=${X11BASE} .if defined(BATCH) SCRIPTS_ENV+= BATCH=yes .endif .if ${PREFIX} == /usr -MANPREFIX?= ${DESTDIR}/usr/share +MANPREFIX?= /usr/share .else MANPREFIX?= ${TARGETDIR} .endif @@ -3169,7 +3152,7 @@ @cd ${.CURDIR} && ${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \ DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \ PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \ - FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \ + FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \ BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \ CONFLICTS="${CONFLICTS}" \ ${ALL_HOOK} @@ -4244,11 +4227,7 @@ build-message: @${ECHO_MSG} "===> Building for ${PKGNAME}" install-message: -.if !defined(DESTDIR) @${ECHO_MSG} "===> Installing for ${PKGNAME}" -.else - @${ECHO_MSG} "===> Installing for ${PKGNAME} into ${DESTDIR}" -.endif package-message: @${ECHO_MSG} "===> Building package for ${PKGNAME}" @@ -4330,11 +4309,7 @@ ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}" @${ECHO_MSG} "===> Returning to user credentials" .else -.if !defined(DESTDIR) @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" -.else - @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} from ${DESTDIR}" -.endif @found_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \ for p in $${found_names}; do \ check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ @@ -4375,11 +4350,7 @@ ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}" @${ECHO_MSG} "===> Returning to user credentials" .else -.if !defined(DESTDIR) @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}" -.else - @${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN} from ${DESTDIR}" -.endif @deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \ if [ -n "$${deinstall_names}" ]; then \ for d in $${deinstall_names}; do \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#3 (text+ko) ==== @@ -48,10 +48,10 @@ .if !defined(NOPRECIOUSMAKEVARS) .if !defined(ARCH) -ARCH!= ${DESTDIR}/usr/bin/uname -p +ARCH!= /usr/bin/uname -p .endif .if !defined(OSREL) -OSREL!= ${DESTDIR}/usr/bin/uname -r | sed -e 's/[-(].*//' +OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//' .endif .if !defined(OSVERSION) .if exists(/sbin/sysctl) @@ -62,19 +62,19 @@ .endif .endif -ID?= ${DESTDIR}/usr/bin/id +ID?= /usr/bin/id UID!= ${ID} -u -LOCALBASE?= ${DESTDIR}${LOCALBASE_REL} +LOCALBASE?= ${LOCALBASE_REL} .if exists(${LOCALBASE}/sbin/pkg_info) PKG_INFO?= ${LOCALBASE}/sbin/pkg_info .else -PKG_INFO?= ${DESTDIR}/usr/sbin/pkg_info +PKG_INFO?= /usr/sbin/pkg_info .endif -SED?= ${DESTDIR}/usr/bin/sed +SED?= /usr/bin/sed PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .if !defined(OPSYS) -OPSYS!= ${DESTDIR}/usr/bin/uname -s +OPSYS!= /usr/bin/uname -s .endif ECHO_MSG?= echo ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.ruby.mk#3 (text+ko) ==== @@ -136,7 +136,7 @@ RUBY_VER?= ${RUBY_DEFAULT_VER} .if defined(RUBY) -.if !exists(${DESTDIR}${RUBY}) +.if !exists(${RUBY}) IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable. .endif @@ -145,7 +145,7 @@ IGNORE= cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable. .endif -_RUBY_CONFIG= ${DESTDIR}${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e +_RUBY_CONFIG= ${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e RUBY_VERSION!= ${_RUBY_CONFIG} 'puts VERSION' RUBY_SUFFIX?= # empty