From owner-p4-projects@FreeBSD.ORG Sun May 27 00:00:36 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 1293916A46C; Sun, 27 May 2007 00:00:36 +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 DFA8016A41F for ; Sun, 27 May 2007 00:00:35 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B7A2613C457 for ; Sun, 27 May 2007 00:00:35 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4R00ZSW082891 for ; Sun, 27 May 2007 00:00:35 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4R00Z5v082882 for perforce@freebsd.org; Sun, 27 May 2007 00:00:35 GMT (envelope-from andrew@freebsd.org) Date: Sun, 27 May 2007 00:00:35 GMT Message-Id: <200705270000.l4R00Z5v082882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 120437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 May 2007 00:00:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=120437 Change 120437 by andrew@andrew_hermies on 2007/05/26 23:59:55 Add the start of the FreeBSD Update Frontend code. It waits for filesystem activity on /var/db/freebsd-update then looks to see if the `sha256("/")`-install link in that directory is present meaning there are updates avaliable. Affected files ... .. //depot/projects/soc2007/andrew-update/Makefile#1 add .. //depot/projects/soc2007/andrew-update/backend/Makefile#1 add .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 27 17:30: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 A1C1716A46D; Sun, 27 May 2007 17:30: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 5884B16A46B for ; Sun, 27 May 2007 17:30:12 +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 4915B13C45E for ; Sun, 27 May 2007 17:30:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4RHUCF9031855 for ; Sun, 27 May 2007 17:30:12 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4RHUBWu031848 for perforce@freebsd.org; Sun, 27 May 2007 17:30:11 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 27 May 2007 17:30:11 GMT Message-Id: <200705271730.l4RHUBWu031848@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 120459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 May 2007 17:30:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=120459 Change 120459 by mjacob@mjexp on 2007/05/27 17:29:58 Fix some DELAY stuff. Affected files ... .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#14 edit Differences ... ==== //depot/projects/mjexp/sys/dev/bge/if_bge.c#14 (text+ko) ==== @@ -591,7 +591,7 @@ break; } - if (i == BGE_TIMEOUT) { + if (i == BGE_TIMEOUT * 10) { device_printf(sc->bge_dev, "EEPROM read timed out\n"); return (1); } @@ -655,6 +655,7 @@ BGE_MIPHY(phy) | BGE_MIREG(reg)); for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); val = CSR_READ_4(sc, BGE_MI_COMM); if (!(val & BGE_MICOMM_BUSY)) break; @@ -700,19 +701,21 @@ BGE_MIPHY(phy) | BGE_MIREG(reg) | val); for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY)) break; } + if (i == BGE_TIMEOUT) { + device_printf(sc->bge_dev, "PHY read timed out\n"); + return (0); + } + if (autopoll & BGE_MIMODE_AUTOPOLL) { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL); DELAY(40); } - if (i == BGE_TIMEOUT) { - device_printf(sc->bge_dev, "PHY read timed out\n"); - return (0); - } return (0); } @@ -1324,9 +1327,9 @@ /* Poll for buffer manager start indication */ for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); if (CSR_READ_4(sc, BGE_BMAN_MODE) & BGE_BMANMODE_ENABLE) break; - DELAY(10); } if (i == BGE_TIMEOUT) { @@ -1342,9 +1345,9 @@ /* Wait until queue initialization is complete */ for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); if (CSR_READ_4(sc, BGE_FTQ_RESET) == 0) break; - DELAY(10); } if (i == BGE_TIMEOUT) { @@ -1513,9 +1516,9 @@ /* Poll to make sure it's shut down. */ for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); if (!(CSR_READ_4(sc, BGE_HCC_MODE) & BGE_HCCMODE_ENABLE)) break; - DELAY(10); } if (i == BGE_TIMEOUT) { @@ -2794,10 +2797,10 @@ * We expect this to fail if no EEPROM is fitted though. */ for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); val = bge_readmem_ind(sc, BGE_SOFTWARE_GENCOMM); if (val == ~BGE_MAGIC_NUMBER) break; - DELAY(10); } if ((sc->bge_flags & BGE_FLAG_EEPROM) && i == BGE_TIMEOUT) @@ -2813,9 +2816,13 @@ * results. */ for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); if (pci_read_config(dev, BGE_PCI_PCISTATE, 4) == pcistate) break; - DELAY(10); + } + + if (i == BGE_TIMEOUT) { + device_printf(sc->bge_dev, "pci state didn't transition\n"); } if (sc->bge_flags & BGE_FLAG_PCIE) { From owner-p4-projects@FreeBSD.ORG Sun May 27 17:31: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 9AF9C16A474; Sun, 27 May 2007 17:31: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 2B29016A469 for ; Sun, 27 May 2007 17:31:14 +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 F3D0C13C458 for ; Sun, 27 May 2007 17:31:13 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4RHVDCt033054 for ; Sun, 27 May 2007 17:31:13 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4RHVDhh033045 for perforce@freebsd.org; Sun, 27 May 2007 17:31:13 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 27 May 2007 17:31:13 GMT Message-Id: <200705271731.l4RHVDhh033045@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 120460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 May 2007 17:31:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=120460 Change 120460 by mjacob@mjexp on 2007/05/27 17:31:10 Add an ioctl entry point in prepartion for lsiutil support. Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt.c#9 edit .. //depot/projects/mjexp/sys/dev/mpt/mpt_ioctl.h#1 add Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt.c#9 (text+ko) ==== @@ -108,10 +108,41 @@ #include #include +#include +#include #define MPT_MAX_TRYS 3 #define MPT_MAX_WAIT 300000 +static d_ioctl_t mptioctl; +#if __FreeBSD_version < 500000 +#define MPT_CDEV_MAJOR 249 +static struct cdevsw mpt_cdevsw = { + /* open */ nullopen, + /* close */ nullclose, + /* read */ noread, + /* write */ nowrite, + /* ioctl */ mptioctl, + /* poll */ nopoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ "mpt", + /* maj */ MPT_CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TAPE, +}; +#else +static struct cdevsw mpt_cdevsw = { + .d_version = D_VERSION, +#if __FreeBSD_version < 700037 + .d_flags = D_NEEDGIANT, +#endif + .d_ioctl = mptioctl, + .d_name = "mpt", +}; +#endif + static int maxwait_ack = 0; static int maxwait_int = 0; static int maxwait_state = 0; @@ -2099,6 +2130,7 @@ mpt_config_reply_handler; mpt_reply_handlers[MPT_CBI(MPT_REPLY_HANDLER_HANDSHAKE)] = mpt_handshake_reply_handler; + (void) make_dev(&mpt_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0600, "mptctl"); return (0); } @@ -2140,7 +2172,6 @@ MPT_LOCK(mpt); error = mpt_configure_ioc(mpt, 0, 0); MPT_UNLOCK(mpt); - return (error); } @@ -2624,6 +2655,40 @@ } /* + * IOCTL support + */ + +#if __FreeBSD_version < 500000 +#define _DEV dev_t +#define _IOP struct proc +#else +#define _IOP struct thread +#define _DEV struct cdev * +#endif + +static int +mptioctl(_DEV dev, u_long c, caddr_t addr, int flags, _IOP *td) +{ + struct mpt_softc *mpt; + int retval = ENOTTY; + + TAILQ_FOREACH(mpt, &mpt_tailq, links) { + if (minor(dev) == device_get_unit(mpt->dev)) { + break; + } + } + if (mpt == NULL) { + return (ENXIO); + } + + switch (c) { + default: + break; + } + return (retval); +} + +/* * Endian Conversion Functions- only used on Big Endian machines */ #if _BYTE_ORDER == _BIG_ENDIAN From owner-p4-projects@FreeBSD.ORG Sun May 27 21:46: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 20FE216A49E; Sun, 27 May 2007 21:46:38 +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 AD8EA16A4C9 for ; Sun, 27 May 2007 21:46:37 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9168313C455 for ; Sun, 27 May 2007 21:46:37 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4RLkbeL089908 for ; Sun, 27 May 2007 21:46:37 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4RLkbnK089902 for perforce@freebsd.org; Sun, 27 May 2007 21:46:37 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 27 May 2007 21:46:37 GMT Message-Id: <200705272146.l4RLkbnK089902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 May 2007 21:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=120477 Change 120477 by ivoras@ivoras_finstall on 2007/05/27 21:45:37 - Fix sysctl retrieval, wrt \0 characters - Implement GEOM confxml tree retrieval - Implement GetDrives() XML-RPC function Affected files ... .. //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/testtool/st.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#3 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#3 (text+ko) ==== @@ -22,15 +22,35 @@ # Interface to (most) FreeBSD's low-level utilities import os, sys +import xmldict cmd_sysctl = "/sbin/sysctl" cmd_geom = "/sbin/geom" cmd_mount = "/sbin/mount" +file_dmesg = "/var/run/dmesg.boot" + def get_sysctl(name): global cmd_sysctl - return os.popen("%s -b %s" % (cmd_sysctl, name)) + str = os.popen("%s -b %s" % (cmd_sysctl, name)).read().strip() + while str[-1] == "\0": + str = str[:-1] + return str def get_cmd_output(name): - return os.popen(name).read() + return os.popen(name).read().strip() + +def get_dmesg(): + global file_dmesg + return [x.strip() for x in file(file_dmesg, "r").readlines()] + +def get_geom_xml(): + return xmldict.buildxmldict(get_sysctl("kern.geom.confxml")) + +if __name__ == "__main__": + xml = get_geom_xml() + for cls in xml["mesh"]["class"]: + if cls["name"].data == "DISK": + for geom in cls["geom"]: + print geom["name"].data, geom["provider"]["mediasize"].data ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#4 (text+ko) ==== @@ -28,7 +28,7 @@ import os,sys from getopt import getopt, GetoptError from select import select -from SimpleXMLRPCServer import SimpleXMLRPCServer +from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler import globals from systoolengine import SysToolEngine @@ -65,19 +65,25 @@ sys.exit(1) +def ToUpper(str): + return str.upper() + engine = SysToolEngine() -server = SimpleXMLRPCServer((bind_host, bind_port), None, globals.debug_level > 0) +server = SimpleXMLRPCServer((bind_host, bind_port), SimpleXMLRPCRequestHandler, globals.debug_level > 0) server.register_introspection_functions() +server.register_function(ToUpper) server.register_instance(engine) +while not globals.exit_systoold: + try: + r,w,e = select([server.fileno()], [], [], 100) + if r: + # Only handle requests if there's a connection pending + # This is done to enable (somewhat) graceful exiting of this + # TCP connection handler loop + server.handle_request() + except KeyboardInterrupt: + break -while not globals.exit_systoold: - r,w,e = select([server.socket], [], [], 100) - print r - if r: - # Only handle requests if there's a connection pending - # This is done to enable (somewhat) graceful exiting of this - # TCP connection handler loop - server.handle_request() - +server.server_close() ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#4 (text+ko) ==== @@ -78,7 +78,33 @@ Examines "kern.drives" sysctl. This is NOT the list of valid GEOM leaves which can be mounted, but a list of found hardware.""" - return freebsd.get_sysctl("kern.disks").split(" ") + drive_list = freebsd.get_sysctl("kern.disks").split(" ") + dmesg = freebsd.get_dmesg() + drive_dict = {} + for drive in drive_list: + found = False + # try finding a line containing a "<" in hope that it's a description + for line in dmesg: + if line.startswith("%s:" % drive) and line.find("<") != -1: + drive_dict[drive] = {"name" : line[len(drive)+2:]} + found = True + if not found: + # try finding the longest line + drive_dict[drive] = {"name": ""} + for line in dmesg: + if line.startswith("%s:" % drive) and len(drive_dict[drive]["name"]) < len(line)-len(drive)-2: + drive_dict[drive] = {"name": line[len(drive)+2:]} + found = True + if not found: + drive_dict[drive]["name"] = "(unknown)" + geomxml = freebsd.get_geom_xml() + for cls in geomxml["mesh"]["class"]: + if cls["name"].data == "DISK": + for geom in cls["geom"]: + dev_name = geom["name"].data + if dev_name in drive_dict: + drive_dict[dev_name]["mediasize"] = int(geom["provider"]["mediasize"].data) / (1024*1024) # in MB, since XML-RPC doesn't have int64 + return drive_dict def GetMountPoints(self): ==== //depot/projects/soc2007/ivoras_finstall/pybackend/testtool/st.py#2 (text+ko) ==== @@ -23,4 +23,12 @@ # The purpose if this utility is mainly to test the XML-RPC calls in the # SysToolD +import sys +from xmlrpclib import ServerProxy + +server = ServerProxy("http://localhost:1025") +if not "systoold" in server.GetCaps(): + print "This is a bogus server" + sys.exit(1) +print server.GetDrives() ==== //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#3 (text+ko) ==== @@ -181,11 +181,15 @@ def builddict(self): """Builds a nested-dictionary-like structure from the xml. This method picks up tags on the main level and calls processTag() for nested tags.""" + global DEBUG d = Tag('', '') while True: tag, attrs, data = self.getnexttag() - if data != '': # data is actually between the last tag and this one + if data != '' and data != "\0": # data is actually between the last tag and this one sys.stderr.write("Warning: inline data between tags?!\n") + if DEBUG: + sys.stderr.write(" ^^^ |"+data+"|\n") + sys.stderr.write(" len=%d" % len(data)) if not tag: break if tag[-1] == '/': # an 'empty' tag (e.g. ) From owner-p4-projects@FreeBSD.ORG Sun May 27 22:29: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 38A7E16A4DD; Sun, 27 May 2007 22:29: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 0F21E16A4CD for ; Sun, 27 May 2007 22:29:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DD31D13C46E for ; Sun, 27 May 2007 22:29:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4RMTixl025283 for ; Sun, 27 May 2007 22:29:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4RMTgID025244 for perforce@freebsd.org; Sun, 27 May 2007 22:29:42 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 27 May 2007 22:29:42 GMT Message-Id: <200705272229.l4RMTgID025244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 120481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 May 2007 22:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=120481 Change 120481 by kmacy@kmacy_vt-x:opentoe_init on 2007/05/27 22:29:31 IFC latest cvs update of cxgb Affected files ... .. //depot/projects/opentoe/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/opentoe/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/opentoe/sys/conf/files#7 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/opentoe/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_version.h#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#17 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#9 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#10 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#20 integrate .. //depot/projects/opentoe/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/opentoe/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/opentoe/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/opentoe/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/opentoe/sys/dev/en/midway.c#2 integrate .. //depot/projects/opentoe/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/opentoe/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/opentoe/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/opentoe/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/opentoe/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/opentoe/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/opentoe/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/trap.c#4 integrate .. //depot/projects/opentoe/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/opentoe/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/opentoe/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/opentoe/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/opentoe/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/opentoe/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/opentoe/sys/kern/kern_event.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_resource.c#3 integrate .. //depot/projects/opentoe/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/opentoe/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/opentoe/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/opentoe/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/opentoe/sys/modules/cxgb/Makefile#8 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/opentoe/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/opentoe/sys/netinet/tcp.h#5 integrate .. //depot/projects/opentoe/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/opentoe/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/opentoe/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/opentoe/sys/netinet6/in6.c#2 integrate .. //depot/projects/opentoe/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/opentoe/sys/pci/ncr.c#3 integrate .. //depot/projects/opentoe/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/opentoe/sys/sys/vnode.h#4 integrate Differences ... ==== //depot/projects/opentoe/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.315 2007/03/26 21:45:44 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -468,7 +468,6 @@ * Otherwise, debugger traps "can't happen". */ #ifdef KDB - /* XXX Giant */ if (kdb_trap(type, 0, frame)) goto out; #endif ==== //depot/projects/opentoe/sys/boot/ia64/common/exec.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/common/exec.c,v 1.16 2006/11/05 22:03:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/common/exec.c,v 1.17 2007/05/27 19:02:46 marcel Exp $"); #include #include @@ -105,7 +105,7 @@ ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2)); pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY | - PTE_PL_KERN | PTE_AR_RWX; + PTE_PL_KERN | PTE_AR_RWX | PTE_ED; __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7))); __asm __volatile("mov cr.itir=%0" :: "r"(28 << 2)); ==== //depot/projects/opentoe/sys/compat/opensolaris/sys/mutex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -46,12 +46,18 @@ typedef struct sx kmutex_t; +#ifndef DEBUG +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) +#else +#define MUTEX_FLAGS (SX_DUPOK) +#endif + #define mutex_init(lock, desc, type, arg) do { \ ASSERT((type) == MUTEX_DEFAULT); \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ + sx_init_flags((lock), "zfs:" #lock, MUTEX_FLAGS); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) #define mutex_enter(lock) sx_xlock(lock) ==== //depot/projects/opentoe/sys/compat/opensolaris/sys/rwlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -48,6 +48,12 @@ typedef struct sx krwlock_t; +#ifndef DEBUG +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) +#else +#define RW_FLAGS (SX_DUPOK) +#endif + #define RW_READ_HELD(x) (rw_read_held((x))) #define RW_WRITE_HELD(x) (rw_write_held((x))) #define RW_LOCK_HELD(x) (rw_lock_held((x))) @@ -57,7 +63,7 @@ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ + sx_init_flags((lock), "zfs:" #lock, RW_FLAGS); \ } while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ ==== //depot/projects/opentoe/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1211 2007/05/25 09:48:18 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -514,6 +514,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard dev/cxgb/cxgb_main.c optional cxgb pci +dev/cxgb/cxgb_offload.c optional cxgb pci +dev/cxgb/cxgb_l2t.c optional cxgb pci dev/cxgb/cxgb_lro.c optional cxgb pci dev/cxgb/cxgb_sge.c optional cxgb pci dev/cxgb/common/cxgb_mc5.c optional cxgb pci ==== //depot/projects/opentoe/sys/dev/acpica/acpi.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.237 2007/05/15 08:41:05 takawata Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.238 2007/05/25 05:26:21 njl Exp $"); #include "opt_acpi.h" #include @@ -242,6 +242,10 @@ /* Allow users to override quirks. */ TUNABLE_INT("debug.acpi.quirks", &acpi_quirks); +static int acpi_susp_bounce; +SYSCTL_INT(_debug_acpi, OID_AUTO, suspend_bounce, CTLFLAG_RW, + &acpi_susp_bounce, 0, "Don't actually suspend, just test devices."); + /* * ACPI can only be loaded as a module by the loader; activating it after * system bootstrap time is not useful, and can be fatal to the system. @@ -2198,6 +2202,10 @@ } slp_state = ACPI_SS_DEV_SUSPEND; + /* If testing device suspend only, back out of everything here. */ + if (acpi_susp_bounce) + break; + status = AcpiEnterSleepStatePrep(state); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", ==== //depot/projects/opentoe/sys/dev/ath/if_ath.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.166 2007/04/23 05:57:06 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4806,7 +4806,7 @@ } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, NULL, 0, NULL, cc, HAL_MODE_ALL, outdoor, xchanmode)) { - ath_hal_getregdomain(ah, ®domain); + (void) ath_hal_getregdomain(ah, ®domain); if_printf(ifp, "unable to collect channel list from hal; " "regdomain likely %u country code %u\n", regdomain, cc); free(chans, M_TEMP); @@ -4871,7 +4871,7 @@ } } free(chans, M_TEMP); - ath_hal_getregdomain(ah, &sc->sc_regdomain); + (void) ath_hal_getregdomain(ah, &sc->sc_regdomain); ath_hal_getcountrycode(ah, &sc->sc_countrycode); sc->sc_xchanmode = xchanmode; sc->sc_outdoor = outdoor; @@ -4947,14 +4947,14 @@ if (sc->sc_curtxpow != ic->ic_txpowlimit) { ath_hal_settxpowlimit(ah, ic->ic_txpowlimit); /* read back in case value is clamped */ - ath_hal_gettxpowlimit(ah, &txpow); - ic->ic_txpowlimit = sc->sc_curtxpow = txpow; + if (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); - ic->ic_bss->ni_txpower = txpow; + if (ath_hal_getmaxtxpow(sc->sc_ah, &txpow)) + ic->ic_bss->ni_txpower = txpow; } static int @@ -5444,7 +5444,7 @@ u_int32_t scale; int error; - ath_hal_gettpscale(sc->sc_ah, &scale); + (void) ath_hal_gettpscale(sc->sc_ah, &scale); error = sysctl_handle_int(oidp, &scale, 0, req); if (error || !req->newptr) return error; @@ -5491,7 +5491,7 @@ u_int rfsilent; int error; - ath_hal_getrfsilent(sc->sc_ah, &rfsilent); + (void) ath_hal_getrfsilent(sc->sc_ah, &rfsilent); error = sysctl_handle_int(oidp, &rfsilent, 0, req); if (error || !req->newptr) return error; @@ -5551,7 +5551,7 @@ u_int32_t tpack; int error; - ath_hal_gettpack(sc->sc_ah, &tpack); + (void) ath_hal_gettpack(sc->sc_ah, &tpack); error = sysctl_handle_int(oidp, &tpack, 0, req); if (error || !req->newptr) return error; @@ -5565,7 +5565,7 @@ u_int32_t tpcts; int error; - ath_hal_gettpcts(sc->sc_ah, &tpcts); + (void) ath_hal_gettpcts(sc->sc_ah, &tpcts); error = sysctl_handle_int(oidp, &tpcts, 0, req); if (error || !req->newptr) return error; ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_common.h#4 (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/cxgb/common/cxgb_common.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mc5.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); #include #include ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (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/cxgb/common/cxgb_t3_cpl.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_hw.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.2 2007/03/20 21:43:32 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); #include #include ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_version.h#4 (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/cxgb/common/cxgb_version.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_xgmac.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_xgmac.c,v 1.2 2007/03/20 21:43:32 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_xgmac.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); #include #include ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#17 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -30,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.8 2007/04/08 15:04:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.9 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ @@ -40,7 +36,7 @@ #define _CXGB_ADAPTER_H_ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.8 2007/04/08 15:04:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.9 2007/05/25 09:48:19 kmacy Exp $"); #include #include ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_config.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -30,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_config.h,v 1.2 2007/03/20 21:43:31 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_config.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ #ifndef _CXGB_CONFIG_H_ ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_ioctl.h#4 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_ioctl.h,v 1.2 2007/03/20 21:43:31 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_ioctl.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ ***************************************************************************/ #ifndef __CHIOCTL_H__ ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#5 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its +2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.4 2007/04/08 22:56:18 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.5 2007/05/25 09:48:19 kmacy Exp $"); #include ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#9 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its +2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.15 2007/04/26 08:38:00 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.18 2007/05/27 22:04:30 kmacy Exp $"); #include #include @@ -1089,7 +1085,9 @@ req->iff = idx; memset(req->src_mac1, 0, sizeof(req->src_mac1)); memcpy(req->src_mac0, pi->hw_addr, ETHER_ADDR_LEN); - m->m_priority = 1; + + m_set_priority(m, 1); + offload_tx(&adapter->tdev, m); return (0); @@ -1142,6 +1140,9 @@ { int i, j; + if (singleq) + return; + for (i = 0; i < (sc)->params.nports; ++i) { const struct port_info *pi = adap2pinfo(sc, i); @@ -1545,7 +1546,6 @@ struct port_info *p = ifp->if_softc; struct mbuf *m0, *m = NULL; int err, in_use_init; - if (!p->link_config.link_ok) return (ENXIO); @@ -1609,6 +1609,11 @@ if (err == 0 && m == NULL) err = ENOBUFS; + if ((err == 0) && (txq->size <= txq->in_use + TX_MAX_DESC) && + (ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + err = ENOSPC; + } return (err); } ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_osdep.h#10 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -30,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.8 2007/04/08 15:04:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_osdep.h,v 1.10 2007/05/27 22:07:47 kmacy Exp $ ***************************************************************************/ @@ -56,6 +52,10 @@ panic("BUG: %s", exp); \ } while (0) + +#define m_get_priority(m) ((uintptr_t)(m)->m_pkthdr.rcvif) +#define m_set_priority(m, pri) ((m)->m_pkthdr.rcvif = (struct ifnet *)((uintptr_t)pri)) + #if __FreeBSD_version > 700030 #define INTR_FILTERS #define FIRMWARE_LATEST @@ -95,9 +95,9 @@ #define TX_MAX_SIZE (1 << 16) /* 64KB */ #define TX_MAX_SEGS 36 /* maximum supported by card */ #define TX_MAX_DESC 4 /* max descriptors per packet */ -#define TX_START_MAX_DESC (TX_MAX_DESC << 1) /* maximum number of descriptors +#define TX_START_MAX_DESC (TX_MAX_DESC << 2) /* maximum number of descriptors * call to start used per */ -#define TX_CLEAN_MAX_DESC (TX_MAX_DESC << 2) /* maximum tx descriptors +#define TX_CLEAN_MAX_DESC (TX_MAX_DESC << 4) /* maximum tx descriptors * to clean per iteration */ ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#20 (text+ko) ==== @@ -9,14 +9,10 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 @@ -32,7 +28,8 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.14 2007/04/26 08:36:59 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.17 2007/05/27 22:07:47 kmacy Exp $"); + #include #include @@ -92,7 +89,7 @@ * Period of the Tx buffer reclaim timer. This timer does not need to run * frequently as Tx buffers are usually reclaimed by new Tx packets. */ -#define TX_RECLAIM_PERIOD (hz >> 2) +#define TX_RECLAIM_PERIOD (hz >> 1) /* * work request size in bytes @@ -366,10 +363,7 @@ q->polling = adap->params.rev > 0; - if (adap->flags & USING_MSIX) - q->coalesce_nsecs = 6000; - else - q->coalesce_nsecs = 3500; + q->coalesce_nsecs = 5000; q->rspq_size = RSPQ_Q_SIZE; q->fl_size = FL_Q_SIZE; @@ -770,6 +764,11 @@ for (i = 0; i < n; i++) { m_freem_vec(m_vec[i]); } + if (qs->port->ifp->if_drv_flags & IFF_DRV_OACTIVE && + txq->size - txq->in_use >= TX_START_MAX_DESC) { + qs->port->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + taskqueue_enqueue(qs->port->tq, &qs->port->start_task); + } } txq = &qs->txq[TXQ_OFLD]; @@ -1179,8 +1178,8 @@ if (mlen <= WR_LEN - sizeof(*cpl)) { txq_prod(txq, 1, &txqs); txq->sdesc[txqs.pidx].m = m0; - m0->m_priority = txqs.pidx; - + + m_set_priority(m0, txqs.pidx); if (m0->m_len == m0->m_pkthdr.len) memcpy(&txd->flit[2], m0->m_data, mlen); else @@ -1220,7 +1219,8 @@ wr_hi = htonl(V_WR_OP(FW_WROPCODE_TUNNEL_TX_PKT) | txqs.compl); wr_lo = htonl(V_WR_TID(txq->token)); txsd->m = m0; - m0->m_priority = txqs.pidx; + m_set_priority(m0, txqs.pidx); + m_set_priority(m0, txqs.pidx); write_wr_hdr_sgl(ndesc, txd, &txqs, txq, sgl, flits, sgl_flits, wr_hi, wr_lo); check_ring_tx_db(p->adapter, txq); @@ -1590,12 +1590,20 @@ bus_dmamap_destroy(q->entry_tag, d->map); d->flags &= ~TX_SW_DESC_MAPPED; } - if (d->m->m_priority == cidx) { + + if (m_get_priority(d->m) == cidx) { + m_vec[nbufs] = d->m; + d->m = NULL; + nbufs++; + } else { + printf("pri=%d cidx=%d\n", (int)m_get_priority(d->m), cidx); + } + if (m_get_priority(d->m) == cidx) { m_vec[nbufs] = d->m; d->m = NULL; nbufs++; } else { - printf("pri=%d cidx=%d\n", d->m->m_priority, cidx); + printf("pri=%d cidx=%d\n", m_get_priority(d->m), cidx); } } ++d; @@ -1736,7 +1744,7 @@ ret = check_desc_avail(adap, q, m, ndesc, TXQ_OFLD); if (__predict_false(ret)) { if (ret == 1) { - m->m_priority = ndesc; /* save for restart */ + m_set_priority(m, ndesc); /* save for restart */ mtx_unlock(&q->lock); return NET_XMIT_CN; } @@ -1792,7 +1800,7 @@ while ((m = mbufq_peek(&q->sendq)) != NULL) { unsigned int gen, pidx; - unsigned int ndesc = m->m_priority; + unsigned int ndesc = m_get_priority(m); if (__predict_false(q->size - q->in_use < ndesc)) { setbit(&qs->txq_stopped, TXQ_OFLD); @@ -1844,7 +1852,7 @@ static __inline int queue_set(const struct mbuf *m) { - return m->m_priority >> 1; + return m_get_priority(m) >> 1; } /** @@ -1857,7 +1865,7 @@ static __inline int is_ctrl_pkt(const struct mbuf *m) { - return m->m_priority & 1; + return m_get_priority(m) & 1; } /** @@ -2378,7 +2386,7 @@ /* * XXX size mismatch */ - rspq->m->m_priority = rss_hash; + m_set_priority(rspq->m, rss_hash); ngathered = rx_offload(&adap->tdev, rspq, rspq->m, offload_mbufs, ngathered); ==== //depot/projects/opentoe/sys/dev/cxgb/sys/mvec.h#3 (text+ko) ==== @@ -9,9 +9,9 @@ * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 2. The name of Kip Macy nor the names of other + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.4 2007/04/14 20:38:38 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.5 2007/05/25 16:42:25 kmacy Exp $ * ***************************************************************************/ ==== //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#4 (text+ko) ==== @@ -9,9 +9,9 @@ * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 2. The name of Kip Macy nor the names of other + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -29,7 +29,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.12 2007/04/20 05:12:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.13 2007/05/25 16:42:25 kmacy Exp $"); #include #include ==== //depot/projects/opentoe/sys/dev/dcons/dcons.c#2 (text+ko) ==== @@ -32,13 +32,16 @@ * SUCH DAMAGE. * * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $ - * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.20 2005/01/06 01:42:34 imp Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons.c,v 1.21 2007/05/25 05:00:39 simokawa Exp $ */ #include #if defined(__DragonFly__) || defined(_BOOT) #include "dcons.h" +#if defined(_BOOT) +#include "stand.h" +#endif #else #include #endif ==== //depot/projects/opentoe/sys/dev/dcons/dcons_crom.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $ - * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.6 2005/01/06 01:42:34 imp Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.7 2007/05/27 14:00:34 simokawa Exp $ */ #include @@ -65,7 +65,7 @@ static bus_addr_t dcons_paddr; #if __FreeBSD_version >= 500000 -static int force_console = 1; +static int force_console = 0; TUNABLE_INT("hw.firewire.dcons_crom.force_console", &force_console); #endif ==== //depot/projects/opentoe/sys/dev/dcons/dcons_os.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.12 2006/11/06 13:41:53 rwatson Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.13 2007/05/27 13:58:43 simokawa Exp $ */ #include @@ -71,9 +71,12 @@ #include #include -#include "opt_ddb.h" #include "opt_comconsole.h" #include "opt_dcons.h" +#include "opt_kdb.h" +#include "opt_gdb.h" +#include "opt_ddb.h" + #ifndef DCONS_POLL_HZ #define DCONS_POLL_HZ 100 @@ -178,7 +181,7 @@ CONSOLE_DRIVER(dcons); -#if __FreeBSD_version >= 502122 +#if defined(GDB) && (__FreeBSD_version >= 502122) static gdb_probe_f dcons_dbg_probe; static gdb_init_f dcons_dbg_init; static gdb_term_f dcons_dbg_term; @@ -191,7 +194,7 @@ extern struct gdb_dbgport *gdb_cur; #endif -#if (defined(KDB) || defined(DDB)) && defined(ALT_BREAK_TO_DEBUGGER) +#if (defined(GDB) || defined(DDB)) && defined(ALT_BREAK_TO_DEBUGGER) static int dcons_check_break(struct dcons_softc *dc, int c) { @@ -200,12 +203,14 @@ #if __FreeBSD_version >= 502122 if (kdb_alt_break(c, &dc->brk_state)) { +#ifdef GDB if ((dc->flags & DC_GDB) != 0) { if (gdb_cur == &dcons_gdb_dbgport) { kdb_dbbe_select("gdb"); breakpoint(); } } else +#endif breakpoint(); } #else @@ -251,6 +256,7 @@ return (c); } +#if defined(GDB) || !defined(CONS_NODEV) static int dcons_os_getc(struct dcons_softc *dc) { @@ -260,6 +266,7 @@ return (c & 0xff); } +#endif static void dcons_os_putc(struct dcons_softc *dc, int c) @@ -705,7 +712,7 @@ return(err); } -#if __FreeBSD_version >= 502122 +#if defined(GDB) && (__FreeBSD_version >= 502122) /* Debugger interface */ static int ==== //depot/projects/opentoe/sys/dev/en/midway.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.71 2006/12/29 16:38:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/en/midway.c,v 1.72 2007/05/27 12:45:05 rwatson Exp $"); /* * @@ -2435,8 +2435,7 @@ device_printf(sc->dev, "unexpected interrupt=0x%b, " "resetting\n", reg, MID_INTBITS); #ifdef EN_DEBUG - kdb_enter("en: unexpected error"); - sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; /* FREEZE! */ + panic("en: unexpected error"); #else en_reset_ul(sc); en_init(sc); ==== //depot/projects/opentoe/sys/dev/lmc/if_lmc.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.31 2007/02/23 12:18:46 piso Exp $ + * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.32 2007/05/27 20:50:23 rwatson Exp $ * * Copyright (c) 2002-2004 David Boggs. * All rights reserved. @@ -58,7 +58,7 @@ * interface and add an Ethernet-to-HDLC gate array to make a WAN card. * David Boggs designed the Ethernet-to-HDLC gate arrays and PC cards. * We did this at our company, LAN Media Corporation (LMC). - * SBE Corp aquired LMC and continues to make the cards. + * SBE Corp acquired LMC and continues to make the cards. * * Since the cards use Tulip Ethernet chips, we started with Matt Thomas' * ubiquitous "de" driver. Michael Graff stripped out the Ethernet stuff ==== //depot/projects/opentoe/sys/dev/mmc/bridge.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 28 05:09: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 20E6816A506; Mon, 28 May 2007 05:09: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 C1D3B16A503 for ; Mon, 28 May 2007 05:09: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 B028C13C447 for ; Mon, 28 May 2007 05:09:42 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4S59gZ2026410 for ; Mon, 28 May 2007 05:09:42 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4S58SYt025332 for perforce@freebsd.org; Mon, 28 May 2007 05:08:28 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 28 May 2007 05:08:28 GMT Message-Id: <200705280508.l4S58SYt025332@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 120490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 05:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=120490 Change 120490 by mjacob@mjexp on 2007/05/28 05:07:13 IFC Affected files ... .. //depot/projects/mjexp/MAINTAINERS#5 integrate .. //depot/projects/mjexp/Makefile#5 integrate .. //depot/projects/mjexp/Makefile.inc1#10 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#16 integrate .. //depot/projects/mjexp/UPDATING#16 integrate .. //depot/projects/mjexp/bin/csh/config.h#3 integrate .. //depot/projects/mjexp/bin/csh/config_p.h#3 integrate .. //depot/projects/mjexp/bin/rcp/rcp.c#2 integrate .. //depot/projects/mjexp/contrib/csup/queue.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/BASE-VER#1 branch .. //depot/projects/mjexp/contrib/gcc/COPYING#2 integrate .. //depot/projects/mjexp/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/mjexp/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/mjexp/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/mjexp/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.1#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.2#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.3#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.4#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.5#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.6#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.7#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/mjexp/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/mjexp/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/mjexp/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/mjexp/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/mjexp/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/gcc/README-fixinc#2 delete .. //depot/projects/mjexp/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/mjexp/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/mjexp/contrib/gcc/addresses.h#1 branch .. //depot/projects/mjexp/contrib/gcc/alias.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/alias.h#1 branch .. //depot/projects/mjexp/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/ansidecl.h#2 delete .. //depot/projects/mjexp/contrib/gcc/attribs.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/builtins.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/builtins.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-common.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-common.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-common.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-format.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-format.h#1 branch .. //depot/projects/mjexp/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/mjexp/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/mjexp/contrib/gcc/c-omp.c#1 branch .. //depot/projects/mjexp/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-parse.in#2 delete .. //depot/projects/mjexp/contrib/gcc/c-parser.c#1 branch .. //depot/projects/mjexp/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/c.opt#2 integrate .. //depot/projects/mjexp/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/calls.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfg.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/mjexp/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/mjexp/contrib/gcc/collect2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/collect2.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/combine.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/common.opt#2 integrate .. //depot/projects/mjexp/contrib/gcc/concat.c#2 delete .. //depot/projects/mjexp/contrib/gcc/conditions.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config.build#2 integrate .. //depot/projects/mjexp/contrib/gcc/config.gcc#2 integrate .. //depot/projects/mjexp/contrib/gcc/config.host#2 integrate .. //depot/projects/mjexp/contrib/gcc/config.in#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/alpha-protos.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/alpha.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/alpha.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/alpha.md#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/elf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/ev4.md#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/ev5.md#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/ev6.md#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/freebsd.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/gnu.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/linux-elf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/linux.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/netbsd.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/openbsd.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/osf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/osf5.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/qrnnd.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-osf4#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/unicosmk.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-cc.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-crt0-64.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-crt0.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-dwarf2.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-ld.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms-psxcrt0.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms64.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/vms_tramp.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/mjexp/contrib/gcc/config/alpha/xm-vms.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/mjexp/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/frv/cmovd.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/cmovh.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/cmovw.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv-abi.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv-asm.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv-modes.def#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv-protos.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frv.md#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frvbegin.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/frvend.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/lib1funcs.asm#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/t-frv#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/freebsd-aout.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/linux-aout.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/lynx-ng.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/moss.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/svr3dbx.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/svr3gas.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/sysv3.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/vsta.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/mjexp/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/linux-aout.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/lynx-ng.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/memset.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/altivec-defs.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/mjexp/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/aout.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/elf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/lite.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/litecoff.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/liteelf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/openbsd.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/pbd.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/sp64-aout.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sp86x-elf.h#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/mjexp/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/mjexp/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/mjexp/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/mjexp/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/mjexp/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/mjexp/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/mjexp/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/mjexp/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/mjexp/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/mjexp/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/mjexp/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/mjexp/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/mjexp/contrib/gcc/configure#2 integrate .. //depot/projects/mjexp/contrib/gcc/configure.ac#2 integrate .. //depot/projects/mjexp/contrib/gcc/conflict.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/convert.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/convert.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/coverage.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/coverage.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp-demangle.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/mjexp/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog.1#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog.2#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/mjexp/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/lex.h#2 delete .. //depot/projects/mjexp/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cplus-dem.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/cpperror.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppexp.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppfiles.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpphash.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpphash.h#2 delete .. //depot/projects/mjexp/contrib/gcc/cppinit.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpplex.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpplib.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpplib.h#2 delete .. //depot/projects/mjexp/contrib/gcc/cppmacro.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cpppch.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppspec.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cpptrad.c#2 delete .. //depot/projects/mjexp/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/mjexp/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/mjexp/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/mjexp/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cse.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cselib.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/cselib.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/dbxout.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/ddg.c#1 branch .. //depot/projects/mjexp/contrib/gcc/ddg.h#1 branch .. //depot/projects/mjexp/contrib/gcc/debug.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/debug.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/defaults.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/demangle.h#2 delete .. //depot/projects/mjexp/contrib/gcc/df-core.c#1 branch .. //depot/projects/mjexp/contrib/gcc/df-problems.c#1 branch .. //depot/projects/mjexp/contrib/gcc/df-scan.c#1 branch .. //depot/projects/mjexp/contrib/gcc/df.c#2 delete .. //depot/projects/mjexp/contrib/gcc/df.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/dfp.c#1 branch .. //depot/projects/mjexp/contrib/gcc/dfp.h#1 branch .. //depot/projects/mjexp/contrib/gcc/diagnostic.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/diagnostic.def#2 integrate .. //depot/projects/mjexp/contrib/gcc/diagnostic.h#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/mjexp/contrib/gcc/doc/compat.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/cppinternals.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/fragments.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/gccint.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/gcov.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/gty.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/mjexp/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/include/texinfo.tex#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/interface.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/mjexp/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/objc.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/mjexp/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/portability.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/mjexp/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/mjexp/contrib/gcc/dojump.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/doloop.c#2 delete .. //depot/projects/mjexp/contrib/gcc/dominance.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/domwalk.c#1 branch .. //depot/projects/mjexp/contrib/gcc/domwalk.h#1 branch .. //depot/projects/mjexp/contrib/gcc/double-int.c#1 branch .. //depot/projects/mjexp/contrib/gcc/double-int.h#1 branch .. //depot/projects/mjexp/contrib/gcc/dummy-checksum.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 28 13:00: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 6FC1616A4AB; Mon, 28 May 2007 13:00:52 +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 214A716A4FE for ; Mon, 28 May 2007 13:00:52 +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 0DA2013C458 for ; Mon, 28 May 2007 13:00:52 +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.8/8.13.8) with ESMTP id l4SD0qI2065003 for ; Mon, 28 May 2007 13:00:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SCwMQq064851 for perforce@freebsd.org; Mon, 28 May 2007 12:58:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 May 2007 12:58:22 GMT Message-Id: <200705281258.l4SCwMQq064851@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 120497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 13:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=120497 Change 120497 by rwatson@rwatson_zoo on 2007/05/28 12:57:17 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - gcc 4.2.0 upgrade - INCLUDE_CONFIG_FILE and config 6.6 - Symbol versioning, global library version bump - top supports full process titles - OpenSSL update, gcc420 updates - libthr now the default thread library - ether_aton variations - Extended libgeom interface for interacting with GEOM devices from user space. - Support for Camellia crypto algorithm - hptiop, ng_car, rum - routing header 0 handling changes for IPv6 - accounting time type fixes, backward compatibility - timezone update - host uuid - CAM and several CAM drivers MPSAFE - if_em reworked - further cxgb, including LRO - TCP helpfully broken out into sensible files - ZFS uses FreeBSD name cache - bce TSO support - mxge update - GEOM disk identifiers, BIO_DELETE - clock locking broken out from sched_lock - WITNESS/INVARIANTS locking foo somewhat redone. - sx locks optimized, sblock optimized - sleepqs, turnstiles slab allocated - More SCTP - TCP debugging MPSAFE Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#46 integrate .. //depot/projects/trustedbsd/base/Makefile#51 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#85 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#24 integrate .. //depot/projects/trustedbsd/base/UPDATING#81 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#8 integrate .. //depot/projects/trustedbsd/base/bin/csh/config_p.h#4 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#26 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#10 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#15 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/csup/queue.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/BASE-VER#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/COPYING#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/COPYING.LIB#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#18 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.0#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.1#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.2#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.3#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.4#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.5#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.6#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.7#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/LANGUAGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/README-fixinc#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/aclocal.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/addresses.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/alias.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/alias.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ansidecl.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/basic-block.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bb-reorder.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bitmap.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bitmap.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtin-attrs.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtin-types.def#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-aux-info.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.def#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-convert.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-dump.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-errors.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lang.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-objc-common.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-omp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#12 delete .. //depot/projects/trustedbsd/base/contrib/gcc/c-parser.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/c-pch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-ppoutput.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pretty-print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pretty-print.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-tree.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c.opt#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/caller-save.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfg.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfganal.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgbuild.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgloop.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/choose-temp.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/common.opt#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/concat.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/conditions.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.build#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.host#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha-protos.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#12 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#11 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#12 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/elf.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev4.md#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev5.md#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/ev6.md#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/freebsd.h#11 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/gnu.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/lib1funcs.asm#6 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux-elf.h#6 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux.h#9 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/netbsd.h#9 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/openbsd.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf5.h#6 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/qrnnd.asm#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-alpha#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-crtfm#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-ieee#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-osf4#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-vms#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/unicosmk.h#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/va_list.h#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-cc.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-crt0-64.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-crt0.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-dwarf2.asm#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-dwarf2eh.asm#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-ld.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-psxcrt0-64.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-psxcrt0.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms64.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms_tramp.asm#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/x-vms#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/xm-vms.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/README-interworking#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aof.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aout.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-protos.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/coff.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/crti.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/crtn.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/ecos-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/freebsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/lib1funcs.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-elf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-gas.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/netbsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pe.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pe.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/rtems-elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/semi.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/semiaof.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/strongarm-coff.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/strongarm-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/strongarm-pe.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-arm-coff#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-arm-elf#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-linux#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-pe#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-semi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-strongarm-pe#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-xscale-elf#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/uclinux-elf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unknown-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/xscale-coff.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/xscale-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-c.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbx.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbxcoff.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dbxelf.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/elfos.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/fp-bit.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/fp-bit.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-nthr.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovd.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovh.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/cmovw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-abi.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-asm.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-modes.def#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv-protos.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frv.md#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frvbegin.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/frvend.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/lib1funcs.asm#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/t-frv#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/gnu.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/gofast.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/athlon.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/att.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/beos-elf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/biarch64.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/bsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/crtdll.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin1.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/djgpp.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/emmintrin.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd-aout.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#20 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd64.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gas.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gmon-sol2.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gnu.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gthr-win32.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-aout.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-coff.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-interix.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-interix3.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386elf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/k6.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-aout.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux64.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/lynx-ng.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/lynx.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mingw32.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mmintrin.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/moss.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd-elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/openbsd.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/pentium.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/pmmintrin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/ppro.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/ptx4-i.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/rtemself.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco5.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2-c1.asm#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2-gc1.asm#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3dbx.h#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3gas.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv3.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv4-cpp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv4.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sysv5.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-linux64#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-mingw32#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-rtems-i386#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-sol2#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/udk.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/unix.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/uwin.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/vsta.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/winnt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-cygwin#3 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x86-64.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-cygwin.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-djgpp.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-mingw32.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xmmintrin.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtbegin.asm#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtend.asm#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crti.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/crtn.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/fde-glibc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/freebsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/hpux.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-c.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-protos.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.md#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64intrin.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/lib1funcs.asm#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/linux.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/quadlib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/sysv4.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-hpux#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-ia64#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/interix.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/interix3.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/libgloss.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/linux-aout.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/linux.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/lynx-ng.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/lynx.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/memset.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd-aout.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd-elf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/openbsd-oldgas.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/openbsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ptx4.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix51.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec-defs.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/crtsavres.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-tramp.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi-ci.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi-cn.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.asm#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabialtivec.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabisim.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabispe.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/gnu.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/host-darwin.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linuxaltivec.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/lynx.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/netbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/ppc64-fp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sol-ci.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sol-cn.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4le.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-beos#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-darwin#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-ppccomm#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/tramp.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/windiss.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/xcoff.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rtems.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/fixdfdi.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/libgcc-glibc.ver#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/linux.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390-protos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.md#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390x.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-linux#3 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-linux64#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sol2.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/aout.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/biarch64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/cypress.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/elf.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/hypersparc.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux64.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/lite.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/litecoff.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/liteelf.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd-elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/pbd.h#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/rtemself.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-64.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-bi.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-c1.asm#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gas-bi.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp64-aout.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp64-elf.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp86x-elf.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-protos.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.md#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparclet.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/supersparc.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sysv4.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-linux64#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-openbsd#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sp86x#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sparclite#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/ultra1_2.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/ultra3.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/svr3.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/svr4.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-darwin#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-linux#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-linux-gnulibc1#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-darwin#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-elf-ver#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-sld#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/usegas.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-linux#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.ac#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/conflict.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/convert.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/convert.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/coverage.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/coverage.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#18 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.1#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.2#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/NEWS#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/config-lang.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.def#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cxx-pretty-print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/dump.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/except.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/expr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/friend.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/g++spec.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lang-specs.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/operators.def#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/optimize.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ptree.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/repo.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/rtti.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cplus-dem.c#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppdefault.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppdefault.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpperror.c#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppexp.c#9 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#10 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpphash.c#8 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpphash.h#9 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppinit.c#14 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpplex.c#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#13 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.h#9 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#12 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cpppch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppspec.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpptrad.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/crtstuff.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ddg.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/ddg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/debug.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/debug.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/demangle.h#7 delete .. //depot/projects/trustedbsd/base/contrib/gcc/df-core.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/df-problems.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/df-scan.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/df.c#5 delete .. //depot/projects/trustedbsd/base/contrib/gcc/df.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dfp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/dfp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/diagnostic.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/c-tree.texi#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/doc/compat.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/contrib.texi#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/contribute.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.texi#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppinternals.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppopts.texi#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 28 17:34:27 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 9FB2516A52B; Mon, 28 May 2007 17:34: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 77A4E16A4FF for ; Mon, 28 May 2007 17:34:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 680BD13C465 for ; Mon, 28 May 2007 17:34:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SHYRJh032995 for ; Mon, 28 May 2007 17:34:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SHYRo9032989 for perforce@freebsd.org; Mon, 28 May 2007 17:34:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 28 May 2007 17:34:27 GMT Message-Id: <200705281734.l4SHYRo9032989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 17:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=120505 Change 120505 by hselasky@hselasky_mini_itx on 2007/05/28 17:34:13 Set Max Frame Burst to 2048 bytes, hence some chips do not support a higher value. This affects "AX88178" and "AX88772" based chips only. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#26 (text+ko) ==== @@ -243,7 +243,10 @@ .type = UE_BULK, .endpoint = -1, /* any */ .direction = UE_DIR_IN, - .bufsize = AXE_BULK_BUF_SIZE, +#if (MCLBYTES < 2048) +#error "(MCLBYTES < 2048)" +#endif + .bufsize = MCLBYTES, .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &axe_bulk_read_callback, .timeout = 0, /* no timeout */ @@ -698,12 +701,6 @@ sc->sc_flags |= AXE_FLAG_WAIT_LINK; - /* correct maximum bulk-receive length */ - - sc->sc_xfer[1]->length = - (sc->sc_flags & (AXE_FLAG_772|AXE_FLAG_178)) ? - AXE_BULK_BUF_SIZE : MIN(MCLBYTES, AXE_BULK_BUF_SIZE); - /* start setup */ usbd_config_td_queue_command @@ -1454,7 +1451,7 @@ /* Enable receiver, set RX mode */ rxmode = (AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE); if (sc->sc_flags & (AXE_FLAG_178|AXE_FLAG_772)) { - rxmode |= AXE_178_RXCMD_MFB_16384; /* default */ + rxmode |= AXE_178_RXCMD_MFB_2048; /* chip default */ } else { rxmode |= AXE_172_RXCMD_UNICAST; } From owner-p4-projects@FreeBSD.ORG Mon May 28 19:53: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 AB9E016A47B; Mon, 28 May 2007 19:53: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 7DB1F16A46D for ; Mon, 28 May 2007 19:53:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 61FB813C484 for ; Mon, 28 May 2007 19:53:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SJrJCj073373 for ; Mon, 28 May 2007 19:53:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SJrJPZ073352 for perforce@freebsd.org; Mon, 28 May 2007 19:53:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 28 May 2007 19:53:19 GMT Message-Id: <200705281953.l4SJrJPZ073352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 19:53:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=120510 Change 120510 by rpaulo@rpaulo_epsilon on 2007/05/28 19:52:46 Setup the Sudden Motion sensor so that it sends an IRQ when the laptop recieves a shock. For example, if the laptop is moved in air agressivly, the following will show up on dmesg: asmc0: WARNING: possible shock! asmc0: WARNING: possible shock! asmc0: WARNING: high acceleration detected! Fix comments. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#4 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#3 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#3 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#4 $ * */ @@ -76,6 +76,7 @@ static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); static void asms_sms_calibrate(device_t); +static int asmc_sms_intr(void *); /* * Model functions. @@ -226,6 +227,7 @@ asmc_attach(device_t dev) { int i, j; + int error; char name[2]; struct asmc_softc *sc = device_get_softc(dev); struct asmc_model *model; @@ -354,6 +356,26 @@ dev, 0, model->smc_sms_z, "I", "Sudden Motion Sensor Z value"); + /* + * Allocate an IRQ for the SMS. + */ + sc->sc_rid = 0; + sc->sc_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_rid, + ASMC_IRQ, ASMC_IRQ, 1, RF_ACTIVE); + if (sc->sc_res == NULL) { + device_printf(dev, "unable to allocate IRQ resource\n"); + goto out; + } + + error = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC|INTR_MPSAFE|INTR_EXCL, + asmc_sms_intr, NULL, dev, &sc->sc_cookie); + if (error) { + device_printf(dev, "unable to setup SMS IRQ\n"); + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, + sc->sc_res); + } + out: return 0; } @@ -365,6 +387,11 @@ sysctl_ctx_free(&sc->sc_sysctl_ctx); + if (sc->sc_cookie) + bus_teardown_intr(dev, sc->sc_res, sc->sc_cookie); + if (sc->sc_res) + bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_res); + return 0; } @@ -376,9 +403,45 @@ uint8_t buf[4]; /* + * We are ready to recieve interrupts from the SMS. + */ + buf[0] = 0x01; + asmc_key_write(dev, ASMC_KEY_INTOK, buf, 1); + DELAY(50); + + /* + * Initiate the polling intervals. + */ + buf[0] = 20; /* msecs */ + asmc_key_write(dev, ASMC_KEY_SMS_LOW_INT, buf, 1); + DELAY(150); + + buf[0] = 20; /* msecs */ + asmc_key_write(dev, ASMC_KEY_SMS_HIGH_INT, buf, 1); + DELAY(150); + + buf[0] = 0x00; + buf[1] = 0x60; + asmc_key_write(dev, ASMC_KEY_SMS_LOW, buf, 2); + DELAY(150); + + buf[0] = 0x01; + buf[1] = 0xc0; + asmc_key_write(dev, ASMC_KEY_SMS_HIGH, buf, 2); + DELAY(150); + + /* + * I'm not sure what this key does, but it seems to be + * required. + */ + buf[0] = 0x01; + asmc_key_write(dev, ASMC_KEY_SMS_FLAG, buf, 1); + DELAY(50); + + /* * Wait up to 5 seconds for SMS initialization. */ - for (i = 0; i < 100; i++) { + for (i = 0; i < 10000; i++) { if (asmc_key_read(dev, ASMC_KEY_SMS, buf, 2) == 0 && (buf[0] != 0x00 || buf[1] != 0x00)) { error = 0; @@ -397,7 +460,7 @@ sc->sc_nfan = asmc_fan_count(dev); if (sc->sc_nfan > ASMC_MAXFANS) { device_printf(dev, "more than %d fans were detected. Please " - "report this.", ASMC_MAXFANS); + "report this.\n", ASMC_MAXFANS); sc->sc_nfan = ASMC_MAXFANS; } @@ -424,7 +487,7 @@ val = val & ASMC_STATUS_MASK; - for (i = 0; i < 10000; i++) { + for (i = 0; i < 100; i++) { if ((inb(ASMC_CMDPORT) & ASMC_STATUS_MASK) == val) return 0; DELAY(10); @@ -668,6 +731,31 @@ } static int +asmc_sms_intr(void *arg) +{ + uint8_t type; + device_t dev = (device_t) arg; + + type = inb(ASMC_INTPORT); + + switch (type) { + case ASMC_SMS_INTFF: + device_printf(dev, "WARNING: possible free fall!\n"); + break; + case ASMC_SMS_INTHA: + device_printf(dev, "WARNING: high acceleration detected!\n"); + break; + case ASMC_SMS_INTSH: + device_printf(dev, "WARNING: possible shock!\n"); + break; + default: + device_printf(dev, "%s unknown interrupt\n", __func__); + } + + return 0; +} + +static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t) arg1; ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#2 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#3 $ * */ @@ -45,6 +45,10 @@ struct sysctl_oid *sc_sms_tree; struct asmc_model *sc_model; + + int sc_rid; + struct resource *sc_res; + void *sc_cookie; }; struct asmc_model { @@ -66,6 +70,13 @@ const char *smc_tempdescs[8]; }; +/* + * The Sudden Motion Sensor is able to generate an interrupt when + * there are certain critical conditions (free fall, high acceleration and + * shocks). + * The following IRQ is used. + */ +#define ASMC_IRQ 6 /* * Data port. @@ -80,6 +91,12 @@ #define ASMC_CMDREAD 0x10 #define ASMC_CMDWRITE 0x11 +/* + * Interrupt port. + */ +#define ASMC_INTPORT 0x31f + + /* Number of keys */ #define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ @@ -98,11 +115,19 @@ * Sudden Motion Sensor (SMS). */ #define ASMC_SMS_INIT1 0xe0 -#define ASMC_SMS_INIT2 0x00 +#define ASMC_SMS_INIT2 0xf8 #define ASMC_KEY_SMS "MOCN" /* RW; 2 bytes */ #define ASMC_KEY_SMS_X "MO_X" /* RO; 2 bytes */ #define ASMC_KEY_SMS_Y "MO_Y" /* RO; 2 bytes */ #define ASMC_KEY_SMS_Z "MO_Z" /* RO; 2 bytes */ +#define ASMC_KEY_SMS_LOW "MOLT" /* RW; 2 bytes */ +#define ASMC_KEY_SMS_HIGH "MOHT" /* RW; 2 bytes */ +#define ASMC_KEY_SMS_LOW_INT "MOLD" /* RW; 1 byte */ +#define ASMC_KEY_SMS_HIGH_INT "MOHD" /* RW; 1 byte */ +#define ASMC_KEY_SMS_FLAG "MSDW" /* RW; 1 byte */ +#define ASMC_SMS_INTFF 0x60 /* Free fall Interrupt */ +#define ASMC_SMS_INTHA 0x6f /* High Acceleration Interrupt */ +#define ASMC_SMS_INTSH 0x80 /* Shock Interrupt */ /* * Keyboard backlight. @@ -116,10 +141,16 @@ #define ASMC_KEY_CLAMSHELL "MSLD" /* RO; 1 byte */ /* + * Interrupt keys. + */ +#define ASMC_KEY_INTOK "NTOK" /* WO; 1 byte */ + + + +/* * Temperatures. * * First for MacBook/MacBook Pro, then for Intel Mac Mini. - * XXX: the descriptions/names are probably wrong (rpaulo) * */ From owner-p4-projects@FreeBSD.ORG Mon May 28 19:55:27 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 AAEE916A521; Mon, 28 May 2007 19:55:26 +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 4105D16A532 for ; Mon, 28 May 2007 19:55:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B1A213C4D0 for ; Mon, 28 May 2007 19:55:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SJtPX7075540 for ; Mon, 28 May 2007 19:55:26 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SJtPKx075531 for perforce@freebsd.org; Mon, 28 May 2007 19:55:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 28 May 2007 19:55:25 GMT Message-Id: <200705281955.l4SJtPKx075531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 19:55:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=120512 Change 120512 by rpaulo@rpaulo_epsilon on 2007/05/28 19:54:25 Fix function spelling. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#5 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#4 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#5 $ * */ @@ -75,7 +75,7 @@ static int asmc_fan_getvalue(device_t, const char *, int); static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); -static void asms_sms_calibrate(device_t); +static void asmc_sms_calibrate(device_t); static int asmc_sms_intr(void *); /* @@ -455,7 +455,7 @@ } out: - asms_sms_calibrate(dev); + asmc_sms_calibrate(dev); sc->sc_nfan = asmc_fan_count(dev); if (sc->sc_nfan > ASMC_MAXFANS) { @@ -721,7 +721,7 @@ } static void -asms_sms_calibrate(device_t dev) +asmc_sms_calibrate(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); From owner-p4-projects@FreeBSD.ORG Mon May 28 20:58:04 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 6631516A474; Mon, 28 May 2007 20:58:04 +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 24A2C16A46E for ; Mon, 28 May 2007 20:58:04 +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 119E713C46A for ; Mon, 28 May 2007 20:58:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SKw4lP042979 for ; Mon, 28 May 2007 20:58:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SKtg1o040903 for perforce@freebsd.org; Mon, 28 May 2007 20:55:42 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 May 2007 20:55:42 GMT Message-Id: <200705282055.l4SKtg1o040903@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 120516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 20:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=120516 Change 120516 by marcel@marcel_xcllnt on 2007/05/28 20:55:22 IFC @120509 Affected files ... .. //depot/projects/tty/MAINTAINERS#25 integrate .. //depot/projects/tty/Makefile#22 integrate .. //depot/projects/tty/Makefile.inc1#33 integrate .. //depot/projects/tty/ObsoleteFiles.inc#11 integrate .. //depot/projects/tty/UPDATING#35 integrate .. //depot/projects/tty/bin/csh/config.h#8 integrate .. //depot/projects/tty/bin/csh/config_p.h#4 integrate .. //depot/projects/tty/bin/df/df.c#10 integrate .. //depot/projects/tty/bin/mv/mv.1#4 integrate .. //depot/projects/tty/bin/rcp/rcp.c#6 integrate .. //depot/projects/tty/bin/sh/var.c#10 integrate .. //depot/projects/tty/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/tty/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/tty/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/tty/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/tty/contrib/amd/amq/amq.8#5 integrate .. //depot/projects/tty/contrib/csup/queue.h#2 integrate .. //depot/projects/tty/contrib/gcc/BASE-VER#1 branch .. //depot/projects/tty/contrib/gcc/COPYING#2 integrate .. //depot/projects/tty/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/tty/contrib/gcc/ChangeLog#8 integrate .. //depot/projects/tty/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/tty/contrib/gcc/ChangeLog.0#3 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.1#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.2#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.3#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.4#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.5#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.6#4 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.7#3 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/tty/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/tty/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/tty/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/tty/contrib/gcc/LANGUAGES#3 integrate .. //depot/projects/tty/contrib/gcc/Makefile.in#7 integrate .. //depot/projects/tty/contrib/gcc/README-fixinc#2 delete .. //depot/projects/tty/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/tty/contrib/gcc/aclocal.m4#5 integrate .. //depot/projects/tty/contrib/gcc/addresses.h#1 branch .. //depot/projects/tty/contrib/gcc/alias.c#6 integrate .. //depot/projects/tty/contrib/gcc/alias.h#1 branch .. //depot/projects/tty/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/tty/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/tty/contrib/gcc/ansidecl.h#5 delete .. //depot/projects/tty/contrib/gcc/attribs.c#5 integrate .. //depot/projects/tty/contrib/gcc/basic-block.h#5 integrate .. //depot/projects/tty/contrib/gcc/bb-reorder.c#4 integrate .. //depot/projects/tty/contrib/gcc/bitmap.c#4 integrate .. //depot/projects/tty/contrib/gcc/bitmap.h#4 integrate .. //depot/projects/tty/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/tty/contrib/gcc/builtin-attrs.def#4 integrate .. //depot/projects/tty/contrib/gcc/builtin-types.def#5 integrate .. //depot/projects/tty/contrib/gcc/builtins.c#8 integrate .. //depot/projects/tty/contrib/gcc/builtins.def#4 integrate .. //depot/projects/tty/contrib/gcc/c-aux-info.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-common.c#7 integrate .. //depot/projects/tty/contrib/gcc/c-common.def#4 integrate .. //depot/projects/tty/contrib/gcc/c-common.h#6 integrate .. //depot/projects/tty/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/tty/contrib/gcc/c-convert.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/tty/contrib/gcc/c-decl.c#9 integrate .. //depot/projects/tty/contrib/gcc/c-dump.c#3 integrate .. //depot/projects/tty/contrib/gcc/c-errors.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-format.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-format.h#1 branch .. //depot/projects/tty/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/tty/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/tty/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/tty/contrib/gcc/c-lang.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-lex.c#5 integrate .. //depot/projects/tty/contrib/gcc/c-objc-common.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/tty/contrib/gcc/c-omp.c#1 branch .. //depot/projects/tty/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-parse.in#6 delete .. //depot/projects/tty/contrib/gcc/c-parser.c#1 branch .. //depot/projects/tty/contrib/gcc/c-pch.c#3 integrate .. //depot/projects/tty/contrib/gcc/c-ppoutput.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-pragma.c#4 integrate .. //depot/projects/tty/contrib/gcc/c-pragma.h#4 integrate .. //depot/projects/tty/contrib/gcc/c-pretty-print.c#3 integrate .. //depot/projects/tty/contrib/gcc/c-pretty-print.h#3 integrate .. //depot/projects/tty/contrib/gcc/c-semantics.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-tree.h#4 integrate .. //depot/projects/tty/contrib/gcc/c-typeck.c#8 integrate .. //depot/projects/tty/contrib/gcc/c.opt#3 integrate .. //depot/projects/tty/contrib/gcc/caller-save.c#4 integrate .. //depot/projects/tty/contrib/gcc/calls.c#7 integrate .. //depot/projects/tty/contrib/gcc/cfg.c#4 integrate .. //depot/projects/tty/contrib/gcc/cfganal.c#5 integrate .. //depot/projects/tty/contrib/gcc/cfgbuild.c#5 integrate .. //depot/projects/tty/contrib/gcc/cfgcleanup.c#7 integrate .. //depot/projects/tty/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/tty/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/tty/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/tty/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/tty/contrib/gcc/cfglayout.h#4 integrate .. //depot/projects/tty/contrib/gcc/cfgloop.c#5 integrate .. //depot/projects/tty/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/tty/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/tty/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/tty/contrib/gcc/cfgrtl.c#6 integrate .. //depot/projects/tty/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/tty/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/tty/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/tty/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/tty/contrib/gcc/collect2.c#6 integrate .. //depot/projects/tty/contrib/gcc/collect2.h#4 integrate .. //depot/projects/tty/contrib/gcc/combine.c#8 integrate .. //depot/projects/tty/contrib/gcc/common.opt#3 integrate .. //depot/projects/tty/contrib/gcc/concat.c#2 delete .. //depot/projects/tty/contrib/gcc/conditions.h#2 integrate .. //depot/projects/tty/contrib/gcc/config.build#2 integrate .. //depot/projects/tty/contrib/gcc/config.gcc#8 integrate .. //depot/projects/tty/contrib/gcc/config.host#3 integrate .. //depot/projects/tty/contrib/gcc/config.in#7 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/alpha-protos.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.c#7 delete .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.h#6 delete .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.md#7 delete .. //depot/projects/tty/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/elf.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/ev4.md#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/ev5.md#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/ev6.md#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/freebsd.h#5 delete .. //depot/projects/tty/contrib/gcc/config/alpha/gnu.h#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/lib1funcs.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/linux-elf.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/linux.h#5 delete .. //depot/projects/tty/contrib/gcc/config/alpha/netbsd.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/openbsd.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/osf.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/osf5.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/qrnnd.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-crtfm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-osf4#5 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/unicosmk.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-cc.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-crt0-64.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-crt0.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-dwarf2.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-dwarf2eh.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-ld.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-psxcrt0-64.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms-psxcrt0.c#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms.h#4 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms64.h#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/vms_tramp.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/tty/contrib/gcc/config/alpha/xm-vms.h#3 delete .. //depot/projects/tty/contrib/gcc/config/arm/README-interworking#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/aof.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/aout.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm-protos.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.md#6 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/coff.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/crti.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/crtn.asm#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/ecos-elf.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/freebsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/lib1funcs.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/linux-elf.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/arm/linux-gas.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/netbsd-elf.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/netbsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/pe.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/pe.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/rtems-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/semi.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/semiaof.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/strongarm-coff.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/strongarm-elf.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/strongarm-pe.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/t-arm-coff#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-arm-elf#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/t-linux#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-pe#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-semi#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-strongarm-pe#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-xscale-elf#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/uclinux-elf.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/unknown-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/tty/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/arm/xscale-coff.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/arm/xscale-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/tty/contrib/gcc/config/darwin-c.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/tty/contrib/gcc/config/darwin.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/tty/contrib/gcc/config/dbx.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/dbxcoff.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/dbxelf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/tty/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/tty/contrib/gcc/config/elfos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/fp-bit.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/fp-bit.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd-nthr.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd-spec.h#9 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/frv/cmovd.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/cmovh.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/cmovw.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv-abi.h#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv-asm.h#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv-modes.def#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv-protos.h#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv.h#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frv.md#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frvbegin.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/frvend.c#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/lib1funcs.asm#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/tty/contrib/gcc/config/frv/t-frv#3 delete .. //depot/projects/tty/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/tty/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/tty/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/tty/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/tty/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/tty/contrib/gcc/config/gnu.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/gofast.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/tty/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/tty/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/tty/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/athlon.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/att.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/beos-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/biarch64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/bsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/crtdll.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/cygwin.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/cygwin.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/cygwin1.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/djgpp.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/emmintrin.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd-aout.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/freebsd.h#8 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd64.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/i386/gas.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/gnu.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/i386-aout.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-coff.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-interix.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-interix3.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.c#8 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.h#9 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.md#7 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/i386elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/k6.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/linux-aout.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/linux.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/linux64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/lynx-ng.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/lynx.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/mingw32.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/mmintrin.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/moss.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/netbsd-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/netbsd64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/openbsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/pentium.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/pmmintrin.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/ppro.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/ptx4-i.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/rtemself.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sco5.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sol2.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/svr3dbx.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/svr3gas.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/sysv3.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/sysv4-cpp.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sysv4.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/sysv5.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-linux64#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-mingw32#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-rtems-i386#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/unix.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/uwin.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/vsta.h#4 delete .. //depot/projects/tty/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/winnt.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/tty/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/x86-64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/xm-cygwin.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/xm-djgpp.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/xm-mingw32.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/crtbegin.asm#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/crtend.asm#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/crti.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/crtn.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/fde-glibc.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/freebsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/hpux.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64-c.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64-protos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/ia64intrin.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/lib1funcs.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/linux.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/quadlib.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/sysv4.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/t-hpux#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/t-ia64#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/unwind-ia64.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/tty/contrib/gcc/config/interix.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/interix3.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/tty/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/tty/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/tty/contrib/gcc/config/libgloss.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/linux-aout.h#4 delete .. //depot/projects/tty/contrib/gcc/config/linux.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/lynx-ng.h#4 delete .. //depot/projects/tty/contrib/gcc/config/lynx.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/tty/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/tty/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/tty/contrib/gcc/config/memset.c#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/tty/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/tty/contrib/gcc/config/netbsd-aout.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/netbsd-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/netbsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/openbsd-oldgas.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/openbsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/ptx4.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/aix43.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix51.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/altivec-defs.h#3 delete .. //depot/projects/tty/contrib/gcc/config/rs6000/altivec.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/crtsavres.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-ldouble.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-tramp.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/eabi-ci.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabi-cn.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabi.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabialtivec.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabisim.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabispe.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/gnu.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/host-darwin.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux64.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/linuxaltivec.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/lynx.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/tty/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/netbsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/ppc64-fp.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-protos.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.c#8 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.md#8 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rtems.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/sol-ci.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/sol-cn.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4.h#9 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4le.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-aix43#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-beos#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-darwin#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/t-ppccomm#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/tramp.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/windiss.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/xcoff.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rtems.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/tty/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/fixdfdi.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/libgcc-glibc.ver#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/linux.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/s390-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390-protos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/s390x.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/tty/contrib/gcc/config/s390/t-linux#3 branch .. //depot/projects/tty/contrib/gcc/config/s390/t-linux64#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/tty/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/tpf.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/tty/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/tty/contrib/gcc/config/sol2.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/aout.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/biarch64.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/cypress.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/elf.h#3 delete .. //depot/projects/tty/contrib/gcc/config/sparc/freebsd.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/hypersparc.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/linux.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/linux64.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/lite.h#3 delete .. //depot/projects/tty/contrib/gcc/config/sparc/litecoff.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/liteelf.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/netbsd-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/openbsd.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/openbsd64.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/pbd.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/rtemself.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-64.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-bi.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-c1.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-gas-bi.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/sol2.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/sp64-aout.h#3 delete .. //depot/projects/tty/contrib/gcc/config/sparc/sp64-elf.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sp86x-elf.h#4 delete .. //depot/projects/tty/contrib/gcc/config/sparc/sparc-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc-protos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.c#7 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.md#6 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/sparclet.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/supersparc.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sysv4.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/tty/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/tty/contrib/gcc/config/sparc/ultra1_2.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/ultra3.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/svr3.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/svr4.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/t-darwin#4 integrate .. //depot/projects/tty/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/tty/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/tty/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/tty/contrib/gcc/config/t-linux#4 integrate .. //depot/projects/tty/contrib/gcc/config/t-linux-gnulibc1#3 delete .. //depot/projects/tty/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-darwin#3 integrate .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-sld#4 integrate .. //depot/projects/tty/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/tty/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/tty/contrib/gcc/config/usegas.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/tty/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/tty/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/tty/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/tty/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/tty/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/tty/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/tty/contrib/gcc/configure#8 integrate .. //depot/projects/tty/contrib/gcc/configure.ac#4 integrate .. //depot/projects/tty/contrib/gcc/conflict.c#4 integrate .. //depot/projects/tty/contrib/gcc/convert.c#4 integrate .. //depot/projects/tty/contrib/gcc/convert.h#3 integrate .. //depot/projects/tty/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/tty/contrib/gcc/coverage.c#3 integrate .. //depot/projects/tty/contrib/gcc/coverage.h#2 integrate .. //depot/projects/tty/contrib/gcc/cp-demangle.c#5 delete .. //depot/projects/tty/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/tty/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/tty/contrib/gcc/cp/ChangeLog#8 integrate .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/tty/contrib/gcc/cp/ChangeLog.1#4 delete .. //depot/projects/tty/contrib/gcc/cp/ChangeLog.2#4 delete .. //depot/projects/tty/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/tty/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/tty/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/tty/contrib/gcc/cp/Make-lang.in#6 integrate .. //depot/projects/tty/contrib/gcc/cp/NEWS#5 integrate .. //depot/projects/tty/contrib/gcc/cp/call.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/class.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/config-lang.in#4 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/tty/contrib/gcc/cp/cp-lang.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/tty/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/tty/contrib/gcc/cp/cp-tree.def#5 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-tree.h#8 integrate .. //depot/projects/tty/contrib/gcc/cp/cvt.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/cxx-pretty-print.c#3 integrate .. //depot/projects/tty/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/tty/contrib/gcc/cp/decl.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/decl.h#4 integrate .. //depot/projects/tty/contrib/gcc/cp/decl2.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/dump.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/error.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/except.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/expr.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/friend.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/g++spec.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/init.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/lang-specs.h#4 integrate .. //depot/projects/tty/contrib/gcc/cp/lex.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/lex.h#4 delete .. //depot/projects/tty/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/method.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/name-lookup.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/name-lookup.h#3 integrate .. //depot/projects/tty/contrib/gcc/cp/operators.def#5 integrate .. //depot/projects/tty/contrib/gcc/cp/optimize.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/pt.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/ptree.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/repo.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/rtti.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/search.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/semantics.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/tree.c#7 integrate .. //depot/projects/tty/contrib/gcc/cp/typeck.c#8 integrate .. //depot/projects/tty/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/tty/contrib/gcc/cplus-dem.c#4 delete .. //depot/projects/tty/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/tty/contrib/gcc/cppdefault.c#3 integrate .. //depot/projects/tty/contrib/gcc/cppdefault.h#4 integrate .. //depot/projects/tty/contrib/gcc/cpperror.c#4 delete .. //depot/projects/tty/contrib/gcc/cppexp.c#4 delete .. //depot/projects/tty/contrib/gcc/cppfiles.c#6 delete .. //depot/projects/tty/contrib/gcc/cpphash.c#4 delete .. //depot/projects/tty/contrib/gcc/cpphash.h#5 delete .. //depot/projects/tty/contrib/gcc/cppinit.c#6 delete .. //depot/projects/tty/contrib/gcc/cpplex.c#4 delete .. //depot/projects/tty/contrib/gcc/cpplib.c#7 delete .. //depot/projects/tty/contrib/gcc/cpplib.h#4 delete .. //depot/projects/tty/contrib/gcc/cppmacro.c#5 delete .. //depot/projects/tty/contrib/gcc/cpppch.c#2 delete .. //depot/projects/tty/contrib/gcc/cppspec.c#4 integrate .. //depot/projects/tty/contrib/gcc/cpptrad.c#3 delete .. //depot/projects/tty/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/tty/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/tty/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/tty/contrib/gcc/crtstuff.c#5 integrate .. //depot/projects/tty/contrib/gcc/cse.c#7 integrate .. //depot/projects/tty/contrib/gcc/cselib.c#5 integrate .. //depot/projects/tty/contrib/gcc/cselib.h#5 integrate .. //depot/projects/tty/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/tty/contrib/gcc/dbxout.h#3 integrate .. //depot/projects/tty/contrib/gcc/ddg.c#1 branch .. //depot/projects/tty/contrib/gcc/ddg.h#1 branch .. //depot/projects/tty/contrib/gcc/debug.c#4 integrate .. //depot/projects/tty/contrib/gcc/debug.h#4 integrate .. //depot/projects/tty/contrib/gcc/defaults.h#5 integrate .. //depot/projects/tty/contrib/gcc/demangle.h#4 delete .. //depot/projects/tty/contrib/gcc/df-core.c#1 branch .. //depot/projects/tty/contrib/gcc/df-problems.c#1 branch .. //depot/projects/tty/contrib/gcc/df-scan.c#1 branch .. //depot/projects/tty/contrib/gcc/df.c#4 delete .. //depot/projects/tty/contrib/gcc/df.h#4 integrate .. //depot/projects/tty/contrib/gcc/dfp.c#1 branch .. //depot/projects/tty/contrib/gcc/dfp.h#1 branch .. //depot/projects/tty/contrib/gcc/diagnostic.c#4 integrate .. //depot/projects/tty/contrib/gcc/diagnostic.def#4 integrate .. //depot/projects/tty/contrib/gcc/diagnostic.h#4 integrate .. //depot/projects/tty/contrib/gcc/doc/c-tree.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/tty/contrib/gcc/doc/compat.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/contrib.texi#6 integrate .. //depot/projects/tty/contrib/gcc/doc/contribute.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/cpp.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/cppinternals.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/cppopts.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/extend.texi#6 integrate .. //depot/projects/tty/contrib/gcc/doc/fragments.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/frontends.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/gcc.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/gccint.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/gcov.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/gty.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/hostconfig.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/tty/contrib/gcc/doc/include/fdl.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/include/gcc-common.texi#8 integrate .. //depot/projects/tty/contrib/gcc/doc/include/gpl.texi#3 integrate .. //depot/projects/tty/contrib/gcc/doc/include/texinfo.tex#4 integrate .. //depot/projects/tty/contrib/gcc/doc/interface.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/invoke.texi#8 integrate .. //depot/projects/tty/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/tty/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/tty/contrib/gcc/doc/makefile.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/md.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/objc.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/tty/contrib/gcc/doc/passes.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/portability.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/rtl.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/sourcebuild.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/standards.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/tm.texi#7 integrate .. //depot/projects/tty/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/tty/contrib/gcc/doc/trouble.texi#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 28 23:53: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 1FA1916A51E; Mon, 28 May 2007 23:53: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 8501916A4D8 for ; Mon, 28 May 2007 23:53:47 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 73FFE13C489 for ; Mon, 28 May 2007 23:53:47 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4SNrlK1099892 for ; Mon, 28 May 2007 23:53:47 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4SNrlv4099883 for perforce@freebsd.org; Mon, 28 May 2007 23:53:47 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 28 May 2007 23:53:47 GMT Message-Id: <200705282353.l4SNrlv4099883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 May 2007 23:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120528 Change 120528 by thompsa@thompsa_heff on 2007/05/28 23:52:53 Allow scans to be aborted by catching the return status and not scheduling another scan if it was aborted. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#27 (text+ko) ==== @@ -1384,7 +1384,15 @@ sc->sc_scan_timer = 0; sc->flags &= ~IWI_FLAG_SCANNING; - ieee80211_scan_next(ic); + + switch (scan->status) { + case IWI_SCAN_COMPLETED: + ieee80211_scan_next(ic); + break; + case IWI_SCAN_ABORTED: + ieee80211_cancel_scan(ic); + break; + } break; ==== //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#10 (text+ko) ==== @@ -417,6 +417,10 @@ #define IWI_SCAN_TYPE_BDIRECTED 4 /* active, directed+bcast probe */ #define IWI_SCAN_TYPES 5 +/* scan result codes */ +#define IWI_SCAN_COMPLETED 1 /* scan compeleted sucessfully */ +#define IWI_SCAN_ABORTED 2 /* scan was aborted by the driver */ + /* structure for command IWI_CMD_SCAN_EXT */ struct iwi_scan_ext { uint32_t full_scan_index; From owner-p4-projects@FreeBSD.ORG Tue May 29 01:53:26 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 0757616A46D; Tue, 29 May 2007 01:53:26 +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 B466116A46B for ; Tue, 29 May 2007 01:53:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A4CEF13C4B7 for ; Tue, 29 May 2007 01:53:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4T1rPXu023474 for ; Tue, 29 May 2007 01:53:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4T1rPTB023458 for perforce@freebsd.org; Tue, 29 May 2007 01:53:25 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 29 May 2007 01:53:25 GMT Message-Id: <200705290153.l4T1rPTB023458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 01:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=120531 Change 120531 by thompsa@thompsa_heff on 2007/05/29 01:52:31 - Make sure that net80211 initiates all scan aborts - Remove call to net80211 on IWI_SCAN_ABORTED Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#28 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#28 (text+ko) ==== @@ -162,7 +162,6 @@ static int iwi_config(struct iwi_softc *); static int iwi_get_firmware(struct iwi_softc *); static void iwi_put_firmware(struct iwi_softc *); -static void iwi_scanabort(void *, int); static int iwi_scanchan(struct iwi_softc *, unsigned long); static void iwi_scan_start(struct ieee80211com *); static void iwi_scan_end(struct ieee80211com *); @@ -275,7 +274,6 @@ #endif TASK_INIT(&sc->sc_radiontask, 0, iwi_radio_on, sc); TASK_INIT(&sc->sc_radiofftask, 0, iwi_radio_off, sc); - TASK_INIT(&sc->sc_scanaborttask, 0, iwi_scanabort, sc); TASK_INIT(&sc->sc_setwmetask, 0, iwi_wme_setparams, sc); TASK_INIT(&sc->sc_downtask, 0, iwi_down, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); @@ -969,7 +967,7 @@ taskqueue_enqueue(sc->sc_tq, &sc->sc_downtask); if (ic->ic_state == IEEE80211_S_SCAN && (sc->flags & IWI_FLAG_SCANNING)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_scanaborttask); + ieee80211_cancel_scan(ic); break; case IEEE80211_S_ASSOC: default: @@ -1385,14 +1383,8 @@ sc->sc_scan_timer = 0; sc->flags &= ~IWI_FLAG_SCANNING; - switch (scan->status) { - case IWI_SCAN_COMPLETED: + if (scan->status == IWI_SCAN_COMPLETED) ieee80211_scan_next(ic); - break; - case IWI_SCAN_ABORTED: - ieee80211_cancel_scan(ic); - break; - } break; @@ -2651,19 +2643,6 @@ *st = (*st & 0x0f) | ((scan_type & 0xf) << 4); } -static void -iwi_scanabort(void *arg, int npending) -{ - struct iwi_softc *sc = arg; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - /* NB: make sure we're still scanning */ - if (sc->flags & IWI_FLAG_SCANNING) - iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); - IWI_UNLOCK(sc); -} - /* * Scan on ic_curchan according to ic_scan (essid, active/passive, dwell ...) */ @@ -3451,7 +3430,9 @@ break; case IWI_SCAN_END: sc->flags &= ~IWI_FLAG_CHANNEL_SCAN; - iwi_scanabort(sc, 0); + /* NB: make sure we're still scanning */ + if (sc->flags & IWI_FLAG_SCANNING) + iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); break; case IWI_SCAN_CURCHAN: if (!(sc->flags & IWI_FLAG_CHANNEL_SCAN)) { @@ -3459,12 +3440,9 @@ __func__)); return; } - if (iwi_scanchan(sc, sc->sc_maxdwell)) { - iwi_scanabort(sc, 0); - IWI_UNLOCK(sc); + if (iwi_scanchan(sc, sc->sc_maxdwell)) ieee80211_cancel_scan(ic); - return; - } + break; } done: From owner-p4-projects@FreeBSD.ORG Tue May 29 01:55: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 1E43D16A4EA; Tue, 29 May 2007 01:55: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 E899516A4D8 for ; Tue, 29 May 2007 01:55:28 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C072513C489 for ; Tue, 29 May 2007 01:55:28 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4T1tShP025474 for ; Tue, 29 May 2007 01:55:28 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4T1tSi1025464 for perforce@freebsd.org; Tue, 29 May 2007 01:55:28 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 29 May 2007 01:55:28 GMT Message-Id: <200705290155.l4T1tSi1025464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 01:55:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=120532 Change 120532 by thompsa@thompsa_heff on 2007/05/29 01:54:56 Set if_timer so that sc_scantimer is checked by iwi_watchdog (this should be on our own callout) Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#29 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#29 (text+ko) ==== @@ -2695,7 +2695,8 @@ DPRINTF(("Scanning on channel %u\n", ieee80211_chan2ieee(ic, chan))); sc->flags |= IWI_FLAG_SCANNING; - sc->sc_scan_timer = 1; + sc->sc_scan_timer = 3; + sc->sc_ifp->if_timer = 1; return (iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan)); } From owner-p4-projects@FreeBSD.ORG Tue May 29 02:00:36 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 7413716A421; Tue, 29 May 2007 02:00:36 +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 4523D16A400 for ; Tue, 29 May 2007 02:00:36 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3561913C44C for ; Tue, 29 May 2007 02:00:36 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4T20ZPM030189 for ; Tue, 29 May 2007 02:00:35 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4T20ZXB030180 for perforce@freebsd.org; Tue, 29 May 2007 02:00:35 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 29 May 2007 02:00:35 GMT Message-Id: <200705290200.l4T20ZXB030180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 02:00:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=120533 Change 120533 by thompsa@thompsa_heff on 2007/05/29 01:59:42 Remove unused tasks Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#13 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#13 (text+ko) ==== @@ -183,9 +183,6 @@ struct task sc_radiontask; /* radio on processing */ struct task sc_radiofftask; /* radio off processing */ - struct task sc_scanstarttask;/* scan start processing */ - struct task sc_scanaborttask;/* scan abort processing */ - struct task sc_scandonetask;/* scan completed processing */ struct task sc_setwmetask; /* set wme params processing */ struct task sc_downtask; /* disassociate processing */ struct task sc_restarttask; /* restart adapter processing */ From owner-p4-projects@FreeBSD.ORG Tue May 29 14:29: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 97A7416A468; Tue, 29 May 2007 14:29: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 2EFE316A41F for ; Tue, 29 May 2007 14:29:03 +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 1DA1B13C45A for ; Tue, 29 May 2007 14:29:03 +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.8/8.13.8) with ESMTP id l4TET3iK057557 for ; Tue, 29 May 2007 14:29:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TET2OC057554 for perforce@freebsd.org; Tue, 29 May 2007 14:29:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 May 2007 14:29:02 GMT Message-Id: <200705291429.l4TET2OC057554@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 120556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 14:29:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=120556 Change 120556 by rwatson@rwatson_zoo on 2007/05/29 14:28:56 Embed audit data for processes directly in process credential rather than into indirect data hung off the process. This means audit information is available in asynchronous contexts, and allows lock-free access to data on a per-thread basis via td_ucred, reducing locking contention for auditing multi-threaded processes and reducing locking overhead for all processes. Sadly, this currently requires a nested include of bsm/audit.h from ucired.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#21 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#22 edit .. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#43 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#28 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#39 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#37 edit .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#22 edit .. //depot/projects/trustedbsd/audit3/sys/sys/ucred.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#15 (text+ko) ==== @@ -440,8 +440,7 @@ p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = NULL; /* Don't jail it. */ #ifdef AUDIT - audit_proc_alloc(p); - audit_proc_kproc0(p); + audit_cred_kproc0(p->p_ucred); #endif #ifdef MAC mac_create_proc0(p->p_ucred); @@ -706,7 +705,7 @@ mac_create_proc1(newcred); #endif #ifdef AUDIT - audit_proc_init(initproc); + audit_cred_proc1(newcred); #endif initproc->p_ucred = newcred; PROC_UNLOCK(initproc); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#21 (text+ko) ==== @@ -807,9 +807,6 @@ #ifdef MAC mac_destroy_proc(p); #endif -#ifdef AUDIT - audit_proc_free(p); -#endif KASSERT(FIRST_THREAD_IN_PROC(p), ("kern_wait: no residual thread!")); uma_zfree(proc_zone, p); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#22 (text+ko) ==== @@ -279,9 +279,6 @@ #ifdef MAC mac_init_proc(newproc); #endif -#ifdef AUDIT - audit_proc_alloc(newproc); -#endif knlist_init(&newproc->p_klist, &newproc->p_mtx, NULL, NULL, NULL); STAILQ_INIT(&newproc->p_ktr); @@ -511,9 +508,6 @@ mtx_unlock_spin(&sched_lock); td2->td_ucred = crhold(p2->p_ucred); -#ifdef AUDIT - audit_proc_fork(p1, p2); -#endif pargs_hold(p2->p_args); if (flags & RFSIGSHARE) { @@ -752,9 +746,6 @@ #ifdef MAC mac_destroy_proc(newproc); #endif -#ifdef AUDIT - audit_proc_free(newproc); -#endif uma_zfree(proc_zone, newproc); if (p1->p_flag & P_HADTHREADS) { PROC_LOCK(p1); ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#12 (text+ko) ==== @@ -1771,6 +1771,9 @@ MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); refcount_init(&cr->cr_ref, 1); +#ifdef AUDIT + audit_cred_init(cr); +#endif #ifdef MAC mac_init_cred(cr); #endif @@ -1812,6 +1815,9 @@ */ if (jailed(cr)) prison_free(cr->cr_prison); +#ifdef AUDIT + audit_cred_destroy(cr); +#endif #ifdef MAC mac_destroy_cred(cr); #endif @@ -1844,6 +1850,9 @@ uihold(dest->cr_ruidinfo); if (jailed(dest)) prison_hold(dest->cr_prison); +#ifdef AUDIT + audit_cred_copy(src, dest); +#endif #ifdef MAC mac_copy_cred(src, dest); #endif ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#43 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 1999-2005 Apple Computer, Inc. - * Copyright (c) 2006 Robert N. M. Watson + * Copyright (c) 2006-2007 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,7 +71,7 @@ #include static uma_zone_t audit_record_zone; -static MALLOC_DEFINE(M_AUDITPROC, "audit_proc", "Audit process storage"); +static MALLOC_DEFINE(M_AUDITCRED, "audit_cred", "Audit cred storage"); MALLOC_DEFINE(M_AUDITDATA, "audit_data", "Audit data storage"); MALLOC_DEFINE(M_AUDITPATH, "audit_path", "Audit path storage"); MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); @@ -178,15 +178,11 @@ ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid; ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid; ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0]; - PROC_LOCK(td->td_proc); - ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid; - ar->k_ar.ar_subj_asid = td->td_proc->p_au->ai_asid; + ar->k_ar.ar_subj_auid = td->td_ucred->cr_audit.ai_auid; + ar->k_ar.ar_subj_asid = td->td_ucred->cr_audit.ai_asid; ar->k_ar.ar_subj_pid = td->td_proc->p_pid; - ar->k_ar.ar_subj_amask = td->td_proc->p_au->ai_mask; - ar->k_ar.ar_subj_term_addr = td->td_proc->p_au->ai_termid; - bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN); - PROC_UNLOCK(td->td_proc); - + ar->k_ar.ar_subj_amask = td->td_ucred->cr_audit.ai_mask; + ar->k_ar.ar_subj_term_addr = td->td_ucred->cr_audit.ai_termid; return (0); } @@ -483,11 +479,11 @@ * Check which audit mask to use; either the kernel non-attributable * event mask or the process audit mask. */ - auid = td->td_proc->p_au->ai_auid; + auid = td->td_ucred->cr_audit.ai_auid; if (auid == AU_DEFAUDITID) aumask = &audit_nae_mask; else - aumask = &td->td_proc->p_au->ai_mask; + aumask = &td->td_ucred->cr_audit.ai_mask; /* * Allocate an audit record, if preselection allows it, and store @@ -551,88 +547,68 @@ } /* - * Allocate storage for a new process (init, or otherwise). + * Copy audit state from an existing credential to a new credential. */ void -audit_proc_alloc(struct proc *p) +audit_cred_copy(struct ucred *src, struct ucred *dest) { - KASSERT(p->p_au == NULL, ("audit_proc_alloc: p->p_au != NULL (%d)", - p->p_pid)); - p->p_au = malloc(sizeof(*(p->p_au)), M_AUDITPROC, M_WAITOK); + bcopy(&src->cr_audit, &dest->cr_audit, sizeof(dest->cr_audit)); } /* - * Allocate storage for a new thread. + * Free audit state from a credential when the credential is freed. */ void -audit_thread_alloc(struct thread *td) +audit_cred_destroy(struct ucred *cred) { - td->td_ar = NULL; + bzero(&cred->cr_audit, sizeof(cred->cr_audit)); } /* - * Thread destruction. + * Allocate audit state for a new credential. */ void -audit_thread_free(struct thread *td) +audit_cred_init(struct ucred *cred) { - KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL")); + bzero(&cred->cr_audit, sizeof(cred->cr_audit)); } /* * Initialize audit information for the first kernel process (proc 0) and for * the first user process (init). - * - * XXX It is not clear what the initial values should be for audit ID, - * session ID, etc. */ void -audit_proc_kproc0(struct proc *p) +audit_cred_kproc0(struct ucred *cred) { - KASSERT(p->p_au != NULL, ("audit_proc_kproc0: p->p_au == NULL (%d)", - p->p_pid)); - bzero(p->p_au, sizeof(*(p)->p_au)); } void -audit_proc_init(struct proc *p) +audit_cred_proc1(struct ucred *cred) { - KASSERT(p->p_au != NULL, ("audit_proc_init: p->p_au == NULL (%d)", - p->p_pid)); - bzero(p->p_au, sizeof(*(p)->p_au)); - p->p_au->ai_auid = AU_DEFAUDITID; + cred->cr_audit.ai_auid = AU_DEFAUDITID; } /* - * Copy the audit info from the parent process to the child process when - * a fork takes place. + * Allocate storage for a new thread. */ void -audit_proc_fork(struct proc *parent, struct proc *child) +audit_thread_alloc(struct thread *td) { - PROC_LOCK_ASSERT(parent, MA_OWNED); - PROC_LOCK_ASSERT(child, MA_OWNED); - KASSERT(parent->p_au != NULL, - ("audit_proc_fork: parent->p_au == NULL (%d)", parent->p_pid)); - KASSERT(child->p_au != NULL, - ("audit_proc_fork: child->p_au == NULL (%d)", child->p_pid)); - bcopy(parent->p_au, child->p_au, sizeof(*child->p_au)); + td->td_ar = NULL; } /* - * Free the auditing structure for the process. + * Thread destruction. */ void -audit_proc_free(struct proc *p) +audit_thread_free(struct thread *td) { - KASSERT(p->p_au != NULL, ("p->p_au == NULL (%d)", p->p_pid)); - free(p->p_au, M_AUDITPROC); - p->p_au = NULL; + KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL")); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#23 (text+ko) ==== @@ -173,11 +173,11 @@ void audit_arg_argv(char *argv, int argc, int length); void audit_arg_envv(char *envv, int envc, int length); void audit_sysclose(struct thread *td, int fd); -void audit_proc_alloc(struct proc *p); -void audit_proc_kproc0(struct proc *p); -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, struct proc *child); -void audit_proc_free(struct proc *p); +void audit_cred_copy(struct ucred *src, struct ucred *dest); +void audit_cred_destroy(struct ucred *cred); +void audit_cred_init(struct ucred *cred); +void audit_cred_kproc0(struct ucred *cred); +void audit_cred_proc1(struct ucred *cred); void audit_thread_alloc(struct thread *td); void audit_thread_free(struct thread *td); @@ -216,10 +216,6 @@ #else /* !AUDIT */ -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, struct proc *child); -void audit_proc_free(struct proc *p); - #define AUDIT_ARG(op, args...) do { \ } while (0) ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.11 2007/04/13 14:55:19 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.10 2007/02/20 13:38:11 rwatson Exp $ */ #include @@ -365,16 +365,16 @@ if (ar == NULL) return; - ar->k_ar.ar_arg_auid = p->p_au->ai_auid; + ar->k_ar.ar_arg_auid = p->p_ucred->cr_audit.ai_auid; ar->k_ar.ar_arg_euid = p->p_ucred->cr_uid; ar->k_ar.ar_arg_egid = p->p_ucred->cr_groups[0]; ar->k_ar.ar_arg_ruid = p->p_ucred->cr_ruid; ar->k_ar.ar_arg_rgid = p->p_ucred->cr_rgid; - ar->k_ar.ar_arg_asid = p->p_au->ai_asid; - ar->k_ar.ar_arg_termid_addr = p->p_au->ai_termid; + ar->k_ar.ar_arg_asid = p->p_ucred->cr_audit.ai_asid; + ar->k_ar.ar_arg_termid_addr = p->p_ucred->cr_audit.ai_termid; ar->k_ar.ar_arg_pid = p->p_pid; ARG_SET_VALID(ar, ARG_AUID | ARG_EUID | ARG_EGID | ARG_RUID | - ARG_RGID | ARG_ASID | ARG_TERMID_ADDR | ARG_PID | ARG_PROCESS); + ARG_RGID | ARG_ASID | ARG_TERMID | ARG_PID | ARG_PROCESS); } void ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#39 (text+ko) ==== @@ -181,7 +181,6 @@ pid_t ar_subj_pid; struct au_tid ar_subj_term; struct au_tid_addr ar_subj_term_addr; - char ar_subj_comm[MAXCOMLEN + 1]; struct au_mask ar_subj_amask; /* Operation arguments. */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#37 (text+ko) ==== @@ -167,6 +167,7 @@ int auditon(struct thread *td, struct auditon_args *uap) { + struct ucred *newcred, *oldcred; int error; union auditon_udata udata; struct proc *tp; @@ -324,47 +325,53 @@ case A_GETPINFO: if (udata.au_aupinfo.ap_pid < 1) return (EINVAL); - if ((tp = pfind(udata.au_aupinfo.ap_pid)) == NULL) return (EINVAL); if (p_cansee(td, tp) != 0) { PROC_UNLOCK(tp); return (EINVAL); } - - if (tp->p_au->ai_termid.at_type == AU_IPv6) { + if (tp->p_ucred->cr_audit.ai_termid.at_type == AU_IPv6) { PROC_UNLOCK(tp); return (EINVAL); } - udata.au_aupinfo.ap_auid = tp->p_au->ai_auid; + udata.au_aupinfo.ap_auid = + tp->p_ucred->cr_audit.ai_auid; udata.au_aupinfo.ap_mask.am_success = - tp->p_au->ai_mask.am_success; + tp->p_ucred->cr_audit.ai_mask.am_success; udata.au_aupinfo.ap_mask.am_failure = - tp->p_au->ai_mask.am_failure; + tp->p_ucred->cr_audit.ai_mask.am_failure; udata.au_aupinfo.ap_termid.machine = - tp->p_au->ai_termid.at_addr[0]; + tp->p_ucred->cr_audit.ai_termid.at_addr[0]; udata.au_aupinfo.ap_termid.port = - (dev_t)tp->p_au->ai_termid.at_port; - udata.au_aupinfo.ap_asid = tp->p_au->ai_asid; + (dev_t)tp->p_ucred->cr_audit.ai_termid.at_port; + udata.au_aupinfo.ap_asid = + tp->p_ucred->cr_audit.ai_asid; PROC_UNLOCK(tp); break; case A_SETPMASK: if (udata.au_aupinfo.ap_pid < 1) return (EINVAL); - - if ((tp = pfind(udata.au_aupinfo.ap_pid)) == NULL) + newcred = crget(); + if ((tp = pfind(udata.au_aupinfo.ap_pid)) == NULL) { + crfree(newcred); return (EINVAL); + } if (p_cansee(td, tp) != 0) { PROC_UNLOCK(tp); + crfree(newcred); return (EINVAL); } - - tp->p_au->ai_mask.am_success = + oldcred = tp->p_ucred; + crcopy(newcred, oldcred); + newcred->cr_audit.ai_mask.am_success = udata.au_aupinfo.ap_mask.am_success; - tp->p_au->ai_mask.am_failure = + newcred->cr_audit.ai_mask.am_failure = udata.au_aupinfo.ap_mask.am_failure; + td->td_proc->p_ucred = newcred; PROC_UNLOCK(tp); + crfree(oldcred); break; case A_SETFSIZE: @@ -384,13 +391,16 @@ return (EINVAL); if ((tp = pfind(udata.au_aupinfo_addr.ap_pid)) == NULL) return (EINVAL); - udata.au_aupinfo_addr.ap_auid = tp->p_au->ai_auid; + udata.au_aupinfo_addr.ap_auid = + tp->p_ucred->cr_audit.ai_auid; udata.au_aupinfo_addr.ap_mask.am_success = - tp->p_au->ai_mask.am_success; + tp->p_ucred->cr_audit.ai_mask.am_success; udata.au_aupinfo_addr.ap_mask.am_failure = - tp->p_au->ai_mask.am_failure; - udata.au_aupinfo_addr.ap_termid = tp->p_au->ai_termid; - udata.au_aupinfo_addr.ap_asid = tp->p_au->ai_asid; + tp->p_ucred->cr_audit.ai_mask.am_failure; + udata.au_aupinfo_addr.ap_termid = + tp->p_ucred->cr_audit.ai_termid; + udata.au_aupinfo_addr.ap_asid = + tp->p_ucred->cr_audit.ai_asid; PROC_UNLOCK(tp); break; @@ -442,64 +452,46 @@ getauid(struct thread *td, struct getauid_args *uap) { int error; - au_id_t id; if (jailed(td->td_ucred)) return (ENOSYS); error = priv_check(td, PRIV_AUDIT_GETAUDIT); if (error) return (error); - - /* - * XXX: Integer read on static pointer dereference: doesn't need - * locking? - */ - PROC_LOCK(td->td_proc); - id = td->td_proc->p_au->ai_auid; - PROC_UNLOCK(td->td_proc); - return copyout(&id, uap->auid, sizeof(id)); + return (copyout(&td->td_ucred->cr_audit.ai_auid, uap->auid, + sizeof(td->td_ucred->cr_audit.ai_auid))); } /* ARGSUSED */ int setauid(struct thread *td, struct setauid_args *uap) { + struct ucred *newcred, *oldcred; + au_id_t id; int error; - au_id_t id; if (jailed(td->td_ucred)) return (ENOSYS); - error = priv_check(td, PRIV_AUDIT_SETAUDIT); - if (error) - return (error); - error = copyin(uap->auid, &id, sizeof(id)); if (error) return (error); - audit_arg_auid(id); - -#ifdef MAC - error = mac_check_proc_setauid(td->td_ucred, id); + newcred = crget(); + PROC_LOCK(td->td_proc); + oldcred = td->td_proc->p_ucred; + crcopy(newcred, oldcred); + error = priv_check_cred(oldcred, PRIV_AUDIT_SETAUDIT, 0); if (error) - return (error); -#endif - - /* - * XXX: Integer write on static pointer dereference: doesn't need - * locking? - * - * XXXAUDIT: Might need locking to serialize audit events in the same - * order as change events? Or maybe that's an under-solveable - * problem. - * - * XXXRW: Test privilege while holding the proc lock? - */ - PROC_LOCK(td->td_proc); - td->td_proc->p_au->ai_auid = id; + goto fail; + newcred->cr_audit.ai_auid = id; + td->td_proc->p_ucred = newcred; PROC_UNLOCK(td->td_proc); - + crfree(oldcred); return (0); +fail: + PROC_UNLOCK(td->td_proc); + crfree(newcred); + return (error); } /* @@ -517,108 +509,108 @@ error = priv_check(td, PRIV_AUDIT_GETAUDIT); if (error) return (error); - - PROC_LOCK(td->td_proc); - if (td->td_proc->p_au->ai_termid.at_type == AU_IPv6) { - PROC_UNLOCK(td->td_proc); - return (E2BIG); - } bzero(&ai, sizeof(ai)); - ai.ai_auid = td->td_proc->p_au->ai_auid; - ai.ai_mask = td->td_proc->p_au->ai_mask; - ai.ai_asid = td->td_proc->p_au->ai_asid; - ai.ai_termid.machine = td->td_proc->p_au->ai_termid.at_addr[0]; - ai.ai_termid.port = td->td_proc->p_au->ai_termid.at_port; - PROC_UNLOCK(td->td_proc); - - return (copyout(&ai, uap->auditinfo, sizeof(ai))); + ai.ai_auid = td->td_ucred->cr_audit.ai_auid; + ai.ai_mask = td->td_ucred->cr_audit.ai_mask; + ai.ai_asid = td->td_ucred->cr_audit.ai_asid; + ai.ai_termid.machine = td->td_ucred->cr_audit.ai_termid.at_addr[0]; + ai.ai_termid.port = td->td_ucred->cr_audit.ai_termid.at_port; + return (copyout(&ai, uap->auditinfo, sizeof(&ai))); } /* ARGSUSED */ int setaudit(struct thread *td, struct setaudit_args *uap) { + struct ucred *newcred, *oldcred; struct auditinfo ai; int error; if (jailed(td->td_ucred)) return (ENOSYS); - error = priv_check(td, PRIV_AUDIT_SETAUDIT); - if (error) - return (error); - error = copyin(uap->auditinfo, &ai, sizeof(ai)); if (error) return (error); - audit_arg_auditinfo(&ai); - + newcred = crget(); + PROC_LOCK(td->td_proc); + oldcred = td->td_proc->p_ucred; + crcopy(newcred, oldcred); #ifdef MAC - error = mac_check_proc_setaudit(td->td_ucred, &ai); + error = mac_check_proc_setaudit(oldcred, &ai); if (error) - return (error); + goto fail; #endif - - /* - * XXXRW: Test privilege while holding the proc lock? - */ - PROC_LOCK(td->td_proc); - bzero(td->td_proc->p_au, sizeof(struct auditinfo_addr)); - td->td_proc->p_au->ai_auid = ai.ai_auid; - td->td_proc->p_au->ai_mask = ai.ai_mask; - td->td_proc->p_au->ai_asid = ai.ai_asid; - td->td_proc->p_au->ai_termid.at_addr[0] = ai.ai_termid.machine; - td->td_proc->p_au->ai_termid.at_port = ai.ai_termid.port; - td->td_proc->p_au->ai_termid.at_type = AU_IPv4; + error = priv_check_cred(oldcred, PRIV_AUDIT_SETAUDIT, 0); + if (error) + goto fail; + bzero(&newcred->cr_audit, sizeof(newcred->cr_audit)); + newcred->cr_audit.ai_auid = ai.ai_auid; + newcred->cr_audit.ai_mask = ai.ai_mask; + newcred->cr_audit.ai_asid = ai.ai_asid; + newcred->cr_audit.ai_termid.at_addr[0] = ai.ai_termid.machine; + newcred->cr_audit.ai_termid.at_port = ai.ai_termid.port; + newcred->cr_audit.ai_termid.at_type = AU_IPv4; + td->td_proc->p_ucred = newcred; PROC_UNLOCK(td->td_proc); - + crfree(oldcred); return (0); +fail: + PROC_UNLOCK(td->td_proc); + crfree(newcred); + return (error); } /* ARGSUSED */ int getaudit_addr(struct thread *td, struct getaudit_addr_args *uap) { - struct auditinfo_addr aia; int error; if (jailed(td->td_ucred)) return (ENOSYS); + if (uap->length < sizeof(*uap->auditinfo_addr)) + return (EOVERFLOW); error = priv_check(td, PRIV_AUDIT_GETAUDIT); if (error) return (error); - if (uap->length < sizeof(aia)) - return (EOVERFLOW); - PROC_LOCK(td->td_proc); - aia = *td->td_proc->p_au; - PROC_UNLOCK(td->td_proc); - return (copyout(&aia, uap->auditinfo_addr, sizeof(aia))); + return (copyout(&td->td_ucred->cr_audit, uap->auditinfo_addr, + sizeof(*uap->auditinfo_addr))); } /* ARGSUSED */ int setaudit_addr(struct thread *td, struct setaudit_addr_args *uap) { + struct ucred *newcred, *oldcred; struct auditinfo_addr aia; int error; if (jailed(td->td_ucred)) return (ENOSYS); - error = priv_check(td, PRIV_AUDIT_SETAUDIT); + error = copyin(uap->auditinfo_addr, &aia, sizeof(aia)); if (error) return (error); - + /* XXXRW: Audit argument. */ + newcred = crget(); + PROC_LOCK(td->td_proc); + oldcred = td->td_proc->p_ucred; + crcopy(newcred, oldcred); #ifdef MAC - error = mac_check_proc_setaudit(td->td_ucred, NULL); + error = mac_check_proc_setaudit(oldcred, NULL); if (error) - return (error); + goto fail; #endif - error = copyin(uap->auditinfo_addr, &aia, sizeof(aia)); + error = priv_check_cred(oldcred, PRIV_AUDIT_SETAUDIT, 0); if (error) - return (error); - PROC_LOCK(td->td_proc); - *td->td_proc->p_au = aia; + goto fail; + newcred->cr_audit = aia; + td->td_proc->p_ucred = newcred; PROC_UNLOCK(td->td_proc); + crfree(oldcred); + return (0); +fail: + crfree(newcred); return (error); } @@ -662,17 +654,7 @@ return (error); vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; -#ifdef MAC - error = mac_check_system_auditctl(td->td_ucred, vp); - VOP_UNLOCK(vp, 0, td); - if (error) { - vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); - VFS_UNLOCK_GIANT(vfslocked); - return (error); - } -#else VOP_UNLOCK(vp, 0, td); -#endif NDFREE(&nd, NDF_ONLY_PNBUF); if (vp->v_type != VREG) { vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); @@ -758,23 +740,4 @@ return (ENOSYS); } - -void -audit_proc_init(struct proc *p) -{ - -} - -void -audit_proc_fork(struct proc *parent, struct proc *child) -{ - -} - -void -audit_proc_free(struct proc *p) -{ - -} - #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit3/sys/sys/proc.h#22 (text+ko) ==== @@ -150,7 +150,6 @@ * either lock is sufficient for read access, but both locks must be held * for write access. */ -struct auditinfo; struct kaudit_record; struct td_sched; struct nlminfo; @@ -579,7 +578,6 @@ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ - struct auditinfo_addr *p_au; /* (c) Process audit properties. */ }; #define p_session p_pgrp->pg_session ==== //depot/projects/trustedbsd/audit3/sys/sys/ucred.h#7 (text+ko) ==== @@ -33,6 +33,8 @@ #ifndef _SYS_UCRED_H_ #define _SYS_UCRED_H_ +#include + /* * Credentials. * @@ -55,6 +57,7 @@ struct prison *cr_prison; /* jail(2) */ #define cr_endcopy cr_label struct label *cr_label; /* MAC label */ + struct auditinfo_addr cr_audit; /* Audit properties. */ }; #define NOCRED ((struct ucred *)0) /* no credential available */ #define FSCRED ((struct ucred *)-1) /* filesystem credential */ From owner-p4-projects@FreeBSD.ORG Tue May 29 14:45: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 35F9016A421; Tue, 29 May 2007 14:45: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 F216016A400 for ; Tue, 29 May 2007 14:45:24 +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 E330713C45A for ; Tue, 29 May 2007 14:45:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TEjOVA072288 for ; Tue, 29 May 2007 14:45:24 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TEjOqo072275 for perforce@freebsd.org; Tue, 29 May 2007 14:45:24 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 29 May 2007 14:45:24 GMT Message-Id: <200705291445.l4TEjOqo072275@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 120558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 14:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120558 Change 120558 by rdivacky@rdivacky_witten on 2007/05/29 14:44:59 Dont allow zero or negative pid/tid arguments to tgkill/tkill. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_signal.c#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_signal.c#2 (text+ko) ==== @@ -550,8 +550,8 @@ ka.pid = args->pid; ka.signum = args->sig; - if (args->tgid == -1) - return linux_kill(td, &ka); + if (args->pid <= 0 || args->tgid <= 0) + return EINVAL; if ((p = pfind(args->pid)) == NULL) return ESRCH; @@ -583,6 +583,8 @@ if (ldebug(tkill)) printf(ARGS(tkill, "%i, %i"), args->tid, args->sig); #endif + if (args->tid <= 0) + return EINVAL; return (linux_kill(td, (struct linux_kill_args *) args)); } From owner-p4-projects@FreeBSD.ORG Tue May 29 15:15: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 D3EF616A479; Tue, 29 May 2007 15:15: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 6DD7C16A477 for ; Tue, 29 May 2007 15:15:21 +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 5B25913C44C for ; Tue, 29 May 2007 15:15:21 +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.8/8.13.8) with ESMTP id l4TFFLlr001249 for ; Tue, 29 May 2007 15:15:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TFD1F3098997 for perforce@freebsd.org; Tue, 29 May 2007 15:13:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 May 2007 15:13:01 GMT Message-Id: <200705291513.l4TFD1F3098997@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 120563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 15:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=120563 Change 120563 by rwatson@rwatson_zoo on 2007/05/29 15:12:54 Integrate TrustedBSD audit branch from TrustedBSD base branch. See @120497 for a list of changes merged. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#16 integrate .. //depot/projects/trustedbsd/audit3/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#20 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#16 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#22 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config.h#6 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/config_p.h#4 integrate .. //depot/projects/trustedbsd/audit3/bin/df/df.c#7 integrate .. //depot/projects/trustedbsd/audit3/bin/mv/mv.1#3 integrate .. //depot/projects/trustedbsd/audit3/bin/rcp/rcp.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#7 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/trustedbsd/audit3/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/queue.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/BASE-VER#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.1#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.2#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.3#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.4#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.5#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.6#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.7#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/README-fixinc#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/addresses.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/alias.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/alias.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ansidecl.h#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/attribs.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/basic-block.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/bb-reorder.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/bitmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/bitmap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/builtin-attrs.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/builtin-types.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/builtins.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/builtins.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-aux-info.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-common.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-common.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-common.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-convert.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-decl.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-dump.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-errors.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-format.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-format.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-lang.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-lex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-objc-common.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-omp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-parse.in#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-parser.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pch.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pragma.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pragma.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pretty-print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-pretty-print.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-semantics.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-tree.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c-typeck.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/c.opt#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/caller-save.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/calls.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfg.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfganal.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgbuild.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgcleanup.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfglayout.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgloop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cfgrtl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/collect2.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/collect2.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/combine.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/common.opt#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/concat.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/conditions.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.build#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.gcc#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.host#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha-protos.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha.c#5 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha.h#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/alpha.md#5 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/elf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/ev4.md#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/ev5.md#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/ev6.md#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/freebsd.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/gnu.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/lib1funcs.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/linux-elf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/linux.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/netbsd.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/openbsd.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/osf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/osf5.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/qrnnd.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-osf4#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/unicosmk.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-cc.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-crt0-64.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-crt0.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-dwarf2.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-dwarf2eh.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-ld.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-psxcrt0-64.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms-psxcrt0.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms64.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/vms_tramp.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/alpha/xm-vms.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/README-interworking#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/aof.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/aout.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-modes.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/coff.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/crtn.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/ecos-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/freebsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/lib1funcs.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/linux-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/linux-gas.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/netbsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/pe.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/pe.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/rtems-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/semi.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/semiaof.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/strongarm-coff.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/strongarm-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/strongarm-pe.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-arm-coff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-arm-elf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-linux#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-pe#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-semi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-strongarm-pe#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/t-xscale-elf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/uclinux-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/unknown-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/arm/xscale-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-c.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/dbx.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/dbxcoff.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/dbxelf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/elfos.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/fp-bit.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/fp-bit.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/freebsd-nthr.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/freebsd-spec.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/cmovd.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/cmovh.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/cmovw.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv-abi.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv-asm.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv-modes.def#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv-protos.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frv.md#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frvbegin.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/frvend.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/lib1funcs.asm#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/t-frv#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/gnu.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/gofast.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/athlon.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/att.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/beos-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/biarch64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/bsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/crtdll.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygwin.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygwin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygwin1.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/djgpp.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/emmintrin.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/freebsd-aout.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/gas.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/gnu.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-aout.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-coff.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-interix.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-interix3.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386-protos.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.md#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/i386elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/k6.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/linux-aout.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/linux64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/lynx-ng.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/lynx.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/mingw32.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/mmintrin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/moss.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netbsd64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/openbsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/pentium.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/pmmintrin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/ppro.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/ptx4-i.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/rtemself.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sco5.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sol2.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/svr3dbx.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/svr3gas.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sysv3.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sysv4-cpp.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sysv4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/sysv5.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-rtems-i386#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/unix.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/uwin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/vsta.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/winnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/x86-64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/xm-cygwin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/xm-djgpp.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/xm-mingw32.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/i386/xmmintrin.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/crtbegin.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/crtend.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/crti.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/crtn.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/fde-glibc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/freebsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/hpux.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64-c.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64-modes.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64-protos.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/lib1funcs.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/quadlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/sysv4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/t-ia64#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/unwind-ia64.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/unwind-ia64.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/interix.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/interix3.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/libgloss.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/linux-aout.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/lynx-ng.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/lynx.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/memset.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/netbsd-aout.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/netbsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/openbsd-oldgas.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/openbsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/ptx4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix43.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix51.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/altivec-defs.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/altivec.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/crtsavres.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-ldouble.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabi-ci.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabi-cn.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabi.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabialtivec.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabisim.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/eabispe.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/gnu.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/host-darwin.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linux.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linux64.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linuxaltivec.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/lynx.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/netbsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/ppc64-fp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000-modes.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.md#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/rtems.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sol-ci.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sol-cn.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sysv4.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/sysv4le.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-aix43#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-beos#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-darwin#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-ppccomm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/tramp.asm#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/windiss.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rs6000/xcoff.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/rtems.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/fixdfdi.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390-modes.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390-protos.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/s390x.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/tpf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sol2.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/aout.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/biarch64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/cypress.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/elf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/hypersparc.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/linux64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/lite.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/litecoff.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/liteelf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/openbsd.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/openbsd64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/pbd.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/rtemself.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-64.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-bi.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-gas-bi.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sol2.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sp64-aout.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sp64-elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sp86x-elf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc-modes.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc-protos.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.md#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sparclet.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/supersparc.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/sysv4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/ultra1_2.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/sparc/ultra3.md#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/svr3.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/svr4.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-darwin#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-linux#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-slibgcc-darwin#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-slibgcc-sld#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/usegas.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/configure#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/configure.ac#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/conflict.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/convert.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/convert.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/coverage.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/coverage.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp-demangle.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog.1#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog.2#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/Make-lang.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/NEWS#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/call.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/class.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/config-lang.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-lang.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-tree.def#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cp-tree.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cxx-pretty-print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/decl.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/decl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/decl2.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/dump.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/except.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/expr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/friend.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/g++spec.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/init.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/lang-specs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/lex.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/lex.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/mangle.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/method.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/name-lookup.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/name-lookup.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/operators.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/optimize.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/pt.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/ptree.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/repo.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/rtti.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/search.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/tree.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/typeck.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cp/typeck2.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cplus-dem.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppdefault.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppdefault.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpperror.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppexp.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppfiles.c#5 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpphash.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpphash.h#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppinit.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpplex.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpplib.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpplib.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppmacro.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpppch.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppspec.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cpptrad.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppucnid.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppucnid.pl#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/cppucnid.tab#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/crtstuff.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cse.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cselib.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/cselib.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/dbxout.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/dbxout.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/ddg.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/ddg.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/debug.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/debug.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/defaults.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/demangle.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/df-core.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/df-problems.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/df-scan.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/df.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/df.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/dfp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/dfp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/diagnostic.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/diagnostic.def#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/diagnostic.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/c-tree.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/cfg.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/compat.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/contrib.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/contribute.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/cpp.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/cppinternals.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/cppopts.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/extend.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/fragments.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/frontends.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/gcc.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/gccint.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/gcov.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/gty.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/hostconfig.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/implement-c.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/include/fdl.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/include/gcc-common.texi#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/include/gpl.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/include/texinfo.tex#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/interface.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/invoke.texi#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/libgcc.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/loop.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/makefile.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/md.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/objc.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/options.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/passes.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/portability.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/rtl.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/sourcebuild.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/standards.texi#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/tm.texi#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/tree-ssa.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/gcc/doc/trouble.texi#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 29 15:50: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 E0D8D16A475; Tue, 29 May 2007 15:50: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 962B816A473 for ; Tue, 29 May 2007 15:50:18 +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 7843813C484 for ; Tue, 29 May 2007 15:50:18 +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.8/8.13.8) with ESMTP id l4TFoIek034119 for ; Tue, 29 May 2007 15:50:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TFo774033916 for perforce@freebsd.org; Tue, 29 May 2007 15:50:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 May 2007 15:50:07 GMT Message-Id: <200705291550.l4TFo774033916@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 120566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 15:50:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=120566 Change 120566 by rwatson@rwatson_zoo on 2007/05/29 15:49:19 Integrate TrustedBSD priv branch from TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/smp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/trustedbsd/priv/sys/arm/include/asm.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/profile.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#5 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.i386#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#15 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#9 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.i386#8 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files.pc98#7 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.mk#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#6 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#10 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/trustedbsd/priv/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/trustedbsd/priv/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/LICENSE#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_hw.c#4 delete .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_hw.h#4 delete .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em_osdep.h#4 delete .. //depot/projects/trustedbsd/priv/sys/dev/en/midway.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/mii.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ums.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_dev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_disk.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_disk.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_io.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_slice.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_subr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/PAE#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/msi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/support.s#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/proc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/smp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_clock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_event.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exit.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_lock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mib.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sx.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_synch.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thread.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_bus.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_lock.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_prof.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_rman.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_trap.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_generic.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_default.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vnode_if.src#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#11 integrate .. //depot/projects/trustedbsd/priv/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/em/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/linux/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/rum/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/modules/twa/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/ethernet.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/net/if.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_lagg.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_lagg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_var.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/route.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_car.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_car.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/icmp6.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/if_ether.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_gif.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_id.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_input.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_options.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_options.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/trustedbsd/priv/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/opencrypto/xform.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/opencrypto/xform.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_tl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/pci/ncr.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/cache.h#3 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/nexus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/acct.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/callout.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/disk.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/filedesc.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/interrupt.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/lock_profile.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/lockf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#10 integrate .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/sys/rwlock.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/socketvar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sx.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysctl.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysent.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#12 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vmmeter.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vnode.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_int.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_fault.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_glue.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_map.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_meter.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_object.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#6 (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.30 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -71,9 +72,16 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; +#ifdef INTR_FILTER +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +static void intr_event_stray(void *cookie); +#endif + #ifdef SMP static int assign_cpu; @@ -109,14 +117,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -134,20 +142,26 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); +#ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, + (mask_fn)isrc->is_pic->pic_enable_source, + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); +#else + error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); +#endif if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; - isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + isrc->is_handlers = 0; + sx_xunlock(&intr_table_lock); return (0); } @@ -171,19 +185,18 @@ error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); - if (!isrc->is_enabled) { - isrc->is_enabled = 1; + isrc->is_handlers++; + if (isrc->is_handlers == 1) { #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); - isrc->is_pic->pic_enable_source(isrc); + isrc->is_pic->pic_enable_source(isrc); + } + sx_xunlock(&intr_table_lock); } return (error); } @@ -196,8 +209,16 @@ isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); - if (error == 0) + if (error == 0) { + sx_xlock(&intr_table_lock); + isrc->is_handlers--; + if (isrc->is_handlers == 0) { + isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); + isrc->is_pic->pic_disable_intr(isrc); + } intrcnt_updatename(isrc); + sx_xunlock(&intr_table_lock); + } return (error); } @@ -212,11 +233,82 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; + int vector; + + td = curthread; + + /* + * We count software interrupts when we process them. The + * code here follows previous practice, but there's an + * argument for counting hardware interrupts when they're + * processed too. + */ + (*isrc->is_count)++; + PCPU_LAZY_INC(cnt.v_intr); + + ie = isrc->is_event; + + /* + * XXX: We assume that IRQ 0 is only used for the ISA timer + * device (clk). + */ + vector = isrc->is_pic->pic_vector(isrc); + if (vector == 0) + clkintr_pending = 1; + + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); +} + +static void >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 29 15:54: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 817A016A469; Tue, 29 May 2007 15:54: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 417A916A41F for ; Tue, 29 May 2007 15:54:24 +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 31B0313C46A for ; Tue, 29 May 2007 15:54:24 +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.8/8.13.8) with ESMTP id l4TFsOjq038460 for ; Tue, 29 May 2007 15:54:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TFsNVK038453 for perforce@freebsd.org; Tue, 29 May 2007 15:54:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 29 May 2007 15:54:23 GMT Message-Id: <200705291554.l4TFsNVK038453@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 120567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 15:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120567 Change 120567 by rwatson@rwatson_zoo on 2007/05/29 15:53:45 Move suser(9) compatibility APIs to priv.h; eliminate SUSER_ALLOWJAIL as that knowledge is now handled internally to the privilege check facility. This doesn't compile yet. Affected files ... .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#15 edit .. //depot/projects/trustedbsd/priv/sys/sys/systm.h#13 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#15 (text+ko) ==== @@ -466,6 +466,18 @@ struct ucred; int priv_check(struct thread *td, int priv); int priv_check_cred(struct ucred *cred, int priv, int flags); + +/* + * Continue to support external modules that rely on suser(9) -- for now. + */ +int suser(struct thread *td); +int suser_cred(struct ucred *cred, int flags); + +/* + * For historical reasons, flags to priv_check_cred() retain the SUSER_ + * prefix. + */ +#define SUSER_RUID 2 #endif #endif /* !_SYS_PRIV_H_ */ ==== //depot/projects/trustedbsd/priv/sys/sys/systm.h#13 (text+ko) ==== @@ -236,12 +236,6 @@ void cpu_startprofclock(void); void cpu_stopprofclock(void); -/* flags for suser() and suser_cred() */ -#define SUSER_ALLOWJAIL 1 -#define SUSER_RUID 2 - -int suser(struct thread *td); -int suser_cred(struct ucred *cred, int flags); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); From owner-p4-projects@FreeBSD.ORG Tue May 29 18:10: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 1AC9A16A469; Tue, 29 May 2007 18:10: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 B5CA016A421 for ; Tue, 29 May 2007 18:10:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A651613C45D for ; Tue, 29 May 2007 18:10:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TIAX88076095 for ; Tue, 29 May 2007 18:10:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TIAX3B076079 for perforce@freebsd.org; Tue, 29 May 2007 18:10:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 May 2007 18:10:33 GMT Message-Id: <200705291810.l4TIAX3B076079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 18:10:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=120572 Change 120572 by hselasky@hselasky_mini_itx on 2007/05/29 18:09:34 Fix a LOR. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#31 (text+ko) ==== @@ -3452,8 +3452,8 @@ /* Enable RHSC interrupt if condition is cleared. */ if((OREAD4(sc, port) >> 16) == 0) { + ehci_pcd_enable(sc); mtx_lock(&sc->sc_bus.mtx); - ehci_pcd_enable(sc); } break; default: ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#25 (text+ko) ==== @@ -2518,8 +2518,8 @@ /* enable RHSC interrupt if condition is cleared. */ if((OREAD4(sc, port) >> 16) == 0) { + ohci_rhsc_enable(sc); mtx_lock(&sc->sc_bus.mtx); - ohci_rhsc_enable(sc); } break; default: From owner-p4-projects@FreeBSD.ORG Tue May 29 18:12: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 3555B16A46F; Tue, 29 May 2007 18:12: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 D962316A468 for ; Tue, 29 May 2007 18:12:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C865513C458 for ; Tue, 29 May 2007 18:12:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TICaMo078682 for ; Tue, 29 May 2007 18:12:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TICaAN078663 for perforce@freebsd.org; Tue, 29 May 2007 18:12:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 May 2007 18:12:36 GMT Message-Id: <200705291812.l4TICaAN078663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 18:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120573 Change 120573 by hselasky@hselasky_mini_itx on 2007/05/29 18:12:33 Updates to V4L v2.0 header files. Affected files ... .. //depot/projects/usb/src/sys/sys/videodev.h#3 edit .. //depot/projects/usb/src/sys/sys/videokern.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/sys/videodev.h#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/sys/videokern.h#2 (text+ko) ==== @@ -74,6 +74,12 @@ typedef struct file v4l2_file_t; #endif +typedef int32_t (vidioc_enum_fmt_t) + (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); + +typedef int32_t (vidioc_xxx_fmt_t) + (v4l2_file_t *file, void *fh, struct v4l2_format *f); + struct video_device { /* Device info */ @@ -118,68 +124,40 @@ (v4l2_file_t *file, void *fh, enum v4l2_priority p); /* VIDIOC_ENUM_FMT handlers */ - int32_t (*vidioc_enum_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); + vidioc_enum_fmt_t *vidioc_enum_fmt_cap; + vidioc_enum_fmt_t *vidioc_enum_fmt_overlay; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi_capture; + vidioc_enum_fmt_t *vidioc_enum_fmt_video_output; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi_output; + vidioc_enum_fmt_t *vidioc_enum_fmt_type_private; /* VIDIOC_G_FMT handlers */ - int32_t (*vidioc_g_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_g_fmt_cap; + vidioc_xxx_fmt_t *vidioc_g_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_g_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_g_fmt_type_private; /* VIDIOC_S_FMT handlers */ - int32_t (*vidioc_s_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_s_fmt_cap; + vidioc_xxx_fmt_t *vidioc_s_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_s_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_s_fmt_type_private; /* VIDIOC_TRY_FMT handlers */ - int32_t (*vidioc_try_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_try_fmt_cap; + vidioc_xxx_fmt_t *vidioc_try_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_try_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_try_fmt_type_private; /* Buffer handlers */ int32_t (*vidioc_reqbufs) @@ -312,7 +290,7 @@ int32_t (*vidioc_g_register) (v4l2_file_t *file, void *fh, struct v4l2_register *reg); int32_t (*vidioc_s_register)' - (v4l2_file_t *file, void *fh, struct v4l2_register *reg); + (v4l2_file_t *file, void *fh, struct v4l2_register *reg); #endif /* Internal use only variables: */ From owner-p4-projects@FreeBSD.ORG Tue May 29 18:21: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 E807516A46B; Tue, 29 May 2007 18:21:49 +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 A569A16A421 for ; Tue, 29 May 2007 18:21:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9544113C455 for ; Tue, 29 May 2007 18:21:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TILn74086417 for ; Tue, 29 May 2007 18:21:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TILnDj086406 for perforce@freebsd.org; Tue, 29 May 2007 18:21:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 May 2007 18:21:49 GMT Message-Id: <200705291821.l4TILnDj086406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 18:21:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120575 Change 120575 by hselasky@hselasky_mini_itx on 2007/05/29 18:21:03 Fix a panic at USB host controller detach, due to a NULL pointer reference. Detaching an USB pcmcia card is still not safe due to some code inherited from the old USB stack in "usb.c". This will be fixed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#18 (text+ko) ==== @@ -379,14 +379,15 @@ ehci_pci_detach(device_t self) { ehci_softc_t *sc = device_get_softc(self); + device_t bdev; usbd_config_td_stop(&(sc->sc_config_td)); if(sc->sc_bus.bdev) { - device_detach(sc->sc_bus.bdev); - device_delete_child(self, sc->sc_bus.bdev); - sc->sc_bus.bdev = NULL; + bdev = sc->sc_bus.bdev; + device_detach(bdev); + device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#18 (text+ko) ==== @@ -342,14 +342,15 @@ ohci_pci_detach(device_t self) { ohci_softc_t *sc = device_get_softc(self); + device_t bdev; usbd_config_td_stop(&(sc->sc_config_td)); if(sc->sc_bus.bdev) { - device_detach(sc->sc_bus.bdev); - device_delete_child(self, sc->sc_bus.bdev); - sc->sc_bus.bdev = NULL; + bdev = sc->sc_bus.bdev; + device_detach(bdev); + device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#17 (text+ko) ==== @@ -342,14 +342,15 @@ uhci_pci_detach(device_t self) { uhci_softc_t *sc = device_get_softc(self); + device_t bdev; usbd_config_td_stop(&(sc->sc_config_td)); if(sc->sc_bus.bdev) { - device_detach(sc->sc_bus.bdev); - device_delete_child(self, sc->sc_bus.bdev); - sc->sc_bus.bdev = NULL; + bdev = sc->sc_bus.bdev; + device_detach(bdev); + device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ From owner-p4-projects@FreeBSD.ORG Tue May 29 22:04:18 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 599D316A498; Tue, 29 May 2007 22:04: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 26C0A16A46C for ; Tue, 29 May 2007 22:04:18 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D98313C4AE for ; Tue, 29 May 2007 22:04:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TM4EiK096879 for ; Tue, 29 May 2007 22:04:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TM4E3w096869 for perforce@freebsd.org; Tue, 29 May 2007 22:04:14 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 29 May 2007 22:04:14 GMT Message-Id: <200705292204.l4TM4E3w096869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 22:04:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=120584 Change 120584 by thompsa@thompsa_heff on 2007/05/29 22:03:08 Grab the associd from the frame. This lets ieee80211_input process the beacon frames and will scan the next channel much quicker for a bgscan. We may want to just pass a full list of channels to scan to the firmware as Linux does it. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#30 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#30 (text+ko) ==== @@ -1318,6 +1318,7 @@ #define SUBTYPE(wh) ((wh)->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) const uint8_t *frm, *efrm, *wme; struct ieee80211_node *ni; + uint16_t capinfo, status, associd; /* NB: +8 for capinfo, status, associd, and first ie */ if (!(sizeof(*wh)+8 < len && len < IEEE80211_MAX_LEN) || @@ -1334,7 +1335,13 @@ */ frm = (const uint8_t *)&wh[1]; efrm = ((const uint8_t *) wh) + len; - frm += 6; + + capinfo = le16toh(*(const uint16_t *)frm); + frm += 2; + status = le16toh(*(const uint16_t *)frm); + frm += 2; + associd = le16toh(*(const uint16_t *)frm); + frm += 2; wme = NULL; while (frm < efrm) { @@ -1349,6 +1356,8 @@ } ni = sc->sc_ic.ic_bss; + ni->ni_capinfo = capinfo; + ni->ni_associd = associd; if (wme != NULL) ni->ni_flags |= IEEE80211_NODE_QOS; else From owner-p4-projects@FreeBSD.ORG Tue May 29 22:05: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 8E80E16A481; Tue, 29 May 2007 22:05: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 6506016A47D for ; Tue, 29 May 2007 22:05:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E91513C4C7 for ; Tue, 29 May 2007 22:05:16 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TM5Fu1098015 for ; Tue, 29 May 2007 22:05:15 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TM5FTg098006 for perforce@freebsd.org; Tue, 29 May 2007 22:05:15 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 29 May 2007 22:05:15 GMT Message-Id: <200705292205.l4TM5FTg098006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 29 May 2007 22:05:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120585 Change 120585 by thompsa@thompsa_heff on 2007/05/29 22:04:20 Turn on BGSCAN as it is working fine. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#31 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#31 (text+ko) ==== @@ -370,9 +370,7 @@ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ | IEEE80211_C_WPA /* 802.11i */ | IEEE80211_C_WME /* 802.11e */ -#if 0 | IEEE80211_C_BGSCAN /* capable of bg scanning */ -#endif ; /* read MAC address from EEPROM */ From owner-p4-projects@FreeBSD.ORG Wed May 30 03:26:27 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 407F716A469; Wed, 30 May 2007 03:26: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 CF4C316A468 for ; Wed, 30 May 2007 03:26:26 +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 BFAB613C44C for ; Wed, 30 May 2007 03:26:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U3QQQc006435 for ; Wed, 30 May 2007 03:26:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U3QBFC006272 for perforce@freebsd.org; Wed, 30 May 2007 03:26:11 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 May 2007 03:26:11 GMT Message-Id: <200705300326.l4U3QBFC006272@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 120592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 03:26:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=120592 Change 120592 by sam@sam_ebb on 2007/05/30 03:26:05 IFC @ 120591 Affected files ... .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#13 integrate .. //depot/projects/wifi/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#18 integrate .. //depot/projects/wifi/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/wifi/sys/arm/include/vmparam.h#6 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/avila_ata.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425.c#6 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/wifi/sys/boot/i386/Makefile#2 integrate .. //depot/projects/wifi/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/wifi/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/wifi/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/wifi/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/wifi/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/wifi/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/wifi/sys/boot/i386/loader/Makefile#8 integrate .. //depot/projects/wifi/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/wifi/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/wifi/sys/cam/README.quirks#1 branch .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/wifi/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/wifi/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/wifi/sys/conf/files#50 integrate .. //depot/projects/wifi/sys/conf/kern.mk#8 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#142 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/wifi/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/wifi/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/wifi/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/wifi/sys/dev/en/midway.c#9 integrate .. //depot/projects/wifi/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/wifi/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/wifi/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/wifi/sys/dev/random/randomdev_soft.c#9 integrate .. //depot/projects/wifi/sys/dev/random/yarrow.c#4 integrate .. //depot/projects/wifi/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.c#12 integrate .. //depot/projects/wifi/sys/dev/syscons/scmouse.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#26 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#14 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#12 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/wifi/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#15 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#14 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#23 integrate .. //depot/projects/wifi/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/wifi/sys/ia64/ia64/busdma_machdep.c#9 integrate .. //depot/projects/wifi/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/wifi/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/wifi/sys/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/wifi/sys/ia64/include/vmparam.h#7 integrate .. //depot/projects/wifi/sys/kern/kern_clock.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_event.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_mtxpool.c#4 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#10 integrate .. //depot/projects/wifi/sys/kern/subr_mbpool.c#3 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#28 integrate .. //depot/projects/wifi/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/wifi/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/wifi/sys/net/ethernet.h#6 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#8 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#14 integrate .. //depot/projects/wifi/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#21 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#12 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netipsec/ipsec.c#8 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/wifi/sys/netipsec/key.c#4 integrate .. //depot/projects/wifi/sys/netncp/ncp_conn.c#6 integrate .. //depot/projects/wifi/sys/pci/ncr.c#8 integrate .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#17 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/wifi/sys/sys/sx.h#9 integrate .. //depot/projects/wifi/sys/sys/syslimits.h#5 integrate .. //depot/projects/wifi/sys/sys/vnode.h#33 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_gjournal.c#2 integrate Differences ... ==== //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/wifi/sys/amd64/amd64/trap.c#14 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.315 2007/03/26 21:45:44 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -468,7 +468,6 @@ * Otherwise, debugger traps "can't happen". */ #ifdef KDB - /* XXX Giant */ if (kdb_trap(type, 0, frame)) goto out; #endif ==== //depot/projects/wifi/sys/amd64/conf/GENERIC#20 (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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#18 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/wifi/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/wifi/sys/arm/include/vmparam.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/wifi/sys/arm/xscale/ixp425/avila_ata.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425var.h#4 (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/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/wifi/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/wifi/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/wifi/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/wifi/sys/boot/i386/loader/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/wifi/sys/boot/i386/loader/conf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/wifi/sys/boot/i386/loader/main.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/wifi/sys/boot/ia64/common/exec.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/common/exec.c,v 1.16 2006/11/05 22:03:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/common/exec.c,v 1.17 2007/05/27 19:02:46 marcel Exp $"); #include #include @@ -105,7 +105,7 @@ ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2)); pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY | - PTE_PL_KERN | PTE_AR_RWX; + PTE_PL_KERN | PTE_AR_RWX | PTE_ED; __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7))); __asm __volatile("mov cr.itir=%0" :: "r"(28 << 2)); ==== //depot/projects/wifi/sys/cam/scsi/scsi_da.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/wifi/sys/compat/opensolaris/sys/mutex.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -46,12 +46,18 @@ typedef struct sx kmutex_t; +#ifndef DEBUG +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) +#else +#define MUTEX_FLAGS (SX_DUPOK) +#endif + #define mutex_init(lock, desc, type, arg) do { \ ASSERT((type) == MUTEX_DEFAULT); \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ + sx_init_flags((lock), "zfs:" #lock, MUTEX_FLAGS); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) #define mutex_enter(lock) sx_xlock(lock) ==== //depot/projects/wifi/sys/compat/opensolaris/sys/rwlock.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.2 2007/04/09 01:05:31 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -48,6 +48,12 @@ typedef struct sx krwlock_t; +#ifndef DEBUG +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) +#else +#define RW_FLAGS (SX_DUPOK) +#endif + #define RW_READ_HELD(x) (rw_read_held((x))) #define RW_WRITE_HELD(x) (rw_write_held((x))) #define RW_LOCK_HELD(x) (rw_lock_held((x))) @@ -57,7 +63,7 @@ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, SX_DUPOK); \ + sx_init_flags((lock), "zfs:" #lock, RW_FLAGS); \ } while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ ==== //depot/projects/wifi/sys/conf/files#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1211 2007/05/25 09:48:18 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -515,6 +515,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard dev/cxgb/cxgb_main.c optional cxgb pci +dev/cxgb/cxgb_offload.c optional cxgb pci +dev/cxgb/cxgb_l2t.c optional cxgb pci dev/cxgb/cxgb_lro.c optional cxgb pci dev/cxgb/cxgb_sge.c optional cxgb pci dev/cxgb/common/cxgb_mc5.c optional cxgb pci ==== //depot/projects/wifi/sys/conf/kern.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,10 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -Wno-pointer-sign -fformat-extensions + ${_wundef} ${_Wno_pointer_sign} -fformat-extensions +.if !defined(WITH_GCC3) +_Wno_pointer_sign=-Wno-pointer-sign +.endif .if !defined(NO_UNDEF) _wundef= -Wundef .endif ==== //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 (text+ko) ==== @@ -154,6 +154,7 @@ if ((error = zfs_zget(zfsvfs, lr->lr_doid, &dzp)) != 0) return (error); + bzero(&cn, sizeof(cn)); cn.cn_nameptr = name; cn.cn_namelen = strlen(name); cn.cn_nameiop = DELETE; @@ -246,6 +247,7 @@ svp = tvp = NULL; + bzero(&scn, sizeof(scn)); scn.cn_nameptr = sname; scn.cn_namelen = strlen(sname); scn.cn_nameiop = DELETE; @@ -260,6 +262,7 @@ goto fail; VOP_UNLOCK(svp, 0, td); + bzero(&tcn, sizeof(tcn)); tcn.cn_nameptr = tname; tcn.cn_namelen = strlen(tname); tcn.cn_nameiop = RENAME; ==== //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 (text+ko) ==== @@ -3355,6 +3355,7 @@ return (EOPNOTSUPP); vattr_init_mask(vap); + vap->va_mask &= ~AT_NOSET; return (zfs_setattr(ap->a_vp, vap, 0, ap->a_cred, NULL)); } ==== //depot/projects/wifi/sys/dev/acpica/acpi.c#26 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.237 2007/05/15 08:41:05 takawata Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.238 2007/05/25 05:26:21 njl Exp $"); #include "opt_acpi.h" #include @@ -242,6 +242,10 @@ /* Allow users to override quirks. */ TUNABLE_INT("debug.acpi.quirks", &acpi_quirks); +static int acpi_susp_bounce; +SYSCTL_INT(_debug_acpi, OID_AUTO, suspend_bounce, CTLFLAG_RW, + &acpi_susp_bounce, 0, "Don't actually suspend, just test devices."); + /* * ACPI can only be loaded as a module by the loader; activating it after * system bootstrap time is not useful, and can be fatal to the system. @@ -2198,6 +2202,10 @@ } slp_state = ACPI_SS_DEV_SUSPEND; + /* If testing device suspend only, back out of everything here. */ + if (acpi_susp_bounce) + break; + status = AcpiEnterSleepStatePrep(state); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepStatePrep failed - %s\n", ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#142 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.165 2007/04/19 13:09:56 sephe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -5294,14 +5294,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_intrset(sc, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } @@ -5497,7 +5502,7 @@ } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, NULL, 0, NULL, cc, HAL_MODE_ALL, outdoor, xchanmode)) { - ath_hal_getregdomain(ah, ®domain); + (void) ath_hal_getregdomain(ah, ®domain); if_printf(ifp, "unable to collect channel list from hal; " "regdomain likely %u country code %u\n", regdomain, cc); free(chans, M_TEMP); @@ -5543,7 +5548,7 @@ } ic->ic_nchans = nchan; free(chans, M_TEMP); - ath_hal_getregdomain(ah, &sc->sc_regdomain); + (void) ath_hal_getregdomain(ah, &sc->sc_regdomain); ath_hal_getcountrycode(ah, &sc->sc_countrycode); sc->sc_xchanmode = xchanmode; sc->sc_outdoor = outdoor; @@ -5617,14 +5622,14 @@ if (sc->sc_curtxpow != ic->ic_txpowlimit) { ath_hal_settxpowlimit(ah, ic->ic_txpowlimit); /* read back in case value is clamped */ - ath_hal_gettxpowlimit(ah, &txpow); - ic->ic_txpowlimit = sc->sc_curtxpow = txpow; + if (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); - ic->ic_bss->ni_txpower = txpow; + if (ath_hal_getmaxtxpow(sc->sc_ah, &txpow)) + ic->ic_bss->ni_txpower = txpow; } static int @@ -6131,7 +6136,7 @@ u_int32_t scale; int error; - ath_hal_gettpscale(sc->sc_ah, &scale); + (void) ath_hal_gettpscale(sc->sc_ah, &scale); error = sysctl_handle_int(oidp, &scale, 0, req); if (error || !req->newptr) return error; @@ -6174,7 +6179,7 @@ u_int rfsilent; int error; - ath_hal_getrfsilent(sc->sc_ah, &rfsilent); + (void) ath_hal_getrfsilent(sc->sc_ah, &rfsilent); error = sysctl_handle_int(oidp, &rfsilent, 0, req); if (error || !req->newptr) return error; @@ -6230,7 +6235,7 @@ u_int32_t tpack; int error; - ath_hal_gettpack(sc->sc_ah, &tpack); + (void) ath_hal_gettpack(sc->sc_ah, &tpack); error = sysctl_handle_int(oidp, &tpack, 0, req); if (error || !req->newptr) return error; @@ -6244,7 +6249,7 @@ u_int32_t tpcts; int error; - ath_hal_gettpcts(sc->sc_ah, &tpcts); + (void) ath_hal_gettpcts(sc->sc_ah, &tpcts); error = sysctl_handle_int(oidp, &tpcts, 0, req); if (error || !req->newptr) return error; ==== //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 30 05:10: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 54AE916A564; Wed, 30 May 2007 05:10: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 0F6AE16A562 for ; Wed, 30 May 2007 05:10:44 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F320F13C4B7 for ; Wed, 30 May 2007 05:10:43 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U5Ahn3013194 for ; Wed, 30 May 2007 05:10:43 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U5AaSB013095 for perforce@freebsd.org; Wed, 30 May 2007 05:10:36 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 30 May 2007 05:10:36 GMT Message-Id: <200705300510.l4U5AaSB013095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 120594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 05:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=120594 Change 120594 by zec@zec_tpx32 on 2007/05/30 05:10:32 Stale IFC... Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/profile.h#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/vimage/src/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/vimage/src/sys/conf/files#10 integrate .. //depot/projects/vimage/src/sys/conf/kern.mk#2 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/vimage/src/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/tcp.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#2 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#16 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#10 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#14 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/vimage/src/sys/sys/lockf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#7 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#5 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#7 integrate .. //depot/projects/vimage/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/vimage/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/vimage/src/sys/amd64/include/md_var.h#3 (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/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/vimage/src/sys/amd64/include/smp.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/vimage/src/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -286,8 +286,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - (uintmax_t)ptoa(cnt.v_free_count), - (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/vimage/src/sys/arm/include/asm.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/vimage/src/sys/arm/include/pmap.h#3 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/vimage/src/sys/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/vimage/src/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ ==== //depot/projects/vimage/src/sys/coda/coda_vnops.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.70 2007/03/13 01:50:21 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); #include #include @@ -129,7 +129,7 @@ .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - ._vop_lock = coda_lock, /* lock */ + .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ } int -coda_lock(struct _vop_lock_args *ap) +coda_lock(struct vop_lock1_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; ==== //depot/projects/vimage/src/sys/coda/coda_vnops.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.17 2006/11/13 05:51:21 kmacy Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.18 2007/05/18 13:02:12 kib Exp $ * */ @@ -72,7 +72,7 @@ vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -_vop_lock_t coda_lock; +vop_lock1_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.112 2007/05/01 03:09:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.113 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_vimage.h" @@ -150,14 +150,14 @@ /* * The correct thing here would be: * - memfree = cnt.v_free_count * PAGE_SIZE; + memfree = VMCNT_GET(free_count) * PAGE_SIZE; memused = memtotal - memfree; * * but it might mislead linux binaries into thinking there * is very little memory left, so we cheat and tell them that * all memory that isn't wired down is free. */ - memused = cnt.v_wire_count * PAGE_SIZE; + memused = VMCNT_GET(wire_count) * PAGE_SIZE; memfree = memtotal - memused; swap_pager_status(&i, &j); swaptotal = (unsigned long long)i * PAGE_SIZE; @@ -179,7 +179,7 @@ * like unstaticizing it just for linprocfs's sake. */ buffers = 0; - cached = cnt.v_cache_count * PAGE_SIZE; + cached = VMCNT_GET(cache_count) * PAGE_SIZE; sbuf_printf(sb, " total: used: free: shared: buffers: cached:\n" @@ -399,12 +399,12 @@ "intr %u\n" "ctxt %u\n" "btime %lld\n", - cnt.v_vnodepgsin, - cnt.v_vnodepgsout, - cnt.v_swappgsin, - cnt.v_swappgsout, - cnt.v_intr, - cnt.v_swtch, + VMCNT_GET(vnodepgsin), + VMCNT_GET(vnodepgsout), + VMCNT_GET(swappgsin), + VMCNT_GET(swappgsout), + VMCNT_GET(intr), + VMCNT_GET(swtch), (long long)boottime.tv_sec); return (0); } ==== //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -141,7 +141,7 @@ LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale; sysinfo.totalram = physmem * PAGE_SIZE; - sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE; + sysinfo.freeram = sysinfo.totalram - VMCNT_GET(wire_count) * PAGE_SIZE; sysinfo.sharedram = 0; mtx_lock(&vm_object_list_mtx); ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.91 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.92 2007/05/18 07:10:44 jeff Exp $"); #include "opt_mac.h" @@ -778,14 +778,14 @@ #if defined(UVM) *retval = uvmexp.free; /* XXX: free instead of total */ #else - *retval = cnt.v_free_count; /* XXX: free instead of total */ + *retval = VMCNT_GET(free_count); /* XXX: free instead of total */ #endif break; case SVR4_CONFIG_AVPHYS_PAGES: #if defined(UVM) *retval = uvmexp.active; /* XXX: active instead of avg */ #else - *retval = cnt.v_active_count; /* XXX: active instead of avg */ + *retval = VMCNT_GET(active_count); /* XXX: active instead of avg */ #endif break; #endif /* NOTYET */ ==== //depot/projects/vimage/src/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1208 2007/05/16 17:19:47 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1209 2007/05/17 01:29:55 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1427,7 +1427,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_core.c optional sched_core kern/sched_ule.c optional sched_ule -kern/serdev_if.m optional puc | scc +kern/serdev_if.m standard kern/subr_acl_posix1e.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard ==== //depot/projects/vimage/src/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/vimage/src/sys/conf/kern.pre.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/vimage/src/sys/conf/kmod.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/vimage/src/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.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#4 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#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/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/vimage/src/sys/dev/twa/tw_osl_share.h#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/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.10 2007/04/05 19:15:46 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.11 2007/05/17 04:07:19 marcel Exp $"); #include #include @@ -79,7 +79,7 @@ { 0x1033, 0x007d, 0x1033, 0x8012, "NEC RS232C", 0x10 }, { 0x103c, 0x1048, 0x103c, 0x1227, "HP Diva Serial [GSP] UART - Powerbar SP2", 0x10 }, -{ 0x103c, 0x1048, 0x103c, 0x1301, "HP Diva RMP3", 0x10 }, +{ 0x103c, 0x1048, 0x103c, 0x1301, "HP Diva RMP3", 0x14 }, { 0x103c, 0x1290, 0xffff, 0, "HP Auxiliary Diva Serial Port", 0x18 }, { 0x11c1, 0x0480, 0xffff, 0, "Agere Systems Venus Modem (V90, 56KFlex)", 0x14 }, { 0x115d, 0x0103, 0xffff, 0, "Xircom Cardbus Ethernet + 56k Modem", 0x10 }, ==== //depot/projects/vimage/src/sys/dev/usb/ufoma.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.93 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.94 2007/05/18 13:02:12 kib Exp $ */ /* @@ -510,7 +510,7 @@ * vnodes below us on the stack. */ static int -null_lock(struct _vop_lock_args *ap) +null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -728,7 +728,7 @@ .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - ._vop_lock = null_lock, + .vop_lock1 = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, ==== //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.37 2006/08/09 17:43:26 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.38 2007/05/18 07:10:44 jeff Exp $ * */ #include @@ -475,8 +475,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + VMCNT_ADD(vnodein, 1); + VMCNT_ADD(vnodepgsin, npages); iov.iov_base = (caddr_t) kva; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 30 05:57: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 38FA016A46C; Wed, 30 May 2007 05:57: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 D811C16A46B for ; Wed, 30 May 2007 05:57:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C7A5813C45D for ; Wed, 30 May 2007 05:57:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U5vf0G053590 for ; Wed, 30 May 2007 05:57:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U5vfRb053581 for perforce@freebsd.org; Wed, 30 May 2007 05:57:41 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 30 May 2007 05:57:41 GMT Message-Id: <200705300557.l4U5vfRb053581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 120595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 05:57:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120595 Change 120595 by kmacy@kmacy_vt-x:opentoe_init on 2007/05/30 05:56:44 initial cut of protosw hooking of TCP offload module Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_socket.c#2 edit .. //depot/projects/opentoe/sys/modules/cxgb/t3_tom/Makefile#3 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_socket.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -31,6 +27,473 @@ ***************************************************************************/ +#include "opt_ddb.h" +#include "opt_inet.h" +#include "opt_inet6.h" +#include "opt_tcpdebug.h" + +#include +#include +#include +#include +#include +#include +#ifdef INET6 +#include +#endif /* INET6 */ +#include +#include +#include +#include +#include + +#ifdef DDB +#include +#endif + +#include +#include + +#include +#include +#ifdef INET6 +#include +#endif +#include +#ifdef INET6 +#include +#endif +#include +#include +#ifdef INET6 +#include +#include +#endif +#include +#include +#include +#include +#include +#include +#ifdef TCPDEBUG +#include +#endif + +#ifdef TCPDEBUG +#define TCPDEBUG0 int ostate = 0 +#define TCPDEBUG1() ostate = tp ? tp->t_state : 0 +#define TCPDEBUG2(req) if (tp && (so->so_options & SO_DEBUG)) \ + tcp_trace(TA_USER, ostate, tp, 0, 0, req) +#else +#define TCPDEBUG0 +#define TCPDEBUG1() +#define TCPDEBUG2(req) +#endif + +static int (*tcp_usr_bind)(struct socket *so, struct sockaddr *nam, struct thread *td); +static int (*tcp_usr_attach)(struct socket *so, int proto, struct thread *td); + +static int +chelsio_ip_ctloutput(struct socket *so, struct sockopt *sopt) +{ + struct inpcb *inp = sotoinpcb(so); + int error, optval; + + error = optval = 0; + + if (sopt->sopt_name == IP_TOS) { + switch (sopt->sopt_dir) { + case SOPT_SET: + error = sooptcopyin(sopt, &optval, sizeof optval, + sizeof optval); + if (inp->inp_ip_tos != optval) { + inp->inp_ip_tos = optval; +#ifdef notyet + sk->sk_priority = rt_tos2priority(optval); +#endif + t3_set_tos(so); + } + break; + case SOPT_GET: + optval = inp->inp_ip_tos; + error = sooptcopyout(sopt, &optval, sizeof optval); + break; + default: + error = ENOPROTOOPT; + break; + } + } +#ifdef INET6 + else if (INP_CHECK_SOCKAF(so, AF_INET6)) + error = ip6_ctloutput(so, sopt); +#endif /* INET6 */ + else + error = ip_ctloutput(so, sopt); +} + +static int +chelsio_tcp_ctloutput(struct socket *so, struct sockopt *sopt) +{ + + if (sopt->sopt_level != IPPROTO_TCP) { + INP_UNLOCK(inp); + chelsio_ip_ctloutput(so, sopt); + return (error); + } + if (inp->inp_vflag & (INP_TIMEWAIT | INP_DROPPED)) { + error = ECONNRESET; + goto out; + } + tp = intotcpcb(inp); + if (optname == TCP_NODELAY) { + int oldflags = tp->t_flags; + + if (oldflags & TF_NODELAY) + tp->t_flags &= ~TF_NODELAY; + else + tp->t_flags |= TF_NODELAY; + + if ((oldflags & TF_NODELAY) == 0) + t3_set_nagle(so); + } else + tcp_ctloutput(so, sopt); + + return (0); +} + +/* + * Close a connection by sending a CPL_CLOSE_CON_REQ message. Cannot fail + * under any circumstances. We take the easy way out and always queue the + * message to the write_queue. We can optimize the case where the queue is + * already empty though the optimization is probably not worth it. + */ +static void +close_conn(struct socket *so) +{ +#ifdef notyet + struct sk_buff *skb; + struct cpl_close_con_req *req; + unsigned int tid = TID(tcp_sk(sk)); + + skb = alloc_skb_nofail(sizeof(struct cpl_close_con_req)); + req = (struct cpl_close_con_req *)__skb_put(skb, sizeof(*req)); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_CLOSE_CON)); + req->wr.wr_lo = htonl(V_WR_TID(tid)); + OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, tid)); + req->rsvd = htonl(tcp_sk(sk)->write_seq); + + tcp_uncork(sk); + skb_entail(sk, skb, TCPCB_FLAG_NO_APPEND); + if (sk->sk_state != TCP_SYN_SENT) + t3_push_frames(sk, 1); +#endif +} + /* - * Placeholder for FreeBSD equivalent to t3_cpl_sock.c + * Drop a TCP connection, reporting + * the specified error. If connection is synchronized, + * then send a RST to peer. + */ +static struct tcpcb * +chelsio_tcp_drop(struct tcpcb *tp, int errno) +{ + struct socket *so = tp->t_inpcb->inp_socket; + + INP_INFO_WLOCK_ASSERT(&tcbinfo); + INP_LOCK_ASSERT(tp->t_inpcb); + + if (TCPS_HAVERCVDSYN(tp->t_state)) { + tp->t_state = TCPS_CLOSED; + close_conn(so); + tcpstat.tcps_drops++; + } else + tcpstat.tcps_conndrops++; + + if (errno == ETIMEDOUT && tp->t_softerror) + errno = tp->t_softerror; + so->so_error = errno; + return (tcp_close(tp)); +} + +/* + * Abort the TCP. Drop the connection abruptly. + */ +static void +chelsio_usr_abort(struct socket *so) +{ + struct inpcb *inp; + struct tcpcb *tp = NULL; + TCPDEBUG0; + + inp = sotoinpcb(so); + KASSERT(inp != NULL, ("tcp_usr_abort: inp == NULL")); + + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(inp); + KASSERT(inp->inp_socket != NULL, + ("tcp_usr_abort: inp_socket == NULL")); + + /* + * If we still have full TCP state, and we're not dropped, drop. + */ + if (!(inp->inp_vflag & INP_TIMEWAIT) && + !(inp->inp_vflag & INP_DROPPED)) { + tp = intotcpcb(inp); + TCPDEBUG1(); + chelsio_tcp_drop(tp, ECONNABORTED); + TCPDEBUG2(PRU_ABORT); + } + if (!(inp->inp_vflag & INP_DROPPED)) { + SOCK_LOCK(so); + so->so_state |= SS_PROTOREF; + SOCK_UNLOCK(so); + inp->inp_vflag |= INP_SOCKREF; + } + INP_UNLOCK(inp); + INP_INFO_WUNLOCK(&tcbinfo); +} + +static int +chelsio_usr_attach(struct socket *so, int proto, struct thread *td) +{ + /* XXX */ + return (0); +} + +static int +chelsio_usr_bind(struct socket *so, struct sockaddr *nam, struct thread *td) +{ + tcp_usr_bind(so, nam, td); + /* + * XXX sync state with card + */ + return (0); +} + +/* + * Initiate (or continue) disconnect. + * If embryonic state, just send reset (once). + * If in ``let data drain'' option and linger null, just drop. + * Otherwise (hard), mark socket disconnecting and drop + * current input data; switch states based on user close, and + * send segment to peer (with FIN). + */ +static void +chelsio_tcp_disconnect(struct tcpcb *tp) +{ + /* XXX */ +} + +/* + * TCP socket is closed. Start friendly disconnect. + */ +static void +chelsio_usr_close(struct socket *so) +{ + struct inpcb *inp; + struct tcpcb *tp = NULL; + TCPDEBUG0; + + inp = sotoinpcb(so); + KASSERT(inp != NULL, ("tcp_usr_close: inp == NULL")); + + INP_INFO_WLOCK(&tcbinfo); + INP_LOCK(inp); + KASSERT(inp->inp_socket != NULL, + ("tcp_usr_close: inp_socket == NULL")); + + /* + * If we still have full TCP state, and we're not dropped, initiate + * a disconnect. + */ + if (!(inp->inp_vflag & INP_TIMEWAIT) && + !(inp->inp_vflag & INP_DROPPED)) { + tp = intotcpcb(inp); + TCPDEBUG1(); + chelsio_tcp_disconnect(tp); + TCPDEBUG2(PRU_CLOSE); + } + if (!(inp->inp_vflag & INP_DROPPED)) { + SOCK_LOCK(so); + so->so_state |= SS_PROTOREF; + SOCK_UNLOCK(so); + inp->inp_vflag |= INP_SOCKREF; + } + INP_UNLOCK(inp); + INP_INFO_WUNLOCK(&tcbinfo); +} + +static int +chelsio_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) +{ + /* XXX */ + return (0); +} + +/* + * Initiate disconnect from peer. + * If connection never passed embryonic stage, just drop; + * else if don't need to let data drain, then can just drop anyways, + * else have to begin TCP shutdown process: mark socket disconnecting, + * drain unread data, state switch to reflect user close, and + * send segment (e.g. FIN) to peer. Socket will be really disconnected + * when peer sends FIN and acks ours. + * + * SHOULD IMPLEMENT LATER PRU_CONNECT VIA REALLOC TCPCB. + */ +static int +chelsio_usr_disconnect(struct socket *so) +{ + struct inpcb *inp; + struct tcpcb *tp = NULL; + int error = 0; + + TCPDEBUG0; + INP_INFO_WLOCK(&tcbinfo); + inp = sotoinpcb(so); + KASSERT(inp != NULL, ("tcp_usr_disconnect: inp == NULL")); + INP_LOCK(inp); + if (inp->inp_vflag & (INP_TIMEWAIT | INP_DROPPED)) { + error = ECONNRESET; + goto out; + } + tp = intotcpcb(inp); + TCPDEBUG1(); + chelsio_tcp_disconnect(tp); +out: + TCPDEBUG2(PRU_DISCONNECT); + INP_UNLOCK(inp); + INP_INFO_WUNLOCK(&tcbinfo); + return (error); +} + +/* + * After a receive, possibly send window update to peer. + */ +static int +chelsio_usr_rcvd(struct socket *so, int flags) +{ + /* XXX */ + + return (0); +} + +static int +chelsio_usr_send(struct socket *so, int flags, struct mbuf *m, + struct sockaddr *nam, struct mbuf *control, struct thread *td) +{ + /* XXX */ + return (0); +} + +/* + * State transitions and actions for close. Note that if we are in SYN_SENT + * we remain in that state as we cannot control a connection while it's in + * SYN_SENT; such connections are allowed to establish and are then aborted. + */ +static unsigned char new_state[16] = { + /* current state: new state: action: */ + /* (Invalid) */ TCP_CLOSE, + /* TCP_ESTABLISHED */ TCP_FIN_WAIT1 | TCP_ACTION_FIN, + /* TCP_SYN_SENT */ TCP_SYN_SENT, + /* TCP_SYN_RECV */ TCP_FIN_WAIT1 | TCP_ACTION_FIN, + /* TCP_FIN_WAIT1 */ TCP_FIN_WAIT1, + /* TCP_FIN_WAIT2 */ TCP_FIN_WAIT2, + /* TCP_TIME_WAIT */ TCP_CLOSE, + /* TCP_CLOSE */ TCP_CLOSE, + /* TCP_CLOSE_WAIT */ TCP_LAST_ACK | TCP_ACTION_FIN, + /* TCP_LAST_ACK */ TCP_LAST_ACK, + /* TCP_LISTEN */ TCP_CLOSE, + /* TCP_CLOSING */ TCP_CLOSING, +}; + +/* + * Perform a state transition during close and return the actions indicated + * for the transition. Do not make this function inline, the main reason + * it exists at all is to avoid multiple inlining of tcp_set_state. + */ +static int +close_transition(struct tcpcb *tp) +{ + int next = (int)new_state[tp->t_state]; + + tp->t_state = next & TCP_STATE_MASK; + return (next & TCP_ACTION_FIN); +} + +/* + * Mark the connection as being incapable of further output. */ +static int +chelsio_usr_shutdown(struct socket *so) +{ + int error = 0; + struct inpcb *inp; + struct tcpcb *tp = NULL; + + TCPDEBUG0; + INP_INFO_WLOCK(&tcbinfo); + inp = sotoinpcb(so); + KASSERT(inp != NULL, ("inp == NULL")); + INP_LOCK(inp); + if (inp->inp_vflag & (INP_TIMEWAIT | INP_DROPPED)) { + error = ECONNRESET; + goto out; + } + tp = intotcpcb(inp); + TCPDEBUG1(); + socantsendmore(so); + close_transition(tp); + close_conn(so); +out: + TCPDEBUG2(PRU_SHUTDOWN); + INP_UNLOCK(inp); + INP_INFO_WUNLOCK(&tcbinfo); + + return (error); +} + +struct protosw t3_tcp_protosw; +struct pr_usrreqs t3_tcp_usrreqs = { + .pru_abort = chelsio_usr_abort, + .pru_attach = chelsio_usr_attach, + .pru_bind = chelsio_usr_bind, + .pru_close = chelsio_usr_close, + .pru_connect = chelsio_usr_connect, + .pru_control = in6_control, + .pru_disconnect = chelsio_usr_disconnect, + .pru_rcvd = chelsio_usr_rcvd, + .pru_send = chelsio_usr_send, + .pru_shutdown = chelsio_usr_shutdown, + .pru_sosetlabel = in_pcbsosetlabel, +}; + +static void +t3_init_offload_ops(void) +{ + struct protosw *tcp_protosw; + + /* + * XXX need to handle AF_INET6 case as well + */ + tcp_protosw = pffindtype(AF_INET, SOCK_STREAM); + + t3_tcp_protosw = *tcp_protosw; + + t3_tcp_protosw.pr_ctloutput = chelsio_tcp_ctloutput; + + t3_tcp_usrreqs = tcp_usrreqs; + tcp_usr_bind = tcp_usrreqs.pru_bind; + tcp_usr_attach = tcp_usrreqs.pru_attach; + + t3_tcp_usrreqs.pru_accept = tcp_usrreqs.pru_accept; + t3_tcp_usrreqs.pru_control = tcp_usrreqs.pru_control; + t3_tcp_usrreqs.pru_detach = tcp_usrreqs.pru_detach; + t3_tcp_usrreqs.pru_listen = tcp_usrreqs.pru_listen; + t3_tcp_usrreqs.pru_peeraddr = tcp_usrreqs.pru_peeraddr; + t3_tcp_usrreqs.pru_rcvoob = tcp_usrreqs.pru_rcvoob; + t3_tcp_usrreqs.pru_sockaddr = tcp_usrreqs.pru_sockaddr; + t3_tcp_usrreqs.pru_sosetlabel = tcp_usrreqs.pru_sosetlabel; + + t3_tcp_protosw.pr_usrreqs = &t3_tcp_usrreqs; +} ==== //depot/projects/opentoe/sys/modules/cxgb/t3_tom/Makefile#3 (text+ko) ==== @@ -3,8 +3,9 @@ .PATH: ${ULP}/t3_tom ${ULP}/toedev KMOD= t3_tom -SRCS= t3_ddp.c t3_tom.c t3_cpl_io.c -SRCS+= t3_listen.c t3_cpl_socket.c -SRCS+= device_if.h bus_if.h pci_if.h +SRCS= t3_cpl_socket.c t3_ddp.c +SRCS+= t3_tom.c t3_cpl_io.c t3_listen.c +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h +SRCS+= opt_inet6.h opt_tcpdebug.h opt_ddb.h .include From owner-p4-projects@FreeBSD.ORG Wed May 30 07:19: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 28A1916A46C; Wed, 30 May 2007 07:19: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 ED9DF16A41F for ; Wed, 30 May 2007 07:19:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB74613C44C for ; Wed, 30 May 2007 07:19:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U7JNFH033808 for ; Wed, 30 May 2007 07:19:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U7JKIV033804 for perforce@freebsd.org; Wed, 30 May 2007 07:19:20 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 30 May 2007 07:19:20 GMT Message-Id: <200705300719.l4U7JKIV033804@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 120597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 07:19:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120597 Change 120597 by kmacy@kmacy_vt-x:opentoe_init on 2007/05/30 07:18:58 IFC Affected files ... .. //depot/projects/opentoe/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/opentoe/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/opentoe/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/opentoe/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/opentoe/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/opentoe/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/opentoe/sys/boot/i386/Makefile#2 integrate .. //depot/projects/opentoe/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/opentoe/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/opentoe/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/opentoe/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/opentoe/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/opentoe/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/opentoe/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/opentoe/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/opentoe/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/opentoe/sys/cam/README.quirks#1 branch .. //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/opentoe/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_version.h#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_adapter.h#18 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_lro.c#6 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/opentoe/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/opentoe/sys/dev/en/midway.c#3 integrate .. //depot/projects/opentoe/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/opentoe/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/opentoe/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/opentoe/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/opentoe/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/opentoe/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/opentoe/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/opentoe/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/opentoe/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/opentoe/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/opentoe/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_clock.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_event.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_mib.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_sx.c#6 integrate .. //depot/projects/opentoe/sys/kern/subr_witness.c#7 integrate .. //depot/projects/opentoe/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/opentoe/sys/modules/cxgb/Makefile#9 integrate .. //depot/projects/opentoe/sys/net/ethernet.h#3 integrate .. //depot/projects/opentoe/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#9 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.h#7 integrate .. //depot/projects/opentoe/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/opentoe/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/opentoe/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/opentoe/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/opentoe/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/opentoe/sys/netipsec/key.c#2 integrate .. //depot/projects/opentoe/sys/pci/ncr.c#4 integrate .. //depot/projects/opentoe/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/opentoe/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/opentoe/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/opentoe/sys/sys/sx.h#5 integrate .. //depot/projects/opentoe/sys/sys/syslimits.h#2 integrate .. //depot/projects/opentoe/sys/ufs/ufs/ufs_gjournal.c#2 integrate Differences ... ==== //depot/projects/opentoe/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/opentoe/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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -179,5 +179,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) - - +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/opentoe/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/opentoe/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/opentoe/sys/arm/include/vmparam.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/opentoe/sys/arm/xscale/ixp425/avila_ata.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/opentoe/sys/arm/xscale/ixp425/ixp425var.h#3 (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/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/opentoe/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/opentoe/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/opentoe/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/opentoe/sys/boot/i386/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/opentoe/sys/boot/i386/loader/conf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/opentoe/sys/boot/i386/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/opentoe/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 (text+ko) ==== @@ -154,6 +154,7 @@ if ((error = zfs_zget(zfsvfs, lr->lr_doid, &dzp)) != 0) return (error); + bzero(&cn, sizeof(cn)); cn.cn_nameptr = name; cn.cn_namelen = strlen(name); cn.cn_nameiop = DELETE; @@ -246,6 +247,7 @@ svp = tvp = NULL; + bzero(&scn, sizeof(scn)); scn.cn_nameptr = sname; scn.cn_namelen = strlen(sname); scn.cn_nameiop = DELETE; @@ -260,6 +262,7 @@ goto fail; VOP_UNLOCK(svp, 0, td); + bzero(&tcn, sizeof(tcn)); tcn.cn_nameptr = tname; tcn.cn_namelen = strlen(tname); tcn.cn_nameiop = RENAME; ==== //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 (text+ko) ==== @@ -3355,6 +3355,7 @@ return (EOPNOTSUPP); vattr_init_mask(vap); + vap->va_mask &= ~AT_NOSET; return (zfs_setattr(ap->a_vp, vap, 0, ap->a_cred, NULL)); } ==== //depot/projects/opentoe/sys/dev/ath/if_ath.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4592,14 +4592,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { AEL100X_TX_DISABLE = 9, ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_common.h#5 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,13 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H +#ifdef CONFIG_DEFINED +#include +#else #include +#endif enum { MAX_NPORTS = 2, /* max # of ports */ @@ -538,7 +538,11 @@ unsigned int val; }; +#ifdef CONFIG_DEFINED +#include +#else #include +#endif #ifndef PCI_VENDOR_ID_CHELSIO # define PCI_VENDOR_ID_CHELSIO 0x1425 ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mc5.c#4 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.3 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { IDT75P52100 = 4, ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* Marvell PHY interrupt status bits. */ #define MV_INTR_JABBER 0x0001 ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_regs.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* This file is automatically generated --- do not edit */ ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_sge_defs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_t3_hw.c#5 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,12 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.4 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /** * t3_wait_op_done_val - wait until an operation is completed ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_tcb.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ ==== //depot/projects/opentoe/sys/dev/cxgb/common/cxgb_version.h#5 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 30 07:23: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 05AD516A46C; Wed, 30 May 2007 07:23:49 +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 B685116A41F for ; Wed, 30 May 2007 07:23:48 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A62DF13C469 for ; Wed, 30 May 2007 07:23:48 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U7NmSV037264 for ; Wed, 30 May 2007 07:23:48 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U7Nmko037258 for perforce@freebsd.org; Wed, 30 May 2007 07:23:48 GMT (envelope-from andrew@freebsd.org) Date: Wed, 30 May 2007 07:23:48 GMT Message-Id: <200705300723.l4U7Nmko037258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 120598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 07:23:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=120598 Change 120598 by andrew@andrew_hermies on 2007/05/30 07:22:48 Document what the look_for_updates function is ment to do and how it does it Use default_check_period rather than a magic number Push the selection of base dirs out of look_for_updates to let me read it from a config file later Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#2 (text+ko) ==== @@ -71,16 +71,27 @@ return 0; } +/* + * Loops looking for updates. + * There are two ways, the first is to use kqueue to wait + * for an EVFILT_VNODE event on the database directory with + * a timeout to allow for the directory to have changed + * between the time we last checked for updates and the + * call to kqueue. The second is to sleep for a set time + * period. The only advantage the kqueue method has over + * sleeping is we may see the update sooner this way. + */ void * -look_for_updates(void *data __unused) +look_for_updates(void *data) { - const char *base_dirs[] = { "/", NULL }; char db_dir[PATH_MAX]; struct timespec timeout; int *dir_fd, kq, use_kqueue, found_updates; struct kevent *events, changes; size_t pos, dir_count; + char **base_dirs; + base_dirs = data; for (dir_count = 0; base_dirs[dir_count] != NULL; dir_count++) continue; @@ -110,7 +121,7 @@ found_updates = 0; /* XXX This timeout will be bigger in a live system */ - timeout.tv_sec = 10; + timeout.tv_sec = default_check_period; timeout.tv_nsec = 0; kq = kqueue(); if (kq == -1) @@ -140,7 +151,7 @@ use_kqueue = 1; } } else { - sleep(10); + sleep(default_check_period); } } return NULL; @@ -149,7 +160,8 @@ int main(int argc __unused, char *argv[] __unused) { - look_for_updates(NULL); + const char *base_dirs[] = { "/", NULL }; + look_for_updates(base_dirs); return 0; } From owner-p4-projects@FreeBSD.ORG Wed May 30 08: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 9E25416A46B; Wed, 30 May 2007 08:12:49 +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 320ED16A400 for ; Wed, 30 May 2007 08:12:49 +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 1F2FA13C487 for ; Wed, 30 May 2007 08:12:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U8CmCr086932 for ; Wed, 30 May 2007 08:12:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8CmSL086912 for perforce@freebsd.org; Wed, 30 May 2007 08:12:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:12:48 GMT Message-Id: <200705300812.l4U8CmSL086912@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 120600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 08:12:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120600 Change 120600 by rwatson@rwatson_zoo on 2007/05/30 08:12:29 Sync up CVS and P4 versions of various Makefile and $FreeBSD$ bits that at some point got out of sync. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#13 edit .. //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#4 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/Makefile,v 1.1 2006/03/19 15:47:53 rwatson Exp $ # PROG= audit_pipe_ioctl ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c,v 1.1 2006/03/19 15:47:53 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#13 (text+ko) ==== @@ -22,10 +22,4 @@ PRECIOUSPROG= .endif -.if !defined(NO_AUDIT) -DPADD+= ${LIBBSM} -LDADD+= -lbsm -CFLAGS += -DUSE_BSM_AUDIT -.endif - .include ==== //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#5 (text+ko) ==== @@ -18,10 +18,4 @@ BINMODE=4555 PRECIOUSPROG= -.if !defined(NO_AUDIT) -CFLAGS+= -DUSE_BSM_AUDIT -DPADD+= ${LIBBSM} -LDADD+= -lbsm -.endif - .include ==== //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/audit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/auditd/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm ==== //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/praudit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm From owner-p4-projects@FreeBSD.ORG Wed May 30 08:14: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 680A116A46B; Wed, 30 May 2007 08:14: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 D87A516A468 for ; Wed, 30 May 2007 08:14: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 C604B13C44C for ; Wed, 30 May 2007 08:14: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.8/8.13.8) with ESMTP id l4U8Evih089073 for ; Wed, 30 May 2007 08:14:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8EvHD089057 for perforce@freebsd.org; Wed, 30 May 2007 08:14:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:14:57 GMT Message-Id: <200705300814.l4U8EvHD089057@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 120601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 08:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=120601 Change 120601 by rwatson@rwatson_zoo on 2007/05/30 08:13:55 Remove dup swapoff method from mac_test that snuck in during some or another integ. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#10 (text+ko) ==== @@ -2667,7 +2667,6 @@ .mpo_check_system_auditon = mac_test_check_system_auditon, .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_swapoff = mac_test_check_system_swapoff, - .mpo_check_system_swapoff = mac_test_check_system_swapoff, .mpo_check_system_swapon = mac_test_check_system_swapon, .mpo_check_system_sysctl = mac_test_check_system_sysctl, .mpo_check_vnode_access = mac_test_check_vnode_access, From owner-p4-projects@FreeBSD.ORG Wed May 30 08:15: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 A8DDF16A46C; Wed, 30 May 2007 08:15: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 86FDE16A469 for ; Wed, 30 May 2007 08:15:59 +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 7434713C457 for ; Wed, 30 May 2007 08:15:59 +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.8/8.13.8) with ESMTP id l4U8FxML090018 for ; Wed, 30 May 2007 08:15:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8FxM1090012 for perforce@freebsd.org; Wed, 30 May 2007 08:15:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:15:59 GMT Message-Id: <200705300815.l4U8FxM1090012@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 120602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 08:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=120602 Change 120602 by rwatson@rwatson_zoo on 2007/05/30 08:15:41 Remove duplicate test functions that got brought in when the MAC audit support was looped back from CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#11 (text+ko) ==== @@ -1681,24 +1681,6 @@ COUNTER_DECL(check_proc_setuid); static int -mac_test_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) -{ - - ASSERT_CRED_LABEL(cred->cr_label); - - return (0); -} - -static int -mac_test_check_proc_setauid(struct ucred *cred, uid_t auid) -{ - - ASSERT_CRED_LABEL(cred->cr_label); - - return (0); -} - -static int mac_test_check_proc_setuid(struct ucred *cred, uid_t uid) { @@ -1982,15 +1964,6 @@ return (0); } -static int -mac_test_check_system_audit(struct ucred *cred, void *record, int length) -{ - - ASSERT_CRED_LABEL(cred->cr_label); - - return (0); -} - COUNTER_DECL(check_system_auditctl); static int mac_test_check_system_auditctl(struct ucred *cred, struct vnode *vp, From owner-p4-projects@FreeBSD.ORG Wed May 30 08:31: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 E003516A46B; Wed, 30 May 2007 08:31: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 7FD2816A400 for ; Wed, 30 May 2007 08:31:20 +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 6147213C487 for ; Wed, 30 May 2007 08:31:20 +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.8/8.13.8) with ESMTP id l4U8VKUn005311 for ; Wed, 30 May 2007 08:31:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8VIWQ005241 for perforce@freebsd.org; Wed, 30 May 2007 08:31:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:31:18 GMT Message-Id: <200705300831.l4U8VIWQ005241@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 120603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 08:31:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120603 Change 120603 by rwatson@rwatson_zoo on 2007/05/30 08:31:07 Revert all MAC files in the audit3 branch to their CVS state; pretty much entirely merge and integration related duplicates. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_label.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_socket.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_system.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_vfs.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_portacl/mac_portacl.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_audit.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007 Robert N. M. Watson + * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. * @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac/mac_audit.c,v 1.1 2007/04/21 22:08:47 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007 Robert N. M. Watson + * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_inet.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_internal.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_label.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_net.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_pipe.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_policy.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007 Robert N. M. Watson + * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_posix_sem.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_priv.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_socket.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_syscalls.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_system.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_msg.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_sem.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_sysv_shm.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_vfs.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#13 (text+ko) ==== @@ -2483,50 +2483,6 @@ } static int -mac_biba_check_system_auditctl(struct ucred *cred, struct vnode *vp, - struct label *vplabel) -{ - struct mac_biba *subj, *obj; - int error; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(cred->cr_label); - - error = mac_biba_subject_privileged(subj); - if (error) - return (error); - - if (vplabel == NULL) - return (0); - - obj = SLOT(vplabel); - if (!mac_biba_high_effective(obj)) - return (EACCES); - - return (0); -} - -static int -mac_biba_check_system_auditon(struct ucred *cred, int cmd) -{ - struct mac_biba *subj; - int error; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(cred->cr_label); - - error = mac_biba_subject_privileged(subj); - if (error) - return (error); - - return (0); -} - -static int mac_biba_check_system_auditon(struct ucred *cred, int cmd) { struct mac_biba *subj; ==== //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#13 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_ifoff/mac_ifoff.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#12 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_none/mac_none.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_portacl/mac_portacl.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#10 (text+ko) ==== @@ -923,20 +923,6 @@ } static int -stub_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) -{ - - return (0); -} - -static int -stub_check_proc_setauid(struct ucred *cred, uid_t auid) -{ - - return (0); -} - -static int stub_check_proc_setuid(struct ucred *cred, uid_t uid) { @@ -1112,28 +1098,6 @@ } static int -stub_check_system_audit(struct ucred *cred, void *record, int length) -{ - - return (0); -} - -static int -stub_check_system_auditctl(struct ucred *cred, struct vnode *vp, - struct label *vlabel) -{ - - return (0); -} - -static int -stub_check_system_auditon(struct ucred *cred, int cmd) -{ - - return (0); -} - -static int stub_check_system_auditctl(struct ucred *cred, struct vnode *vp, struct label *vplabel) { @@ -1645,7 +1609,6 @@ .mpo_check_system_auditon = stub_check_system_auditon, .mpo_check_system_reboot = stub_check_system_reboot, .mpo_check_system_swapoff = stub_check_system_swapoff, - .mpo_check_system_swapoff = stub_check_system_swapoff, .mpo_check_system_swapon = stub_check_system_swapon, .mpo_check_system_sysctl = stub_check_system_sysctl, .mpo_check_vnode_access = stub_check_vnode_access, ==== //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#12 (text+ko) ==== @@ -1957,9 +1957,6 @@ LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_system_audit); - if (label != NULL) { - ASSERT_VNODE_LABEL(label); - } return (0); } @@ -2001,7 +1998,7 @@ COUNTER_DECL(check_system_swapoff); static int -mac_test_check_system_swapon(struct ucred *cred, struct vnode *vp, +mac_test_check_system_swapoff(struct ucred *cred, struct vnode *vp, struct label *vplabel) { From owner-p4-projects@FreeBSD.ORG Wed May 30 08:38:30 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 008B716A46B; Wed, 30 May 2007 08:38: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 A2EAD16A468 for ; Wed, 30 May 2007 08:38:29 +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 8F9AB13C448 for ; Wed, 30 May 2007 08:38:29 +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.8/8.13.8) with ESMTP id l4U8cTOl012533 for ; Wed, 30 May 2007 08:38:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8cT6i012524 for perforce@freebsd.org; Wed, 30 May 2007 08:38:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:38:29 GMT Message-Id: <200705300838.l4U8cT6i012524@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 120604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 08:38:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=120604 Change 120604 by rwatson@rwatson_zoo on 2007/05/30 08:38:04 Sync another $FreeBSD$ Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#29 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.10 2007/02/20 13:38:11 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_arg.c,v 1.11 2007/04/13 14:55:19 csjp Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Wed May 30 09:33: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 A7C7C16A469; Wed, 30 May 2007 09:33: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 5EF9516A400 for ; Wed, 30 May 2007 09:33:47 +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 486D613C483 for ; Wed, 30 May 2007 09:33:47 +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.8/8.13.8) with ESMTP id l4U9XlRQ072817 for ; Wed, 30 May 2007 09:33:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U9XjEG072788 for perforce@freebsd.org; Wed, 30 May 2007 09:33:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 09:33:45 GMT Message-Id: <200705300933.l4U9XjEG072788@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 120608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 09:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120608 Change 120608 by rwatson@rwatson_zoo on 2007/05/30 09:33:24 Integrate TrustedBSD base branch from FreeBSD CVS: - Firewire console support in boot loader - UNIX domain socket debugging - More SCTP - Remove ar_subj_comm in kaudit_record Affected files ... .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/conf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#14 integrate .. //depot/projects/trustedbsd/base/sys/cam/README.quirks#1 branch .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#65 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#58 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev_soft.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#64 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#23 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#65 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#32 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#44 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#53 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#39 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mib.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sx.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#66 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#50 integrate .. //depot/projects/trustedbsd/base/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/net/ethernet.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#56 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#76 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#40 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/key.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#23 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#18 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#60 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/bus_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/syslimits.h#11 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#33 (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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/base/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#8 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425var.h#4 (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/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/trustedbsd/base/sys/boot/i386/Makefile#6 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/trustedbsd/base/sys/boot/i386/loader/conf.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#65 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#37 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4592,14 +4592,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { AEL100X_TX_DISABLE = 9, ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_common.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,13 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H +#ifdef CONFIG_DEFINED +#include +#else #include +#endif enum { MAX_NPORTS = 2, /* max # of ports */ @@ -538,7 +538,11 @@ unsigned int val; }; +#ifdef CONFIG_DEFINED +#include +#else #include +#endif #ifndef PCI_VENDOR_ID_CHELSIO # define PCI_VENDOR_ID_CHELSIO 0x1425 ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_mc5.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.3 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { IDT75P52100 = 4, ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* Marvell PHY interrupt status bits. */ #define MV_INTR_JABBER 0x0001 ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_regs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* This file is automatically generated --- do not edit */ ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_sge_defs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,12 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.4 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /** * t3_wait_op_done_val - wait until an operation is completed ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_tcb.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_version.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_vsc8211.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 30 09:38: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 C794416A46B; Wed, 30 May 2007 09:38: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 8968816A468 for ; Wed, 30 May 2007 09:38:55 +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 72B9413C448 for ; Wed, 30 May 2007 09:38:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U9ctq5077415 for ; Wed, 30 May 2007 09:38:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U9criO077388 for perforce@freebsd.org; Wed, 30 May 2007 09:38:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 09:38:53 GMT Message-Id: <200705300938.l4U9criO077388@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 120609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 09:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=120609 Change 120609 by rwatson@rwatson_zoo on 2007/05/30 09:38:26 Integrate TrustedBSD audit3 branch from base branch; see @120608 for change description. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/README.quirks#1 branch .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/midway.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mib.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_witness.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ethernet.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/key.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/ncr.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#45 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#40 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#38 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syslimits.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#15 (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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/audit3/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425var.h#4 (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/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#19 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4592,14 +4592,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { AEL100X_TX_DISABLE = 9, ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_common.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,13 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H +#ifdef CONFIG_DEFINED +#include +#else #include +#endif enum { MAX_NPORTS = 2, /* max # of ports */ @@ -538,7 +538,11 @@ unsigned int val; }; +#ifdef CONFIG_DEFINED +#include +#else #include +#endif #ifndef PCI_VENDOR_ID_CHELSIO # define PCI_VENDOR_ID_CHELSIO 0x1425 ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mc5.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.3 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { IDT75P52100 = 4, ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* Marvell PHY interrupt status bits. */ #define MV_INTR_JABBER 0x0001 ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_regs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* This file is automatically generated --- do not edit */ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_sge_defs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,12 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.4 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /** * t3_wait_op_done_val - wait until an operation is completed ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_tcb.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_version.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_vsc8211.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* VSC8211 PHY specific registers. */ enum { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 30 09:46:05 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 3F39916A469; Wed, 30 May 2007 09:46:05 +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 10CBC16A421 for ; Wed, 30 May 2007 09:46:05 +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 F057813C43E for ; Wed, 30 May 2007 09:46:04 +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.8/8.13.8) with ESMTP id l4U9k45D084672 for ; Wed, 30 May 2007 09:46:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U9k4Yn084664 for perforce@freebsd.org; Wed, 30 May 2007 09:46:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 09:46:04 GMT Message-Id: <200705300946.l4U9k4Yn084664@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 120610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 09:46:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=120610 Change 120610 by rwatson@rwatson_zoo on 2007/05/30 09:45:06 audit_arg_process() captures arg_termid_addr, not arg_termid. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#30 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#30 (text+ko) ==== @@ -374,7 +374,7 @@ ar->k_ar.ar_arg_termid_addr = p->p_ucred->cr_audit.ai_termid; ar->k_ar.ar_arg_pid = p->p_pid; ARG_SET_VALID(ar, ARG_AUID | ARG_EUID | ARG_EGID | ARG_RUID | - ARG_RGID | ARG_ASID | ARG_TERMID | ARG_PID | ARG_PROCESS); + ARG_RGID | ARG_ASID | ARG_TERMID_ADDR | ARG_PID | ARG_PROCESS); } void From owner-p4-projects@FreeBSD.ORG Wed May 30 10:11: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 E57E116A46E; Wed, 30 May 2007 10:11:39 +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 8F84916A400 for ; Wed, 30 May 2007 10:11:39 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7BA0113C45B for ; Wed, 30 May 2007 10:11:39 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4UABddh011129 for ; Wed, 30 May 2007 10:11:39 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UABdLD011117 for perforce@freebsd.org; Wed, 30 May 2007 10:11:39 GMT (envelope-from andrew@freebsd.org) Date: Wed, 30 May 2007 10:11:39 GMT Message-Id: <200705301011.l4UABdLD011117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 120613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 10:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=120613 Change 120613 by andrew@andrew_hermies on 2007/05/30 10:11:03 Make the back end use getopt to process commandline arguments and read a config file. The config file isn't processed yet. Affected files ... .. //depot/projects/soc2007/andrew-update/backend/Makefile#2 edit .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ PROG= facund-be -LDADD+= -lmd +LDADD+= -lutil -lmd MAN= ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#3 (text+ko) ==== @@ -33,7 +33,9 @@ #include #include +#include #include +#include #include #include #include @@ -44,7 +46,8 @@ /* Check if there are updates every 30min */ static const time_t default_check_period = 30 * 60; -#define UPDATE_DATA_DIR "/var/db/freebsd-update" +#define DEFAULT_CONFIG_FILE "/etc/freebsd-update-control.conf" +#define UPDATE_DATA_DIR "/var/db/freebsd-update" static int has_update(const char *); static void* look_for_updates(void *); @@ -161,7 +164,44 @@ main(int argc __unused, char *argv[] __unused) { const char *base_dirs[] = { "/", NULL }; + const char *config_file; + int config_fd; + properties config_data; + char ch; + + config_file = DEFAULT_CONFIG_FILE; + + while ((ch = getopt(argc, argv, "c:h")) != -1) { + switch(ch) { + case 'c': + config_file = optarg; + break; + case 'h': + default: + fprintf(stderr, "usage: %s [-c config]\n", + getprogname()); + exit(1); + } + } + argc -= optind; + argv += optind; + + /* Read in the config file */ + config_fd = open(config_file, O_RDONLY); + if (config_fd == -1 && errno != ENOENT) { + errx(1, "Could not open the config file"); + } else if (config_fd != -1) { + /* Read in the config file */ + config_data = properties_read(config_fd); + + if (config_data == NULL) { + errx(1, "Could not read the config file"); + } + properties_free(config_data); + } + look_for_updates(base_dirs); + return 0; } From owner-p4-projects@FreeBSD.ORG Wed May 30 11:28: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 BF4C916A46D; Wed, 30 May 2007 11:28:13 +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 3BAD816A468 for ; Wed, 30 May 2007 11:28:13 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2687313C469 for ; Wed, 30 May 2007 11:28:13 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4UBSDsD076080 for ; Wed, 30 May 2007 11:28:13 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UBSCXU076074 for perforce@freebsd.org; Wed, 30 May 2007 11:28:12 GMT (envelope-from dongmei@FreeBSD.org) Date: Wed, 30 May 2007 11:28:12 GMT Message-Id: <200705301128.l4UBSCXU076074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 120614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 11:28:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=120614 Change 120614 by dongmei@dongmei2007 on 2007/05/30 11:27:38 rebuild the program Affected files ... .. //depot/projects/soc2007/dongmei-auditanalyzer/colors.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/compat_macros.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/config.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/dlg_utils.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/color.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/column_info.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/epan.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/epan.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/except.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/except.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/filesystem.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/frame_data.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/frame_data.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/prefs-int.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/prefs.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/prefs.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/range.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/timestamp.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/epan/timestamp.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/file.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/file.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/file_dlg.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/file_dlg.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/file_util.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/globals.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/gtkglobals.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/gui_utils.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/gui_utils.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/image/wsicon16.xpm#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/main.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/main.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/recent.c#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/recent.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/simple_dialog.h#2 delete .. //depot/projects/soc2007/dongmei-auditanalyzer/ui_util.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 30 13:41: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 9378B16A46E; Wed, 30 May 2007 13:41: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 1E82E16A421 for ; Wed, 30 May 2007 13:41: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 0872513C44C for ; Wed, 30 May 2007 13:41: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.8/8.13.8) with ESMTP id l4UDfEFp062313 for ; Wed, 30 May 2007 13:41:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UDfEFj062198 for perforce@freebsd.org; Wed, 30 May 2007 13:41:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 13:41:14 GMT Message-Id: <200705301341.l4UDfEFj062198@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 120624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 13:41:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=120624 Change 120624 by rwatson@rwatson_zoo on 2007/05/30 13:41:06 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - Further cleanup/synchronization of kernel audit code. Affected files ... .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#7 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/security/audit/audit.h#7 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.h,v 1.10 2007/04/13 14:55:19 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit.h,v 1.11 2007/05/30 11:41:28 rwatson Exp $ */ /* @@ -214,10 +214,6 @@ #else /* !AUDIT */ -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, struct proc *child); -void audit_proc_free(struct proc *p); - #define AUDIT_ARG(op, args...) do { \ } while (0) ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#10 (text) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.12 2007/04/17 12:24:18 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.13 2007/05/30 09:48:37 rwatson Exp $ */ #include @@ -688,6 +688,7 @@ ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); else ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + return (t); } @@ -1070,6 +1071,7 @@ ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); else ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + return (t); } ==== //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#13 (text) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.15 2007/05/30 08:39:16 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.16 2007/05/30 11:41:28 rwatson Exp $ */ #include "opt_mac.h" @@ -747,23 +747,4 @@ return (ENOSYS); } - -void -audit_proc_init(struct proc *p) -{ - -} - -void -audit_proc_fork(struct proc *parent, struct proc *child) -{ - -} - -void -audit_proc_free(struct proc *p) -{ - -} - #endif /* AUDIT */ From owner-p4-projects@FreeBSD.ORG Wed May 30 13:42: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 EE29F16A46F; Wed, 30 May 2007 13:42: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 C9E3B16A468 for ; Wed, 30 May 2007 13:42:16 +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 B337C13C458 for ; Wed, 30 May 2007 13:42:16 +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.8/8.13.8) with ESMTP id l4UDgGsV067818 for ; Wed, 30 May 2007 13:42:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UDgGfD067797 for perforce@freebsd.org; Wed, 30 May 2007 13:42:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 13:42:16 GMT Message-Id: <200705301342.l4UDgGfD067797@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 120625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 13:42:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120625 Change 120625 by rwatson@rwatson_zoo on 2007/05/30 13:41:51 Integrate TrustedBSD audit3 branch from TrustedBSD base: minor kernel audit synchronization. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.h,v 1.10 2007/04/13 14:55:19 csjp Exp $ + * $FreeBSD: src/sys/security/audit/audit.h,v 1.11 2007/05/30 11:41:28 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.12 2007/04/17 12:24:18 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.13 2007/05/30 09:48:37 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.15 2007/05/30 08:39:16 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.16 2007/05/30 11:41:28 rwatson Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Wed May 30 13:50: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 999D016A488; Wed, 30 May 2007 13:50: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 4FBAE16A492 for ; Wed, 30 May 2007 13:50:29 +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 A6BD813C489 for ; Wed, 30 May 2007 13:50:28 +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.8/8.13.8) with ESMTP id l4UDoSvv087855 for ; Wed, 30 May 2007 13:50:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UDoSrA087849 for perforce@freebsd.org; Wed, 30 May 2007 13:50:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 13:50:28 GMT Message-Id: <200705301350.l4UDoSrA087849@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 120628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 13:50:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=120628 Change 120628 by rwatson@rwatson_zoo on 2007/05/30 13:50:22 Restore lost MAC check for auditctl(). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#40 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#40 (text+ko) ==== @@ -654,7 +654,17 @@ return (error); vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; +#ifdef MAC + error = mac_check_system_auditctl(td->td_ucred, vp); + VOP_UNLOCK(vp, 0, td); + if (error) { + vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); + VFS_UNLOCK_GIANT(vfslocked); + return (error); + } +#else VOP_UNLOCK(vp, 0, td); +#endif NDFREE(&nd, NDF_ONLY_PNBUF); if (vp->v_type != VREG) { vn_close(vp, AUDIT_CLOSE_FLAGS, td->td_ucred, td); From owner-p4-projects@FreeBSD.ORG Wed May 30 14:04: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 F28C016A469; Wed, 30 May 2007 14:04:46 +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 BD52F16A41F for ; Wed, 30 May 2007 14:04:46 +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 A81C113C457 for ; Wed, 30 May 2007 14:04:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4UE4kkc002790 for ; Wed, 30 May 2007 14:04:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UE4kZ6002784 for perforce@freebsd.org; Wed, 30 May 2007 14:04:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 14:04:46 GMT Message-Id: <200705301404.l4UE4kZ6002784@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 120629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 14:04:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=120629 Change 120629 by rwatson@rwatson_zoo on 2007/05/30 14:04:10 Re-add missing setaudit() MAC check. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#41 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#41 (text+ko) ==== @@ -480,6 +480,11 @@ PROC_LOCK(td->td_proc); oldcred = td->td_proc->p_ucred; crcopy(newcred, oldcred); +#ifdef MAC + error = mac_check_proc_setauid(oldcred, id); + if (error) + goto fail; +#endif error = priv_check_cred(oldcred, PRIV_AUDIT_SETAUDIT, 0); if (error) goto fail; From owner-p4-projects@FreeBSD.ORG Wed May 30 14:18: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 12F8016A469; Wed, 30 May 2007 14:18: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 DD9DB16A421 for ; Wed, 30 May 2007 14:18:56 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id 9672913C455 for ; Wed, 30 May 2007 14:18:54 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id BB27B8BD6E4 for ; Wed, 30 May 2007 16:18:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id STLC1MXsrenv for ; Wed, 30 May 2007 16:18:51 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 79E828BD6DF for ; Wed, 30 May 2007 16:18:51 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l4UEIppt045798 for perforce@FreeBSD.org; Wed, 30 May 2007 16:18:51 +0200 (CEST) (envelope-from rdivacky) Date: Wed, 30 May 2007 16:18:51 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20070530141851.GA45778@freebsd.org> References: <200705291445.l4TEjOqo072275@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200705291445.l4TEjOqo072275@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i Cc: Subject: Re: PERFORCE change 120558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 May 2007 14:18:57 -0000 On Tue, May 29, 2007 at 02:45:24PM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=120558 > > Change 120558 by rdivacky@rdivacky_witten on 2007/05/29 14:44:59 > > Dont allow zero or negative pid/tid arguments to tgkill/tkill. > > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_signal.c#2 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_signal.c#2 (text+ko) ==== > > @@ -550,8 +550,8 @@ > ka.pid = args->pid; > ka.signum = args->sig; > > - if (args->tgid == -1) > - return linux_kill(td, &ka); > + if (args->pid <= 0 || args->tgid <= 0) > + return EINVAL; this is a WIP and might be wrapped in if (linux_use26(td)), hard to say ;( From owner-p4-projects@FreeBSD.ORG Thu May 31 08:31: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 57B9316A468; Thu, 31 May 2007 08:31: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 EC36616A41F for ; Thu, 31 May 2007 08:31:01 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C481913C457 for ; Thu, 31 May 2007 08:31:01 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4V8V1ER076034 for ; Thu, 31 May 2007 08:31:01 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4V8V1SG076022 for perforce@freebsd.org; Thu, 31 May 2007 08:31:01 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 31 May 2007 08:31:01 GMT Message-Id: <200705310831.l4V8V1SG076022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 08:31:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120649 Change 120649 by thompsa@thompsa_heff on 2007/05/31 08:30:49 Fix lock leakage. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#32 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#32 (text+ko) ==== @@ -3446,6 +3446,7 @@ if (!(sc->flags & IWI_FLAG_CHANNEL_SCAN)) { DPRINTF(("%s: ic_scan_curchan while not scanning\n", __func__)); + IWI_UNLOCK(sc); return; } if (iwi_scanchan(sc, sc->sc_maxdwell)) From owner-p4-projects@FreeBSD.ORG Thu May 31 08:34: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 7FAC616A468; Thu, 31 May 2007 08:34: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 3E6B416A421 for ; Thu, 31 May 2007 08:34:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2EB4F13C45D for ; Thu, 31 May 2007 08:34:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4V8Y6CG079686 for ; Thu, 31 May 2007 08:34:06 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4V8Y5It079673 for perforce@freebsd.org; Thu, 31 May 2007 08:34:05 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 31 May 2007 08:34:05 GMT Message-Id: <200705310834.l4V8Y5It079673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 08:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=120650 Change 120650 by thompsa@thompsa_heff on 2007/05/31 08:33:19 Add support for scanning all channels at once. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#33 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#33 (text+ko) ==== @@ -162,11 +162,12 @@ static int iwi_config(struct iwi_softc *); static int iwi_get_firmware(struct iwi_softc *); static void iwi_put_firmware(struct iwi_softc *); -static int iwi_scanchan(struct iwi_softc *, unsigned long); +static int iwi_scanchan(struct iwi_softc *, unsigned long, int); static void iwi_scan_start(struct ieee80211com *); static void iwi_scan_end(struct ieee80211com *); static void iwi_set_channel(struct ieee80211com *); static void iwi_scan_curchan(struct ieee80211com *, unsigned long maxdwell); +static void iwi_scan_allchan(struct ieee80211com *, unsigned long maxdwell); static void iwi_scan_mindwell(struct ieee80211com *); static void iwi_assoc(struct ieee80211com *ic); static void iwi_ops(void *, int); @@ -1376,9 +1377,12 @@ switch (notif->type) { case IWI_NOTIF_TYPE_SCAN_CHANNEL: chan = (struct iwi_notif_scan_channel *)(notif + 1); - + DPRINTFN(3, ("Scan of channel %u complete (%u)\n", ic->ic_channels[chan->nchan].ic_freq, chan->nchan)); + + /* Reset the timer, the scan is still going */ + sc->sc_scan_timer = 3; break; case IWI_NOTIF_TYPE_SCAN_COMPLETE: @@ -2654,13 +2658,14 @@ * Scan on ic_curchan according to ic_scan (essid, active/passive, dwell ...) */ static int -iwi_scanchan(struct iwi_softc *sc, unsigned long maxdwell) +iwi_scanchan(struct iwi_softc *sc, unsigned long maxdwell, int mode) { struct ieee80211com *ic; struct ieee80211_channel *chan; struct ieee80211_scan_state *ss; struct iwi_scan_ext scan; int error = 0; + int i, type; IWI_LOCK_CHECK(sc); if (sc->flags & IWI_FLAG_SCANNING) { @@ -2682,25 +2687,37 @@ scan.dwell_time[IWI_SCAN_TYPE_BROADCAST] = htole16(maxdwell); scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED] = htole16(maxdwell); - if (IEEE80211_IS_CHAN_5GHZ(chan)) - scan.channels[0] = 1 | IWI_CHAN_5GHZ; - else - scan.channels[0] = 1 | IWI_CHAN_2GHZ; - scan.channels[1] = ieee80211_chan2ieee(ic, chan); /* We can only set one essid for a directed scan */ if (ss->ss_nssid != 0) { - set_scan_type(&scan, 1, IWI_SCAN_TYPE_BDIRECTED); + type = IWI_SCAN_TYPE_BDIRECTED; error = iwi_cmd(sc, IWI_CMD_SET_ESSID, ss->ss_ssid[0].ssid, ss->ss_ssid[0].len); if (error) return (error); } else if ((ss->ss_flags & IEEE80211_SCAN_ACTIVE) && (chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0) { - set_scan_type(&scan, 1, IWI_SCAN_TYPE_BROADCAST); + type = IWI_SCAN_TYPE_BROADCAST; } else - set_scan_type(&scan, 1, IWI_SCAN_TYPE_PASSIVE); + type = IWI_SCAN_TYPE_PASSIVE; + + if (mode == IWI_SCAN_ALLCHAN) { + for (i = 0; i < ss->ss_last;) { + chan = ss->ss_chans[i]; + scan.channels[++i] = ieee80211_chan2ieee(ic, chan); + set_scan_type(&scan, i, type); + } + } else { + /* Scan the current channel only */ + i = 1; + scan.channels[i] = ieee80211_chan2ieee(ic, chan); + set_scan_type(&scan, i, type); + } + if (IEEE80211_IS_CHAN_5GHZ(chan)) + scan.channels[0] = i | IWI_CHAN_5GHZ; + else + scan.channels[0] = i | IWI_CHAN_2GHZ; - DPRINTF(("Scanning on channel %u\n", ieee80211_chan2ieee(ic, chan))); + DPRINTF(("Scanning on %d channel(s)\n", i)); sc->flags |= IWI_FLAG_SCANNING; sc->sc_scan_timer = 3; sc->sc_ifp->if_timer = 1; @@ -3443,13 +3460,14 @@ iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); break; case IWI_SCAN_CURCHAN: + case IWI_SCAN_ALLCHAN: if (!(sc->flags & IWI_FLAG_CHANNEL_SCAN)) { DPRINTF(("%s: ic_scan_curchan while not scanning\n", __func__)); IWI_UNLOCK(sc); return; } - if (iwi_scanchan(sc, sc->sc_maxdwell)) + if (iwi_scanchan(sc, sc->sc_maxdwell, sc->sc_scanop)) ieee80211_cancel_scan(ic); break; @@ -3466,7 +3484,6 @@ sc->sc_scanop = IWI_SCAN_START; taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); - } static void @@ -3490,6 +3507,17 @@ } static void +iwi_scan_allchan(struct ieee80211com *ic, unsigned long maxdwell) +{ + struct ifnet *ifp = ic->ic_ifp; + struct iwi_softc *sc = ifp->if_softc; + + sc->sc_scanop = IWI_SCAN_ALLCHAN; + sc->sc_maxdwell = maxdwell; + taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); +} + +static void iwi_scan_mindwell(struct ieee80211com *ic) { /* NB: don't try to abort scan; wait for firmware to finish */ From owner-p4-projects@FreeBSD.ORG Thu May 31 08:44: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 EF60B16A469; Thu, 31 May 2007 08:44: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 A9B3816A421 for ; Thu, 31 May 2007 08:44:18 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9A74513C468 for ; Thu, 31 May 2007 08:44:18 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4V8iIca089501 for ; Thu, 31 May 2007 08:44:18 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4V8iI1I089493 for perforce@freebsd.org; Thu, 31 May 2007 08:44:18 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 31 May 2007 08:44:18 GMT Message-Id: <200705310844.l4V8iI1I089493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 08:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=120651 Change 120651 by thompsa@thompsa_heff on 2007/05/31 08:44:06 Split the debug message for the two scan types. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#34 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#34 (text+ko) ==== @@ -2706,18 +2706,20 @@ scan.channels[++i] = ieee80211_chan2ieee(ic, chan); set_scan_type(&scan, i, type); } + DPRINTF(("Scanning on %d channel(s)\n", i)); } else { /* Scan the current channel only */ i = 1; scan.channels[i] = ieee80211_chan2ieee(ic, chan); set_scan_type(&scan, i, type); + DPRINTF(("Scanning on channel %u\n", + ieee80211_chan2ieee(ic, chan))); } if (IEEE80211_IS_CHAN_5GHZ(chan)) scan.channels[0] = i | IWI_CHAN_5GHZ; else scan.channels[0] = i | IWI_CHAN_2GHZ; - DPRINTF(("Scanning on %d channel(s)\n", i)); sc->flags |= IWI_FLAG_SCANNING; sc->sc_scan_timer = 3; sc->sc_ifp->if_timer = 1; From owner-p4-projects@FreeBSD.ORG Thu May 31 14:05: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 38E3B16A468; Thu, 31 May 2007 14:05: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 E32C516A41F for ; Thu, 31 May 2007 14:05:56 +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 D39D213C45E for ; Thu, 31 May 2007 14:05:56 +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.8/8.13.8) with ESMTP id l4VE5u3U002209 for ; Thu, 31 May 2007 14:05:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VE5uR5002193 for perforce@freebsd.org; Thu, 31 May 2007 14:05:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:05:56 GMT Message-Id: <200705311405.l4VE5uR5002193@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 120663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:05:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=120663 Change 120663 by rwatson@rwatson_zoo on 2007/05/31 14:05:34 Start process of removing SUSER_ALLOWJAIL flag. Affected files ... .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#14 edit .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_uid16.c#5 edit .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_fcntl.c#6 edit .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#7 edit .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#9 edit .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#9 edit .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#10 edit .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vnops.c#6 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#8 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#10 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#9 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#8 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#12 edit .. //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#7 edit .. //depot/projects/trustedbsd/priv/sys/kern/subr_acl_posix1e.c#4 edit .. //depot/projects/trustedbsd/priv/sys/kern/sysv_ipc.c#6 edit .. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#10 edit .. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#12 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#14 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#13 edit .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#13 edit .. //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#10 edit .. //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#10 edit .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#8 edit .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#8 edit .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#13 edit .. //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#9 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.c#6 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#8 edit .. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#10 edit .. //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 edit .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#7 edit .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#9 edit .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#10 edit .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#9 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#14 (text+ko) ==== @@ -1077,8 +1077,7 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, - SUSER_ALLOWJAIL)) != 0) { + if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, 0)) != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_uid16.c#5 (text+ko) ==== @@ -124,8 +124,7 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, - SUSER_ALLOWJAIL)) != 0) { + if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, 0)) != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_fcntl.c#6 (text+ko) ==== @@ -281,8 +281,7 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check(td, PRIV_VFS_ADMIN)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) ==== //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#7 (text+ko) ==== @@ -612,8 +612,7 @@ struct file *fp; int error, vfslocked; - if ((error = priv_check_cred(td->td_ucred, PRIV_VFS_FCHROOT, - SUSER_ALLOWJAIL)) != 0) + if ((error = priv_check(td, PRIV_VFS_FCHROOT)) != 0) return error; if ((error = getvnode(fdp, uap->fd, &fp)) != 0) return error; ==== //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#9 (text+ko) ==== @@ -1168,7 +1168,7 @@ if ((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) { error = priv_check_cred(ap->a_td->td_ucred, - PRIV_VFS_CHOWN, SUSER_ALLOWJAIL); + PRIV_VFS_CHOWN, 0); if (error) return (error); } @@ -1180,7 +1180,7 @@ if (vap->va_mode != (mode_t)VNOVAL) { if (ap->a_cred->cr_uid != de->de_uid) { error = priv_check_cred(ap->a_td->td_ucred, - PRIV_VFS_ADMIN, SUSER_ALLOWJAIL); + PRIV_VFS_ADMIN, 0); if (error) return (error); } ==== //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#9 (text+ko) ==== @@ -408,8 +408,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid) { - error = priv_check_cred(cred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); if (error) return (error); } @@ -426,8 +425,7 @@ * sensible filesystem attempts it a lot. */ if (vap->va_flags & SF_SETTABLE) { - error = priv_check_cred(cred, PRIV_VFS_SYSFLAGS, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_SYSFLAGS, 0); if (error) return (error); } @@ -454,8 +452,7 @@ gid = pmp->pm_gid; if (cred->cr_uid != pmp->pm_uid || uid != pmp->pm_uid || (gid != pmp->pm_gid && !groupmember(gid, cred))) { - error = priv_check_cred(cred, PRIV_VFS_CHOWN, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_CHOWN, 0); if (error) return (error); } @@ -520,8 +517,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid) { - error = priv_check_cred(cred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); if (error) return (error); } ==== //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#10 (text+ko) ==== @@ -115,7 +115,7 @@ * are missing. */ error = priv_check_cred(td->td_ucred, - PRIV_DEBUG_SUGID, SUSER_ALLOWJAIL); + PRIV_DEBUG_SUGID, 0); if (error) break; } ==== //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vnops.c#6 (text+ko) ==== @@ -415,8 +415,7 @@ * Privileged non-jail processes may not modify system flags * if securelevel > 0 and any existing system flags are set. */ - if (!priv_check_cred(cred, PRIV_VFS_SYSFLAGS, - SUSER_ALLOWJAIL)) { + if (!priv_check_cred(cred, PRIV_VFS_SYSFLAGS, 0)) { if (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) { error = securelevel_gt(cred, 0); @@ -535,14 +534,12 @@ * process is not a member of. */ if (vp->v_type != VDIR && (mode & S_ISTXT)) { - error = priv_check_cred(cred, PRIV_VFS_STICKYFILE, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_STICKYFILE, 0); if (error) return (EFTYPE); } if (!groupmember(ip->i_gid, cred) && (mode & ISGID)) { - error = priv_check_cred(cred, PRIV_VFS_SETGID, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_SETGID, 0); if (error) return (error); } @@ -586,8 +583,7 @@ */ if (uid != ip->i_uid || (gid != ip->i_gid && !groupmember(gid, cred))) { - error = priv_check_cred(cred, PRIV_VFS_CHOWN, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_CHOWN, 0); if (error) return (error); } @@ -597,8 +593,7 @@ ip->i_uid = uid; ip->i_flag |= IN_CHANGE; if ((ip->i_mode & (ISUID | ISGID)) && (ouid != uid || ogid != gid)) { - if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, - SUSER_ALLOWJAIL) != 0) + if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0) != 0) ip->i_mode &= ~(ISUID | ISGID); } return (0); @@ -1648,8 +1643,7 @@ tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_nlink = 1; if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred)) { - if (priv_check_cred(cnp->cn_cred, PRIV_VFS_RETAINSUGID, - SUSER_ALLOWJAIL)) + if (priv_check_cred(cnp->cn_cred, PRIV_VFS_RETAINSUGID, 0)) ip->i_mode &= ~ISGID; } ==== //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -567,8 +567,7 @@ #ifdef KTRACE if (p->p_tracevp != NULL && - priv_check_cred(oldcred, PRIV_DEBUG_DIFFCRED, - SUSER_ALLOWJAIL)) { + priv_check_cred(oldcred, PRIV_DEBUG_DIFFCRED, 0)) { mtx_lock(&ktrace_mtx); p->p_traceflag = 0; tracevp = p->p_tracevp; ==== //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#10 (text+ko) ==== @@ -309,8 +309,7 @@ * * XXXRW: Can we avoid privilege here if it's not needed? */ - error = priv_check_cred(td->td_ucred, PRIV_PROC_LIMIT, SUSER_RUID | - SUSER_ALLOWJAIL); + error = priv_check_cred(td->td_ucred, PRIV_PROC_LIMIT, SUSER_RUID); if (error == 0) ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1, 0); else { ==== //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#9 (text+ko) ==== @@ -793,8 +793,7 @@ p->p_tracecred = crhold(td->td_ucred); } p->p_traceflag |= facs; - if (priv_check_cred(td->td_ucred, PRIV_KTRACE, - SUSER_ALLOWJAIL) == 0) + if (priv_check(td, PRIV_KTRACE) == 0) p->p_traceflag |= KTRFAC_ROOT; } else { /* KTROP_CLEAR */ @@ -1000,7 +999,7 @@ PROC_LOCK_ASSERT(targetp, MA_OWNED); if (targetp->p_traceflag & KTRFAC_ROOT && - priv_check_cred(td->td_ucred, PRIV_KTRACE, SUSER_ALLOWJAIL)) + priv_check(td, PRIV_KTRACE)) return (0); if (p_candebug(td, targetp) != 0) ==== //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#8 (text+ko) ==== @@ -511,8 +511,7 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ uid != oldcred->cr_uid && /* allow setuid(geteuid()) */ #endif - (error = priv_check_cred(oldcred, PRIV_CRED_SETUID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETUID, 0)) != 0) goto fail; /* @@ -529,7 +528,7 @@ uid == oldcred->cr_uid || #endif /* We are using privs. */ - priv_check_cred(oldcred, PRIV_CRED_SETUID, SUSER_ALLOWJAIL) == 0) + priv_check_cred(oldcred, PRIV_CRED_SETUID, 0) == 0) #endif { /* @@ -602,8 +601,7 @@ if (euid != oldcred->cr_ruid && /* allow seteuid(getuid()) */ euid != oldcred->cr_svuid && /* allow seteuid(saved uid) */ - (error = priv_check_cred(oldcred, PRIV_CRED_SETEUID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETEUID, 0)) != 0) goto fail; /* @@ -672,8 +670,7 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use BSD-compat clause from B.4.2.2 */ gid != oldcred->cr_groups[0] && /* allow setgid(getegid()) */ #endif - (error = priv_check_cred(oldcred, PRIV_CRED_SETGID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETGID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -687,7 +684,7 @@ gid == oldcred->cr_groups[0] || #endif /* We are using privs. */ - priv_check_cred(oldcred, PRIV_CRED_SETGID, SUSER_ALLOWJAIL) == 0) + priv_check_cred(oldcred, PRIV_CRED_SETGID, 0) == 0) #endif { /* @@ -756,8 +753,7 @@ if (egid != oldcred->cr_rgid && /* allow setegid(getgid()) */ egid != oldcred->cr_svgid && /* allow setegid(saved gid) */ - (error = priv_check_cred(oldcred, PRIV_CRED_SETEGID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETEGID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -817,8 +813,7 @@ goto fail; #endif - error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, - SUSER_ALLOWJAIL); + error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, 0); if (error) goto fail; @@ -887,8 +882,7 @@ ruid != oldcred->cr_svuid) || (euid != (uid_t)-1 && euid != oldcred->cr_uid && euid != oldcred->cr_ruid && euid != oldcred->cr_svuid)) && - (error = priv_check_cred(oldcred, PRIV_CRED_SETREUID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETREUID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -953,8 +947,7 @@ rgid != oldcred->cr_svgid) || (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] && egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) && - (error = priv_check_cred(oldcred, PRIV_CRED_SETREGID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETREGID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -1030,8 +1023,7 @@ (suid != (uid_t)-1 && suid != oldcred->cr_ruid && suid != oldcred->cr_svuid && suid != oldcred->cr_uid)) && - (error = priv_check_cred(oldcred, PRIV_CRED_SETRESUID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETRESUID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -1108,8 +1100,7 @@ (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid && sgid != oldcred->cr_svgid && sgid != oldcred->cr_groups[0])) && - (error = priv_check_cred(oldcred, PRIV_CRED_SETRESGID, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(oldcred, PRIV_CRED_SETRESGID, 0)) != 0) goto fail; crcopy(newcred, oldcred); @@ -1317,8 +1308,7 @@ { if (!see_other_uids && u1->cr_ruid != u2->cr_ruid) { - if (priv_check_cred(u1, PRIV_SEEOTHERUIDS, SUSER_ALLOWJAIL) - != 0) + if (priv_check_cred(u1, PRIV_SEEOTHERUIDS, 0) != 0) return (ESRCH); } return (0); @@ -1357,8 +1347,7 @@ break; } if (!match) { - if (priv_check_cred(u1, PRIV_SEEOTHERGIDS, - SUSER_ALLOWJAIL) != 0) + if (priv_check_cred(u1, PRIV_SEEOTHERGIDS, 0) != 0) return (ESRCH); } } @@ -1475,8 +1464,7 @@ break; default: /* Not permitted without privilege. */ - error = priv_check_cred(cred, PRIV_SIGNAL_SUGID, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_SIGNAL_SUGID, 0); if (error) return (error); } @@ -1490,9 +1478,7 @@ cred->cr_ruid != proc->p_ucred->cr_svuid && cred->cr_uid != proc->p_ucred->cr_ruid && cred->cr_uid != proc->p_ucred->cr_svuid) { - /* Not permitted without privilege. */ - error = priv_check_cred(cred, PRIV_SIGNAL_DIFFCRED, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_SIGNAL_DIFFCRED, 0); if (error) return (error); } @@ -1570,8 +1556,7 @@ return (error); if (td->td_ucred->cr_ruid != p->p_ucred->cr_ruid && td->td_ucred->cr_uid != p->p_ucred->cr_ruid) { - error = priv_check_cred(td->td_ucred, PRIV_SCHED_DIFFCRED, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_SCHED_DIFFCRED); if (error) return (error); } @@ -1610,8 +1595,7 @@ KASSERT(td == curthread, ("%s: td not curthread", __func__)); PROC_LOCK_ASSERT(p, MA_OWNED); if (!unprivileged_proc_debug) { - error = priv_check_cred(td->td_ucred, PRIV_DEBUG_UNPRIV, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_DEBUG_UNPRIV); if (error) return (error); } @@ -1662,15 +1646,13 @@ * for td to debug p. */ if (!grpsubset || !uidsubset) { - error = priv_check_cred(td->td_ucred, PRIV_DEBUG_DIFFCRED, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_DEBUG_DIFFCRED); if (error) return (error); } if (credentialchanged) { - error = priv_check_cred(td->td_ucred, PRIV_DEBUG_SUGID, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_DEBUG_SUGID); if (error) return (error); } @@ -1931,8 +1913,7 @@ int error; char logintmp[MAXLOGNAME]; - error = priv_check_cred(td->td_ucred, PRIV_PROC_SETLOGIN, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_PROC_SETLOGIN); if (error) return (error); error = copyinstr(uap->namebuf, logintmp, sizeof(logintmp), NULL); ==== //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#12 (text+ko) ==== @@ -650,8 +650,7 @@ alimp = &oldlim->pl_rlimit[which]; if (limp->rlim_cur > alimp->rlim_max || limp->rlim_max > alimp->rlim_max) - if ((error = priv_check_cred(td->td_ucred, - PRIV_PROC_SETRLIMIT, SUSER_ALLOWJAIL))) { + if ((error = priv_check(td, PRIV_PROC_SETRLIMIT))) { PROC_UNLOCK(p); lim_free(newlim); return (error); ==== //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#7 (text+ko) ==== @@ -1255,8 +1255,7 @@ /* Is this sysctl writable by only privileged users? */ if (req->newptr && !(oid->oid_kind & CTLFLAG_ANYBODY)) { if (oid->oid_kind & CTLFLAG_PRISON) - error = priv_check_cred(req->td->td_ucred, - PRIV_SYSCTL_WRITEJAIL, SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_SYSCTL_WRITEJAIL); else error = priv_check(req->td, PRIV_SYSCTL_WRITE); if (error) ==== //depot/projects/trustedbsd/priv/sys/kern/subr_acl_posix1e.c#4 (text+ko) ==== @@ -82,24 +82,22 @@ if (type == VDIR) { if ((acc_mode & VEXEC) && !priv_check_cred(cred, - PRIV_VFS_LOOKUP, SUSER_ALLOWJAIL)) + PRIV_VFS_LOOKUP, 0)) priv_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && !priv_check_cred(cred, - PRIV_VFS_EXEC, SUSER_ALLOWJAIL)) + PRIV_VFS_EXEC, 0)) priv_granted |= VEXEC; } - if ((acc_mode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, - SUSER_ALLOWJAIL)) + if ((acc_mode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VREAD; if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && - !priv_check_cred(cred, PRIV_VFS_WRITE, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND); - if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL)) + if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN; /* ==== //depot/projects/trustedbsd/priv/sys/kern/sysv_ipc.c#6 (text+ko) ==== @@ -125,22 +125,19 @@ */ priv_granted = 0; if ((acc_mode & IPC_M) && !(dac_granted & IPC_M)) { - error = priv_check_cred(td->td_ucred, PRIV_IPC_ADMIN, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_IPC_ADMIN); 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); + error = priv_check(td, PRIV_IPC_READ); if (error == 0) priv_granted |= IPC_R; } if ((acc_mode & IPC_W) && !(dac_granted & IPC_W)) { - error = priv_check_cred(td->td_ucred, PRIV_IPC_WRITE, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_IPC_WRITE); if (error == 0) priv_granted |= IPC_W; } ==== //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#10 (text+ko) ==== @@ -502,8 +502,7 @@ if ((error = ipcperm(td, &msqkptr->u.msg_perm, IPC_M))) goto done2; if (msqbuf->msg_qbytes > msqkptr->u.msg_qbytes) { - error = priv_check_cred(td->td_ucred, - PRIV_IPC_MSGSIZE, SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_IPC_MSGSIZE); if (error) goto done2; } ==== //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#12 (text+ko) ==== @@ -961,8 +961,7 @@ sx_assert(&pn->mn_info->mi_lock, SX_LOCKED); if (ucred->cr_uid != pn->mn_uid && - (error = priv_check_cred(ucred, PRIV_MQ_ADMIN, - SUSER_ALLOWJAIL)) != 0) + (error = priv_check_cred(ucred, PRIV_MQ_ADMIN, 0)) != 0) error = EACCES; else if (!pn->mn_deleted) { parent = pn->mn_parent; @@ -1221,8 +1220,7 @@ */ if (((ap->a_cred->cr_uid != pn->mn_uid) || uid != pn->mn_uid || (gid != pn->mn_gid && !groupmember(gid, ap->a_cred))) && - (error = priv_check_cred(ap->a_td->td_ucred, - PRIV_MQ_ADMIN, SUSER_ALLOWJAIL)) != 0) + (error = priv_check(ap->a_td, PRIV_MQ_ADMIN)) != 0) return (error); pn->mn_uid = uid; pn->mn_gid = gid; @@ -1231,8 +1229,7 @@ if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != pn->mn_uid) && - (error = priv_check_cred(ap->a_td->td_ucred, - PRIV_MQ_ADMIN, SUSER_ALLOWJAIL))) + (error = priv_check(ap->a_td, PRIV_MQ_ADMIN))) return (error); pn->mn_mode = vap->va_mode; c = 1; ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#14 (text+ko) ==== @@ -918,7 +918,7 @@ } if (va.va_uid != td->td_ucred->cr_uid) { error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL); + 0); if (error) { vput(vp); return (error); ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#13 (text+ko) ==== @@ -3300,24 +3300,24 @@ * requests, instead of PRIV_VFS_EXEC. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !priv_check_cred(cred, PRIV_VFS_LOOKUP, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_LOOKUP, 0)) priv_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !priv_check_cred(cred, PRIV_VFS_EXEC, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_EXEC, 0)) priv_granted |= VEXEC; } if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) && - !priv_check_cred(cred, PRIV_VFS_READ, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VREAD; if ((acc_mode & VWRITE) && ((dac_granted & VWRITE) == 0) && - !priv_check_cred(cred, PRIV_VFS_WRITE, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && ((dac_granted & VADMIN) == 0) && - !priv_check_cred(cred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL)) + !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN; if ((acc_mode & (priv_granted | dac_granted)) == acc_mode) { ==== //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#13 (text+ko) ==== @@ -837,8 +837,7 @@ struct nameidata nd; int vfslocked; - error = priv_check_cred(td->td_ucred, PRIV_VFS_CHROOT, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_CHROOT); if (error) return (error); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, @@ -1379,15 +1378,13 @@ return (error); if (hardlink_check_uid && cred->cr_uid != va.va_uid) { - error = priv_check_cred(cred, PRIV_VFS_LINK, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_LINK, 0); if (error) return (error); } if (hardlink_check_gid && !groupmember(va.va_gid, cred)) { - error = priv_check_cred(cred, PRIV_VFS_LINK, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_LINK, 0); if (error) return (error); } @@ -2349,8 +2346,7 @@ * chown can't fail when done as root. */ if (vp->v_type == VCHR || vp->v_type == VBLK) { - error = priv_check_cred(td->td_ucred, PRIV_VFS_CHFLAGS_DEV, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_CHFLAGS_DEV); if (error) return (error); } @@ -3852,8 +3848,7 @@ if (error) goto out; if (td->td_ucred->cr_uid != vattr.va_uid) { - error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_ADMIN); if (error) goto out; } ==== //depot/projects/trustedbsd/priv/sys/netinet/in_pcb.c#10 (text+ko) ==== @@ -340,13 +340,13 @@ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL)) + 0)) return (EACCES); if (jailed(cred)) prison = 1; if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) && priv_check_cred(so->so_cred, - PRIV_NETINET_REUSEPORT, SUSER_ALLOWJAIL) != 0) { + PRIV_NETINET_REUSEPORT, 0) != 0) { t = in_pcblookup_local(inp->inp_pcbinfo, sin->sin_addr, lport, prison ? 0 : INPLOOKUP_WILDCARD); @@ -411,7 +411,7 @@ lastport = &pcbinfo->ipi_lasthi; } else if (inp->inp_flags & INP_LOWPORT) { error = priv_check_cred(cred, - PRIV_NETINET_RESERVEDPORT, SUSER_ALLOWJAIL); + PRIV_NETINET_RESERVEDPORT, 0); if (error) return error; first = ipport_lowfirstauto; /* 1023 */ ==== //depot/projects/trustedbsd/priv/sys/netinet/raw_ip.c#10 (text+ko) ==== @@ -607,13 +607,8 @@ inp = sotoinpcb(so); KASSERT(inp == NULL, ("rip_attach: inp != NULL")); - /* - * XXXRW: Centralize privilege decision in kern_jail.c. - */ - if (jailed(td->td_ucred) && !jail_allow_raw_sockets) - return (EPERM); - error = priv_check_cred(td->td_ucred, PRIV_NETINET_RAW, - SUSER_ALLOWJAIL); + + error = priv_check(td, PRIV_NETINET_RAW); if (error) return error; if (proto >= IPPROTO_MAX || proto < 0) ==== //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#8 (text+ko) ==== @@ -2120,10 +2120,7 @@ /* got to be root to get at low ports */ if (ntohs(lport) < IPPORT_RESERVED) { if (p && (error = - priv_check_cred(p->td_ucred, - PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL - ) + priv_check(p, PRIV_NETINET_RESERVEDPORT) )) { SCTP_INP_DECR_REF(inp); SCTP_INP_WUNLOCK(inp); ==== //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#8 (text+ko) ==== @@ -385,13 +385,8 @@ /* FIX, for non-bsd is this right? */ vrf_id = SCTP_DEFAULT_VRFID; - /* - * XXXRW: Other instances of getcred use SUSER_ALLOWJAIL, as socket - * visibility is scoped using cr_canseesocket(), which it is not - * here. - */ - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, - SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_NETINET_GETCRED); + if (error) return (error); @@ -3302,9 +3297,8 @@ { union sctp_sockstore *ss; - error = priv_check_cred(curthread->td_ucred, - PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL); + error = priv_check(curthread, + PRIV_NETINET_RESERVEDPORT); if (error) break; ==== //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#13 (text+ko) ==== @@ -1019,8 +1019,7 @@ struct inpcb *inp; int error; - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, - SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); @@ -1064,8 +1063,7 @@ struct inpcb *inp; int error, mapped = 0; - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, - SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); ==== //depot/projects/trustedbsd/priv/sys/netinet/udp_usrreq.c#9 (text+ko) ==== @@ -696,8 +696,7 @@ struct inpcb *inp; int error; - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, - SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); ==== //depot/projects/trustedbsd/priv/sys/netinet6/in6_pcb.c#6 (text+ko) ==== @@ -192,11 +192,11 @@ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL)) + 0)) return (EACCES); if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr) && priv_check_cred(so->so_cred, - PRIV_NETINET_REUSEPORT, SUSER_ALLOWJAIL) != 0) { + PRIV_NETINET_REUSEPORT, 0) != 0) { t = in6_pcblookup_local(pcbinfo, &sin6->sin6_addr, lport, INPLOOKUP_WILDCARD); ==== //depot/projects/trustedbsd/priv/sys/netinet6/in6_src.c#8 (text+ko) ==== @@ -775,8 +775,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->ipi_lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, 0); if (error) return error; first = ipport_lowfirstauto; /* 1023 */ ==== //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#10 (text+ko) ==== @@ -419,8 +419,7 @@ mtx_unlock(&rule_mtx); if (error != 0 && mac_portacl_suser_exempt != 0) - error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, 0); return (error); } ==== //depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 (text+ko) ==== @@ -114,8 +114,7 @@ return (0); if (suser_privileged) { - if (priv_check_cred(cr1, PRIV_SEEOTHERUIDS, SUSER_ALLOWJAIL) - == 0) + if (priv_check_cred(cr1, PRIV_SEEOTHERUIDS, 0) == 0) return (0); } ==== //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#7 (text+ko) ==== @@ -173,7 +173,7 @@ #endif if (size == fs->fs_bsize && fs->fs_cstotal.cs_nbfree == 0) goto nospace; - if (priv_check_cred(cred, PRIV_VFS_BLOCKRESERVE, SUSER_ALLOWJAIL) && + if (priv_check_cred(cred, PRIV_VFS_BLOCKRESERVE, 0) && freespace(fs, fs->fs_minfree) - numfrags(fs, size) < 0) goto nospace; if (bpref >= fs->fs_size) @@ -268,7 +268,7 @@ #endif /* DIAGNOSTIC */ reclaimed = 0; retry: - if (priv_check_cred(cred, PRIV_VFS_BLOCKRESERVE, SUSER_ALLOWJAIL) && + if (priv_check_cred(cred, PRIV_VFS_BLOCKRESERVE, 0) && freespace(fs, fs->fs_minfree) - numfrags(fs, nsize - osize) < 0) { goto nospace; } ==== //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#9 (text+ko) ==== @@ -790,8 +790,7 @@ */ if ((ip->i_mode & (ISUID | ISGID)) && resid > uio->uio_resid && ap->a_cred) { - if (priv_check_cred(ap->a_cred, PRIV_VFS_RETAINSUGID, - SUSER_ALLOWJAIL)) { + if (priv_check_cred(ap->a_cred, PRIV_VFS_RETAINSUGID, 0)) { ip->i_mode &= ~(ISUID | ISGID); DIP_SET(ip, i_mode, ip->i_mode); } @@ -1121,8 +1120,7 @@ * tampering. */ if ((ip->i_mode & (ISUID | ISGID)) && resid > uio->uio_resid && ucred) { - if (priv_check_cred(ucred, PRIV_VFS_RETAINSUGID, - SUSER_ALLOWJAIL)) { + if (priv_check_cred(ucred, PRIV_VFS_RETAINSUGID, 0)) { ip->i_mode &= ~(ISUID | ISGID); dp->di_mode = ip->i_mode; } ==== //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#10 (text+ko) ==== @@ -515,7 +515,7 @@ int error, flags, vfslocked; struct nameidata nd; - error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAON, 0); + error = priv_check(td, PRIV_UFS_QUOTAON); if (error) return (error); @@ -747,10 +747,7 @@ struct ufsmount *ump; int error; - /* - * XXXRW: This also seems wrong to allow in a jail? - */ - error = priv_check_cred(td->td_ucred, PRIV_UFS_QUOTAOFF, 0); + error = priv_check(td, PRIV_UFS_QUOTAOFF); if (error) return (error); @@ -783,8 +780,7 @@ switch (type) { case USRQUOTA: if ((td->td_ucred->cr_uid != id) && !unprivileged_get_quota) { - error = priv_check_cred(td->td_ucred, - PRIV_VFS_GETQUOTA, SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_GETQUOTA); if (error) return (error); } @@ -793,8 +789,7 @@ case GRPQUOTA: if (!groupmember(id, td->td_ucred) && !unprivileged_get_quota) { - error = priv_check_cred(td->td_ucred, - PRIV_VFS_GETQUOTA, SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_GETQUOTA); if (error) return (error); } @@ -830,8 +825,7 @@ struct dqblk newlim; int error; - error = priv_check_cred(td->td_ucred, PRIV_VFS_SETQUOTA, - SUSER_ALLOWJAIL); + error = priv_check(td, PRIV_VFS_SETQUOTA); if (error) return (error); @@ -901,7 +895,7 @@ struct dqblk usage; int error; - error = priv_check_cred(td->td_ucred, PRIV_UFS_SETUSE, 0); + error = priv_check(td, PRIV_UFS_SETUSE); if (error) return (error); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 31 14:25: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 A89DB16A469; Thu, 31 May 2007 14:25: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 57F1616A41F for ; Thu, 31 May 2007 14:25:23 +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 4A58A13C465 for ; Thu, 31 May 2007 14:25:23 +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.8/8.13.8) with ESMTP id l4VEPMEQ020820 for ; Thu, 31 May 2007 14:25:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VEPMIV020803 for perforce@freebsd.org; Thu, 31 May 2007 14:25:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:25:22 GMT Message-Id: <200705311425.l4VEPMIV020803@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 120664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120664 Change 120664 by rwatson@rwatson_zoo on 2007/05/31 14:24:20 Fix comment, remove comment. Affected files ... .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_osdep.h#6 (text+ko) ==== @@ -212,11 +212,9 @@ /* * 8. Test for "privileged" socket opened by superuser. * FreeBSD tests ((so)->so_cred != NULL && priv_check_cred((so)->so_cred, - * PRIV_NETINET_IPSEC, SUSER_ALLOWJAIL) == 0). + * PRIV_NETINET_IPSEC, 0) == 0). * NetBSD (1.6N) tests (so)->so_uid == 0). * This difference is wrapped inside the IPSEC_PRIVILEGED_SO() macro. - * - * XXXRW: Why was this suser_allowjail? */ #ifdef __FreeBSD__ #define IPSEC_IS_PRIVILEGED_SO(_so) \ From owner-p4-projects@FreeBSD.ORG Thu May 31 14:28: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 D336516A46E; Thu, 31 May 2007 14:28: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 A677A16A400 for ; Thu, 31 May 2007 14:28:27 +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 98ADC13C458 for ; Thu, 31 May 2007 14:28:27 +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.8/8.13.8) with ESMTP id l4VESRYn023177 for ; Thu, 31 May 2007 14:28:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VESRHs023168 for perforce@freebsd.org; Thu, 31 May 2007 14:28:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:28:27 GMT Message-Id: <200705311428.l4VESRHs023168@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 120665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=120665 Change 120665 by rwatson@rwatson_zoo on 2007/05/31 14:27:52 Remove more SUSER_ALLOWJAIL; annotate missing cred->socket check in UDPv6. Affected files ... .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#8 edit .. //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#8 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#8 (text+ko) ==== @@ -438,13 +438,7 @@ vrf_id = SCTP_DEFAULT_VRFID; - /* - * XXXRW: Other instances of getcred use SUSER_ALLOWJAIL, as socket - * visibility is scoped using cr_canseesocket(), which it is not - * here. - */ - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_RESERVEDPORT, - 0); + error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); ==== //depot/projects/trustedbsd/priv/sys/netinet6/udp6_usrreq.c#8 (text+ko) ==== @@ -437,8 +437,7 @@ struct inpcb *inp; int error; - error = priv_check_cred(req->td->td_ucred, PRIV_NETINET_GETCRED, - SUSER_ALLOWJAIL); + error = priv_check(req->td, PRIV_NETINET_GETCRED); if (error) return (error); @@ -465,6 +464,9 @@ INP_LOCK(inp); KASSERT(inp->inp_socket != NULL, ("udp6_getcred: inp_socket == NULL")); + /* + * XXXRW: There should be a scoping access control check here. + */ cru2x(inp->inp_socket->so_cred, &xuc); INP_UNLOCK(inp); INP_INFO_RUNLOCK(&udbinfo); From owner-p4-projects@FreeBSD.ORG Thu May 31 14:33: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 9123616A468; Thu, 31 May 2007 14:33: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 4DEE016A41F for ; Thu, 31 May 2007 14:33:34 +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 3FE7E13C447 for ; Thu, 31 May 2007 14:33:34 +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.8/8.13.8) with ESMTP id l4VEXYOH027769 for ; Thu, 31 May 2007 14:33:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VEXYPH027763 for perforce@freebsd.org; Thu, 31 May 2007 14:33:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:33:34 GMT Message-Id: <200705311433.l4VEXYPH027763@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 120666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:33:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=120666 Change 120666 by rwatson@rwatson_zoo on 2007/05/31 14:33:06 No more SUSER_ALLOWJAIL. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_priv.c#6 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_priv.c#6 (text+ko) ==== @@ -77,18 +77,8 @@ /* * Jail policy will restrict certain privileges that may otherwise be * be granted. - * - * While debugging the transition from SUSER_ALLOWJAIL to Jail being - * aware of specific privileges, perform run-time checking that the - * two versions of the policy align. This assertion will go away - * once the SUSER_ALLOWJAIL flag has gone away. */ error = prison_priv_check(cred, priv); -#ifdef NOTYET - KASSERT(!jailed(cred) || error == ((flags & SUSER_ALLOWJAIL) ? 0 : - EPERM), ("priv_check_cred: prison_priv_check %d but flags %s", - error, flags & SUSER_ALLOWJAIL ? "allowjail" : "!allowjail")); -#endif if (error) return (error); From owner-p4-projects@FreeBSD.ORG Thu May 31 14:34:36 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 A864316A46C; Thu, 31 May 2007 14:34:36 +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 86B1B16A468 for ; Thu, 31 May 2007 14:34:36 +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 6051E13C457 for ; Thu, 31 May 2007 14:34:36 +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.8/8.13.8) with ESMTP id l4VEYaR6028855 for ; Thu, 31 May 2007 14:34:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VEYaIL028846 for perforce@freebsd.org; Thu, 31 May 2007 14:34:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:34:36 GMT Message-Id: <200705311434.l4VEYaIL028846@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 120668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:34:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120668 Change 120668 by rwatson@rwatson_zoo on 2007/05/31 14:34:33 Don't allow raw IPv6 sockets in jail. Affected files ... .. //depot/projects/trustedbsd/priv/sys/netinet6/raw_ip6.c#4 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/netinet6/raw_ip6.c#4 (text+ko) ==== @@ -352,7 +352,7 @@ INP_LOCK(in6p); priv = 0; - if (suser_cred(so->so_cred, SUSER_ALLOWJAIL) == 0) + if (suser_cred(so->so_cred, 0) == 0) priv = 1; dst = &dstsock->sin6_addr; if (control) { From owner-p4-projects@FreeBSD.ORG Thu May 31 14:36: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 4A3F716A46C; Thu, 31 May 2007 14:36: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 1B00016A400 for ; Thu, 31 May 2007 14:36:40 +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 0CDD613C455 for ; Thu, 31 May 2007 14:36:40 +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.8/8.13.8) with ESMTP id l4VEadO4030616 for ; Thu, 31 May 2007 14:36:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VEadXO030601 for perforce@freebsd.org; Thu, 31 May 2007 14:36:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:36:39 GMT Message-Id: <200705311436.l4VEadXO030601@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 120669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=120669 Change 120669 by rwatson@rwatson_zoo on 2007/05/31 14:36:29 SUSER_ALLOWJAIL reduction. Affected files ... .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_policy.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_policy.c#2 (text+ko) ==== @@ -72,7 +72,7 @@ if (!hardlink_check_uid) return (0); - return (priv_check_cred(cred, PRIV_VFS_LINK, SUSER_ALLOWJAIL)); + return (priv_check_cred(cred, PRIV_VFS_LINK, 0)); } int @@ -86,7 +86,7 @@ secpolicy_vnode_remove(struct ucred *cred) { - return (priv_check_cred(cred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL)); + return (priv_check_cred(cred, PRIV_VFS_ADMIN, 0)); } int @@ -94,23 +94,20 @@ int mode) { - if ((mode & VREAD) && - priv_check_cred(cred, PRIV_VFS_READ, SUSER_ALLOWJAIL) != 0) { + if ((mode & VREAD) && priv_check_cred(cred, PRIV_VFS_READ, 0) != 0) { return (EACCES); } if ((mode & VWRITE) && - priv_check_cred(cred, PRIV_VFS_WRITE, SUSER_ALLOWJAIL) != 0) { + priv_check_cred(cred, PRIV_VFS_WRITE, 0) != 0) { return (EACCES); } if (mode & VEXEC) { if (vp->v_type == VDIR) { - if (priv_check_cred(cred, PRIV_VFS_LOOKUP, - SUSER_ALLOWJAIL) != 0) { + if (priv_check_cred(cred, PRIV_VFS_LOOKUP, 0) != 0) { return (EACCES); } } else { - if (priv_check_cred(cred, PRIV_VFS_EXEC, - SUSER_ALLOWJAIL) != 0) { + if (priv_check_cred(cred, PRIV_VFS_EXEC, 0) != 0) { return (EACCES); } } @@ -124,7 +121,7 @@ if (owner == cred->cr_uid) return (0); - return (priv_check_cred(cred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL)); + return (priv_check_cred(cred, PRIV_VFS_ADMIN, 0)); } int @@ -173,8 +170,7 @@ if (((mask & AT_UID) && vap->va_uid != ovap->va_uid) || ((mask & AT_GID) && vap->va_gid != ovap->va_gid && !groupmember(vap->va_gid, cred))) { - error = priv_check_cred(cred, PRIV_VFS_CHOWN, - SUSER_ALLOWJAIL); + error = priv_check_cred(cred, PRIV_VFS_CHOWN, 0); if (error) return (error); } @@ -214,7 +210,7 @@ { if (!groupmember(gid, cred)) - return (priv_check_cred(cred, PRIV_VFS_SETGID, SUSER_ALLOWJAIL)); + return (priv_check_cred(cred, PRIV_VFS_SETGID, 0)); return (0); } @@ -222,7 +218,7 @@ secpolicy_vnode_setid_retain(struct ucred *cred, boolean_t issuidroot __unused) { - return (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, SUSER_ALLOWJAIL)); + return (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0)); } void @@ -230,8 +226,7 @@ { if ((vap->va_mode & (S_ISUID | S_ISGID)) != 0) { - if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, - SUSER_ALLOWJAIL)) { + if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0)) { vap->va_mask |= AT_MODE; vap->va_mode &= ~(S_ISUID|S_ISGID); } @@ -250,7 +245,7 @@ * is not a member of. Both of these are allowed in jail(8). */ if (vp->v_type != VDIR && (vap->va_mode & S_ISTXT)) { - if (priv_check_cred(cred, PRIV_VFS_STICKYFILE, SUSER_ALLOWJAIL)) + if (priv_check_cred(cred, PRIV_VFS_STICKYFILE, 0)) return (EFTYPE); } /* From owner-p4-projects@FreeBSD.ORG Thu May 31 14:42: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 5F5D216A542; Thu, 31 May 2007 14:42: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 1B97B16A49A for ; Thu, 31 May 2007 14:42:54 +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 0B91B13C4C6 for ; Thu, 31 May 2007 14:42:54 +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.8/8.13.8) with ESMTP id l4VEgssj036269 for ; Thu, 31 May 2007 14:42:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VEglWu036191 for perforce@freebsd.org; Thu, 31 May 2007 14:42:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 31 May 2007 14:42:47 GMT Message-Id: <200705311442.l4VEglWu036191@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 120670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 14:42:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=120670 Change 120670 by rwatson@rwatson_zoo on 2007/05/31 14:41:56 Integrate TrustedBSD priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/README.quirks#1 branch .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/en/midway.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_clock.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_event.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mib.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sx.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/ethernet.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netipsec/key.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/ncr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sx.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syslimits.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#9 (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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/priv/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/trustedbsd/priv/sys/arm/include/vmparam.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#4 (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/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/trustedbsd/priv/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/trustedbsd/priv/sys/boot/i386/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/trustedbsd/priv/sys/boot/i386/loader/conf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/trustedbsd/priv/sys/boot/i386/loader/main.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4592,14 +4592,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { AEL100X_TX_DISABLE = 9, ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_common.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,13 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H +#ifdef CONFIG_DEFINED +#include +#else #include +#endif enum { MAX_NPORTS = 2, /* max # of ports */ @@ -538,7 +538,11 @@ unsigned int val; }; +#ifdef CONFIG_DEFINED +#include +#else #include +#endif #ifndef PCI_VENDOR_ID_CHELSIO # define PCI_VENDOR_ID_CHELSIO 0x1425 ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mc5.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.3 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { IDT75P52100 = 4, ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* Marvell PHY interrupt status bits. */ #define MV_INTR_JABBER 0x0001 ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_regs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* This file is automatically generated --- do not edit */ ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_sge_defs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,12 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.4 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /** * t3_wait_op_done_val - wait until an operation is completed ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_tcb.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_version.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/priv/sys/dev/cxgb/common/cxgb_vsc8211.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 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. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* VSC8211 PHY specific registers. */ enum { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 31 15:40:26 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 865EA16A421; Thu, 31 May 2007 15:40:26 +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 3C65416A400 for ; Thu, 31 May 2007 15:40:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2E2E413C455 for ; Thu, 31 May 2007 15:40:26 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VFeQmV084062 for ; Thu, 31 May 2007 15:40:26 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VFe6bB083728 for perforce@freebsd.org; Thu, 31 May 2007 15:40:06 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 31 May 2007 15:40:06 GMT Message-Id: <200705311540.l4VFe6bB083728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 15:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=120672 Change 120672 by rpaulo@rpaulo_epsilon on 2007/05/31 15:40:02 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ia64/common/exec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/README.quirks#1 branch .. //depot/projects/soc2007/rpaulo-macbook/cam/cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.pc98#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/kern.mk#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/README#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/en/midway.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/md/md.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/bridge.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/random/yarrow.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ess.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/solo.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/proc.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_support.s#1 branch .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/exception.S#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/locore.S#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_event.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exec.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_linker.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_resource.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/link_elf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_bus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_mbpool.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_prof.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/tty_cons.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vnode_if.src#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/cxgb/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/zfs/Makefile#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ethernet.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_bridge.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/route.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_nat.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_structs.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/nd6.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/key.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netncp/ncp_conn.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/pci/ncr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/vmparam.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_private.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/acct.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/conf.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/filedesc.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sx.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/syslimits.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/systm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/vmmeter.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/vnode.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#4 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); #include "opt_cpu.h" @@ -236,7 +236,7 @@ "\015" "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ - "\020" + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" "\023DCA" /* Direct Cache Access */ @@ -342,13 +342,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $"); /* * Manages physical address maps. @@ -1149,7 +1149,7 @@ */ m->right = *free; *free = m; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); return 1; } @@ -1459,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - VMCNT_DEC(wire_count, 1); + VMCNT_SUB(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/support.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.126 2007/03/31 01:47:37 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ */ #include "opt_ddb.h" @@ -671,49 +671,6 @@ incl %eax ret -/*****************************************************************************/ -/* linux_futex support */ -/*****************************************************************************/ - -futex_fault: - movq $0,PCB_ONFAULT(%rcx) - movq $-EFAULT,%rax - ret - -ENTRY(futex_xchgl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - - movq $VM_MAXUSER_ADDRESS-4,%rax - cmpq %rax,%rsi - ja futex_fault - -#ifdef SMP - lock -#endif - xchgl %edi,(%rsi) - movl %edi,(%rdx) - xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) - ret - -ENTRY(futex_addl) - movq PCPU(CURPCB),%rcx - movq $futex_fault,PCB_ONFAULT(%rcx) - - movq $VM_MAXUSER_ADDRESS-4,%rax - cmpq %rax,%rsi - ja futex_fault - -#ifdef SMP - lock -#endif - xaddl %edi,(%rsi) - movl %edi,(%rdx) - xorl %eax,%eax - movq %rax,PCB_ONFAULT(%rcx) - ret - /* * Support for BB-profiling (gcc -a). The kernbb program will extract * the data from the kernel. ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.315 2007/03/26 21:45:44 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -468,7 +468,6 @@ * Otherwise, debugger traps "can't happen". */ #ifdef KDB - /* XXX Giant */ if (kdb_trap(type, 0, frame)) goto out; #endif ==== //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#3 (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.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/specialreg.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.38 2007/03/20 20:22:45 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -123,6 +123,7 @@ #define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 +#define CPUID2_PDCM 0x00008000 #define CPUID2_DCA 0x00040000 /* ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.6 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.7 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf32_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/genassym.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $"); #include #include #include @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.30 2007/01/17 00:53:05 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.31 2007/05/23 13:19:00 cognet Exp $"); #include #include @@ -55,12 +55,11 @@ #include #include #include -#include -#include #include #include #include +#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/at91/kb920x_machdep.c#2 (text) ==== @@ -48,7 +48,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.21 2007/03/27 06:29:19 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.22 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -77,7 +77,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/conf/AVILA#2 (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/arm/conf/AVILA,v 1.3 2007/02/26 02:04:24 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $ machine arm ident AVILA @@ -30,7 +30,7 @@ options STARTUP_PAGETABLE_ADDR=0x10000000 include "../xscale/ixp425/std.avila" #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. +hints "AVILA.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale @@ -137,3 +137,13 @@ #device crypto #device cryptodev #device hifn # NB: Soekris minipci card known to work + +#device usb +#options USB_DEBUG +#device uhci +#device ohci +#device ehci +#device ugen +#device umass +#device scbus # SCSI bus (required for SCSI) +#device da # Direct Access (disks) ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/ep80219_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.6 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.7 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/i80321/iq31244_machdep.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.27 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.28 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/avila_ata.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.3 2007/03/14 18:05:04 jhay Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,17 +120,14 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, board_type, ide_gpin, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; - board_type = 0; sc->sc_dev = dev; /* NB: borrow from parent */ sc->sc_iot = sa->sc_iot; sc->sc_exp_ioh = sa->sc_exp_ioh; - if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) - board_type = 1; /* Avila board */ - - if (board_type == 1) { + if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) { + /* Avila board */ if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS1_HWBASE, IXP425_EXP_BUS_CS1_SIZE, 0, &sc->sc_ioh)) panic("%s: unable to map Expansion Bus CS1 window", @@ -144,6 +141,7 @@ sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; } else { + /* Pronghorn */ if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS3_HWBASE, IXP425_EXP_BUS_CS3_SIZE, 0, &sc->sc_ioh)) panic("%s: unable to map Expansion Bus CS3 window", @@ -187,11 +185,11 @@ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPOER, GPIO_CONF_READ_4(sa, IXP425_GPIO_GPOER) | (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.4 2007/05/03 09:51:12 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.5 2007/05/23 13:20:50 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -78,7 +78,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/if_npe.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.5 2007/02/10 15:43:58 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -550,11 +550,27 @@ struct npe_softc * sc = device_get_softc(dev); int unit = device_get_unit(dev); int error, i; + uint32_t imageid; - /* load NPE firmware and start it running */ - error = ixpnpe_init(sc->sc_npe, "npe_fw", npeconfig[unit].imageid); - if (error != 0) - return error; + /* + * Load NPE firmware and start it running. We assume + * that minor version bumps remain compatible so probe + * the firmware image starting with the expected version + * and then bump the minor version up to the max. + */ + imageid = npeconfig[unit].imageid; + for (;;) { + error = ixpnpe_init(sc->sc_npe, "npe_fw", imageid); + if (error == 0) + break; + /* ESRCH is returned when the requested image is not present */ + if (error != ESRCH) + return error; + /* bump the minor version up to the max possible */ + if (NPEIMAGE_MINOR(imageid) == 0xff) + return error; + imageid++; + } if (bus_space_map(sc->sc_iot, npeconfig[unit].regbase, npeconfig[unit].regsize, 0, &sc->sc_ioh)) { ==== //depot/projects/soc2007/rpaulo-macbook/arm/xscale/ixp425/ixp425.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.5 2007/03/14 19:03:07 jhay Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -236,17 +236,14 @@ rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0) panic("ixp425_attach: failed to set up IRQ rman"); - device_add_child(dev, "pcib", 0); - device_add_child(dev, "ixpclk", 0); - device_add_child(dev, "ixpwdog", 0); - device_add_child(dev, "ixpiic", 0); - device_add_child(dev, "uart", 0); - /* XXX these are optional, what if they are not configured? */ - device_add_child(dev, "ixpqmgr", 0); - device_add_child(dev, "npe", 0); /* NPE-B */ - device_add_child(dev, "npe", 1); /* NPE-C */ - device_add_child(dev, "ata_avila", 0); /* XXX */ - device_add_child(dev, "led_avila", 0); + BUS_ADD_CHILD(dev, 0, "pcib", 0); + BUS_ADD_CHILD(dev, 0, "ixpclk", 0); + BUS_ADD_CHILD(dev, 0, "ixpiic", 0); + /* XXX move to hints? */ + BUS_ADD_CHILD(dev, 0, "ixpwdog", 0); + + /* attach wired devices via hints */ + bus_enumerate_hinted_children(dev); if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) @@ -261,6 +258,60 @@ return (0); } +static void +ixp425_hinted_child(device_t bus, const char *dname, int dunit) +{ + device_t child; + struct ixp425_ivar *ivar; + + child = BUS_ADD_CHILD(bus, 0, dname, dunit); + ivar = IXP425_IVAR(child); + resource_int_value(dname, dunit, "addr", &ivar->addr); + resource_int_value(dname, dunit, "irq", &ivar->irq); +} + +static device_t +ixp425_add_child(device_t dev, int order, const char *name, int unit) +{ + device_t child; + struct ixp425_ivar *ivar; + + child = device_add_child_ordered(dev, order, name, unit); + if (child == NULL) + return NULL; + ivar = malloc(sizeof(struct ixp425_ivar), M_DEVBUF, M_NOWAIT); + if (ivar == NULL) { + device_delete_child(dev, child); + return NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 31 16:09: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 E615C16A469; Thu, 31 May 2007 16:09:01 +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 AA65416A41F for ; Thu, 31 May 2007 16:09:01 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9CC6913C458 for ; Thu, 31 May 2007 16:09:01 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VG91BQ012758 for ; Thu, 31 May 2007 16:09:01 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VG91VX012741 for perforce@freebsd.org; Thu, 31 May 2007 16:09:01 GMT (envelope-from taleks@FreeBSD.org) Date: Thu, 31 May 2007 16:09:01 GMT Message-Id: <200705311609.l4VG91VX012741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 120673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 16:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120673 Change 120673 by taleks@taleks_th on 2007/05/31 16:08:23 Started adding of UDP, sockets and DNS resolving. Most of functions are stubs. Added pxe_filter module to make filtration of incoming packets and serves as ip/port data storage for sockets. pxe_udp module - handles UDP protocol. pxe_dns - DNS resolving module. Updated pxe_arp with stats getting function. pxe_sock module now has only send/recv buffer related information, all ip/port data went to pxe_filter. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.h#1 add Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#4 (text+ko) ==== @@ -4,7 +4,7 @@ INTERNALLIB= SRCS= pxe_conv.c pxe_core.h pxe_isr.S pxe_sock.c pxe_arp.c pxe_ip.c pxe_mutex.c \ - pxe_core.c pxe_icmp.c pxe_mem.c + pxe_core.c pxe_icmp.c pxe_mem.c pxe_udp.c pxe_filter.c pxe_dns.c CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica \ @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ #debug flag -#CFLAGS+= -DPXE_DEBUG +CFLAGS+= -DPXE_DEBUG #CFLAGS+= -DPXE_DEBUG_HELL .include ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#5 (text+ko) ==== @@ -73,6 +73,31 @@ return (NULL); } +void +pxe_arp_stats() +{ + int entry = 0; + int limit = (arp_usage > MAX_ARP_ENTRIES) ? MAX_ARP_ENTRIES : arp_usage; + + printf("ARP updates: %d\n", arp_usage); + + for (; entry < limit; ++entry) { + + PXE_IPADDR ip; + uint8_t *mac = arp_table[entry].mac; + ip.ip = arp_table[entry].ip4.ip; + + if ( (ip.ip == 0) || (mac == NULL) ) + continue; + + printf("%d.%d.%d.%d\t%2x:%2x:%2x:%2x:%2x:%2x\n", + ip.octet[0], ip.octet[1], ip.octet[2], ip.octet[3], + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] + ); + } + +} + /* * pxe_arp_protocol() - process received arp packet, this function is called in style * of pxe_protocol_call function type, but last two parameters are unused ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#5 (text+ko) ==== @@ -33,9 +33,11 @@ /* initialisation routine */ void pxe_arp_init(); /* find MAC by provided ip */ -const MAC_ADDR* pxe_arp_ip4mac(uint32_t ip); +const MAC_ADDR *pxe_arp_ip4mac(uint32_t ip); /* protocol handler for received packets */ int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data); +/* ARP table statistics */ +void pxe_arp_stats(); /* ARP packet types */ #define PXE_ARPOP_REQUEST 1 ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#11 (text+ko) ==== @@ -11,6 +11,7 @@ #include "pxe_isr.h" #include "pxe_mem.h" #include "pxe_mutex.h" +#include "pxe_udp.h" /* PXE API calls here will be made in same way as in pxeboot. * the only difference - installation of isr, that was not needed in pxe.c. @@ -25,7 +26,10 @@ static pxe_t *pxe = NULL; /* !PXE */ static BOOTPLAYER bootplayer; /* PXE Cached information. */ - +/* TODO: to think if packets queue must be in pxe_core. + * It seems, it'll be used only by TCP + */ + /* pxe core structures*/ PXE_PACKET core_packets[PXE_MAX_PACKETS]; /* buffered packets */ pxe_protocol_call core_protocol[256]; /* protocol's callback fuctions */ @@ -34,6 +38,7 @@ /* NIC info */ PXE_IPADDR nic_ip = {0}; MAC_ADDR nic_mac; /* may be init it also by zero? */ +PXE_IPADDR ns_ip = {0};/* nameserver addr */ /* core packet statistics */ uint32_t packets_dropped = 0; @@ -305,11 +310,18 @@ printf("my ip: %d.%d.%d.%d\n", nic_ip.octet[0], nic_ip.octet[1], nic_ip.octet[2], nic_ip.octet[3]); /* my MAC */ pxe_memcpy(&bootplayer.CAddr, &nic_mac, MAC_ADDR_LEN); - printf("my MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + printf("my MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", + nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + ns_ip.ip = 0x0100a8c0; /* TODO: to determiny nameserver ip*/ + pxe_arp_init(); + pxe_filter_init(); + pxe_socket_init(); pxe_icmp_init(); + pxe_udp_init(); + pxe_ip_route_init(0x0100a8c0); /* NOTE: setting default route 192.168.0.1 * need to determiny gateway by getting info drom DHCP packets, * but cached packets for some resons have no gip set. So, @@ -349,11 +361,9 @@ #ifdef PXE_DEBUG printf("pxe_core_install_isr() info:\n"); - printf("IRQ (int): %d (%d)\n", undi_info->IntNumber, int_num); - printf("Base io: %d\n", undi_info->BaseIo); - printf("MTU: %d\n", undi_info->MaxTranUnit); - printf("RX buffer queue: %d\n", undi_info->RxBufCt); - printf("TX buffer queue: %d\n", undi_info->TxBufCt); + printf("\tIRQ (int): %d (%d)\n", undi_info->IntNumber, int_num); + printf("\tMTU: %d\n", undi_info->MaxTranUnit); + printf("\tRX/TX buffer queue: %d/%d\n", undi_info->RxBufCt, undi_info->TxBufCt); #endif __pxe_entry_seg2 = pxe->EntryPointSP.segment; __pxe_entry_off2 = pxe->EntryPointSP.offset; @@ -368,7 +378,7 @@ v86int(); v86.ctl = V86_FLAGS; - printf("chained handler @ 0x%x:0x%x (0x%x/0x%x:0x%x)\n", v86.ebx, v86.edx, v86.ecx, VTOPSEG(__chained_irq_off), VTOPOFF(__chained_irq_off)); + printf("\tchained handler @ 0x%x:0x%x\n", v86.ebx, v86.edx); /* v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = (VTOPSEG(__mask_irq) << 16) | VTOPOFF(__mask_irq); @@ -788,7 +798,7 @@ if (protocol == PXE_PROTOCOL_ARP) { - pxe_arp_protocol(&dummy_pack, PXE_CORE_FRAG, NULL); + pxe_arp_protocol(&dummy_pack, PXE_CORE_HANDLE, NULL); ++processed_packets; /* aasume ARP packet always in one fragment */ @@ -802,7 +812,7 @@ if ( (!core_protocol[iphdr->protocol]) || (!core_protocol[iphdr->protocol](&dummy_pack, - PXE_CORE_FRAG, NULL)) ) { + (buffer_size == frame_size) ? PXE_CORE_HANDLE : PXE_CORE_FRAG, NULL)) ) { drop_flag = 1; } else { @@ -1012,6 +1022,13 @@ return nic_ip.ip; } +uint32_t +pxe_get_nsip32() +{ + + return ns_ip.ip; +} + const MAC_ADDR* pxe_get_mymac() { ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#9 (text+ko) ==== @@ -116,4 +116,7 @@ /* returns NIC MAC */ const MAC_ADDR *pxe_get_mymac(); +/* returns nameserver ip */ +uint32_t pxe_get_nsip32(); + #endif // PXE_CORE_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#7 (text+ko) ==== @@ -112,7 +112,7 @@ reply_icmphdr->checksum = ~pxe_ip_checksum(reply_icmphdr, sizeof(PXE_ICMP_HDR) + data_size); - if (!pxe_ip_send(pack->data, iphdr->src_ip, 0x01, pack->data_size, 1) && echo_flags) { + if (!pxe_ip_send(pack->data, iphdr->src_ip, PXE_ICMP_PROTOCOL, pack->data_size, 1) && echo_flags) { printf("pxe_ping(): failed to send echo reply.\n"); } @@ -127,8 +127,7 @@ { /* register protocol in pxe_core protocols table. */ - /* 0x01 - ICMP protocol */ - pxe_core_register(0x01, pxe_icmp_callback); + pxe_core_register(PXE_ICMP_PROTOCOL, pxe_icmp_callback); return (1); } @@ -174,7 +173,7 @@ icmphdr->checksum = ~(pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR) + 32)); - if (!pxe_ip_send(data, ip->ip, 0x01, pack_size, 1) && echo_flags) { + if (!pxe_ip_send(data, ip->ip, PXE_ICMP_PROTOCOL, pack_size, 1) && echo_flags) { printf("pxe_ping(): failed to send echo reply.\n"); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#6 (text+ko) ==== @@ -9,6 +9,7 @@ * reference: RFC792 */ +#define PXE_ICMP_PROTOCOL 0x01 /* ICMP header */ typedef struct pxe_icmp_hdr { uint8_t type; /* type of ICMP packet */ @@ -20,14 +21,16 @@ /* timeout in milliseconds */ #define PXE_ICMP_TIMEOUT 5000 + /* pxe_ping - send icmp echo request packets to host * in: * ip - host ip address * count - packets to send, 0 - to send infinte count + * flags - 1 echo ping information to screen * out: * successfull recieved echo's count */ -int pxe_ping(PXE_IPADDR *ip, int count); +int pxe_ping(PXE_IPADDR *ip, int count, int flags); /* pxe_icmp_init - inits icmp protocol * in: ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#4 (text+ko) ==== @@ -1,81 +1,377 @@ #include "pxe_mem.h" +#include "pxe_filter.h" #include "pxe_sock.h" -#include "pxe_tcp.h" +#include "pxe_udp.h" +static PXE_SOCKET pxe_sockets[PXE_DEFAULT_SOCKETS]; +static uint16_t avail_port = 1025; -PXE_SOCKET pxe_sockets[PXE_DEFAULT_SOCKETS]; - -int -pxe_sockets_init() +void +pxe_socket_init() { pxe_memset(pxe_sockets, 0, sizeof(pxe_sockets)); - - return (1); } int -pxe_tcp_socket() +pxe_socket_alloc() { int sock_index = 0; /* searching free sockets */ for (; sock_index < PXE_DEFAULT_SOCKETS; ++sock_index) { - if (pxe_sockets[sock_index].state == PXE_TCP_CLOSED) { + if (pxe_sockets[sock_index].state == PXE_SOCKET_FREE) { /* found free socket */ - pxe_sockets[sock_index].state = PXE_TCP_MARK; + pxe_memset(&pxe_sockets[sock_index], 0, sizeof(PXE_SOCKET)); + pxe_sockets[sock_index].state = PXE_SOCKET_USED; return sock_index; } } return (-1); /* no socket found :( */ } -/* + +int +pxe_socket_free(int socket) +{ + PXE_SOCKET *sock = &pxe_sockets[socket]; + + sock->state = PXE_SOCKET_FREE; + + if (sock->filter) { + pxe_filter_remove(sock->filter); + sock->filter = NULL; + } + + return (1); +} + + +int +pxe_socket() +{ + int socket = pxe_socket_alloc(); + + /* allocating structure */ + if (socket == -1) + return (-1); + + /* creating buffers */ + PXE_SOCKET *sock = &pxe_sockets[socket]; + + sock->send_buffer.data = pxe_alloc(PXE_DEFAULT_SEND_BUFSIZE); + + if (sock->send_buffer.data == NULL) { + + pxe_socket_free(socket); + return (-1); + } + + sock->send_buffer.bufsize = PXE_DEFAULT_SEND_BUFSIZE; + sock->send_buffer.bufleft = PXE_DEFAULT_SEND_BUFSIZE; + sock->send_buffer.next_data = sock->send_buffer.data; + + sock->recv_buffer.data = pxe_alloc(PXE_DEFAULT_RECV_BUFSIZE); + + if (sock->recv_buffer.data == NULL) { + + pxe_free(sock->send_buffer.data); + pxe_socket_free(socket); + return (-1); + } + + sock->recv_buffer.bufsize = PXE_DEFAULT_RECV_BUFSIZE; + sock->recv_buffer.bufleft = PXE_DEFAULT_RECV_BUFSIZE; + sock->recv_buffer.next_data = sock->recv_buffer.data; + + return (socket); +} + int -pxe_connect(int socket, uint32_t ip, uint16_t port) +pxe_close(int socket) { - int result = pxe_tcp_send_packet(pxe_sockets[socket], NULL, 0, - PXE_TCP_SYN); - if (result == 0) { + if (socket > PXE_DEFAULT_SOCKETS) { return (0); } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + pxe_free(sock->send_buffer.data); + pxe_free(sock->recv_buffer.data); + + return pxe_socket_free(socket); +} - pxe_sockets[socket].state = PXE_TCP_SYN_SENT; - return (1); +int +pxe_listen(int socket, uint8_t proto, uint16_t port) +{ +#ifdef PXE_DEBUG + printf("pxe_listen(): proto 0x%x, port: %d.\n", proto, port); +#endif - pxe_tcp_recv_packet(pxe_sockets[socket], NULL, 0, - PXE_TCP_SYN | PXE_TCP_ACK); - pxe_tcp_send_packet(pxe_sockets[socket], NULL, 0, PXE_TCP_ACK); + PXE_FILTER_ENTRY *filter = pxe_filter_add(0, 0, pxe_get_myip32(), port, &pxe_sockets[socket], proto); + + if (filter == NULL) { + printf("pxe_listen(): failed to add filter.\n"); + return (-1); + } + + pxe_filter_mask(filter, 0, 0, 0xffffffff, 0xffff); + + pxe_sockets[socket].filter = filter; + + if (proto == PXE_UDP_PROTOCOL) { /* for UDP it's fake listen */ + return (socket); + } + + while (pxe_sockets[socket].waiting == 0) { +#ifdef PXE_DEBUG + twiddle(); +#endif + if (!pxe_core_recv_packets()) { + delay(100000); + } + } + + return (0); } int -pxe_send(int socket, void *buf, size_t buflen) +pxe_accept(int socket) +{ + + if (socket > PXE_DEFAULT_SOCKETS) { + return (-1); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + if (sock->waiting == 0) + return (-1); + + int back = sock->waiting; + + PXE_FILTER_ENTRY *entry = sock->filter; + + for ( ; back != 0; --back) { + + /* filter childs are earlier */ + entry = entry->prev; + + if (entry == NULL) { +#ifdef PXE_DEBUG + printf("pxe_accept(): corrupted waiting count.\n"); +#endif + return (-1); + } + } + + int accepted_socket = pxe_socket(); + + if (accepted_socket == -1) + return (-1); + + /* decreasing waiting queue */ + --sock->waiting; + + sock = &pxe_sockets[accepted_socket]; + + sock->filter = entry; + entry->socket = sock; + + return (accepted_socket); +} + +void +pxe_sock_stats() { + int socket = 0; + PXE_SOCKET* sock = pxe_sockets; + + for ( ; socket < PXE_DEFAULT_SOCKETS; ++socket, ++sock) { + + if (sock->state == PXE_SOCKET_FREE) + continue; + + printf("%d: filter 0x%x, recv/send: %d/%d, waiting: %d.\n ", + socket, sock->filter, sock->recv, sock->sent, sock->waiting + ); + } +} - if (!pxe_tcp_pack(socket, buf, buflen)) { - pxe_flush(socket); - pxe_tcp_pack(socket, buf, buflen); +int +pxe_sock_bufspace(int socket) +{ + if (socket > PXE_DEFAULT_SOCKETS) { + return (-1); } + + return pxe_sockets[socket].recv_buffer.bufleft; } int -pxe_recv(int socket, void *buf, size_t buflen) +pxe_sock_place(int socket, void* data, uint16_t size) { - PXE_SOCKET *sock = &pxe_sockets[socket]; +#ifdef PXE_DEBUG_HELL + printf("pxe_sock_place(): sock: %d, data: 0x%x, size: %d\n", socket, data, size); +#endif + if (socket > PXE_DEFAULT_SOCKETS) { + return (-1); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + uint16_t copy_size = size; + + /* there is no enogh space available in recv buffer + * try as much as possible. + */ + if (sock->recv_buffer.bufleft < size) { + + copy_size = sock->recv_buffer.bufleft; + + if (copy_size == 0) + return (0); + } + + pxe_memcpy(data, sock->recv_buffer.next_data, copy_size); + + sock->recv_buffer.next_data += copy_size; + sock->recv_buffer.bufleft -= copy_size; + + return (copy_size); +} - if (sock->sendbuffer.leftbuf < buflen) { +int +pxe_sock_rewind(int socket, uint16_t size) +{ + if (socket > PXE_DEFAULT_SOCKETS) { + return (-1); } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + uint16_t rew_bytes = sock->recv_buffer.next_data - sock->recv_buffer.data; + + /* if data to rewind enough, than rewing size, else only available rew_bytes */ + if (rew_bytes > size) + rew_bytes = size; + + sock->recv_buffer.next_data -= rew_bytes; + sock->recv_buffer.bufleft += rew_bytes; + + return (rew_bytes); +} + +/* out: + * 0 - no free port + * >0 - port number + */ +uint16_t +pxe_next_port() +{ /* dummy, TODO: check filters, if port used */ + + if (avail_port == 40000) + avail_port = 1025; + + return (avail_port++); } -*/ +/* NOTE: now assuming that only UDP is implemented */ int -pxe_close(int socket) +pxe_sendto(int socket, uint32_t ip, uint16_t port, void *data, uint16_t size) { - pxe_sockets[socket].state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("pxe_sendto(): ip:port = %8x:%d, size = %d bytes.\n", ip, port, size); +#endif + if (size + sizeof(PXE_UDP_PACKET) > PXE_DEFAULT_SEND_BUFSIZE) { + printf("pxe_sendto(): send buffer too small for %d bytes.\n", size); + return (-1); + } + + if (!pxe_connect(socket, ip, port, PXE_UDP_PROTOCOL)) { + printf("pxe_sendto(): failed to connect.\n"); + return (-1); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + /* for UDP socket, send buffer used only for one dgram */ + PXE_UDP_PACKET *udp_pack = (PXE_UDP_PACKET *)sock->send_buffer.data; + + /* copy user data */ + pxe_memcpy(data, udp_pack + 1, size); + + PXE_FILTER_ENTRY *filter = sock->filter; + + /* filters are useful for incoming packet, so dst_port + * is local port. + */ + uint16_t lport = filter->dst_port; + + if (!pxe_udp_send(udp_pack, ip, port, lport, size + sizeof(PXE_UDP_PACKET), 1)) { + printf("pxe_sendto(): failed to send data.\n"); + return (-1); + } + + return (size); +} + + + +int +pxe_connect(int socket, uint32_t ip, uint16_t port, uint8_t proto) +{ + if (socket > PXE_DEFAULT_SOCKETS) { + return (0); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + /* socket was already initalized */ + if (sock->filter != NULL) { + + pxe_filter_remove(sock->filter); + sock->filter = NULL; /* just to be sure... */ + } + + uint16_t lport = pxe_next_port(); /* getting free local port */ + + if (port == 0) { + printf("pxe_connect(): failed to allocate local port.\n"); + return (0); + } + + PXE_FILTER_ENTRY *entry = + pxe_filter_add( ip, port, pxe_get_myip32(), lport, sock, proto); + + + if ( entry == NULL ) { + printf("pxe_connect(): failed to add filter.\n"); + return (0); + } + + /* all is ok */ return (1); } + + +int +pxe_send(int socket, void *buf, size_t buflen) +{ + + return (0); +} + +int +pxe_recv(int socket, void *buf, size_t buflen) +{ + + return (0); +} + + ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#4 (text+ko) ==== @@ -4,50 +4,90 @@ #include #include +#include "pxe_filter.h" #include "pxe_ip.h" - /* buffer size choosed by default for sending/recieving*/ -#define PXE_DEFAULT_RECV_BUFSIZE 16384 -#define PXE_DEFAULT_SEND_BUFSIZE 2048 +#define PXE_DEFAULT_RECV_BUFSIZE 8192 +#define PXE_DEFAULT_SEND_BUFSIZE 2048 /* minimal and max packet sizes to optimize tcp usage*/ -#define PXE_MIN_SEND_PACKET_SIZE 512 -#define PXE_MTU 1500 -/* dwfault count of sockets used at the same time */ -#define PXE_DEFAULT_SOCKETS 2 +#define PXE_MIN_SEND_PACKET_SIZE 512 +#define PXE_MTU 1500 +/* default count of sockets used at the same time */ +#define PXE_DEFAULT_SOCKETS 8 +/* default count of waiting queue */ +#define PXE_DEFAULT_WAITCOUNT 3 +/* socket states */ +#define PXE_SOCKET_FREE 0x0 +#define PXE_SOCKET_USED 0x1 /* pxe_buffer - buffer related information */ typedef struct pxe_buffer { - void *data; /* pointer to memory block, used for buffer*/ - uint32_t bufsize; /* size of memory block */ + void *data; /* pointer to memory block, used for buffer*/ + uint32_t bufsize; /* size of memory block */ - void *next_data; /* pointer to next free byte in memory block*/ - uint32_t bufleft; /* left buffer space */ + void *next_data; /* pointer to next free byte in memory block*/ + uint32_t bufleft; /* left buffer space */ } PXE_BUFFER; +/* socket*/ typedef struct pxe_socket { - PXE_BUFFER send_buffer; - PXE_BUFFER recv_buffer; + PXE_BUFFER send_buffer; + PXE_BUFFER recv_buffer; - uint32_t sent; - uint32_t recv; - uint8_t state; + /* transmit and status counters*/ + uint32_t sent; + uint32_t recv; + uint8_t state; + uint8_t waiting; /* number of connections waiting to accept */ - PXE_IPADDR local_ip; - uint16_t local_port; + /* for resending usage */ + uint32_t last_time_sent; + uint32_t last_time_recv; + PXE_FILTER_ENTRY *filter; /* filter, that feeds data to this socket */ +} PXE_SOCKET; - PXE_IPADDR remote_ip; - uint16_t remote_port; +/* inits this module */ +void pxe_sock_init(); +/* allocates pxe_socket structure */ +int pxe_socket_alloc(); +/* frees socket structure */ +int pxe_socket_free(int socket); +/* shows socket usage statistics */ +void pxe_sock_stats(); +/* returns available space in recv buffer of socket */ +int pxe_sock_bufspace(int socket); +/* places data to buffer */ +int pxe_sock_place(int socket, void* data, uint16_t size); +/* removes data from buffer */ +int pxe_sock_rewind(int socket, uint16_t size); - uint32_t last_time_sent; - uint32_t last_time_recv; +/* pxe_listen() - creates "listening" socket + * it's not the same as normal listen() system call. + * Every pxe_listen() call creates pxe_socket structure + * and adds filter to filter table. + * WARN: + * -1 - means failed + * >= 0 - socket for UDP + * == 0 - success for TCP + */ +int pxe_listen(int socket, uint8_t proto, uint16_t port); +/* accept awaiting connections */ +int pxe_accept(int socket); +/* send to provided ip/port, updating filter for socket */ +int pxe_sendto(int socket, uint32_t ip, uint16_t port, void *data, uint16_t size); +int pxe_connect(int socket, uint32_t ip, uint16_t port, uint8_t proto); -} PXE_SOCKET; +/* int pxe_listen_from(int socket, uint8_t proto, uint16_t port, uint32_t src_ip, uint16_t port, int block); */ -int pxe_sockets_init(); -int pxe_tcp_socket(); -int pxe_connect(int socket, uint32_t ip, uint16_t port); +/* send data to socket, blocking */ int pxe_send(int socket, void *buf, size_t buflen); +/* receive data from socket, blocking */ int pxe_recv(int socket, void *buf, size_t buflen); +/* create new socket */ +int pxe_socket(); +/* close socket */ int pxe_close(int socket); +/* returns next available local port */ +uint16_t pxe_next_port(); #endif // PXE_SOCK_H_INCLUDED From owner-p4-projects@FreeBSD.ORG Thu May 31 17:09: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 694D516A46B; Thu, 31 May 2007 17:09: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 15DC916A468 for ; Thu, 31 May 2007 17:09:15 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E5F4D13C48C for ; Thu, 31 May 2007 17:09:14 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VH9ENg071539 for ; Thu, 31 May 2007 17:09:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VH9Ei4071536 for perforce@freebsd.org; Thu, 31 May 2007 17:09:14 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 31 May 2007 17:09:14 GMT Message-Id: <200705311709.l4VH9Ei4071536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 17:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=120674 Change 120674 by thompsa@thompsa_heff on 2007/05/31 17:08:38 Submit forgotten file. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#14 (text+ko) ==== @@ -211,6 +211,7 @@ #define IWI_SCAN_END (1 << 2) #define IWI_ASSOC (1 << 3) #define IWI_SCAN_CURCHAN (1 << 4) +#define IWI_SCAN_ALLCHAN (1 << 5) int sc_scanop; /* op for scan task to do */ unsigned long sc_maxdwell; /* max dwell time for curchan */ struct bpf_if *sc_drvbpf; From owner-p4-projects@FreeBSD.ORG Thu May 31 20:37: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 E1FC116A468; Thu, 31 May 2007 20:37: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 B5F8416A46E for ; Thu, 31 May 2007 20:37: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 A324113C458 for ; Thu, 31 May 2007 20:37:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VKbbeS067252 for ; Thu, 31 May 2007 20:37:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VKbWxP067153 for perforce@freebsd.org; Thu, 31 May 2007 20:37:32 GMT (envelope-from sam@freebsd.org) Date: Thu, 31 May 2007 20:37:32 GMT Message-Id: <200705312037.l4VKbWxP067153@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 120682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 20:37:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=120682 Change 120682 by sam@sam_ebb on 2007/05/31 20:37:10 IFC @ 120681 Affected files ... .. //depot/projects/wifi/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/wifi/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/wifi/sys/arm/arm/intr.c#13 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#16 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#21 integrate .. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/wifi/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/wifi/sys/conf/files#51 integrate .. //depot/projects/wifi/sys/conf/options#33 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/wifi/sys/dev/em/README#8 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#25 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/wifi/sys/dev/md/md.c#16 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#16 integrate .. //depot/projects/wifi/sys/dev/pccard/pccardvarp.h#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#15 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/wifi/sys/dev/sound/clone.c#1 branch .. //depot/projects/wifi/sys/dev/sound/clone.h#1 branch .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sndstat.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#12 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.h#3 integrate .. //depot/projects/wifi/sys/dev/sound/unit.c#1 branch .. //depot/projects/wifi/sys/dev/sound/unit.h#1 branch .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/version.h#1 branch .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#15 integrate .. //depot/projects/wifi/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#21 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/wifi/sys/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/wifi/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/wifi/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_acct.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#19 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#26 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#23 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#18 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/wifi/sys/kern/kern_linker.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#19 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#11 integrate .. //depot/projects/wifi/sys/kern/link_elf.c#8 integrate .. //depot/projects/wifi/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/wifi/sys/kern/tty_cons.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#15 integrate .. //depot/projects/wifi/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#9 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#26 integrate .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#6 integrate .. //depot/projects/wifi/sys/security/audit/audit.h#4 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/wifi/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/intr_machdep.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/wifi/sys/sys/conf.h#18 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#13 integrate .. //depot/projects/wifi/sys/sys/sx.h#10 integrate .. //depot/projects/wifi/sys/sys/vnode.h#34 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/wifi/sys/vm/swap_pager.c#18 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#18 integrate Differences ... ==== //depot/projects/wifi/sys/amd64/amd64/identcpu.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); #include "opt_cpu.h" @@ -236,7 +236,7 @@ "\015" "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ - "\020" + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" "\023DCA" /* Direct Cache Access */ @@ -342,13 +342,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#15 (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.32 2007/05/08 21:29:12 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.33 2007/05/31 19:25:34 piso Exp $ */ /* @@ -310,7 +310,7 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, vector, thread, ret; td = curthread; @@ -356,6 +356,7 @@ * a trapframe as its argument. */ td->td_intr_nesting_level++; + ret = 0; thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { @@ -367,9 +368,17 @@ ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_filter(frame); + ret = ih->ih_filter(frame); else - ih->ih_filter(ih->ih_argument); + ret = ih->ih_filter(ih->ih_argument); + /* + * Wrapper handler special case: see + * i386/intr_machdep.c::intr_execute_handlers() + */ + if (!thread) { + if (ret == FILTER_SCHEDULE_THREAD) + thread = 1; + } } /* ==== //depot/projects/wifi/sys/amd64/include/specialreg.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.38 2007/03/20 20:22:45 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -123,6 +123,7 @@ #define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 +#define CPUID2_PDCM 0x00008000 #define CPUID2_DCA 0x00040000 /* ==== //depot/projects/wifi/sys/arm/arm/intr.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.14 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.15 2007/05/31 19:25:34 piso Exp $"); #include #include #include @@ -104,7 +104,7 @@ struct intr_event *event; struct intr_handler *ih; struct thread *td = curthread; - int i, thread; + int i, thread, ret; PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; @@ -116,13 +116,22 @@ continue; /* Execute fast handlers. */ + ret = 0; thread = 0; TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { if (ih->ih_filter == NULL) thread = 1; else - ih->ih_filter(ih->ih_argument ? + ret = ih->ih_filter(ih->ih_argument ? ih->ih_argument : frame); + /* + * Wrapper handler special case: see + * i386/intr_machdep.c::intr_execute_handlers() + */ + if (!thread) { + if (ret == FILTER_SCHEDULE_THREAD) + thread = 1; + } } /* Schedule thread if needed. */ ==== //depot/projects/wifi/sys/coda/coda_vnops.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.72 2007/05/31 11:51:48 kib Exp $"); #include #include @@ -257,7 +257,7 @@ cp->c_inode = inode; /* Open the cache file. */ - error = VOP_OPEN(vp, flag, cred, td, -1); + error = VOP_OPEN(vp, flag, cred, td, NULL); if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); @@ -410,7 +410,7 @@ opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), - cred, td, -1); + cred, td, NULL); printf("coda_rdwr: Internally Opening %p\n", vp); if (error) { printf("coda_rdwr: VOP_OPEN on container failed %d\n", error); @@ -1525,7 +1525,7 @@ if (cp->c_ovp == NULL) { opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); - error = VOP_OPEN(vp, FREAD, cred, td, -1); + error = VOP_OPEN(vp, FREAD, cred, td, NULL); printf("coda_readdir: Internally Opening %p\n", vp); if (error) { printf("coda_readdir: VOP_OPEN on container failed %d\n", error); ==== //depot/projects/wifi/sys/compat/linux/linux_misc.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.210 2007/05/31 11:51:48 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -305,7 +305,7 @@ if (error) goto cleanup; #endif - error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, NULL); if (error) goto cleanup; @@ -1451,6 +1451,7 @@ int linux_gettid(struct thread *td, struct linux_gettid_args *args) { + #ifdef DEBUG if (ldebug(gettid)) printf(ARGS(gettid, "")); ==== //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.107 2007/04/06 11:18:57 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.108 2007/05/31 11:51:49 kib Exp $"); /* * This file implements a translation layer between the BSD networking @@ -2961,7 +2961,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, path, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, NULL); if (error) { *status = NDIS_STATUS_FILE_NOT_FOUND; ExFreePool(fh); ==== //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.3 2007/05/02 01:03:10 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kobj.c,v 1.4 2007/05/31 11:51:49 kib Exp $"); #include #include @@ -77,7 +77,7 @@ flags = FREAD; NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, file, td); - error = vn_open_cred(&nd, &flags, 0, td->td_ucred, -1); + error = vn_open_cred(&nd, &flags, 0, td->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) return (NULL); ==== //depot/projects/wifi/sys/compat/opensolaris/sys/vnode.h#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/compat/opensolaris/sys/vnode.h,v 1.2 2007/04/23 00:52:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/vnode.h,v 1.3 2007/05/31 11:51:49 kib Exp $ */ #ifndef _OPENSOLARIS_SYS_VNODE_H_ @@ -170,7 +170,7 @@ td->td_proc->p_fd->fd_cdir = rootvnode; NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, pnamep, td); - error = vn_open_cred(&nd, &filemode, createmode, td->td_ucred, -1); + error = vn_open_cred(&nd, &filemode, createmode, td->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error == 0) { /* We just unlock so we hold a reference. */ ==== //depot/projects/wifi/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1211 2007/05/25 09:48:18 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1213 2007/05/31 19:47:39 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -916,6 +916,8 @@ dev/sn/if_sn_isa.c optional sn isa dev/sn/if_sn_pccard.c optional sn pccard dev/snp/snp.c optional snp +dev/sound/clone.c optional sound +dev/sound/unit.c optional sound dev/sound/isa/ad1816.c optional snd_ad1816 isa dev/sound/isa/ess.c optional snd_ess isa dev/sound/isa/gusc.c optional snd_gusc isa @@ -1557,13 +1559,13 @@ net/bpf.c standard net/bpf_jitter.c optional bpf_jitter net/bpf_filter.c optional bpf | netgraph_bpf -net/bridgestp.c optional if_bridge +net/bridgestp.c optional bridge | if_bridge net/bsd_comp.c optional ppp_bsdcomp net/ieee8023ad_lacp.c optional lagg net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm -net/if_bridge.c optional if_bridge +net/if_bridge.c optional bridge | if_bridge net/if_clone.c standard net/if_disc.c optional disc net/if_edsc.c optional edsc ==== //depot/projects/wifi/sys/conf/options#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.588 2007/05/15 16:43:01 mav Exp $ +# $FreeBSD: src/sys/conf/options,v 1.589 2007/05/30 17:39:44 rrs Exp $ # # On the handling of kernel options # @@ -422,6 +422,7 @@ SCTP_SACK_RWND_LOGGING opt_sctp.h SCTP_FLIGHT_LOGGING opt_sctp.h SCTP_MBUF_LOGGING opt_sctp.h +SCTP_PACKET_LOGGING opt_sctp.h # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. # Each netgraph node type can be either be compiled into the kernel ==== //depot/projects/wifi/sys/dev/acpica/Osd/OsdHardware.c#7 (text+ko) ==== @@ -30,13 +30,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.21 2006/09/24 09:39:17 hrs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.22 2007/05/31 00:52:32 njl Exp $"); #include +#include #include #include #include +#include #include /* @@ -232,10 +234,6 @@ return (AE_OK); } -/* XXX should use acpivar.h but too many include dependencies */ -extern ACPI_STATUS acpi_GetInteger(ACPI_HANDLE handle, char *path, int - *number); - /* * Depth-first recursive case for finding the bus, given the slot/function. */ @@ -271,10 +269,8 @@ /* Get the parent's slot and function. */ status = acpi_GetInteger(parent, "_ADR", &adr); - if (ACPI_FAILURE(status)) { - printf("acpi_bus_number: can't get _ADR\n"); + if (ACPI_FAILURE(status)) return (bus); - } slot = ACPI_HIWORD(adr); func = ACPI_LOWORD(adr); @@ -288,7 +284,7 @@ header = pci_cfgregread(bus, slot, func, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE; if (header == PCIM_HDRTYPE_BRIDGE && subclass == PCIS_BRIDGE_PCI) bus = pci_cfgregread(bus, slot, func, PCIR_SECBUS_1, 1); - if (header == PCIM_HDRTYPE_CARDBUS && subclass == PCIS_BRIDGE_CARDBUS) + else if (header == PCIM_HDRTYPE_CARDBUS && subclass == PCIS_BRIDGE_CARDBUS) bus = pci_cfgregread(bus, slot, func, PCIR_SECBUS_2, 1); return (bus); } @@ -328,7 +324,8 @@ bus = acpi_bus_number(rhandle, parent, *PciId); (*PciId)->Bus = bus; if (bootverbose) { - printf("AcpiOsDerivePciId: bus %d dev %d func %d\n", - (*PciId)->Bus, (*PciId)->Device, (*PciId)->Function); + printf("AcpiOsDerivePciId: %s -> bus %d dev %d func %d\n", + acpi_name(chandle), (*PciId)->Bus, (*PciId)->Device, + (*PciId)->Function); } } ==== //depot/projects/wifi/sys/dev/acpica/acpi_dock.c#4 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.5 2007/03/22 18:16:40 jkim Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.6 2007/05/31 08:49:51 takawata Exp $ */ #include "opt_acpi.h" @@ -41,11 +41,6 @@ #define _COMPONENT ACPI_DOCK ACPI_MODULE_NAME("DOCK") -/* For Notify handler */ -#define ACPI_DOCK_NOTIFY_BUS_CHECK 0x00 -#define ACPI_DOCK_NOTIFY_DEVICE_CHECK 0x01 -#define ACPI_DOCK_NOTIFY_EJECT_REQUEST 0x03 - /* For Docking status */ #define ACPI_DOCK_STATUS_UNKNOWN -1 #define ACPI_DOCK_STATUS_UNDOCKED 0 @@ -397,11 +392,11 @@ ACPI_SERIAL_BEGIN(dock); switch (notify) { - case ACPI_DOCK_NOTIFY_BUS_CHECK: - case ACPI_DOCK_NOTIFY_DEVICE_CHECK: + case ACPI_NOTIFY_BUS_CHECK: + case ACPI_NOTIFY_DEVICE_CHECK: acpi_dock_device_check(dev); break; - case ACPI_DOCK_NOTIFY_EJECT_REQUEST: + case ACPI_NOTIFY_EJECT_REQUEST: acpi_dock_removal(dev); break; default: ==== //depot/projects/wifi/sys/dev/em/README#8 (text+ko) ==== @@ -1,8 +1,8 @@ -$FreeBSD: src/sys/dev/em/README,v 1.14 2007/05/04 00:00:11 jfv Exp $ -FreeBSD Driver for the Gigabit Family of Adapters -============================================================ +$FreeBSD: src/sys/dev/em/README,v 1.15 2007/05/30 23:32:21 jfv Exp $ +FreeBSD* Driver for Intel Network Connection +============================================= -April 18, 2007 +May 30, 2007 Contents @@ -21,8 +21,8 @@ Overview ======== -This file describes the FreeBSD* driver for the Gigabit Family of -Adapters. This driver has been developed for use with FreeBSD, Release 6.x. +This file describes the FreeBSD* driver for Intel Network Connection. +This driver has been developed for use with FreeBSD, Release 7.x. For questions related to hardware requirements, refer to the documentation supplied with your Gigabit adapter. All hardware requirements listed @@ -88,13 +88,6 @@ cd em-x.x.x/src cp *.[ch] /usr/src/sys/dev/em - cp Makefile.kernel /usr/src/sys/modules/em/Makefile - - NOTE: At this point you MUST install a patch, kernbuild.patch, which is - located in the patches directory. This is applied as shown below where - "$PATH_TO_KERNBUILD_PATCH" is the location of the kernbuild.patch: - - cd /usr/src/sys; patch -p1 < $PATH_TO_KERNBUILD_PATCH Edit the kernel configuration file (i.e., GENERIC or MYKERNEL) in /usr/src/sys/i386/conf, and ensure the following line is present: @@ -211,6 +204,8 @@ Intel(R) PRO/1000 PT Network Connection Intel(R) PRO/1000 PT Dual Port Server Adapter Intel(R) PRO/1000 PT Dual Port Network Connection + Intel(R) PRO/1000 PT Quad Port Server Adapter + Intel(R) PRO/1000 PF Quad Port Server Adapter Intel(R) PRO/1000 PF Server Adapter Intel(R) PRO/1000 PF Network Connection Intel(R) PRO/1000 PF Dual Port Server Adapter @@ -262,17 +257,12 @@ To remove a VLAN interface: - ifconfig destroy + Intel Network Connection ifconfig destroy Polling ------- - NOTES: Device Polling is only valid for non-SMP (Symmetric MultiProcessing) - kernels. - The driver has to be compiled into the kernel for Device Polling to be - enabled in the driver. - To enable polling in the driver, add the following options to the kernel configuration, and then recompile the kernel: @@ -280,9 +270,9 @@ options HZ=1000 At runtime use: - sysctl kern.polling.enable=1 to turn polling on - Use: - sysctl kern.polling.enable=0 to turn polling off + ifconfig emX polling (to turn polling on) + and: + ifconfig emX -polling (to turn it off) Checksum Offload @@ -317,20 +307,25 @@ TSO --- - The FreeBSD driver now offers support for TSO (TCP Segmentation Offload). - To enable this support perform the following: + The FreeBSD driver offers support for TSO (TCP Segmentation Offload). + + You can enable/disable it in two ways/places: + + - sysctl net.inet.tcp.tso=0 (or 1 to enable it) + + Doing this disables TSO in the stack and will affect all adapters. + + - ifconfig emX -tso + + Doing this will disable TSO only for this adapter. - Patch the kernel with the patch supplied in the tarball. - Rebuild and install the kernel. - Recompile the driver. You must alter the Makefile to build the driver with - E1000_TSO defined. + To enable: - Enable or disable TSO: - sysctl net.inet.tcp.tso=1 or 0 - 0=disabled, 1=enabled (TSO is enabled by default). + - ifconfig emX tso - NOTE: TSO is not supported on 82547 and 82544-based adapters, as well as - older adapters. + NOTES: By default only PCI-Express adapters are ENABLED to do TSO. Others + can be enabled by the user at their own risk + TSO is not supported on 82547 and 82544-based adapters, as well as older adapters. Known Limitations @@ -346,14 +341,7 @@ check your system's BIOS by downloading the Linux Firmware Developer Kit that can be obtained at http://www.linuxfirmwarekit.org/ - FreeBSD version 4.x with Symmetric MultiProcessing (SMP) - -------------------------------------------------------- - In FreeBSD version 4.x with Symmetric MultiProcessing (SMP), there is a known - issue on some newer hardware. The problem is kernel generic and only in SMP - mode. The workaround is to either use FreeBSD version 4.x in single processor - mode, or use FreeBSD 5.4 or later. - There are known performance issues with this driver when running UDP traffic with Jumbo Frames. ---------------------------------------------------------------------------- @@ -369,12 +357,12 @@ The driver can be compiled with the following changes: - Edit ./em.x.x.x/src/if_em.h to uncomment the #define E1000_MASTER_SLAVE - from within the comments. For example, change from: + Edit ./em.x.x.x/src/if_em.h to change the #define EM_MASTER_SLAVE + For example, change from: - /* #define E1000_MASTER_SLAVE 2 */ + #define EM_MASTER_SLAVE e1000_ms_hw_default to: - #define E1000_MASTER_SLAVE 2 + #define EM_MASTER_SLAVE 2 Use one of the following options: 1 = Master mode ==== //depot/projects/wifi/sys/dev/em/if_em.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.179 2007/05/24 18:11:11 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.180 2007/05/30 23:32:21 jfv Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -89,7 +89,7 @@ /********************************************************************* * Driver version: *********************************************************************/ -char em_driver_version[] = "Version - 6.5.2"; +char em_driver_version[] = "Version - 6.5.3"; /********************************************************************* @@ -720,10 +720,10 @@ adapter->pcix_82544 = FALSE; /* Get control from any management/hw control */ - if (((adapter->hw.mac.type != e1000_82573) && - (adapter->hw.mac.type != e1000_ich8lan) && - (adapter->hw.mac.type != e1000_ich9lan)) || - !e1000_check_mng_mode(&adapter->hw)) + if (((adapter->hw.mac.type == e1000_82573) || + (adapter->hw.mac.type == e1000_ich8lan) || + (adapter->hw.mac.type == e1000_ich9lan)) && + e1000_check_mng_mode(&adapter->hw)) em_get_hw_control(adapter); /* Tell the stack that the interface is not active */ @@ -779,11 +779,13 @@ e1000_phy_hw_reset(&adapter->hw); em_release_manageability(adapter); - if (((adapter->hw.mac.type != e1000_82573) && - (adapter->hw.mac.type != e1000_ich8lan) && - (adapter->hw.mac.type != e1000_ich9lan)) || - !e1000_check_mng_mode(&adapter->hw)) + + if (((adapter->hw.mac.type == e1000_82573) || + (adapter->hw.mac.type == e1000_ich8lan) || + (adapter->hw.mac.type == e1000_ich9lan)) && + e1000_check_mng_mode(&adapter->hw)) em_release_hw_control(adapter); + if (adapter->wol) { E1000_WRITE_REG(&adapter->hw, E1000_WUC, E1000_WUC_PME_EN); E1000_WRITE_REG(&adapter->hw, E1000_WUFC, adapter->wol); @@ -845,11 +847,13 @@ em_stop(adapter); em_release_manageability(adapter); - if (((adapter->hw.mac.type != e1000_82573) && - (adapter->hw.mac.type != e1000_ich8lan) && - (adapter->hw.mac.type != e1000_ich9lan)) || - !e1000_check_mng_mode(&adapter->hw)) + + if (((adapter->hw.mac.type == e1000_82573) || + (adapter->hw.mac.type == e1000_ich8lan) || + (adapter->hw.mac.type == e1000_ich9lan)) && + e1000_check_mng_mode(&adapter->hw)) em_release_hw_control(adapter); + if (adapter->wol) { E1000_WRITE_REG(&adapter->hw, E1000_WUC, E1000_WUC_PME_EN); E1000_WRITE_REG(&adapter->hw, E1000_WUFC, adapter->wol); @@ -871,10 +875,10 @@ em_init_locked(adapter); /* Get control from any management/hw control */ - if (((adapter->hw.mac.type != e1000_82573) && - (adapter->hw.mac.type != e1000_ich8lan) && - (adapter->hw.mac.type != e1000_ich9lan)) || - !e1000_check_mng_mode(&adapter->hw)) + if (((adapter->hw.mac.type == e1000_82573) || + (adapter->hw.mac.type == e1000_ich8lan) || + (adapter->hw.mac.type == e1000_ich9lan)) && + e1000_check_mng_mode(&adapter->hw)) em_get_hw_control(adapter); em_init_manageability(adapter); @@ -3151,8 +3155,8 @@ /* Program the Transmit Control Register */ tctl = E1000_READ_REG(&adapter->hw, E1000_TCTL); tctl &= ~E1000_TCTL_CT; - tctl = E1000_TCTL_PSP | E1000_TCTL_RTLC | E1000_TCTL_EN | - (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT); + tctl |= (E1000_TCTL_PSP | E1000_TCTL_RTLC | E1000_TCTL_EN | + (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT)); if (adapter->hw.mac.type >= e1000_82571) tctl |= E1000_TCTL_MULR; @@ -4628,7 +4632,6 @@ hw->dev_spec = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO); if (hw->dev_spec == NULL) error = ENOMEM; - bzero(hw->dev_spec, size); return (error); } ==== //depot/projects/wifi/sys/dev/fxp/if_fxp.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.265 2007/03/28 18:10:50 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.266 2007/05/30 03:46:04 kevlo Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -249,7 +249,7 @@ static int fxp_serial_ifmedia_upd(struct ifnet *ifp); static void fxp_serial_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); -static volatile int fxp_miibus_readreg(device_t dev, int phy, int reg); +static int fxp_miibus_readreg(device_t dev, int phy, int reg); static void fxp_miibus_writereg(device_t dev, int phy, int reg, int value); static void fxp_load_ucode(struct fxp_softc *sc); @@ -2323,7 +2323,7 @@ return (0); } -static volatile int +static int fxp_miibus_readreg(device_t dev, int phy, int reg) { struct fxp_softc *sc = device_get_softc(dev); ==== //depot/projects/wifi/sys/dev/md/md.c#16 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.167 2006/12/14 11:34:07 kib Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.168 2007/05/31 11:51:49 kib Exp $ * */ @@ -913,7 +913,7 @@ if ((mdio->md_options & MD_READONLY) != 0) flags &= ~FWRITE; NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, sc->file, td); - error = vn_open(&nd, &flags, 0, -1); + error = vn_open(&nd, &flags, 0, NULL); if (error != 0) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/wifi/sys/dev/pccard/pccard.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.117 2007/02/23 12:18:49 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.118 2007/05/31 19:29:20 piso Exp $"); #include #include @@ -118,7 +118,8 @@ static int pccard_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); static void pccard_child_detached(device_t parent, device_t dev); -static int pccard_intr(void *arg); +static int pccard_filter(void *arg); +static void pccard_intr(void *arg); static int pccard_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); @@ -1177,7 +1178,7 @@ } static int -pccard_intr(void *arg) +pccard_filter(void *arg) { struct pccard_function *pf = (struct pccard_function*) arg; int reg; @@ -1208,12 +1209,20 @@ doisr = 0; } if (doisr) { - if (pf->filt_handler != NULL) - pf->filt_handler(pf->intr_handler_arg); + if (pf->intr_filter != NULL) + return (pf->intr_filter(pf->intr_handler_arg)); else - pf->intr_handler(pf->intr_handler_arg); + return (FILTER_SCHEDULE_THREAD); } - return (FILTER_HANDLED); + return (FILTER_STRAY); +} + +static void +pccard_intr(void *arg) +{ + struct pccard_function *pf = (struct pccard_function*) arg; + + pf->intr_handler(pf->intr_handler_arg); } static int @@ -1226,19 +1235,13 @@ struct pccard_function *pf = ivar->pf; int err; - if (pf->intr_handler != NULL) + if (pf->intr_filter != NULL || pf->intr_handler != NULL) panic("Only one interrupt handler per function allowed"); - if (filt != NULL && intr != NULL) - return (EINVAL); - if (filt != NULL) - err = bus_generic_setup_intr(dev, child, irq, flags, - pccard_intr, NULL, pf, cookiep); - else - err = bus_generic_setup_intr(dev, child, irq, flags, - NULL, (driver_intr_t *)pccard_intr, pf, cookiep); + err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter, + pccard_intr, pf, cookiep); if (err != 0) return (err); - pf->filt_handler = filt; + pf->intr_filter = filt; pf->intr_handler = intr; pf->intr_handler_arg = arg; pf->intr_handler_cookie = *cookiep; ==== //depot/projects/wifi/sys/dev/pccard/pccardvarp.h#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/pccard/pccardvarp.h,v 1.3 2007/02/23 12:18:49 piso Exp $ + * $FreeBSD: src/sys/dev/pccard/pccardvarp.h,v 1.4 2007/05/31 19:29:20 piso Exp $ */ #ifndef _PCCARD_PCCARDVARP_H @@ -112,7 +112,7 @@ bus_addr_t pf_mfc_iobase; bus_addr_t pf_mfc_iomax; int pf_flags; - driver_filter_t *filt_handler; + driver_filter_t *intr_filter; driver_intr_t *intr_handler; void *intr_handler_arg; void *intr_handler_cookie; ==== //depot/projects/wifi/sys/dev/pccbb/pccbb.c#15 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.160 2007/05/16 19:53:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.161 2007/05/31 19:29:20 piso Exp $"); #include #include @@ -84,6 +84,7 @@ #include #include #include +#include #include #include #include @@ -176,6 +177,7 @@ device_t child); static void cbb_cardbus_power_disable_socket(device_t brdev, device_t child); +static int cbb_func_filt(void *arg); static void cbb_func_intr(void *arg); static void @@ -365,18 +367,19 @@ struct cbb_softc *sc = device_get_softc(dev); int err; + if (filt == NULL && intr == NULL) + return (EINVAL); /* * Well, this is no longer strictly true. You can have multiple * FAST ISRs, but can't mix fast and slow, so we have to assume * least common denominator until the base system supports mixing * and matching better. */ - if (filt != NULL) - return (EINVAL); ih = malloc(sizeof(struct cbb_intrhand), M_DEVBUF, M_NOWAIT); if (ih == NULL) return (ENOMEM); *cookiep = ih; + ih->filt = filt; ih->intr = intr; ih->arg = arg; ih->sc = sc; @@ -385,7 +388,7 @@ * XXX for now that's all we need to do. */ err = BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 31 22:12: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 BA10C16A469; Thu, 31 May 2007 22:12: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 8CC9916A400 for ; Thu, 31 May 2007 22:12:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7AF3413C44C for ; Thu, 31 May 2007 22:12:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4VMCWfj061297 for ; Thu, 31 May 2007 22:12:32 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4VMCWrK061291 for perforce@freebsd.org; Thu, 31 May 2007 22:12:32 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 31 May 2007 22:12:32 GMT Message-Id: <200705312212.l4VMCWrK061291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2007 22:12:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=120683 Change 120683 by thompsa@thompsa_heff on 2007/05/31 22:11:35 Add a simple scan command ring so that sc_scanop does not get clobbered if the taskqueue hasnt fired before the next call. (testing this new code showed it happened often) Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#35 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#15 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#35 (text+ko) ==== @@ -171,6 +171,7 @@ static void iwi_scan_mindwell(struct ieee80211com *); static void iwi_assoc(struct ieee80211com *ic); static void iwi_ops(void *, int); +static int iwi_scan_cmd(struct iwi_softc *, int); static int iwi_auth_and_assoc(struct iwi_softc *); static int iwi_disassociate(struct iwi_softc *, int quiet); static void iwi_down(void *, int); @@ -257,8 +258,8 @@ sc->sc_dev = dev; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, - MTX_DEF); + IWI_LOCK_INIT(sc); + IWI_SCAN_LOCK_INIT(sc); sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); @@ -481,7 +482,8 @@ if (sc->sc_unr != NULL) delete_unrhdr(sc->sc_unr); - mtx_destroy(&sc->sc_mtx); + IWI_LOCK_DESTROY(sc); + IWI_SCAN_LOCK_DESTROY(sc); return 0; } @@ -3439,7 +3441,20 @@ struct iwi_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; IWI_LOCK_DECL; - + int cmd; + +again: + IWI_SCAN_LOCK(sc); + cmd = sc->sc_scanop[sc->sc_scan_cur]; + if (cmd == 0) { + /* No more commands to process */ + IWI_SCAN_UNLOCK(sc); + return; + } + sc->sc_scanop[sc->sc_scan_cur] = 0; /* free the slot */ + sc->sc_scan_cur = (sc->sc_scan_cur + 1) % IWI_SCAN_OPS; + IWI_SCAN_UNLOCK(sc); + IWI_LOCK(sc); while ((ic->ic_state != IEEE80211_S_INIT) && (sc->flags & IWI_FLAG_BUSY)) { msleep(sc, &sc->sc_mtx, 0, "iwicmd", hz/10); @@ -3448,7 +3463,7 @@ if (ic->ic_state == IEEE80211_S_INIT) goto done; - switch (sc->sc_scanop) { + switch (cmd) { case IWI_ASSOC: iwi_auth_and_assoc(sc); break; @@ -3466,8 +3481,7 @@ if (!(sc->flags & IWI_FLAG_CHANNEL_SCAN)) { DPRINTF(("%s: ic_scan_curchan while not scanning\n", __func__)); - IWI_UNLOCK(sc); - return; + goto done; } if (iwi_scanchan(sc, sc->sc_maxdwell, sc->sc_scanop)) ieee80211_cancel_scan(ic); @@ -3476,16 +3490,34 @@ } done: IWI_UNLOCK(sc); + + /* Take another pass */ + goto again; } +static int +iwi_scan_cmd(struct iwi_softc *sc, int cmd) +{ + IWI_SCAN_LOCK(sc); + if (sc->sc_scanop[sc->sc_scan_next] != 0) { + IWI_SCAN_UNLOCK(sc); + DPRINTF(("%s: scan command %d dropped\n", __func__, cmd)); + return (EBUSY); + } + + sc->sc_scanop[sc->sc_scan_next] = cmd; + sc->sc_scan_next = (sc->sc_scan_next + 1) % IWI_SCAN_OPS; + taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + IWI_SCAN_UNLOCK(sc); +} + static void iwi_scan_start(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_scanop = IWI_SCAN_START; - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + iwi_scan_cmd(sc, IWI_SCAN_START); } static void @@ -3503,9 +3535,8 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_scanop = IWI_SCAN_CURCHAN; sc->sc_maxdwell = maxdwell; - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + iwi_scan_cmd(sc, IWI_SCAN_CURCHAN); } static void @@ -3514,9 +3545,8 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_scanop = IWI_SCAN_ALLCHAN; sc->sc_maxdwell = maxdwell; - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + iwi_scan_cmd(sc, IWI_SCAN_ALLCHAN); } static void @@ -3531,8 +3561,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_scanop = IWI_SCAN_END; - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + iwi_scan_cmd(sc, IWI_SCAN_END); } static void @@ -3541,6 +3570,5 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - sc->sc_scanop = IWI_ASSOC; - taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); + iwi_scan_cmd(sc, IWI_ASSOC); } ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#15 (text+ko) ==== @@ -123,6 +123,8 @@ device_t sc_dev; struct mtx sc_mtx; + struct mtx sc_scanlock; + char sc_scanname[12]; /* e.g. "iwi0_scan" */ uint8_t sc_mcast[IEEE80211_ADDR_LEN]; struct unrhdr *sc_unr; struct taskqueue *sc_tq; /* private task queue */ @@ -212,7 +214,10 @@ #define IWI_ASSOC (1 << 3) #define IWI_SCAN_CURCHAN (1 << 4) #define IWI_SCAN_ALLCHAN (1 << 5) - int sc_scanop; /* op for scan task to do */ +#define IWI_SCAN_OPS 5 + int sc_scanop[IWI_SCAN_OPS]; + int sc_scan_cur; /* current queued scan task */ + int sc_scan_next; /* last queued scan task */ unsigned long sc_maxdwell; /* max dwell time for curchan */ struct bpf_if *sc_drvbpf; @@ -235,6 +240,10 @@ * NB.: This models the only instance of async locking in iwi_init_locked * and must be kept in sync. */ +#define IWI_LOCK_INIT(sc) \ + mtx_init(&(sc)->sc_mtx, device_get_nameunit((sc)->sc_dev), \ + MTX_NETWORK_LOCK, MTX_DEF) +#define IWI_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_mtx) #define IWI_LOCK_DECL int __waslocked = 0 #define IWI_LOCK_CHECK(sc) do { \ if (!mtx_owned(&(sc)->sc_mtx)) \ @@ -248,3 +257,11 @@ if (!__waslocked) \ mtx_unlock(&(sc)->sc_mtx); \ } while (0) +#define IWI_SCAN_LOCK_INIT(sc) do { \ + snprintf((sc)->sc_scanname, sizeof((sc)->sc_scanname), "%s_scan", \ + device_get_nameunit((sc)->sc_dev)); \ + mtx_init(&(sc)->sc_scanlock, (sc)->sc_scanname, NULL, MTX_DEF); \ +} while (0) +#define IWI_SCAN_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_scanlock) +#define IWI_SCAN_LOCK(sc) mtx_lock(&(sc)->sc_scanlock) +#define IWI_SCAN_UNLOCK(sc) mtx_unlock(&(sc)->sc_scanlock) From owner-p4-projects@FreeBSD.ORG Fri Jun 1 09:03:53 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 B2F3A16A496; Fri, 1 Jun 2007 09:03:52 +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 8617816A480 for ; Fri, 1 Jun 2007 09:03:52 +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 7358413C45A for ; Fri, 1 Jun 2007 09:03:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5193qjc001751 for ; Fri, 1 Jun 2007 09:03:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5193f1t001596 for perforce@freebsd.org; Fri, 1 Jun 2007 09:03:41 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 09:03:41 GMT Message-Id: <200706010903.l5193f1t001596@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 120698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 09:03:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=120698 Change 120698 by piso@piso_skytech on 2007/06/01 09:02:45 IFC@120696 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#30 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mptable.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/msi.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#15 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/support.S#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#10 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#13 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#8 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/apicvar.h#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#10 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/md_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/smp.h#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/atpic.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/genassym.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#24 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#9 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#11 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/AVILA#3 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2006/intr_filter/arm/include/asm.h#3 integrate .. //depot/projects/soc2006/intr_filter/arm/include/pmap.h#5 integrate .. //depot/projects/soc2006/intr_filter/arm/include/profile.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/include/vmparam.h#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_npe.c#4 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/soc2006/intr_filter/boot/common/loader.8#7 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2006/intr_filter/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2006/intr_filter/boot/i386/loader/main.c#5 integrate .. //depot/projects/soc2006/intr_filter/boot/ia64/common/exec.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/README.quirks#1 branch .. //depot/projects/soc2006/intr_filter/cam/cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_periph.c#5 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#11 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.h#5 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/soc2006/intr_filter/coda/coda_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/coda/coda_vnops.h#3 integrate .. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/soc2006/intr_filter/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_futex.c#5 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#12 integrate .. //depot/projects/soc2006/intr_filter/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.arm#5 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.i386#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#18 integrate .. //depot/projects/soc2006/intr_filter/conf/files#20 integrate .. //depot/projects/soc2006/intr_filter/conf/files.amd64#10 integrate .. //depot/projects/soc2006/intr_filter/conf/files.i386#10 integrate .. //depot/projects/soc2006/intr_filter/conf/files.pc98#8 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.mk#4 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.pre.mk#7 integrate .. //depot/projects/soc2006/intr_filter/conf/kmod.mk#9 integrate .. //depot/projects/soc2006/intr_filter/conf/options#18 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/dnlc.c#2 delete .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf.c#5 integrate .. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia.c#1 branch .. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#18 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ciss/ciss.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/soc2006/intr_filter/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/soc2006/intr_filter/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/dcons/dcons.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/de/if_devar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/em/README#4 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82540.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82541.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82541.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82542.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82543.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82543.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82571.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82571.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82575.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_82575.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_api.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_api.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_defines.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_hw.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_mac.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_mac.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_manage.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_manage.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_phy.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_phy.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/e1000_regs.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#21 integrate .. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#10 integrate .. //depot/projects/soc2006/intr_filter/dev/en/midway.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewire.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/hptiop/hptiop.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/hptiop/hptiop.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#17 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/md/md.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_ioctl.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfireg.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfivar.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/bridge.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_pci.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pci_private.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcireg.h#9 integrate .. //depot/projects/soc2006/intr_filter/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/random/yarrow.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/clone.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/clone.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/isa/ess.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/isa/mss.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/solo.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/unit.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/unit.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/version.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/syscons/scmouse.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_axe.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_cue.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_kue.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_rue.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_udav.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ubsa.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ufoma.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uhid.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ukbd.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/ums.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_mem.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usb_subr.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#15 integrate .. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/soc2006/intr_filter/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union.h#3 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part.h#2 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/madt.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#14 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#9 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/identcpu.c#8 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#37 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/io_apic.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#11 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#13 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mptable.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/msi.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#14 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/support.s#6 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/trap.c#9 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/apicvar.h#7 integrate .. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#10 integrate .. //depot/projects/soc2006/intr_filter/i386/include/proc.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/include/smp.h#3 integrate .. //depot/projects/soc2006/intr_filter/i386/include/specialreg.h#7 integrate .. //depot/projects/soc2006/intr_filter/i386/include/vmparam.h#4 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/atpic.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_support.s#1 branch .. //depot/projects/soc2006/intr_filter/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#27 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/locore.S#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/mca.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#8 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#7 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/vmparam.h#5 integrate .. //depot/projects/soc2006/intr_filter/kern/Make.tags.inc#4 integrate .. //depot/projects/soc2006/intr_filter/kern/imgact_elf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_condvar.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_conf.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#15 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_event.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#42 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_malloc.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mib.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_timeout.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/link_elf_obj.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_lock.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_mbpool.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prof.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#9 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_pipe.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/tty_cons.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mqueue.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#15 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#13 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#14 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_aio.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_cache.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_cluster.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_default.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_lookup.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_vnops.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/vnode_if.src#4 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#16 integrate .. //depot/projects/soc2006/intr_filter/modules/crypto/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/cxgb/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/dcons/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/hptiop/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/linux/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/modules/mfi/Makefile#3 integrate .. //depot/projects/soc2006/intr_filter/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/netgraph/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/modules/netgraph/car/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/sound/sound/Makefile#4 integrate .. //depot/projects/soc2006/intr_filter/modules/twa/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/net/ethernet.h#5 integrate .. //depot/projects/soc2006/intr_filter/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#12 integrate .. //depot/projects/soc2006/intr_filter/net/if.h#5 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#13 integrate .. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#11 integrate .. //depot/projects/soc2006/intr_filter/net/if_fwsubr.c#3 integrate .. //depot/projects/soc2006/intr_filter/net/if_lagg.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_lagg.h#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_var.h#7 integrate .. //depot/projects/soc2006/intr_filter/net/pfkeyv2.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/route.c#3 integrate .. //depot/projects/soc2006/intr_filter/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_car.c#1 branch .. //depot/projects/soc2006/intr_filter/netgraph/ng_car.h#1 branch .. //depot/projects/soc2006/intr_filter/netgraph/ng_fec.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_mppc.c#3 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.c#5 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.h#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/icmp6.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/in.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_cksum.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_gif.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_pcb.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/in_rmx.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_divert.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_ecn.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_encap.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#15 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_icmp.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_id.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_input.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_options.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_options.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_header.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_var.h#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp.h#5 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_fsm.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#15 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_reass.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/tcp_sack.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#13 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.c#8 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.h#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timewait.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet6/esp_camellia.c#1 branch .. //depot/projects/soc2006/intr_filter/netinet6/esp_camellia.h#1 branch .. //depot/projects/soc2006/intr_filter/netinet6/esp_core.c#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.c#7 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_proto.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_input.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet6/raw_ip6.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec.c#5 integrate .. //depot/projects/soc2006/intr_filter/netipsec/ipsec_output.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipsec/key.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipsec/xform_esp.c#2 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_cksum.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_if.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_input.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.c#4 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/soc2006/intr_filter/netipx/ipx_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_debug.c#3 integrate .. //depot/projects/soc2006/intr_filter/netipx/spx_debug.h#3 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_conn.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.c#4 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.h#3 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/xform.c#2 integrate .. //depot/projects/soc2006/intr_filter/opencrypto/xform.h#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#11 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/pci/if_tl.c#5 integrate .. //depot/projects/soc2006/intr_filter/pci/ncr.c#6 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/vmparam.h#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#32 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.c#7 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.h#5 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_private.h#5 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_worker.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#12 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/profile.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#27 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mem.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/cache.h#3 delete .. //depot/projects/soc2006/intr_filter/sun4v/include/iommureg.h#2 delete .. //depot/projects/soc2006/intr_filter/sun4v/include/iommuvar.h#2 delete .. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/soc2006/intr_filter/sun4v/include/pmap.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/profile.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/upa.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/ver.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#7 integrate .. //depot/projects/soc2006/intr_filter/sys/acct.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/callout.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/conf.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/filedesc.h#4 integrate .. //depot/projects/soc2006/intr_filter/sys/lock_profile.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/lockf.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#13 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#12 integrate .. //depot/projects/soc2006/intr_filter/sys/resource.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/resourcevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/rwlock.h#9 integrate .. //depot/projects/soc2006/intr_filter/sys/sx.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/sysctl.h#7 integrate .. //depot/projects/soc2006/intr_filter/sys/sysent.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/syslimits.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/systm.h#12 integrate .. //depot/projects/soc2006/intr_filter/sys/vmmeter.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/vnode.h#8 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#9 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#9 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_core.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/uma_int.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_contig.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#10 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#5 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#9 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_meter.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#11 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#11 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageq.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/soc2006/intr_filter/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/soc2006/intr_filter/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); #include "opt_cpu.h" @@ -236,7 +236,7 @@ "\015" "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ - "\020" + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" "\023DCA" /* Direct Cache Access */ @@ -342,13 +342,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#30 (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.31 2007/05/06 17:02:49 piso Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.33 2007/05/31 19:25:34 piso Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -71,7 +72,8 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; #ifdef INTR_FILTER @@ -115,14 +117,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -150,16 +152,16 @@ #endif if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; - isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + isrc->is_handlers = 0; + sx_xunlock(&intr_table_lock); return (0); } @@ -183,19 +185,18 @@ error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); - if (!isrc->is_enabled) { - isrc->is_enabled = 1; + isrc->is_handlers++; + if (isrc->is_handlers == 1) { #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); - isrc->is_pic->pic_enable_source(isrc); + isrc->is_pic->pic_enable_source(isrc); + } + sx_xunlock(&intr_table_lock); } return (error); } @@ -208,8 +209,16 @@ isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); - if (error == 0) + if (error == 0) { + sx_xlock(&intr_table_lock); + isrc->is_handlers--; + if (isrc->is_handlers == 0) { + isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); + isrc->is_pic->pic_disable_intr(isrc); + } intrcnt_updatename(isrc); + sx_xunlock(&intr_table_lock); + } return (error); } @@ -301,7 +310,7 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, vector, thread, ret; td = curthread; @@ -347,6 +356,7 @@ * a trapframe as its argument. */ td->td_intr_nesting_level++; + ret = 0; thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { @@ -358,9 +368,17 @@ ih->ih_filter, ih->ih_argument == NULL ? frame : >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 1 14:12:26 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 C17A616A468; Fri, 1 Jun 2007 14:12: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 6FABD16A400 for ; Fri, 1 Jun 2007 14:12:25 +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 5FE5413C448 for ; Fri, 1 Jun 2007 14:12:25 +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.8/8.13.8) with ESMTP id l51ECPTL000258 for ; Fri, 1 Jun 2007 14:12:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51ECPH5000252 for perforce@freebsd.org; Fri, 1 Jun 2007 14:12:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 1 Jun 2007 14:12:25 GMT Message-Id: <200706011412.l51ECPH5000252@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 120711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 14:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=120711 Change 120711 by rwatson@rwatson_zoo on 2007/06/01 14:12:22 One more instance of SUSER_ALLOWJAIL. Affected files ... .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#10 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#10 (text+ko) ==== @@ -2203,10 +2203,7 @@ last = ipport_hilastauto; } else if (ip_inp->inp_flags & INP_LOWPORT) { if (p && (error = - priv_check_cred(p->td_ucred, - PRIV_NETINET_RESERVEDPORT, - SUSER_ALLOWJAIL - ) + priv_check(p, PRIV_NETINET_RESERVEDPORT) )) { SCTP_INP_DECR_REF(inp); SCTP_INP_WUNLOCK(inp); From owner-p4-projects@FreeBSD.ORG Fri Jun 1 19:52: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 BDD6516A46D; Fri, 1 Jun 2007 19:52: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 7478816A46B for ; Fri, 1 Jun 2007 19:52: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 6589E13C457 for ; Fri, 1 Jun 2007 19:52:24 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51JqOAc028740 for ; Fri, 1 Jun 2007 19:52:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51JqOXW028729 for perforce@freebsd.org; Fri, 1 Jun 2007 19:52:24 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 19:52:24 GMT Message-Id: <200706011952.l51JqOXW028729@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 120721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 19:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120721 Change 120721 by piso@piso_newluxor on 2007/06/01 19:51:33 reduce diff against HEAD Affected files ... .. //depot/projects/soc2006/intr_filter/arm/conf/EP80219#5 edit .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#11 edit .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#12 edit .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#11 edit .. //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#8 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/conf/EP80219#5 (text+ko) ==== @@ -116,5 +116,3 @@ device bpf #options ROOTDEVNAME=\"ufs:ad4s1a\" -options INTR_FILTER - ==== //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#11 (text+ko) ==== @@ -153,6 +153,3 @@ # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter - -options INTR_FILTER - ==== //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#12 (text+ko) ==== @@ -264,6 +264,3 @@ #device firewire # FireWire bus code #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) - -options INTR_FILTER - ==== //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#11 (text+ko) ==== @@ -155,6 +155,3 @@ options KTR_COMPILE=0xffffffff #options KTR_MASK=KTR_SIG options KTR_VERBOSE - -options INTR_FILTER - ==== //depot/projects/soc2006/intr_filter/sun4v/conf/GENERIC#8 (text+ko) ==== @@ -219,5 +219,3 @@ # its choice was not adequately researched options HZ=100 -options INTR_FILTER - From owner-p4-projects@FreeBSD.ORG Fri Jun 1 20:11: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 C937D16A46C; Fri, 1 Jun 2007 20:11: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 7988616A41F for ; Fri, 1 Jun 2007 20:11:48 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6A34C13C45D for ; Fri, 1 Jun 2007 20:11:48 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51KBm0h048922 for ; Fri, 1 Jun 2007 20:11:48 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51KBmVr048908 for perforce@freebsd.org; Fri, 1 Jun 2007 20:11:48 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 1 Jun 2007 20:11:48 GMT Message-Id: <200706012011.l51KBmVr048908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 20:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=120722 Change 120722 by thompsa@thompsa_heff on 2007/06/01 20:11:15 - fix scan type argument for iwi_scanchan - add return on non-void function Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#36 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#36 (text+ko) ==== @@ -3483,7 +3483,7 @@ __func__)); goto done; } - if (iwi_scanchan(sc, sc->sc_maxdwell, sc->sc_scanop)) + if (iwi_scanchan(sc, sc->sc_maxdwell, cmd)) ieee80211_cancel_scan(ic); break; @@ -3509,6 +3509,7 @@ sc->sc_scan_next = (sc->sc_scan_next + 1) % IWI_SCAN_OPS; taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); IWI_SCAN_UNLOCK(sc); + return (0); } static void From owner-p4-projects@FreeBSD.ORG Fri Jun 1 21:43: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 C4A8516A421; Fri, 1 Jun 2007 21:43: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 73A4416A400 for ; Fri, 1 Jun 2007 21:43:08 +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 6531513C448 for ; Fri, 1 Jun 2007 21:43:08 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51Lh89t039611 for ; Fri, 1 Jun 2007 21:43:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51Lh8NN039604 for perforce@freebsd.org; Fri, 1 Jun 2007 21:43:08 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 21:43:08 GMT Message-Id: <200706012143.l51Lh8NN039604@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 120729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 21:43:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=120729 Change 120729 by piso@piso_newluxor on 2007/06/01 21:42:31 -reduce diff against HEAD -p_ih n puc_port seems useless: axe it Affected files ... .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#15 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#15 (text+ko) ==== @@ -59,7 +59,6 @@ int p_hasintr:1; - driver_filter_t *p_ih; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; @@ -585,8 +584,7 @@ int puc_bus_setup_intr(device_t dev, device_t child, struct resource *res, - int flags, driver_filter_t *filt, void (*ihand)(void *), void *arg, - void **cookiep) + int flags, driver_filter_t *filt, void (*ihand)(void *), void *arg, void **cookiep) { struct puc_port *port; struct puc_softc *sc; @@ -635,7 +633,6 @@ sc->sc_serdevs |= 1UL << (port->p_nr - 1); port->p_hasintr = 1; - port->p_ih = filt; port->p_iharg = arg; *cookiep = port; @@ -676,7 +673,6 @@ return (EINVAL); port->p_hasintr = 0; - port->p_ih = NULL; port->p_iharg = NULL; for (i = 0; i < PUC_ISRCCNT; i++) From owner-p4-projects@FreeBSD.ORG Fri Jun 1 21:49: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 BFCA916A46C; Fri, 1 Jun 2007 21:49: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 61B7116A468 for ; Fri, 1 Jun 2007 21:49:16 +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 5323813C483 for ; Fri, 1 Jun 2007 21:49:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51LnGN9045226 for ; Fri, 1 Jun 2007 21:49:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51LnG4Q045220 for perforce@freebsd.org; Fri, 1 Jun 2007 21:49:16 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 21:49:16 GMT Message-Id: <200706012149.l51LnG4Q045220@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 120730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 21:49:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120730 Change 120730 by piso@piso_newluxor on 2007/06/01 21:49:02 -axe a useless comment -clear the interrupt if a filter executed, else mask the src, run the ithread and then clear th src Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#15 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#15 (text+ko) ==== @@ -219,7 +219,6 @@ * providing two PCI buses. */ -/* XXX let's hope no one ever create a flag with this value... */ #define FAST 0x66600000 #ifdef DEBUGGER_ON_POWERFAIL @@ -990,11 +989,11 @@ struct psycho_clr *pc = arg; int res; - if (pc->pci_filter != NULL) + if (pc->pci_filter != NULL) { res = pc->pci_filter(pc->pci_arg); - else - res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; - PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); + PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); + } else + res = FILTER_SCHEDULE_THREAD; return (res); } @@ -1009,6 +1008,7 @@ (void)PSYCHO_READ8(pc->pci_sc, PSR_DMA_WRITE_SYNC); } pc->pci_handler(pc->pci_arg); + PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); } static int From owner-p4-projects@FreeBSD.ORG Fri Jun 1 21:55: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 DA93016A46B; Fri, 1 Jun 2007 21:55: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 7D75416A468 for ; Fri, 1 Jun 2007 21:55: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 566B113C44B for ; Fri, 1 Jun 2007 21:55:24 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51LtOwa051379 for ; Fri, 1 Jun 2007 21:55:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51LtOSZ051373 for perforce@freebsd.org; Fri, 1 Jun 2007 21:55:24 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 21:55:24 GMT Message-Id: <200706012155.l51LtOSZ051373@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 120731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 21:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120731 Change 120731 by piso@piso_newluxor on 2007/06/01 21:55:06 Clear the interrupt in the ithread just in case it wasn't done in the filter already. Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#16 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#16 (text+ko) ==== @@ -1008,7 +1008,8 @@ (void)PSYCHO_READ8(pc->pci_sc, PSR_DMA_WRITE_SYNC); } pc->pci_handler(pc->pci_arg); - PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); + if (pc->pci_filter == NULL) + PSYCHO_WRITE8(pc->pci_sc, pc->pci_clr, 0); } static int From owner-p4-projects@FreeBSD.ORG Fri Jun 1 22:10: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 0624116A478; Fri, 1 Jun 2007 22:10: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 BFE0C16A475 for ; Fri, 1 Jun 2007 22:10:18 +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 AF92B13C447 for ; Fri, 1 Jun 2007 22:10:18 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51MAI0x065773 for ; Fri, 1 Jun 2007 22:10:18 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51MAIGW065769 for perforce@freebsd.org; Fri, 1 Jun 2007 22:10:18 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 22:10:18 GMT Message-Id: <200706012210.l51MAIGW065769@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 120736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 22:10:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=120736 Change 120736 by piso@piso_newluxor on 2007/06/01 22:09:18 Clear the interrupt in case a filter is run, or do that after the ithread ran. Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#10 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#10 (text+ko) ==== @@ -398,13 +398,13 @@ struct fhc_clr *fc = arg; int res; - if (fc->fc_filter != NULL) + if (fc->fc_filter != NULL) { res = fc->fc_filter(fc->fc_arg); - else - res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; + bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0); + bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR); + } else + res = FILTER_SCHEDULE_THREAD; - bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0); - bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR); return (res); } @@ -414,6 +414,10 @@ struct fhc_clr *fc = arg; fc->fc_func(fc->fc_arg); + if (fc->fc_filter == NULL) { + bus_space_write_4(fc->fc_bt, fc->fc_bh, FHC_ICLR, 0x0); + bus_space_read_4(fc->fc_bt, fc->fc_bh, FHC_ICLR); + } } static struct resource * From owner-p4-projects@FreeBSD.ORG Fri Jun 1 22:15:26 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 E3FFD16A469; Fri, 1 Jun 2007 22:15: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 9DE4916A421 for ; Fri, 1 Jun 2007 22:15:25 +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 8F79F13C447 for ; Fri, 1 Jun 2007 22:15:25 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51MFPhn071219 for ; Fri, 1 Jun 2007 22:15:25 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51MFPoK071209 for perforce@freebsd.org; Fri, 1 Jun 2007 22:15:25 GMT (envelope-from piso@freebsd.org) Date: Fri, 1 Jun 2007 22:15:25 GMT Message-Id: <200706012215.l51MFPoK071209@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 120737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 22:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=120737 Change 120737 by piso@piso_newluxor on 2007/06/01 22:14:38 -correctly schedule the ithread in case there's no filter and mask the src in the meantime -correctly clear the interrupt src after the filter or th ithread ran Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#13 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#13 (text+ko) ==== @@ -635,11 +635,11 @@ int res; scl = (struct sbus_clr *)arg; - if (scl->scl_handler != NULL) + if (scl->scl_handler != NULL) { res = scl->scl_filter(scl->scl_arg); - else - res = FILTER_HANDLED | FILTER_SCHEDULE_THREAD; - SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); + SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); + } else + res = FILTER_SCHEDULE_THREAD; return (res); } @@ -650,6 +650,8 @@ scl = (struct sbus_clr *)arg; scl->scl_handler(scl->scl_arg); + if (scl->scl_handler == NULL) + SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); } static int From owner-p4-projects@FreeBSD.ORG Fri Jun 1 22:42: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 4F74416A4C8; Fri, 1 Jun 2007 22:42: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 EC88016A4C2 for ; Fri, 1 Jun 2007 22:42:01 +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 D8BF313C4AE for ; Fri, 1 Jun 2007 22:42:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51Mg171096063 for ; Fri, 1 Jun 2007 22:42:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51Mg1r9096047 for perforce@freebsd.org; Fri, 1 Jun 2007 22:42:01 GMT (envelope-from marcel@freebsd.org) Date: Fri, 1 Jun 2007 22:42:01 GMT Message-Id: <200706012242.l51Mg1r9096047@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 120741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 22:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120741 Change 120741 by marcel@marcel_xcllnt on 2007/06/01 22:41:17 o db_read_bytes() & db_write_bytes() return an int. o remove src/sys/powerpc/powerpc/machdep.c Affected files ... .. //depot/projects/e500/sys/powerpc/powerpc/db_memrw.c#2 edit .. //depot/projects/e500/sys/powerpc/powerpc/machdep.c#4 delete Differences ... ==== //depot/projects/e500/sys/powerpc/powerpc/db_memrw.c#2 (text+ko) ==== @@ -53,13 +53,10 @@ /* * Read bytes from kernel address space for debugger. */ -void -db_read_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; +int +db_read_bytes(vm_offset_t addr, size_t size, char *data) { - register char *src = (char*)addr; + char *src = (char*)addr; if (size == 4) { *((int*)data) = *((int*)src); @@ -80,13 +77,10 @@ /* * Write bytes to kernel address space for debugger. */ -void -db_write_bytes(addr, size, data) - vm_offset_t addr; - register size_t size; - register char *data; +int +db_write_bytes(vm_offset_t addr, size_t size, char *data) { - register char *dst = (char *)addr; + char *dst = (char *)addr; if (size == 4) { From owner-p4-projects@FreeBSD.ORG Fri Jun 1 23:12: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 B4B8816A41F; Fri, 1 Jun 2007 23:12:39 +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 03F2F16A468 for ; Fri, 1 Jun 2007 23:12:39 +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 E6E1E13C45E for ; Fri, 1 Jun 2007 23:12:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51NCcOV018356 for ; Fri, 1 Jun 2007 23:12:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51NAPCY016063 for perforce@freebsd.org; Fri, 1 Jun 2007 23:10:25 GMT (envelope-from marcel@freebsd.org) Date: Fri, 1 Jun 2007 23:10:25 GMT Message-Id: <200706012310.l51NAPCY016063@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 120742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 23:12:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=120742 Change 120742 by marcel@marcel_xcllnt on 2007/06/01 23:09:12 IFC @120735 Affected files ... .. //depot/projects/powerpc/MAINTAINERS#4 integrate .. //depot/projects/powerpc/Makefile#3 integrate .. //depot/projects/powerpc/Makefile.inc1#7 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#8 integrate .. //depot/projects/powerpc/UPDATING#9 integrate .. //depot/projects/powerpc/bin/chflags/chflags.1#2 integrate .. //depot/projects/powerpc/bin/csh/config.h#3 integrate .. //depot/projects/powerpc/bin/csh/config_p.h#3 integrate .. //depot/projects/powerpc/bin/pax/ar_io.c#2 integrate .. //depot/projects/powerpc/bin/pax/file_subs.c#2 integrate .. //depot/projects/powerpc/bin/pax/pat_rep.c#2 integrate .. //depot/projects/powerpc/bin/pax/sel_subs.c#2 integrate .. //depot/projects/powerpc/bin/pax/tables.c#2 integrate .. //depot/projects/powerpc/bin/rcp/rcp.c#2 integrate .. //depot/projects/powerpc/contrib/csup/queue.h#2 integrate .. //depot/projects/powerpc/contrib/file/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/powerpc/contrib/file/Localstuff#2 integrate .. //depot/projects/powerpc/contrib/file/MAINT#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/animation#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/archive#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/audio#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/cad#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/powerpc/contrib/file/Magdir/commands#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/console#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/database#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/editors#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/elf#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/images#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/java#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/linux#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/mach#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/mime#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/mips#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/os2#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/os400#1 branch .. //depot/projects/powerpc/contrib/file/Magdir/perl#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/python#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/revision#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/riff#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/sql#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/sun#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/tex#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/unicode#1 branch .. //depot/projects/powerpc/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/powerpc/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/powerpc/contrib/file/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/file/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/file/README#2 integrate .. //depot/projects/powerpc/contrib/file/apprentice.c#2 integrate .. //depot/projects/powerpc/contrib/file/apptype.c#2 integrate .. //depot/projects/powerpc/contrib/file/ascmagic.c#2 integrate .. //depot/projects/powerpc/contrib/file/compress.c#2 integrate .. //depot/projects/powerpc/contrib/file/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/file/configure#2 integrate .. //depot/projects/powerpc/contrib/file/configure.in#2 integrate .. //depot/projects/powerpc/contrib/file/file.c#2 integrate .. //depot/projects/powerpc/contrib/file/file.h#2 integrate .. //depot/projects/powerpc/contrib/file/fsmagic.c#2 integrate .. //depot/projects/powerpc/contrib/file/funcs.c#2 integrate .. //depot/projects/powerpc/contrib/file/install-sh#2 integrate .. //depot/projects/powerpc/contrib/file/is_tar.c#2 integrate .. //depot/projects/powerpc/contrib/file/magic.c#2 integrate .. //depot/projects/powerpc/contrib/file/magic.h#2 integrate .. //depot/projects/powerpc/contrib/file/magic.mime#2 integrate .. //depot/projects/powerpc/contrib/file/magic2mime#2 integrate .. //depot/projects/powerpc/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/powerpc/contrib/file/names.h#2 integrate .. //depot/projects/powerpc/contrib/file/patchlevel.h#2 integrate .. //depot/projects/powerpc/contrib/file/print.c#2 integrate .. //depot/projects/powerpc/contrib/file/readelf.c#2 integrate .. //depot/projects/powerpc/contrib/file/softmagic.c#2 integrate .. //depot/projects/powerpc/contrib/file/tar.h#2 integrate .. //depot/projects/powerpc/contrib/file/test.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/BASE-VER#1 branch .. //depot/projects/powerpc/contrib/gcc/COPYING#2 integrate .. //depot/projects/powerpc/contrib/gcc/COPYING.LIB#2 integrate .. //depot/projects/powerpc/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/powerpc/contrib/gcc/ChangeLog.0#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.1#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.2#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.3#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.4#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.5#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.6#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.7#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/powerpc/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/powerpc/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/powerpc/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/powerpc/contrib/gcc/LANGUAGES#2 integrate .. //depot/projects/powerpc/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/gcc/README-fixinc#2 delete .. //depot/projects/powerpc/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/powerpc/contrib/gcc/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/gcc/addresses.h#1 branch .. //depot/projects/powerpc/contrib/gcc/alias.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/alias.h#1 branch .. //depot/projects/powerpc/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/ansidecl.h#2 delete .. //depot/projects/powerpc/contrib/gcc/attribs.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/basic-block.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/bitmap.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/builtin-attrs.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/builtins.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/builtins.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-aux-info.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-common.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-common.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-common.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-convert.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-dump.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-errors.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-format.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-format.h#1 branch .. //depot/projects/powerpc/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/powerpc/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/powerpc/contrib/gcc/c-omp.c#1 branch .. //depot/projects/powerpc/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-parse.in#2 delete .. //depot/projects/powerpc/contrib/gcc/c-parser.c#1 branch .. //depot/projects/powerpc/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-pragma.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-pretty-print.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-pretty-print.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/c.opt#2 integrate .. //depot/projects/powerpc/contrib/gcc/caller-save.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/calls.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfg.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/powerpc/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfglayout.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgloop.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/choose-temp.c#2 delete .. //depot/projects/powerpc/contrib/gcc/collect2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/collect2.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/combine.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/common.opt#2 integrate .. //depot/projects/powerpc/contrib/gcc/concat.c#2 delete .. //depot/projects/powerpc/contrib/gcc/conditions.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config.build#2 integrate .. //depot/projects/powerpc/contrib/gcc/config.gcc#2 integrate .. //depot/projects/powerpc/contrib/gcc/config.host#2 integrate .. //depot/projects/powerpc/contrib/gcc/config.in#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/alpha-protos.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/alpha.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/alpha.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/alpha.md#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/elf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/ev4.md#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/ev5.md#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/ev6.md#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/freebsd.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/gnu.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/linux-elf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/linux.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/netbsd.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/openbsd.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/osf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/osf5.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/qrnnd.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-crtfm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-ieee#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-osf4#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-vms#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/unicosmk.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/va_list.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-cc.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-crt0-64.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-crt0.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-dwarf2.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-dwarf2eh.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-ld.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-psxcrt0-64.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms-psxcrt0.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms64.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/vms_tramp.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/x-vms#2 delete .. //depot/projects/powerpc/contrib/gcc/config/alpha/xm-vms.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/arm/README-interworking#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/crti.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/crtn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/ecos-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/lib1funcs.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/linux-gas.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/netbsd-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/pe.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/pe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/semi.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/semiaof.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/strongarm-coff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/strongarm-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/strongarm-pe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/t-arm-coff#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-arm-elf#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/t-linux#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-pe#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-semi#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-strongarm-pe#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/t-xscale-elf#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/uclinux-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/unknown-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/xscale-coff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/xscale-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/darwin-c.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/powerpc/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/dbx.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/dbxcoff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/dbxelf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/elfos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/fp-bit.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/fp-bit.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/freebsd-nthr.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/frv/cmovd.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/cmovh.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/cmovw.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv-abi.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv-asm.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv-modes.def#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv-protos.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frv.md#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frvbegin.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/frvend.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/lib1funcs.asm#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/t-frv#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/gnu.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/gofast.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/athlon.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/att.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/beos-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/biarch64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/bsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/crtdll.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/cygwin.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/cygwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/djgpp.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/freebsd-aout.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/gas.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/gmon-sol2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/gnu.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-aout.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-coff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-interix.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-interix3.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/i386elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/k6.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/linux-aout.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/lynx-ng.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/lynx.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/mingw32.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/moss.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/pentium.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/pmmintrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/ppro.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/ptx4-i.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/rtemself.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sco5.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2-c1.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2-gc1.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sol2.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/svr3dbx.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/svr3gas.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/sysv3.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/sysv4-cpp.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sysv4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/sysv5.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-linux64#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-mingw32#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-sol2#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/udk.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/uwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/vsta.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/winnt.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/x-cygwin#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/powerpc/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/xm-djgpp.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/xm-mingw32.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/crtbegin.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/crtend.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/crti.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/crtn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/fde-glibc.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64-c.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/ia64/ia64intrin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/lib1funcs.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/ia64/quadlib.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/t-ia64#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/interix.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/interix3.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/libgloss.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/linux-aout.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/lynx-ng.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/lynx.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/memset.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/netbsd-aout.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/netbsd-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/netbsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/openbsd-oldgas.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/openbsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/ptx4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/altivec-defs.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-tramp.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabi-ci.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabi-cn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabi.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabialtivec.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabisim.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/eabispe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/gnu.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linuxaltivec.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/lynx.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/ppc64-fp.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sol-ci.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sol-cn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/sysv4le.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-beos#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-darwin#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/tramp.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/windiss.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/powerpc/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/rtems.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/s390-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/s390x.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/t-linux#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sol2.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/aout.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/biarch64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/cypress.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/elf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/hypersparc.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/linux.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/lite.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/litecoff.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/liteelf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/openbsd.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/openbsd64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/pbd.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/rtemself.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-64.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-bi.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-c1.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/sp64-aout.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/sp64-elf.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sp86x-elf.h#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc-modes.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/sparclet.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/supersparc.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/sysv4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/powerpc/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/t-sparclite#2 delete .. //depot/projects/powerpc/contrib/gcc/config/sparc/ultra1_2.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/ultra3.md#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/svr3.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/svr4.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-darwin#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/powerpc/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/powerpc/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-linux#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-linux-gnulibc1#2 delete .. //depot/projects/powerpc/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/powerpc/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/powerpc/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/usegas.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/powerpc/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/powerpc/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/powerpc/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/powerpc/contrib/gcc/config/x-linux#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/powerpc/contrib/gcc/configure#2 integrate .. //depot/projects/powerpc/contrib/gcc/configure.ac#2 integrate .. //depot/projects/powerpc/contrib/gcc/conflict.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/convert.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/convert.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/coverage.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/coverage.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp-demangle.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/powerpc/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog.1#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog.2#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/NEWS#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/config-lang.in#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/powerpc/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/decl.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/dump.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/expr.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/friend.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/lex.h#2 delete .. //depot/projects/powerpc/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/optimize.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/ptree.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/repo.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cplus-dem.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cppdefault.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/cppdefault.h#2 integrate .. //depot/projects/powerpc/contrib/gcc/cpperror.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cppexp.c#2 delete .. //depot/projects/powerpc/contrib/gcc/cppfiles.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 1 23:22: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 51ACF16A468; Fri, 1 Jun 2007 23:22: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 CE22E16A400 for ; Fri, 1 Jun 2007 23:22:58 +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 BD43613C457 for ; Fri, 1 Jun 2007 23:22:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51NMwrN028143 for ; Fri, 1 Jun 2007 23:22:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51NMpco028015 for perforce@freebsd.org; Fri, 1 Jun 2007 23:22:51 GMT (envelope-from sam@freebsd.org) Date: Fri, 1 Jun 2007 23:22:51 GMT Message-Id: <200706012322.l51NMpco028015@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 120743 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 23:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=120743 Change 120743 by sam@sam_laptop on 2007/06/01 23:22:07 IFC Affected files ... .. //depot/projects/wifi/Makefile.inc1#36 integrate .. //depot/projects/wifi/UPDATING#31 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#8 integrate .. //depot/projects/wifi/bin/pax/ar_io.c#3 integrate .. //depot/projects/wifi/bin/pax/file_subs.c#2 integrate .. //depot/projects/wifi/bin/pax/pat_rep.c#2 integrate .. //depot/projects/wifi/bin/pax/sel_subs.c#2 integrate .. //depot/projects/wifi/bin/pax/tables.c#2 integrate .. //depot/projects/wifi/contrib/file/ChangeLog#4 integrate .. //depot/projects/wifi/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/file/LEGAL.NOTICE#3 integrate .. //depot/projects/wifi/contrib/file/Localstuff#2 integrate .. //depot/projects/wifi/contrib/file/MAINT#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/animation#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/archive#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/audio#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/cad#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/wifi/contrib/file/Magdir/commands#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/console#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/database#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/editors#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/elf#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/images#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/java#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/linux#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/mach#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/mime#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/mips#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/os2#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/os400#1 branch .. //depot/projects/wifi/contrib/file/Magdir/perl#4 integrate .. //depot/projects/wifi/contrib/file/Magdir/python#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/revision#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/riff#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sql#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/sun#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/tex#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/unicode#1 branch .. //depot/projects/wifi/contrib/file/Magdir/varied.out#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/wifi/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/wifi/contrib/file/Makefile.am#4 integrate .. //depot/projects/wifi/contrib/file/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/file/README#2 integrate .. //depot/projects/wifi/contrib/file/apprentice.c#4 integrate .. //depot/projects/wifi/contrib/file/apptype.c#2 integrate .. //depot/projects/wifi/contrib/file/ascmagic.c#4 integrate .. //depot/projects/wifi/contrib/file/compress.c#4 integrate .. //depot/projects/wifi/contrib/file/config.h.in#4 integrate .. //depot/projects/wifi/contrib/file/configure#4 integrate .. //depot/projects/wifi/contrib/file/configure.in#4 integrate .. //depot/projects/wifi/contrib/file/file.c#4 integrate .. //depot/projects/wifi/contrib/file/file.h#4 integrate .. //depot/projects/wifi/contrib/file/fsmagic.c#4 integrate .. //depot/projects/wifi/contrib/file/funcs.c#4 integrate .. //depot/projects/wifi/contrib/file/install-sh#3 integrate .. //depot/projects/wifi/contrib/file/is_tar.c#3 integrate .. //depot/projects/wifi/contrib/file/magic.c#4 integrate .. //depot/projects/wifi/contrib/file/magic.h#3 integrate .. //depot/projects/wifi/contrib/file/magic.mime#4 integrate .. //depot/projects/wifi/contrib/file/magic2mime#3 integrate .. //depot/projects/wifi/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/wifi/contrib/file/names.h#3 integrate .. //depot/projects/wifi/contrib/file/patchlevel.h#4 integrate .. //depot/projects/wifi/contrib/file/print.c#4 integrate .. //depot/projects/wifi/contrib/file/readelf.c#4 integrate .. //depot/projects/wifi/contrib/file/softmagic.c#4 integrate .. //depot/projects/wifi/contrib/file/tar.h#3 integrate .. //depot/projects/wifi/contrib/file/test.c#3 integrate .. //depot/projects/wifi/contrib/gcc/gcc.c#5 integrate .. //depot/projects/wifi/crypto/openssh/pathnames.h#4 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#10 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#30 integrate .. //depot/projects/wifi/etc/etc.amd64/ttys#2 integrate .. //depot/projects/wifi/etc/etc.arm/ttys#2 integrate .. //depot/projects/wifi/etc/etc.i386/ttys#2 integrate .. //depot/projects/wifi/etc/etc.ia64/ttys#2 integrate .. //depot/projects/wifi/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/wifi/etc/etc.sparc64/ttys#7 integrate .. //depot/projects/wifi/etc/login.conf#3 integrate .. //depot/projects/wifi/etc/rc.d/cleanvar#6 integrate .. //depot/projects/wifi/etc/rc.d/initrandom#4 integrate .. //depot/projects/wifi/etc/rc.d/jail#10 integrate .. //depot/projects/wifi/etc/rc.d/tmp#4 integrate .. //depot/projects/wifi/etc/rc.d/var#6 integrate .. //depot/projects/wifi/etc/root/dot.cshrc#2 integrate .. //depot/projects/wifi/etc/root/dot.profile#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#23 integrate .. //depot/projects/wifi/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc_tools/Makefile#6 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#25 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#17 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#16 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/wifi/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_platform.h#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#15 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#14 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#16 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_compress.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_cpio.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#12 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#18 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.h#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.3#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#10 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#10 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#18 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#10 integrate .. //depot/projects/wifi/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/wifi/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/wifi/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/wifi/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/wifi/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/wifi/lib/libarchive/test/README#2 integrate .. //depot/projects/wifi/lib/libarchive/test/main.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test.h#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/wifi/lib/libc/amd64/Symbol.map#4 integrate .. //depot/projects/wifi/lib/libc/arm/Symbol.map#5 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/wifi/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/wifi/lib/libc/i386/Symbol.map#5 integrate .. //depot/projects/wifi/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/net/Symbol.map#6 integrate .. //depot/projects/wifi/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/powerpc/Symbol.map#5 integrate .. //depot/projects/wifi/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/regex/engine.c#8 integrate .. //depot/projects/wifi/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/sparc64/Symbol.map#4 integrate .. //depot/projects/wifi/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/wifi/lib/libfetch/Makefile#6 integrate .. //depot/projects/wifi/lib/libfetch/fetch.3#5 integrate .. //depot/projects/wifi/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/wifi/lib/libmagic/config.h#4 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/wifi/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/wifi/lib/ncurses/form/Makefile#3 integrate .. //depot/projects/wifi/lib/ncurses/menu/Makefile#3 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/wifi/lib/ncurses/panel/Makefile#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/install.sgml#9 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/wifi/release/doc/share/sgml/release.ent#7 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/geom_stripe.c#9 integrate .. //depot/projects/wifi/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/wifi/sbin/savecore/savecore.c#8 integrate .. //depot/projects/wifi/share/man/man4/Makefile#37 integrate .. //depot/projects/wifi/share/man/man4/mmc.4#1 branch .. //depot/projects/wifi/share/man/man4/mmcsd.4#1 branch .. //depot/projects/wifi/share/man/man4/ng_bpf.4#4 integrate .. //depot/projects/wifi/share/man/man4/pcm.4#8 integrate .. //depot/projects/wifi/share/man/man4/pty.4#5 integrate .. //depot/projects/wifi/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#17 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#30 integrate .. //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#5 integrate .. //depot/projects/wifi/share/man/man9/locking.9#2 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#17 integrate .. //depot/projects/wifi/share/mk/Makefile#8 integrate .. //depot/projects/wifi/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/wifi/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/wifi/share/skel/dot.cshrc#2 integrate .. //depot/projects/wifi/share/skel/dot.profile#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#20 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#13 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#12 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#26 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#19 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_io.c#9 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/wifi/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/wifi/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/wifi/sys/kern/init_main.c#18 integrate .. //depot/projects/wifi/sys/kern/kern_acct.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_alq.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_clock.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#20 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#18 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_proc.c#15 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#20 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#18 integrate .. //depot/projects/wifi/sys/kern/subr_trap.c#11 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/wifi/sys/kern/vfs_aio.c#17 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/wifi/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#41 integrate .. //depot/projects/wifi/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#10 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#16 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#13 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#18 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#7 integrate .. //depot/projects/wifi/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/wifi/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#16 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/wifi/sys/sys/proc.h#29 integrate .. //depot/projects/wifi/sys/sys/resource.h#5 integrate .. //depot/projects/wifi/sys/sys/resourcevar.h#5 integrate .. //depot/projects/wifi/sys/sys/vmmeter.h#4 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_inode.c#11 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_bmap.c#6 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#13 integrate .. //depot/projects/wifi/sys/vm/swap_pager.c#19 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#24 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#14 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#18 integrate .. //depot/projects/wifi/sys/vm/vm_glue.c#14 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#19 integrate .. //depot/projects/wifi/sys/vm/vm_meter.c#11 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#12 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#21 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#19 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#25 integrate .. //depot/projects/wifi/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/wifi/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/wifi/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/wifi/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/wifi/usr.bin/file/config.h#4 integrate .. //depot/projects/wifi/usr.bin/file/file.1#5 integrate .. //depot/projects/wifi/usr.bin/file/magic.5#5 integrate .. //depot/projects/wifi/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/wifi/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/wifi/usr.bin/less/lesspipe.sh#4 integrate .. //depot/projects/wifi/usr.bin/make/main.c#26 integrate .. //depot/projects/wifi/usr.bin/tar/Makefile#12 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.1#12 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.c#11 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/wifi/usr.bin/tar/read.c#11 integrate .. //depot/projects/wifi/usr.bin/tar/write.c#16 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.c#3 integrate .. //depot/projects/wifi/usr.sbin/ppp/command.c#6 integrate .. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#13 integrate .. //depot/projects/wifi/usr.sbin/ppp/radius.c#5 integrate .. //depot/projects/wifi/usr.sbin/ppp/radius.h#3 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/wifi/UPDATING#31 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/wifi/bin/chflags/chflags.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/wifi/bin/pax/ar_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/wifi/bin/pax/file_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/wifi/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/wifi/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/wifi/bin/pax/tables.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/wifi/contrib/file/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + +2007-02-08 17:30 Christos Zoulas + + * fix integer underflow in file_printf which can lead to + to exploitable heap overflow (Jean-Sebastien Guay-Lero) + +2007-02-05 11:35 Christos Zoulas + + * make socket/pipe reading more robust + +2007-01-25 16:01 Christos Zoulas + + * Centralize all the tests in file_buffer. + + * Add exclude flag. + +2007-01-18 05:29 Anon Ymous + + * Move the "type" detection code from parse() into its own table + driven routine. This avoids maintaining multiple lists in + file.h. + + * Add an optional conditional field (ust before the type field). + This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is + likely to go away. + +2007-01-16 23:24 Anon Ymous + + * Fix an initialization bug in check_mem(). + +2007-01-16 14:58 Anon Ymous + + * Add a "default" type to print a message if nothing previously + matched at that level or since the last default at that + level. This is useful for setting up switch-like statements. + It can also be used to do if/else constructions without a + redundant second test. + + * Fix the "x" special case test so that one can test for that + string with "=x". + + * Allow "search" to search the entire buffer if the "/N" + search count is missing. + + * Make "regex" work! It now starts its search at the + specified offset and takes an (optional) "/N" line count to + specify the search range; otherwise it searches to the end + of the file. The match is now grabbed correctly for format + strings and the offset set to the end of the match. + + * Add a "/s" flag to "regex" and "search" to set the offset to + the start of the match. By default the offset is set to the + end of the match, as it is with other tests. This is mostly + useful for "regex". + + * Make "search", "string" and "pstring" use the same + file_strncmp() routine so that they support the same flags; + "bestring16" and "lestring16" call the same routine, but + with flags = 0. Also add a "/C" flag (in analogy to "/c") + to ignore the case on uppercase (lowercase) characters in + the test string. + + * Strict adherence to C style string escapes. A warnings are + printed when compiling. Note: previously "\a" was + incorrectly translated to 'a' instead of an (i.e., + BELL, typically 0x07). + + * Make this compile with "-Wall -Wextra" and all the warning + flags used with WARNS=4 in the NetBSD source. Also make it + pass lint. + + * Many "cleanups" and hopefully not too many new bugs! + +2007-01-16 14:56 Anon Ymous + + * make several more files compile with gcc warnings + on and also make them pass lint. + +2007-01-16 14:54 Anon Ymous + + * fix a puts()/putc() usage goof in file.c + + * make file.c compile with gcc warnings and pass lint + +2006-12-11 16:49 Christos Zoulas + + * fix byteswapping issue + + * report the number of bytes we tried to + allocate when allocation fails + + * add a few missed cases in the strength routine + +2006-12-08 16:32 Christos Zoulas + + * store and print the line number of the magic + entry for debugging. + + * if the magic entry did not print anything, + don't treat it as a match + + * change the magic strength algorithm to take + into account the relationship op. + + * fix a bug in search where we could accidentally + return a match. + + * propagate the error return from match to + file_softmagic. + +2006-11-25 13:35 Christos Zoulas + + * Don't store the current offset in the magic + struct, because it needs to be restored and + it was not done properly all the time. Bug + found by: Arkadiusz Miskiewicz + + * Fix problem in the '\0' separator; and don't + print it as an additional separator; print + it as the only separator. + +2006-11-17 10:51 Christos Zoulas + + * Added a -0 option to print a '\0' separator + Etienne Buira + +2006-10-31 15:14 Christos Zoulas + + * Check offset before copying (Mike Frysinger) + + * merge duplicated code + + * add quad date support + + * make sure that we nul terminate desc (Ryoji Kanai) + + * don't process elf notes multiple times + + * allow -z to report empty compressed files + + * use calloc to initialize the ascii buffers (Jos van den Oever) + +2006-06-08 11:11 Christos Zoulas + + * QNX fixes (Mike Gorchak) + + * Add quad support. + + * FIFO checks (Dr. Werner Fink) + + * Linux ELF fixes (Dr. Werner Fink) + + * Magic format checks (Dr. Werner Fink) + + * Magic format function improvent (Karl Chen) + +2006-05-03 11:11 Christos Zoulas + + * Pick up some elf changes and some constant fixes from SUSE + + * Identify gnu tar vs. posix tar + + * When keep going, don't print spurious newlines (Radek Vokál) + +2006-04-01 12:02 Christos Zoulas + + * Use calloc instead of malloc (Mike Frysinger) + + * Fix configure script to detect wctypes.h (Mike Frysinger) + 2006-03-02 16:06 Christos Zoulas * Print empty if the file is (Mike Frysinger) ==== //depot/projects/wifi/contrib/file/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.5 2006/06/19 07:53:49 obrien Exp $ +$FreeBSD: src/contrib/file/FREEBSD-upgrade,v 1.7 2007/05/24 22:02:49 obrien Exp $ Christos Zoulas `file' originals can be found at: ftp://ftp.astron.com/pub/file/ @@ -13,12 +13,12 @@ mv -i doc/* . rm -rf doc rm -rf python - rm lt* - rm missing depcomp - rm config.{guess,sub} + rm -f lt* + rm -f missing depcomp + rm -f config.{guess,sub} - cvs import -m "Virgin import of Christos Zoulas's FILE 4.17." \ - src/contrib/file ZOULAS file_4_17 + cvs import -m "Virgin import of Christos Zoulas's FILE 4.21." \ + src/contrib/file ZOULAS file_4_21 Never make local changes to ZOULAS `file'. Christos is very willing to ==== //depot/projects/wifi/contrib/file/LEGAL.NOTICE#3 (text+ko) ==== @@ -1,7 +1,7 @@ -$Id: LEGAL.NOTICE,v 1.14 2004/09/11 19:15:56 christos Exp $ +$File: LEGAL.NOTICE,v 1.15 2006/05/03 18:48:33 christos Exp $ Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. Software written by Ian F. Darwin and others; -maintained 1994-2004 Christos Zoulas. +maintained 1994- Christos Zoulas. This software is not subject to any export provision of the United States Department of Commerce, and may be exported to any country or planet. ==== //depot/projects/wifi/contrib/file/Localstuff#2 (text+ko) ==== @@ -2,6 +2,6 @@ #------------------------------------------------------------------------------ # Localstuff: file(1) magic for locally observed files # -# $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ +# $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. ==== //depot/projects/wifi/contrib/file/MAINT#2 (text+ko) ==== @@ -1,33 +1,45 @@ -$Id: MAINT,v 1.5 2003/03/23 04:36:37 christos Exp $ +$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $ Maintenance notes: I am continuing to maintain the file command. I welcome your help, but to make my life easier I'd like to request the following: -- Don't change the version numbers! +- Do not distribute changed versions. -If your changes are extensive, I will have to work hard to -integrate them into my version. If you check it into SCCS locally, -the version numbers will likely be kept. IF you check it into RCS -or CVS locally, please use -k to keep the version numbers, and -please use branch deltas (1.21.1, 1.21.2, ...). If you don't do -this, I will likely be unable to use your changes; life's just too -short. +People trying to be helpful occasionally put up their hacked versions +of the file command for anonymous FTP, and people all over the +world get copies of the hacked versions. Within a day or two I am +getting email from around the world asking me why "my" file command +won't compile!!! Needless to say this detracts from the limited +time I have available to work on the actual software. Therefore I +ask you again to please NOT distribute your changed version. If +you need to make changes, please add a patch file next to the +distribution tar, and a README file that clearly explains what you +are trying to fix. -- Do not distribute changed versions. +Thank you for your assistance and cooperation. -People trying to be helpful occasionally put up their hacked versions -of the file command for FTP, then the "archie" server finds and publishes -the hacked version, and people all over the world get copies of it. -Within a day or two I am getting email from around the world -asking me why "my" file command won't compile!!! Needless to say this -detracts from the limited time I have available to work on the actual -software. Therefore I ask you again to please NOT distribute -your changed version. +Code Overview +This is a rough idea of the control flow from the main program: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 1 23:32:26 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 8349516A41F; Fri, 1 Jun 2007 23:32:26 +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 4729716A469 for ; Fri, 1 Jun 2007 23:32:26 +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 35D0713C4AD for ; Fri, 1 Jun 2007 23:32:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51NWQBY038051 for ; Fri, 1 Jun 2007 23:32:26 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51NWBuT037882 for perforce@freebsd.org; Fri, 1 Jun 2007 23:32:11 GMT (envelope-from marcel@freebsd.org) Date: Fri, 1 Jun 2007 23:32:11 GMT Message-Id: <200706012332.l51NWBuT037882@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 120745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 23:32:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=120745 Change 120745 by marcel@marcel_xcllnt on 2007/06/01 23:31:53 IFC @120735 Affected files ... .. //depot/projects/tty/Makefile.inc1#34 integrate .. //depot/projects/tty/UPDATING#36 integrate .. //depot/projects/tty/bin/chflags/chflags.1#11 integrate .. //depot/projects/tty/bin/pax/ar_io.c#6 integrate .. //depot/projects/tty/bin/pax/file_subs.c#3 integrate .. //depot/projects/tty/bin/pax/pat_rep.c#4 integrate .. //depot/projects/tty/bin/pax/sel_subs.c#3 integrate .. //depot/projects/tty/bin/pax/tables.c#3 integrate .. //depot/projects/tty/contrib/file/ChangeLog#4 integrate .. //depot/projects/tty/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/file/LEGAL.NOTICE#4 integrate .. //depot/projects/tty/contrib/file/Localstuff#3 integrate .. //depot/projects/tty/contrib/file/MAINT#3 integrate .. //depot/projects/tty/contrib/file/Magdir/animation#5 integrate .. //depot/projects/tty/contrib/file/Magdir/archive#6 integrate .. //depot/projects/tty/contrib/file/Magdir/audio#6 integrate .. //depot/projects/tty/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/tty/contrib/file/Magdir/cad#3 integrate .. //depot/projects/tty/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/tty/contrib/file/Magdir/commands#4 integrate .. //depot/projects/tty/contrib/file/Magdir/console#5 integrate .. //depot/projects/tty/contrib/file/Magdir/database#4 integrate .. //depot/projects/tty/contrib/file/Magdir/editors#2 integrate .. //depot/projects/tty/contrib/file/Magdir/elf#6 integrate .. //depot/projects/tty/contrib/file/Magdir/filesystems#6 integrate .. //depot/projects/tty/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/tty/contrib/file/Magdir/images#5 integrate .. //depot/projects/tty/contrib/file/Magdir/java#3 integrate .. //depot/projects/tty/contrib/file/Magdir/linux#5 integrate .. //depot/projects/tty/contrib/file/Magdir/lisp#4 integrate .. //depot/projects/tty/contrib/file/Magdir/mach#4 integrate .. //depot/projects/tty/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/tty/contrib/file/Magdir/mime#2 integrate .. //depot/projects/tty/contrib/file/Magdir/mips#2 integrate .. //depot/projects/tty/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/tty/contrib/file/Magdir/msdos#6 integrate .. //depot/projects/tty/contrib/file/Magdir/os2#3 integrate .. //depot/projects/tty/contrib/file/Magdir/os400#1 branch .. //depot/projects/tty/contrib/file/Magdir/perl#5 integrate .. //depot/projects/tty/contrib/file/Magdir/python#5 integrate .. //depot/projects/tty/contrib/file/Magdir/revision#2 integrate .. //depot/projects/tty/contrib/file/Magdir/riff#4 integrate .. //depot/projects/tty/contrib/file/Magdir/sgml#4 integrate .. //depot/projects/tty/contrib/file/Magdir/sql#3 integrate .. //depot/projects/tty/contrib/file/Magdir/sun#3 integrate .. //depot/projects/tty/contrib/file/Magdir/sysex#3 integrate .. //depot/projects/tty/contrib/file/Magdir/tex#3 integrate .. //depot/projects/tty/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/tty/contrib/file/Magdir/unicode#1 branch .. //depot/projects/tty/contrib/file/Magdir/varied.out#4 integrate .. //depot/projects/tty/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/tty/contrib/file/Magdir/vmware#3 integrate .. //depot/projects/tty/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/tty/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/tty/contrib/file/Makefile.am#6 integrate .. //depot/projects/tty/contrib/file/Makefile.in#6 integrate .. //depot/projects/tty/contrib/file/README#4 integrate .. //depot/projects/tty/contrib/file/apprentice.c#6 integrate .. //depot/projects/tty/contrib/file/apptype.c#2 integrate .. //depot/projects/tty/contrib/file/ascmagic.c#6 integrate .. //depot/projects/tty/contrib/file/compress.c#5 integrate .. //depot/projects/tty/contrib/file/config.h.in#6 integrate .. //depot/projects/tty/contrib/file/configure#6 integrate .. //depot/projects/tty/contrib/file/configure.in#6 integrate .. //depot/projects/tty/contrib/file/file.c#6 integrate .. //depot/projects/tty/contrib/file/file.h#6 integrate .. //depot/projects/tty/contrib/file/fsmagic.c#5 integrate .. //depot/projects/tty/contrib/file/funcs.c#4 integrate .. //depot/projects/tty/contrib/file/install-sh#3 integrate .. //depot/projects/tty/contrib/file/is_tar.c#4 integrate .. //depot/projects/tty/contrib/file/magic.c#4 integrate .. //depot/projects/tty/contrib/file/magic.h#3 integrate .. //depot/projects/tty/contrib/file/magic.mime#6 integrate .. //depot/projects/tty/contrib/file/magic2mime#4 integrate .. //depot/projects/tty/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/tty/contrib/file/names.h#4 integrate .. //depot/projects/tty/contrib/file/patchlevel.h#6 integrate .. //depot/projects/tty/contrib/file/print.c#6 integrate .. //depot/projects/tty/contrib/file/readelf.c#6 integrate .. //depot/projects/tty/contrib/file/softmagic.c#6 integrate .. //depot/projects/tty/contrib/file/tar.h#4 integrate .. //depot/projects/tty/contrib/file/test.c#3 integrate .. //depot/projects/tty/contrib/gcc/gcc.c#9 integrate .. //depot/projects/tty/crypto/openssh/pathnames.h#5 integrate .. //depot/projects/tty/crypto/openssh/ssh_config.5#12 integrate .. //depot/projects/tty/crypto/openssh/sshd_config.5#13 integrate .. //depot/projects/tty/etc/defaults/periodic.conf#12 integrate .. //depot/projects/tty/etc/defaults/rc.conf#25 integrate .. //depot/projects/tty/etc/etc.amd64/ttys#3 integrate .. //depot/projects/tty/etc/etc.arm/ttys#3 integrate .. //depot/projects/tty/etc/etc.i386/ttys#3 integrate .. //depot/projects/tty/etc/etc.ia64/ttys#5 integrate .. //depot/projects/tty/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#9 integrate .. //depot/projects/tty/etc/login.conf#4 integrate .. //depot/projects/tty/etc/rc.d/cleanvar#11 integrate .. //depot/projects/tty/etc/rc.d/initrandom#6 integrate .. //depot/projects/tty/etc/rc.d/jail#14 integrate .. //depot/projects/tty/etc/rc.d/tmp#5 integrate .. //depot/projects/tty/etc/rc.d/var#6 integrate .. //depot/projects/tty/etc/root/dot.cshrc#3 integrate .. //depot/projects/tty/etc/root/dot.profile#2 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#29 integrate .. //depot/projects/tty/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/Makefile#10 integrate .. //depot/projects/tty/lib/libarchive/Makefile#14 integrate .. //depot/projects/tty/lib/libarchive/archive.h.in#10 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/tty/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/tty/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/tty/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/tty/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/tty/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/tty/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_compress.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/tty/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/tty/lib/libarchive/archive_util.3#6 integrate .. //depot/projects/tty/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write.3#8 integrate .. //depot/projects/tty/lib/libarchive/archive_write.c#9 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_bzip2.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_gzip.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/tty/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/tty/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/tty/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/tty/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/tty/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/tty/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/tty/lib/libarchive/test/README#2 integrate .. //depot/projects/tty/lib/libarchive/test/main.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test.h#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/tty/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/tty/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/tty/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/tty/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/db/hash/hash.c#4 integrate .. //depot/projects/tty/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/tty/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/tty/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/tty/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/net/Symbol.map#5 integrate .. //depot/projects/tty/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/regex/engine.c#7 integrate .. //depot/projects/tty/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/tty/lib/libfetch/Makefile#12 integrate .. //depot/projects/tty/lib/libfetch/fetch.3#11 integrate .. //depot/projects/tty/lib/libkvm/kvm_proc.c#15 integrate .. //depot/projects/tty/lib/libmagic/config.h#4 integrate .. //depot/projects/tty/lib/libpam/modules/pam_login_access/login_access.c#3 integrate .. //depot/projects/tty/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/tty/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/tty/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/tty/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/tty/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/install.sgml#11 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate .. //depot/projects/tty/release/doc/share/sgml/release.ent#12 integrate .. //depot/projects/tty/sbin/geom/class/stripe/geom_stripe.c#9 integrate .. //depot/projects/tty/sbin/newfs_msdos/newfs_msdos.c#4 integrate .. //depot/projects/tty/sbin/savecore/savecore.c#11 integrate .. //depot/projects/tty/share/man/man4/Makefile#32 integrate .. //depot/projects/tty/share/man/man4/mmc.4#1 branch .. //depot/projects/tty/share/man/man4/mmcsd.4#1 branch .. //depot/projects/tty/share/man/man4/ng_bpf.4#6 integrate .. //depot/projects/tty/share/man/man4/pcm.4#14 integrate .. //depot/projects/tty/share/man/man4/pty.4#8 integrate .. //depot/projects/tty/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/tty/share/man/man4/snd_spicds.4#3 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#21 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#31 integrate .. //depot/projects/tty/share/man/man9/bus_alloc_resource.9#8 integrate .. //depot/projects/tty/share/man/man9/locking.9#2 integrate .. //depot/projects/tty/share/misc/bsd-family-tree#23 integrate .. //depot/projects/tty/share/mk/Makefile#9 integrate .. //depot/projects/tty/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/tty/share/mk/bsd.sys.mk#11 integrate .. //depot/projects/tty/share/skel/dot.cshrc#2 integrate .. //depot/projects/tty/share/skel/dot.profile#2 integrate .. //depot/projects/tty/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/tty/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#23 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/tty/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/tty/sys/arm/arm/busdma_machdep.c#13 integrate .. //depot/projects/tty/sys/arm/arm/intr.c#9 integrate .. //depot/projects/tty/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#21 integrate .. //depot/projects/tty/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/tty/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/tty/sys/boot/i386/Makefile#3 integrate .. //depot/projects/tty/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/tty/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/tty/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/tty/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/tty/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/tty/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/tty/sys/boot/i386/loader/Makefile#10 integrate .. //depot/projects/tty/sys/boot/i386/loader/conf.c#5 integrate .. //depot/projects/tty/sys/boot/i386/loader/main.c#12 integrate .. //depot/projects/tty/sys/cam/README.quirks#1 branch .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/tty/sys/coda/coda_vnops.c#11 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#21 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#15 integrate .. //depot/projects/tty/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/tty/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#21 integrate .. //depot/projects/tty/sys/conf/files#51 integrate .. //depot/projects/tty/sys/conf/options#38 integrate .. //depot/projects/tty/sys/dev/acpica/Osd/OsdHardware.c#12 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#33 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/tty/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/tty/sys/dev/em/README#10 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#24 integrate .. //depot/projects/tty/sys/dev/en/midway.c#19 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#25 integrate .. //depot/projects/tty/sys/dev/md/md.c#20 integrate .. //depot/projects/tty/sys/dev/pccard/pccard.c#16 integrate .. //depot/projects/tty/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/tty/sys/dev/pccbb/pccbb.c#22 integrate .. //depot/projects/tty/sys/dev/pccbb/pccbbvar.h#11 integrate .. //depot/projects/tty/sys/dev/sound/clone.c#1 branch .. //depot/projects/tty/sys/dev/sound/clone.h#1 branch .. //depot/projects/tty/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/tty/sys/dev/sound/pcm/buffer.c#12 integrate .. //depot/projects/tty/sys/dev/sound/pcm/channel.c#17 integrate .. //depot/projects/tty/sys/dev/sound/pcm/channel.h#8 integrate .. //depot/projects/tty/sys/dev/sound/pcm/dsp.c#19 integrate .. //depot/projects/tty/sys/dev/sound/pcm/dsp.h#7 integrate .. //depot/projects/tty/sys/dev/sound/pcm/feeder.c#11 integrate .. //depot/projects/tty/sys/dev/sound/pcm/mixer.c#16 integrate .. //depot/projects/tty/sys/dev/sound/pcm/sndstat.c#11 integrate .. //depot/projects/tty/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/tty/sys/dev/sound/pcm/sound.h#15 integrate .. //depot/projects/tty/sys/dev/sound/pcm/vchan.c#13 integrate .. //depot/projects/tty/sys/dev/sound/pcm/vchan.h#4 integrate .. //depot/projects/tty/sys/dev/sound/unit.c#1 branch .. //depot/projects/tty/sys/dev/sound/unit.h#1 branch .. //depot/projects/tty/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/tty/sys/dev/sound/version.h#1 branch .. //depot/projects/tty/sys/dev/usb/if_ural.c#16 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/tty/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/tty/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/tty/sys/fs/nullfs/null_vfsops.c#16 integrate .. //depot/projects/tty/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/tty/sys/fs/nwfs/nwfs_io.c#13 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_io.c#14 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_node.c#13 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_vnops.c#14 integrate .. //depot/projects/tty/sys/fs/unionfs/union.h#7 integrate .. //depot/projects/tty/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/tty/sys/fs/unionfs/union_vnops.c#14 integrate .. //depot/projects/tty/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/tty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/tty/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/tty/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/tty/sys/i386/i386/identcpu.c#22 integrate .. //depot/projects/tty/sys/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#26 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/tty/sys/i386/i386/sys_machdep.c#16 integrate .. //depot/projects/tty/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/tty/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/tty/sys/i386/include/specialreg.h#11 integrate .. //depot/projects/tty/sys/ia64/ia64/busdma_machdep.c#14 integrate .. //depot/projects/tty/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/tty/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/tty/sys/ia64/ia64/pmap.c#24 integrate .. //depot/projects/tty/sys/kern/init_main.c#22 integrate .. //depot/projects/tty/sys/kern/kern_acct.c#16 integrate .. //depot/projects/tty/sys/kern/kern_alq.c#11 integrate .. //depot/projects/tty/sys/kern/kern_clock.c#19 integrate .. //depot/projects/tty/sys/kern/kern_conf.c#18 integrate .. //depot/projects/tty/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#28 integrate .. //depot/projects/tty/sys/kern/kern_exit.c#25 integrate .. //depot/projects/tty/sys/kern/kern_fork.c#20 integrate .. //depot/projects/tty/sys/kern/kern_intr.c#22 integrate .. //depot/projects/tty/sys/kern/kern_ktrace.c#20 integrate .. //depot/projects/tty/sys/kern/kern_linker.c#18 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#25 integrate .. //depot/projects/tty/sys/kern/kern_mib.c#11 integrate .. //depot/projects/tty/sys/kern/kern_proc.c#19 integrate .. //depot/projects/tty/sys/kern/kern_resource.c#20 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#25 integrate .. //depot/projects/tty/sys/kern/kern_sx.c#9 integrate .. //depot/projects/tty/sys/kern/kern_synch.c#22 integrate .. //depot/projects/tty/sys/kern/kern_thread.c#23 integrate .. //depot/projects/tty/sys/kern/link_elf.c#14 integrate .. //depot/projects/tty/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/tty/sys/kern/subr_trap.c#18 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#25 integrate .. //depot/projects/tty/sys/kern/tty_cons.c#13 integrate .. //depot/projects/tty/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/tty/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/tty/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#24 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/tty/sys/kern/vfs_cluster.c#22 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#29 integrate .. //depot/projects/tty/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/tty/sys/kern/vnode_if.src#12 integrate .. //depot/projects/tty/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/tty/sys/modules/dcons/Makefile#5 integrate .. //depot/projects/tty/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/tty/sys/net/ethernet.h#6 integrate .. //depot/projects/tty/sys/net/if_bridge.c#15 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/tty/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/tty/sys/netinet/sctp.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/tty/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/tty/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/tty/sys/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/tty/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/tty/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/tty/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/tty/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/tty/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/tty/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/tty/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/tty/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/tty/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/tty/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/tty/sys/netinet/sctputil.c#4 integrate .. //depot/projects/tty/sys/netinet/sctputil.h#4 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/tty/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/tty/sys/netinet/tcp_usrreq.c#22 integrate .. //depot/projects/tty/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/tty/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/tty/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/tty/sys/netipsec/key.c#11 integrate .. //depot/projects/tty/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/tty/sys/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/tty/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/tty/sys/pci/ncr.c#14 integrate .. //depot/projects/tty/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/tty/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/tty/sys/powerpc/powerpc/machdep.c#19 integrate .. //depot/projects/tty/sys/security/audit/audit.c#6 integrate .. //depot/projects/tty/sys/security/audit/audit.h#5 integrate .. //depot/projects/tty/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/tty/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/tty/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/tty/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/tty/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/tty/sys/sparc64/sparc64/bus_machdep.c#12 integrate .. //depot/projects/tty/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/tty/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#22 integrate .. //depot/projects/tty/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/tty/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/tty/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/tty/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/tty/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/tty/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/tty/sys/sys/conf.h#17 integrate .. //depot/projects/tty/sys/sys/filedesc.h#13 integrate .. //depot/projects/tty/sys/sys/proc.h#27 integrate .. //depot/projects/tty/sys/sys/resource.h#8 integrate .. //depot/projects/tty/sys/sys/resourcevar.h#11 integrate .. //depot/projects/tty/sys/sys/sx.h#11 integrate .. //depot/projects/tty/sys/sys/syslimits.h#6 integrate .. //depot/projects/tty/sys/sys/vmmeter.h#7 integrate .. //depot/projects/tty/sys/sys/vnode.h#23 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_inode.c#11 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_bmap.c#8 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_extattr.c#14 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_quota.c#16 integrate .. //depot/projects/tty/sys/vm/swap_pager.c#23 integrate .. //depot/projects/tty/sys/vm/uma_core.c#22 integrate .. //depot/projects/tty/sys/vm/vm_contig.c#16 integrate .. //depot/projects/tty/sys/vm/vm_fault.c#21 integrate .. //depot/projects/tty/sys/vm/vm_glue.c#16 integrate .. //depot/projects/tty/sys/vm/vm_map.c#22 integrate .. //depot/projects/tty/sys/vm/vm_meter.c#15 integrate .. //depot/projects/tty/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/tty/sys/vm/vm_object.c#23 integrate .. //depot/projects/tty/sys/vm/vm_page.c#21 integrate .. //depot/projects/tty/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/tty/sys/vm/vm_pageq.c#16 integrate .. //depot/projects/tty/sys/vm/vm_zeroidle.c#14 integrate .. //depot/projects/tty/sys/vm/vnode_pager.c#20 integrate .. //depot/projects/tty/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/tty/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/tty/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/tty/usr.bin/file/config.h#6 integrate .. //depot/projects/tty/usr.bin/file/file.1#8 integrate .. //depot/projects/tty/usr.bin/file/magic.5#7 integrate .. //depot/projects/tty/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/tty/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/tty/usr.bin/less/lesspipe.sh#4 integrate .. //depot/projects/tty/usr.bin/make/main.c#21 integrate .. //depot/projects/tty/usr.bin/tar/Makefile#9 integrate .. //depot/projects/tty/usr.bin/tar/bsdtar.1#10 integrate .. //depot/projects/tty/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/tty/usr.bin/tar/bsdtar.h#6 integrate .. //depot/projects/tty/usr.bin/tar/read.c#9 integrate .. //depot/projects/tty/usr.bin/tar/write.c#12 integrate .. //depot/projects/tty/usr.sbin/dconschat/dconschat.c#6 integrate .. //depot/projects/tty/usr.sbin/ppp/command.c#9 integrate .. //depot/projects/tty/usr.sbin/ppp/ppp.8.m4#14 integrate .. //depot/projects/tty/usr.sbin/ppp/radius.c#7 integrate .. //depot/projects/tty/usr.sbin/ppp/radius.h#5 integrate Differences ... ==== //depot/projects/tty/Makefile.inc1#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/tty/UPDATING#36 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/tty/bin/chflags/chflags.1#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/tty/bin/pax/ar_io.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/tty/bin/pax/file_subs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/tty/bin/pax/pat_rep.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/tty/bin/pax/sel_subs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/tty/bin/pax/tables.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/tty/contrib/file/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + +2007-02-08 17:30 Christos Zoulas + + * fix integer underflow in file_printf which can lead to + to exploitable heap overflow (Jean-Sebastien Guay-Lero) + +2007-02-05 11:35 Christos Zoulas + + * make socket/pipe reading more robust + +2007-01-25 16:01 Christos Zoulas + + * Centralize all the tests in file_buffer. + + * Add exclude flag. + +2007-01-18 05:29 Anon Ymous + + * Move the "type" detection code from parse() into its own table + driven routine. This avoids maintaining multiple lists in + file.h. + + * Add an optional conditional field (ust before the type field). + This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is + likely to go away. + +2007-01-16 23:24 Anon Ymous + + * Fix an initialization bug in check_mem(). + +2007-01-16 14:58 Anon Ymous + + * Add a "default" type to print a message if nothing previously + matched at that level or since the last default at that + level. This is useful for setting up switch-like statements. + It can also be used to do if/else constructions without a + redundant second test. + + * Fix the "x" special case test so that one can test for that + string with "=x". + + * Allow "search" to search the entire buffer if the "/N" + search count is missing. + + * Make "regex" work! It now starts its search at the + specified offset and takes an (optional) "/N" line count to + specify the search range; otherwise it searches to the end + of the file. The match is now grabbed correctly for format + strings and the offset set to the end of the match. + + * Add a "/s" flag to "regex" and "search" to set the offset to + the start of the match. By default the offset is set to the + end of the match, as it is with other tests. This is mostly + useful for "regex". + + * Make "search", "string" and "pstring" use the same + file_strncmp() routine so that they support the same flags; + "bestring16" and "lestring16" call the same routine, but + with flags = 0. Also add a "/C" flag (in analogy to "/c") + to ignore the case on uppercase (lowercase) characters in + the test string. + + * Strict adherence to C style string escapes. A warnings are + printed when compiling. Note: previously "\a" was + incorrectly translated to 'a' instead of an (i.e., + BELL, typically 0x07). + + * Make this compile with "-Wall -Wextra" and all the warning + flags used with WARNS=4 in the NetBSD source. Also make it + pass lint. + + * Many "cleanups" and hopefully not too many new bugs! + +2007-01-16 14:56 Anon Ymous + + * make several more files compile with gcc warnings + on and also make them pass lint. + +2007-01-16 14:54 Anon Ymous + + * fix a puts()/putc() usage goof in file.c + + * make file.c compile with gcc warnings and pass lint + +2006-12-11 16:49 Christos Zoulas + + * fix byteswapping issue + + * report the number of bytes we tried to + allocate when allocation fails + + * add a few missed cases in the strength routine + +2006-12-08 16:32 Christos Zoulas + + * store and print the line number of the magic + entry for debugging. + + * if the magic entry did not print anything, + don't treat it as a match + + * change the magic strength algorithm to take + into account the relationship op. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 1 23:50: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 2EF0216A469; Fri, 1 Jun 2007 23:50:01 +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 CC63E16A41F for ; Fri, 1 Jun 2007 23:50:00 +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 BA77613C455 for ; Fri, 1 Jun 2007 23:50:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l51No0RE057500 for ; Fri, 1 Jun 2007 23:50:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51NnlNT057104 for perforce@freebsd.org; Fri, 1 Jun 2007 23:49:47 GMT (envelope-from marcel@freebsd.org) Date: Fri, 1 Jun 2007 23:49:47 GMT Message-Id: <200706012349.l51NnlNT057104@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 120746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Jun 2007 23:50:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120746 Change 120746 by marcel@marcel_xcllnt on 2007/06/01 23:48:57 IFC @120735 Affected files ... .. //depot/projects/uart/amd64/acpica/madt.c#9 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#19 integrate .. //depot/projects/uart/amd64/amd64/elf_machdep.c#8 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#13 integrate .. //depot/projects/uart/amd64/amd64/io_apic.c#12 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#14 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#27 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/uart/amd64/amd64/mptable.c#7 integrate .. //depot/projects/uart/amd64/amd64/mptable_pci.c#6 integrate .. //depot/projects/uart/amd64/amd64/msi.c#4 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#11 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#46 integrate .. //depot/projects/uart/amd64/amd64/support.S#11 integrate .. //depot/projects/uart/amd64/amd64/trap.c#18 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#14 integrate .. //depot/projects/uart/amd64/conf/GENERIC#28 integrate .. //depot/projects/uart/amd64/conf/NOTES#15 integrate .. //depot/projects/uart/amd64/include/apicvar.h#12 integrate .. //depot/projects/uart/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/uart/amd64/include/md_var.h#9 integrate .. //depot/projects/uart/amd64/include/smp.h#11 integrate .. //depot/projects/uart/amd64/include/specialreg.h#8 integrate .. //depot/projects/uart/amd64/include/vmparam.h#6 integrate .. //depot/projects/uart/amd64/isa/atpic.c#7 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/uart/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#16 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#14 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#13 integrate .. //depot/projects/uart/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/uart/arm/arm/genassym.c#8 integrate .. //depot/projects/uart/arm/arm/intr.c#11 integrate .. //depot/projects/uart/arm/arm/machdep.c#12 integrate .. //depot/projects/uart/arm/arm/pmap.c#22 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#10 integrate .. //depot/projects/uart/arm/conf/AVILA#2 integrate .. //depot/projects/uart/arm/conf/AVILA.hints#1 branch .. //depot/projects/uart/arm/include/asm.h#5 integrate .. //depot/projects/uart/arm/include/pmap.h#16 integrate .. //depot/projects/uart/arm/include/profile.h#3 integrate .. //depot/projects/uart/arm/include/vmparam.h#5 integrate .. //depot/projects/uart/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#18 integrate .. //depot/projects/uart/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/uart/boot/common/loader.8#13 integrate .. //depot/projects/uart/boot/i386/Makefile#3 integrate .. //depot/projects/uart/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/uart/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/uart/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/uart/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/uart/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/uart/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/uart/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/uart/boot/i386/libi386/smbios.c#5 integrate .. //depot/projects/uart/boot/i386/loader/Makefile#8 integrate .. //depot/projects/uart/boot/i386/loader/conf.c#4 integrate .. //depot/projects/uart/boot/i386/loader/main.c#11 integrate .. //depot/projects/uart/boot/ia64/common/exec.c#2 integrate .. //depot/projects/uart/cam/README.quirks#1 branch .. //depot/projects/uart/cam/cam.c#4 integrate .. //depot/projects/uart/cam/cam_periph.c#14 integrate .. //depot/projects/uart/cam/cam_xpt.c#18 integrate .. //depot/projects/uart/cam/cam_xpt.h#5 integrate .. //depot/projects/uart/cam/scsi/scsi_all.c#8 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/uart/cam/scsi/scsi_ch.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#24 integrate .. //depot/projects/uart/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/uart/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/uart/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/uart/coda/coda_vnops.c#14 integrate .. //depot/projects/uart/coda/coda_vnops.h#6 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/uart/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#26 integrate .. //depot/projects/uart/compat/linux/linux_futex.c#4 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#22 integrate .. //depot/projects/uart/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/uart/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#13 integrate .. //depot/projects/uart/conf/Makefile.amd64#7 integrate .. //depot/projects/uart/conf/Makefile.arm#13 integrate .. //depot/projects/uart/conf/Makefile.i386#7 integrate .. //depot/projects/uart/conf/Makefile.ia64#6 integrate .. //depot/projects/uart/conf/Makefile.pc98#7 integrate .. //depot/projects/uart/conf/Makefile.powerpc#6 integrate .. //depot/projects/uart/conf/Makefile.sparc64#6 integrate .. //depot/projects/uart/conf/Makefile.sun4v#2 integrate .. //depot/projects/uart/conf/NOTES#52 integrate .. //depot/projects/uart/conf/files#83 integrate .. //depot/projects/uart/conf/files.amd64#29 integrate .. //depot/projects/uart/conf/files.i386#35 integrate .. //depot/projects/uart/conf/files.pc98#29 integrate .. //depot/projects/uart/conf/kern.mk#10 integrate .. //depot/projects/uart/conf/kern.pre.mk#16 integrate .. //depot/projects/uart/conf/kmod.mk#26 integrate .. //depot/projects/uart/conf/options#49 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/uart/contrib/pf/net/pf.c#13 integrate .. //depot/projects/uart/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/uart/crypto/camellia/camellia.c#1 branch .. //depot/projects/uart/crypto/camellia/camellia.h#1 branch .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#8 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#11 integrate .. //depot/projects/uart/dev/acpica/acpi.c#28 integrate .. //depot/projects/uart/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#13 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_pci.c#11 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#16 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#18 integrate .. //depot/projects/uart/dev/ata/atapi-cam.c#15 integrate .. //depot/projects/uart/dev/ath/if_ath.c#37 integrate .. //depot/projects/uart/dev/bce/if_bce.c#8 integrate .. //depot/projects/uart/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/uart/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/uart/dev/bge/if_bge.c#34 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#22 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#12 integrate .. //depot/projects/uart/dev/ciss/ciss.c#21 integrate .. //depot/projects/uart/dev/ciss/cissvar.h#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/uart/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/uart/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/uart/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/uart/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/uart/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/uart/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/uart/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/uart/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/uart/dev/dcons/dcons.c#3 integrate .. //depot/projects/uart/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/uart/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/uart/dev/de/if_devar.h#3 integrate .. //depot/projects/uart/dev/em/LICENSE#4 integrate .. //depot/projects/uart/dev/em/README#8 integrate .. //depot/projects/uart/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/uart/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/uart/dev/em/e1000_82540.c#1 branch .. //depot/projects/uart/dev/em/e1000_82541.c#1 branch .. //depot/projects/uart/dev/em/e1000_82541.h#1 branch .. //depot/projects/uart/dev/em/e1000_82542.c#1 branch .. //depot/projects/uart/dev/em/e1000_82543.c#1 branch .. //depot/projects/uart/dev/em/e1000_82543.h#1 branch .. //depot/projects/uart/dev/em/e1000_82571.c#1 branch .. //depot/projects/uart/dev/em/e1000_82571.h#1 branch .. //depot/projects/uart/dev/em/e1000_82575.c#1 branch .. //depot/projects/uart/dev/em/e1000_82575.h#1 branch .. //depot/projects/uart/dev/em/e1000_api.c#1 branch .. //depot/projects/uart/dev/em/e1000_api.h#1 branch .. //depot/projects/uart/dev/em/e1000_defines.h#1 branch .. //depot/projects/uart/dev/em/e1000_hw.h#1 branch .. //depot/projects/uart/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/uart/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/uart/dev/em/e1000_mac.c#1 branch .. //depot/projects/uart/dev/em/e1000_mac.h#1 branch .. //depot/projects/uart/dev/em/e1000_manage.c#1 branch .. //depot/projects/uart/dev/em/e1000_manage.h#1 branch .. //depot/projects/uart/dev/em/e1000_nvm.c#1 branch .. //depot/projects/uart/dev/em/e1000_nvm.h#1 branch .. //depot/projects/uart/dev/em/e1000_osdep.h#1 branch .. //depot/projects/uart/dev/em/e1000_phy.c#1 branch .. //depot/projects/uart/dev/em/e1000_phy.h#1 branch .. //depot/projects/uart/dev/em/e1000_regs.h#1 branch .. //depot/projects/uart/dev/em/if_em.c#28 integrate .. //depot/projects/uart/dev/em/if_em.h#24 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#12 delete .. //depot/projects/uart/dev/em/if_em_hw.h#9 delete .. //depot/projects/uart/dev/em/if_em_osdep.h#9 delete .. //depot/projects/uart/dev/en/midway.c#13 integrate .. //depot/projects/uart/dev/firewire/firewire.c#14 integrate .. //depot/projects/uart/dev/firewire/firewire.h#8 integrate .. //depot/projects/uart/dev/firewire/firewirereg.h#9 integrate .. //depot/projects/uart/dev/firewire/fwdev.c#11 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#15 integrate .. //depot/projects/uart/dev/firewire/fwohcireg.h#8 integrate .. //depot/projects/uart/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/uart/dev/firewire/sbp.c#17 integrate .. //depot/projects/uart/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#28 integrate .. //depot/projects/uart/dev/gem/if_gem.c#11 integrate .. //depot/projects/uart/dev/gem/if_gem_pci.c#10 integrate .. //depot/projects/uart/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/uart/dev/hme/if_hme.c#17 integrate .. //depot/projects/uart/dev/hptiop/hptiop.c#1 branch .. //depot/projects/uart/dev/hptiop/hptiop.h#1 branch .. //depot/projects/uart/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/uart/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/uart/dev/isp/isp.c#21 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#23 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#18 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#22 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#17 integrate .. //depot/projects/uart/dev/isp/isp_tpublic.h#11 integrate .. //depot/projects/uart/dev/led/led.c#4 integrate .. //depot/projects/uart/dev/led/led.h#2 integrate .. //depot/projects/uart/dev/lmc/if_lmc.c#10 integrate .. //depot/projects/uart/dev/md/md.c#19 integrate .. //depot/projects/uart/dev/mfi/mfi.c#11 integrate .. //depot/projects/uart/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/uart/dev/mfi/mfi_disk.c#6 integrate .. //depot/projects/uart/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/uart/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/uart/dev/mfi/mfireg.h#7 integrate .. //depot/projects/uart/dev/mfi/mfivar.h#6 integrate .. //depot/projects/uart/dev/mii/brgphy.c#19 integrate .. //depot/projects/uart/dev/mii/mii.c#9 integrate .. //depot/projects/uart/dev/mmc/bridge.h#2 integrate .. //depot/projects/uart/dev/mmc/mmc.c#2 integrate .. //depot/projects/uart/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/uart/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/uart/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/uart/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/uart/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/uart/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/uart/dev/mpt/mpt.c#23 integrate .. //depot/projects/uart/dev/mpt/mpt.h#21 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#25 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#26 integrate .. //depot/projects/uart/dev/mpt/mpt_raid.c#9 integrate .. //depot/projects/uart/dev/msk/if_msk.c#3 integrate .. //depot/projects/uart/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/uart/dev/mxge/eth_z8e.dat.gz.uu#5 integrate .. //depot/projects/uart/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/uart/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/uart/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/uart/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/uart/dev/nve/if_nve.c#8 integrate .. //depot/projects/uart/dev/pccard/pccard.c#17 integrate .. //depot/projects/uart/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#23 integrate .. //depot/projects/uart/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/uart/dev/pci/pci.c#31 integrate .. //depot/projects/uart/dev/pci/pci_if.m#7 integrate .. //depot/projects/uart/dev/pci/pci_pci.c#13 integrate .. //depot/projects/uart/dev/pci/pci_private.h#11 integrate .. //depot/projects/uart/dev/pci/pcib_if.m#6 integrate .. //depot/projects/uart/dev/pci/pcib_private.h#7 integrate .. //depot/projects/uart/dev/pci/pcireg.h#15 integrate .. //depot/projects/uart/dev/pci/pcivar.h#13 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#10 integrate .. //depot/projects/uart/dev/random/yarrow.c#6 integrate .. //depot/projects/uart/dev/sk/if_sk.c#15 integrate .. //depot/projects/uart/dev/sound/clone.c#1 branch .. //depot/projects/uart/dev/sound/clone.h#1 branch .. //depot/projects/uart/dev/sound/isa/ess.c#10 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#12 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#15 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/uart/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/uart/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/uart/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/uart/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/uart/dev/sound/pci/fm801.c#11 integrate .. //depot/projects/uart/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/uart/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#27 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#13 integrate .. //depot/projects/uart/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/uart/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/uart/dev/sound/pci/via8233.c#15 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#16 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.c#11 integrate .. //depot/projects/uart/dev/sound/pcm/buffer.h#9 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#13 integrate .. //depot/projects/uart/dev/sound/pcm/channel.h#8 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.h#7 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/uart/dev/sound/pcm/sndstat.c#8 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#15 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#15 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.c#12 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.h#4 integrate .. //depot/projects/uart/dev/sound/unit.c#1 branch .. //depot/projects/uart/dev/sound/unit.h#1 branch .. //depot/projects/uart/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/uart/dev/sound/version.h#1 branch .. //depot/projects/uart/dev/stge/if_stge.c#4 integrate .. //depot/projects/uart/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/uart/dev/syscons/scmouse.c#8 integrate .. //depot/projects/uart/dev/twa/tw_cl.h#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/uart/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/uart/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/uart/dev/twa/tw_osl.h#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_cam.c#7 integrate .. //depot/projects/uart/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/uart/dev/twa/tw_osl_includes.h#4 integrate .. //depot/projects/uart/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_share.h#5 integrate .. //depot/projects/uart/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#21 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#14 integrate .. //depot/projects/uart/dev/usb/if_axe.c#17 integrate .. //depot/projects/uart/dev/usb/if_axereg.h#8 integrate .. //depot/projects/uart/dev/usb/if_cue.c#12 integrate .. //depot/projects/uart/dev/usb/if_cuereg.h#7 integrate .. //depot/projects/uart/dev/usb/if_kue.c#11 integrate .. //depot/projects/uart/dev/usb/if_kuereg.h#7 integrate .. //depot/projects/uart/dev/usb/if_rue.c#11 integrate .. //depot/projects/uart/dev/usb/if_ruereg.h#6 integrate .. //depot/projects/uart/dev/usb/if_rum.c#1 branch .. //depot/projects/uart/dev/usb/if_rumreg.h#1 branch .. //depot/projects/uart/dev/usb/if_rumvar.h#1 branch .. //depot/projects/uart/dev/usb/if_udav.c#9 integrate .. //depot/projects/uart/dev/usb/if_ural.c#16 integrate .. //depot/projects/uart/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/uart/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/uart/dev/usb/ubsa.c#10 integrate .. //depot/projects/uart/dev/usb/ufoma.c#3 integrate .. //depot/projects/uart/dev/usb/uftdi.c#10 integrate .. //depot/projects/uart/dev/usb/uhid.c#13 integrate .. //depot/projects/uart/dev/usb/ukbd.c#12 integrate .. //depot/projects/uart/dev/usb/ums.c#13 integrate .. //depot/projects/uart/dev/usb/usb.c#14 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#11 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#19 integrate .. //depot/projects/uart/dev/usb/usbdevs#32 integrate .. //depot/projects/uart/fs/devfs/devfs_devs.c#12 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#13 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#19 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#13 integrate .. //depot/projects/uart/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/uart/fs/nwfs/nwfs_io.c#12 integrate .. //depot/projects/uart/fs/procfs/procfs_ioctl.c#8 integrate .. //depot/projects/uart/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#12 integrate .. //depot/projects/uart/fs/smbfs/smbfs_node.c#11 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#12 integrate .. //depot/projects/uart/fs/umapfs/umap_vnops.c#7 integrate .. //depot/projects/uart/fs/unionfs/union.h#6 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/uart/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/uart/geom/geom.h#15 integrate .. //depot/projects/uart/geom/geom_dev.c#15 integrate .. //depot/projects/uart/geom/geom_disk.c#14 integrate .. //depot/projects/uart/geom/geom_disk.h#6 integrate .. //depot/projects/uart/geom/geom_io.c#14 integrate .. //depot/projects/uart/geom/geom_slice.c#8 integrate .. //depot/projects/uart/geom/geom_subr.c#10 integrate .. //depot/projects/uart/geom/part/g_part.c#2 integrate .. //depot/projects/uart/geom/part/g_part.h#2 integrate .. //depot/projects/uart/geom/part/g_part_apm.c#2 integrate .. //depot/projects/uart/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/uart/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/uart/i386/Makefile#2 integrate .. //depot/projects/uart/i386/acpica/madt.c#9 integrate .. //depot/projects/uart/i386/conf/GENERIC#27 integrate .. //depot/projects/uart/i386/conf/NOTES#26 integrate .. //depot/projects/uart/i386/conf/PAE#13 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#22 integrate .. //depot/projects/uart/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/uart/i386/i386/identcpu.c#27 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/uart/i386/i386/io_apic.c#13 integrate .. //depot/projects/uart/i386/i386/local_apic.c#15 integrate .. //depot/projects/uart/i386/i386/machdep.c#29 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#29 integrate .. //depot/projects/uart/i386/i386/mptable.c#8 integrate .. //depot/projects/uart/i386/i386/mptable_pci.c#6 integrate .. //depot/projects/uart/i386/i386/msi.c#4 integrate .. //depot/projects/uart/i386/i386/nexus.c#10 integrate .. //depot/projects/uart/i386/i386/pmap.c#49 integrate .. //depot/projects/uart/i386/i386/support.s#11 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#18 integrate .. //depot/projects/uart/i386/i386/trap.c#20 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/uart/i386/include/apicvar.h#12 integrate .. //depot/projects/uart/i386/include/intr_machdep.h#8 integrate .. //depot/projects/uart/i386/include/proc.h#5 integrate .. //depot/projects/uart/i386/include/smp.h#10 integrate .. //depot/projects/uart/i386/include/specialreg.h#10 integrate .. //depot/projects/uart/i386/include/vmparam.h#6 integrate .. //depot/projects/uart/i386/isa/atpic.c#8 integrate .. //depot/projects/uart/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/uart/i386/linux/linux_support.s#1 branch .. //depot/projects/uart/i386/pci/pci_bus.c#13 integrate .. //depot/projects/uart/ia64/ia64/busdma_machdep.c#11 integrate .. //depot/projects/uart/ia64/ia64/elf_machdep.c#8 integrate .. //depot/projects/uart/ia64/ia64/exception.S#8 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/uart/ia64/ia64/locore.S#5 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#30 integrate .. //depot/projects/uart/ia64/ia64/mca.c#5 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#28 integrate .. //depot/projects/uart/ia64/ia64/trap.c#21 integrate .. //depot/projects/uart/ia64/include/ia64_cpu.h#5 integrate .. //depot/projects/uart/ia64/include/vmparam.h#8 integrate .. //depot/projects/uart/kern/Make.tags.inc#4 integrate .. //depot/projects/uart/kern/imgact_elf.c#10 integrate .. //depot/projects/uart/kern/init_main.c#20 integrate .. //depot/projects/uart/kern/kern_acct.c#14 integrate .. //depot/projects/uart/kern/kern_alq.c#10 integrate .. //depot/projects/uart/kern/kern_clock.c#14 integrate .. //depot/projects/uart/kern/kern_condvar.c#10 integrate .. //depot/projects/uart/kern/kern_conf.c#14 integrate .. //depot/projects/uart/kern/kern_descrip.c#29 integrate .. //depot/projects/uart/kern/kern_event.c#18 integrate .. //depot/projects/uart/kern/kern_exec.c#24 integrate .. //depot/projects/uart/kern/kern_exit.c#21 integrate .. //depot/projects/uart/kern/kern_fork.c#21 integrate .. //depot/projects/uart/kern/kern_intr.c#16 integrate .. //depot/projects/uart/kern/kern_ktrace.c#16 integrate .. //depot/projects/uart/kern/kern_linker.c#14 integrate .. //depot/projects/uart/kern/kern_lock.c#18 integrate .. //depot/projects/uart/kern/kern_malloc.c#17 integrate .. //depot/projects/uart/kern/kern_mib.c#8 integrate .. //depot/projects/uart/kern/kern_mtxpool.c#6 integrate .. //depot/projects/uart/kern/kern_mutex.c#21 integrate .. //depot/projects/uart/kern/kern_proc.c#20 integrate .. //depot/projects/uart/kern/kern_resource.c#14 integrate .. //depot/projects/uart/kern/kern_rwlock.c#11 integrate .. //depot/projects/uart/kern/kern_sig.c#35 integrate .. //depot/projects/uart/kern/kern_sx.c#14 integrate .. //depot/projects/uart/kern/kern_synch.c#22 integrate .. //depot/projects/uart/kern/kern_thread.c#27 integrate .. //depot/projects/uart/kern/kern_time.c#12 integrate .. //depot/projects/uart/kern/kern_timeout.c#10 integrate .. //depot/projects/uart/kern/kern_uuid.c#7 integrate .. //depot/projects/uart/kern/link_elf.c#12 integrate .. //depot/projects/uart/kern/link_elf_obj.c#7 integrate .. //depot/projects/uart/kern/subr_bus.c#19 integrate .. //depot/projects/uart/kern/subr_lock.c#5 integrate .. //depot/projects/uart/kern/subr_mbpool.c#4 integrate .. //depot/projects/uart/kern/subr_prof.c#6 integrate .. //depot/projects/uart/kern/subr_rman.c#14 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/uart/kern/subr_trap.c#12 integrate .. //depot/projects/uart/kern/subr_turnstile.c#13 integrate .. //depot/projects/uart/kern/subr_witness.c#24 integrate .. //depot/projects/uart/kern/sys_generic.c#18 integrate .. //depot/projects/uart/kern/sys_pipe.c#23 integrate .. //depot/projects/uart/kern/tty_cons.c#11 integrate .. //depot/projects/uart/kern/uipc_debug.c#2 integrate .. //depot/projects/uart/kern/uipc_domain.c#11 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#18 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#10 integrate .. //depot/projects/uart/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/uart/kern/uipc_socket.c#27 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#29 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#21 integrate .. //depot/projects/uart/kern/vfs_aio.c#20 integrate .. //depot/projects/uart/kern/vfs_bio.c#30 integrate .. //depot/projects/uart/kern/vfs_cache.c#14 integrate .. //depot/projects/uart/kern/vfs_cluster.c#19 integrate .. //depot/projects/uart/kern/vfs_default.c#20 integrate .. //depot/projects/uart/kern/vfs_lookup.c#19 integrate .. //depot/projects/uart/kern/vfs_mount.c#34 integrate .. //depot/projects/uart/kern/vfs_subr.c#42 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#34 integrate .. //depot/projects/uart/kern/vfs_vnops.c#23 integrate .. //depot/projects/uart/kern/vnode_if.src#16 integrate .. //depot/projects/uart/modules/Makefile#49 integrate .. //depot/projects/uart/modules/crypto/Makefile#6 integrate .. //depot/projects/uart/modules/cxgb/Makefile#3 integrate .. //depot/projects/uart/modules/dcons/Makefile#3 integrate .. //depot/projects/uart/modules/em/Makefile#4 integrate .. //depot/projects/uart/modules/hptiop/Makefile#1 branch .. //depot/projects/uart/modules/linux/Makefile#10 integrate .. //depot/projects/uart/modules/mfi/Makefile#5 integrate .. //depot/projects/uart/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/uart/modules/mxge/mxge/Makefile#3 integrate .. //depot/projects/uart/modules/netgraph/Makefile#11 integrate .. //depot/projects/uart/modules/netgraph/car/Makefile#1 branch .. //depot/projects/uart/modules/rum/Makefile#1 branch .. //depot/projects/uart/modules/sound/sound/Makefile#6 integrate .. //depot/projects/uart/modules/twa/Makefile#6 integrate .. //depot/projects/uart/modules/zfs/Makefile#2 integrate .. //depot/projects/uart/net/ethernet.h#5 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/uart/net/if.c#29 integrate .. //depot/projects/uart/net/if.h#14 integrate .. //depot/projects/uart/net/if_bridge.c#16 integrate .. //depot/projects/uart/net/if_ethersubr.c#24 integrate .. //depot/projects/uart/net/if_fwsubr.c#10 integrate .. //depot/projects/uart/net/if_lagg.c#2 integrate .. //depot/projects/uart/net/if_lagg.h#2 integrate .. //depot/projects/uart/net/if_var.h#17 integrate .. //depot/projects/uart/net/pfkeyv2.h#5 integrate .. //depot/projects/uart/net/route.c#12 integrate .. //depot/projects/uart/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/uart/netatalk/ddp_usrreq.c#11 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#11 integrate .. //depot/projects/uart/netgraph/ng_base.c#18 integrate .. //depot/projects/uart/netgraph/ng_car.c#1 branch .. //depot/projects/uart/netgraph/ng_car.h#1 branch .. //depot/projects/uart/netgraph/ng_fec.c#8 integrate .. //depot/projects/uart/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/uart/netgraph/ng_mppc.c#6 integrate .. //depot/projects/uart/netgraph/ng_nat.c#5 integrate .. //depot/projects/uart/netgraph/ng_nat.h#2 integrate .. //depot/projects/uart/netgraph/ng_socket.c#15 integrate .. //depot/projects/uart/netinet/icmp6.h#8 integrate .. //depot/projects/uart/netinet/if_ether.c#19 integrate .. //depot/projects/uart/netinet/in.c#15 integrate .. //depot/projects/uart/netinet/in_cksum.c#4 integrate .. //depot/projects/uart/netinet/in_gif.c#10 integrate .. //depot/projects/uart/netinet/in_pcb.c#25 integrate .. //depot/projects/uart/netinet/in_pcb.h#15 integrate .. //depot/projects/uart/netinet/in_rmx.c#8 integrate .. //depot/projects/uart/netinet/ip.h#5 integrate .. //depot/projects/uart/netinet/ip_divert.c#17 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#18 integrate .. //depot/projects/uart/netinet/ip_ecn.c#4 integrate .. //depot/projects/uart/netinet/ip_encap.c#6 integrate .. //depot/projects/uart/netinet/ip_fw.h#16 integrate .. //depot/projects/uart/netinet/ip_fw2.c#32 integrate .. //depot/projects/uart/netinet/ip_icmp.c#12 integrate .. //depot/projects/uart/netinet/ip_id.c#4 integrate .. //depot/projects/uart/netinet/ip_input.c#22 integrate .. //depot/projects/uart/netinet/ip_ipsec.c#4 integrate .. //depot/projects/uart/netinet/ip_mroute.c#15 integrate .. //depot/projects/uart/netinet/ip_options.c#3 integrate .. //depot/projects/uart/netinet/ip_options.h#2 integrate .. //depot/projects/uart/netinet/ip_output.c#22 integrate .. //depot/projects/uart/netinet/libalias/alias_proxy.c#6 integrate .. //depot/projects/uart/netinet/raw_ip.c#21 integrate .. //depot/projects/uart/netinet/sctp.h#3 integrate .. //depot/projects/uart/netinet/sctp_asconf.c#4 integrate .. //depot/projects/uart/netinet/sctp_asconf.h#3 integrate .. //depot/projects/uart/netinet/sctp_auth.c#4 integrate .. //depot/projects/uart/netinet/sctp_auth.h#3 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/uart/netinet/sctp_constants.h#6 integrate .. //depot/projects/uart/netinet/sctp_crc32.c#4 integrate .. //depot/projects/uart/netinet/sctp_crc32.h#3 integrate .. //depot/projects/uart/netinet/sctp_header.h#3 integrate .. //depot/projects/uart/netinet/sctp_indata.c#6 integrate .. //depot/projects/uart/netinet/sctp_indata.h#3 integrate .. //depot/projects/uart/netinet/sctp_input.c#6 integrate .. //depot/projects/uart/netinet/sctp_input.h#3 integrate .. //depot/projects/uart/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/uart/netinet/sctp_os.h#3 integrate .. //depot/projects/uart/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/uart/netinet/sctp_output.c#6 integrate .. //depot/projects/uart/netinet/sctp_output.h#4 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#6 integrate .. //depot/projects/uart/netinet/sctp_pcb.h#5 integrate .. //depot/projects/uart/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/uart/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/uart/netinet/sctp_structs.h#5 integrate .. //depot/projects/uart/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/uart/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/uart/netinet/sctp_timer.c#5 integrate .. //depot/projects/uart/netinet/sctp_timer.h#3 integrate .. //depot/projects/uart/netinet/sctp_uio.h#6 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/uart/netinet/sctp_var.h#4 integrate .. //depot/projects/uart/netinet/sctputil.c#6 integrate .. //depot/projects/uart/netinet/sctputil.h#4 integrate .. //depot/projects/uart/netinet/tcp.h#11 integrate .. //depot/projects/uart/netinet/tcp_debug.c#4 integrate .. //depot/projects/uart/netinet/tcp_fsm.h#5 integrate .. //depot/projects/uart/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/uart/netinet/tcp_input.c#34 integrate .. //depot/projects/uart/netinet/tcp_output.c#16 integrate .. //depot/projects/uart/netinet/tcp_reass.c#1 branch .. //depot/projects/uart/netinet/tcp_sack.c#13 integrate .. //depot/projects/uart/netinet/tcp_subr.c#29 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#23 integrate .. //depot/projects/uart/netinet/tcp_timer.c#19 integrate .. //depot/projects/uart/netinet/tcp_timer.h#8 integrate .. //depot/projects/uart/netinet/tcp_timewait.c#1 branch .. //depot/projects/uart/netinet/tcp_usrreq.c#21 integrate .. //depot/projects/uart/netinet/tcp_var.h#19 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#24 integrate .. //depot/projects/uart/netinet6/esp_camellia.c#1 branch .. //depot/projects/uart/netinet6/esp_camellia.h#1 branch .. //depot/projects/uart/netinet6/esp_core.c#7 integrate .. //depot/projects/uart/netinet6/icmp6.c#14 integrate .. //depot/projects/uart/netinet6/in6.c#16 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#17 integrate .. //depot/projects/uart/netinet6/in6_pcb.h#6 integrate .. //depot/projects/uart/netinet6/in6_proto.c#12 integrate .. //depot/projects/uart/netinet6/in6_src.c#15 integrate .. //depot/projects/uart/netinet6/ip6_input.c#15 integrate .. //depot/projects/uart/netinet6/nd6.c#17 integrate .. //depot/projects/uart/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/uart/netinet6/raw_ip6.c#15 integrate .. //depot/projects/uart/netinet6/route6.c#6 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/uart/netinet6/sctp6_var.h#3 integrate .. //depot/projects/uart/netipsec/ipsec.c#16 integrate .. //depot/projects/uart/netipsec/ipsec_output.c#8 integrate .. //depot/projects/uart/netipsec/key.c#9 integrate .. //depot/projects/uart/netipsec/xform_esp.c#10 integrate .. //depot/projects/uart/netipx/ipx.c#6 integrate .. //depot/projects/uart/netipx/ipx.h#6 integrate .. //depot/projects/uart/netipx/ipx_cksum.c#5 integrate .. //depot/projects/uart/netipx/ipx_if.h#4 integrate .. //depot/projects/uart/netipx/ipx_input.c#11 integrate .. //depot/projects/uart/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/uart/netipx/ipx_pcb.c#8 integrate .. //depot/projects/uart/netipx/ipx_pcb.h#6 integrate .. //depot/projects/uart/netipx/ipx_usrreq.c#12 integrate .. //depot/projects/uart/netipx/ipx_var.h#4 integrate .. //depot/projects/uart/netipx/spx_debug.c#4 integrate .. //depot/projects/uart/netipx/spx_debug.h#4 integrate .. //depot/projects/uart/netncp/ncp_conn.c#7 integrate .. //depot/projects/uart/nfs4client/nfs4_vnops.c#10 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#16 integrate .. //depot/projects/uart/nfsclient/nfs_lock.c#8 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#18 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/uart/nfsserver/nfs_syscalls.c#12 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#12 integrate .. //depot/projects/uart/opencrypto/cryptodev.h#9 integrate .. //depot/projects/uart/opencrypto/cryptosoft.c#11 integrate .. //depot/projects/uart/opencrypto/xform.c#7 integrate .. //depot/projects/uart/opencrypto/xform.h#4 integrate .. //depot/projects/uart/pc98/conf/GENERIC#22 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#14 integrate .. //depot/projects/uart/pci/if_tl.c#12 integrate .. //depot/projects/uart/pci/if_vr.c#14 integrate .. //depot/projects/uart/pci/if_vrreg.h#9 integrate .. //depot/projects/uart/pci/ncr.c#13 integrate .. //depot/projects/uart/powerpc/include/vmparam.h#4 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#11 integrate .. //depot/projects/uart/powerpc/powerpc/elf_machdep.c#6 integrate .. //depot/projects/uart/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#17 integrate .. //depot/projects/uart/security/audit/audit.c#10 integrate .. //depot/projects/uart/security/audit/audit.h#6 integrate .. //depot/projects/uart/security/audit/audit_arg.c#9 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#8 integrate .. //depot/projects/uart/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/uart/security/audit/audit_ioctl.h#4 integrate .. //depot/projects/uart/security/audit/audit_pipe.c#7 integrate .. //depot/projects/uart/security/audit/audit_private.h#8 integrate .. //depot/projects/uart/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/uart/security/audit/audit_worker.c#5 integrate .. //depot/projects/uart/security/mac/mac_audit.c#1 branch .. //depot/projects/uart/security/mac/mac_framework.h#4 integrate .. //depot/projects/uart/security/mac/mac_inet.c#5 integrate .. //depot/projects/uart/security/mac/mac_net.c#6 integrate .. //depot/projects/uart/security/mac/mac_pipe.c#5 integrate .. //depot/projects/uart/security/mac/mac_policy.h#2 integrate .. //depot/projects/uart/security/mac/mac_process.c#8 integrate .. //depot/projects/uart/security/mac/mac_socket.c#7 integrate .. //depot/projects/uart/security/mac/mac_system.c#5 integrate .. //depot/projects/uart/security/mac/mac_vfs.c#11 integrate .. //depot/projects/uart/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/uart/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/uart/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/uart/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/uart/security/mac_mls/mac_mls.c#12 integrate .. //depot/projects/uart/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/uart/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/uart/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/uart/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/uart/security/mac_test/mac_test.c#13 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#28 integrate .. //depot/projects/uart/sparc64/include/profile.h#4 integrate .. //depot/projects/uart/sparc64/include/smp.h#5 integrate .. //depot/projects/uart/sparc64/include/ver.h#3 integrate .. //depot/projects/uart/sparc64/include/vmparam.h#3 integrate .. //depot/projects/uart/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/uart/sparc64/sparc64/bus_machdep.c#11 integrate .. //depot/projects/uart/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/uart/sparc64/sparc64/identcpu.c#7 integrate .. //depot/projects/uart/sparc64/sparc64/intr_machdep.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/uart/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/uart/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/uart/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/uart/sun4v/include/cache.h#3 delete .. //depot/projects/uart/sun4v/include/iommureg.h#2 delete .. //depot/projects/uart/sun4v/include/iommuvar.h#2 delete .. //depot/projects/uart/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/uart/sun4v/include/pmap.h#4 integrate .. //depot/projects/uart/sun4v/include/profile.h#2 integrate .. //depot/projects/uart/sun4v/include/upa.h#2 integrate .. //depot/projects/uart/sun4v/include/ver.h#2 integrate .. //depot/projects/uart/sun4v/include/vmparam.h#3 integrate .. //depot/projects/uart/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/uart/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/uart/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/uart/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/uart/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/uart/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/uart/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/uart/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/uart/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/uart/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/uart/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/uart/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/uart/sys/acct.h#3 integrate .. //depot/projects/uart/sys/callout.h#5 integrate .. //depot/projects/uart/sys/conf.h#16 integrate .. //depot/projects/uart/sys/disk.h#4 integrate .. //depot/projects/uart/sys/filedesc.h#11 integrate .. //depot/projects/uart/sys/interrupt.h#9 integrate .. //depot/projects/uart/sys/ioctl_compat.h#5 integrate .. //depot/projects/uart/sys/lock_profile.h#4 integrate .. //depot/projects/uart/sys/lockf.h#6 integrate .. //depot/projects/uart/sys/mount.h#25 integrate .. //depot/projects/uart/sys/param.h#33 integrate .. //depot/projects/uart/sys/priv.h#5 integrate .. //depot/projects/uart/sys/proc.h#30 integrate .. //depot/projects/uart/sys/resource.h#6 integrate .. //depot/projects/uart/sys/resourcevar.h#6 integrate .. //depot/projects/uart/sys/rwlock.h#9 integrate .. //depot/projects/uart/sys/socketvar.h#17 integrate .. //depot/projects/uart/sys/sx.h#12 integrate .. //depot/projects/uart/sys/sysctl.h#15 integrate .. //depot/projects/uart/sys/sysent.h#10 integrate .. //depot/projects/uart/sys/syslimits.h#6 integrate .. //depot/projects/uart/sys/systm.h#22 integrate .. //depot/projects/uart/sys/vmmeter.h#4 integrate .. //depot/projects/uart/sys/vnode.h#22 integrate .. //depot/projects/uart/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#26 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/uart/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/uart/ufs/ufs/ufs_extattr.c#12 integrate .. //depot/projects/uart/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#15 integrate .. //depot/projects/uart/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/uart/vm/swap_pager.c#27 integrate .. //depot/projects/uart/vm/uma_core.c#26 integrate .. //depot/projects/uart/vm/uma_int.h#10 integrate .. //depot/projects/uart/vm/vm_contig.c#21 integrate .. //depot/projects/uart/vm/vm_fault.c#23 integrate .. //depot/projects/uart/vm/vm_glue.c#17 integrate .. //depot/projects/uart/vm/vm_map.c#27 integrate .. //depot/projects/uart/vm/vm_meter.c#10 integrate .. //depot/projects/uart/vm/vm_mmap.c#17 integrate .. //depot/projects/uart/vm/vm_object.c#28 integrate .. //depot/projects/uart/vm/vm_page.c#27 integrate .. //depot/projects/uart/vm/vm_page.h#12 integrate .. //depot/projects/uart/vm/vm_pageout.c#23 integrate .. //depot/projects/uart/vm/vm_pageq.c#12 integrate .. //depot/projects/uart/vm/vm_zeroidle.c#13 integrate .. //depot/projects/uart/vm/vnode_pager.c#21 integrate Differences ... ==== //depot/projects/uart/amd64/acpica/madt.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/uart/amd64/amd64/busdma_machdep.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/uart/amd64/amd64/elf_machdep.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $"); #include #include @@ -82,7 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -97,7 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, - 0, + BI_CAN_EXEC_DYN, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/uart/amd64/amd64/identcpu.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); #include "opt_cpu.h" @@ -236,7 +236,7 @@ "\015" "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 2 00:22: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 600C016A46B; Sat, 2 Jun 2007 00:22: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 B409B16A400 for ; Sat, 2 Jun 2007 00:22:49 +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 A2EBD13C458 for ; Sat, 2 Jun 2007 00:22:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l520MnF3093966 for ; Sat, 2 Jun 2007 00:22:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l520KnKQ089368 for perforce@freebsd.org; Sat, 2 Jun 2007 00:20:49 GMT (envelope-from marcel@freebsd.org) Date: Sat, 2 Jun 2007 00:20:49 GMT Message-Id: <200706020020.l520KnKQ089368@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 120748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 00:22:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120748 Change 120748 by marcel@marcel_xcllnt on 2007/06/02 00:19:54 IFC @120735 Affected files ... .. //depot/projects/ia64/MAINTAINERS#59 integrate .. //depot/projects/ia64/Makefile#56 integrate .. //depot/projects/ia64/Makefile.inc1#118 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#19 integrate .. //depot/projects/ia64/UPDATING#98 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#11 integrate .. //depot/projects/ia64/bin/csh/config.h#7 integrate .. //depot/projects/ia64/bin/csh/config_p.h#4 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#10 integrate .. //depot/projects/ia64/bin/pax/file_subs.c#7 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#9 integrate .. //depot/projects/ia64/bin/pax/sel_subs.c#7 integrate .. //depot/projects/ia64/bin/pax/tables.c#6 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#14 integrate .. //depot/projects/ia64/contrib/csup/queue.h#2 integrate .. //depot/projects/ia64/contrib/file/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/file/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/file/LEGAL.NOTICE#4 integrate .. //depot/projects/ia64/contrib/file/Localstuff#3 integrate .. //depot/projects/ia64/contrib/file/MAINT#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/animation#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/archive#7 integrate .. //depot/projects/ia64/contrib/file/Magdir/audio#7 integrate .. //depot/projects/ia64/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/cad#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/ia64/contrib/file/Magdir/commands#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/console#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/database#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/editors#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/elf#7 integrate .. //depot/projects/ia64/contrib/file/Magdir/filesystems#8 integrate .. //depot/projects/ia64/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/images#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/java#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/linux#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/lisp#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/mach#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/mime#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/mips#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/msdos#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/os2#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/os400#1 branch .. //depot/projects/ia64/contrib/file/Magdir/perl#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/python#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/riff#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/sgml#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/sql#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/sun#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/sysex#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/tex#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/unicode#1 branch .. //depot/projects/ia64/contrib/file/Magdir/varied.out#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/vmware#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/ia64/contrib/file/Makefile.am#8 integrate .. //depot/projects/ia64/contrib/file/Makefile.in#8 integrate .. //depot/projects/ia64/contrib/file/README#6 integrate .. //depot/projects/ia64/contrib/file/apprentice.c#7 integrate .. //depot/projects/ia64/contrib/file/apptype.c#2 integrate .. //depot/projects/ia64/contrib/file/ascmagic.c#7 integrate .. //depot/projects/ia64/contrib/file/compress.c#6 integrate .. //depot/projects/ia64/contrib/file/config.h.in#8 integrate .. //depot/projects/ia64/contrib/file/configure#8 integrate .. //depot/projects/ia64/contrib/file/configure.in#8 integrate .. //depot/projects/ia64/contrib/file/file.c#8 integrate .. //depot/projects/ia64/contrib/file/file.h#7 integrate .. //depot/projects/ia64/contrib/file/fsmagic.c#6 integrate .. //depot/projects/ia64/contrib/file/funcs.c#4 integrate .. //depot/projects/ia64/contrib/file/install-sh#3 integrate .. //depot/projects/ia64/contrib/file/is_tar.c#5 integrate .. //depot/projects/ia64/contrib/file/magic.c#4 integrate .. //depot/projects/ia64/contrib/file/magic.h#3 integrate .. //depot/projects/ia64/contrib/file/magic.mime#7 integrate .. //depot/projects/ia64/contrib/file/magic2mime#4 integrate .. //depot/projects/ia64/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/ia64/contrib/file/names.h#5 integrate .. //depot/projects/ia64/contrib/file/patchlevel.h#8 integrate .. //depot/projects/ia64/contrib/file/print.c#7 integrate .. //depot/projects/ia64/contrib/file/readelf.c#8 integrate .. //depot/projects/ia64/contrib/file/softmagic.c#8 integrate .. //depot/projects/ia64/contrib/file/tar.h#4 integrate .. //depot/projects/ia64/contrib/file/test.c#3 integrate .. //depot/projects/ia64/contrib/gcc/BASE-VER#1 branch .. //depot/projects/ia64/contrib/gcc/COPYING#3 integrate .. //depot/projects/ia64/contrib/gcc/COPYING.LIB#3 integrate .. //depot/projects/ia64/contrib/gcc/ChangeLog#16 integrate .. //depot/projects/ia64/contrib/gcc/ChangeLog-1997#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-1998#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-1999#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2000#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2001#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2002#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2003#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2004#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2005#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog-2006#1 branch .. //depot/projects/ia64/contrib/gcc/ChangeLog.0#3 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.1#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.10#2 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.2#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.3#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.4#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.5#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.6#4 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.7#3 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.8#2 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.9#2 delete .. //depot/projects/ia64/contrib/gcc/ChangeLog.tree-ssa#1 branch .. //depot/projects/ia64/contrib/gcc/DATESTAMP#1 branch .. //depot/projects/ia64/contrib/gcc/DEV-PHASE#1 branch .. //depot/projects/ia64/contrib/gcc/LANGUAGES#4 integrate .. //depot/projects/ia64/contrib/gcc/Makefile.in#15 integrate .. //depot/projects/ia64/contrib/gcc/README-fixinc#3 delete .. //depot/projects/ia64/contrib/gcc/acinclude.m4#1 branch .. //depot/projects/ia64/contrib/gcc/aclocal.m4#6 integrate .. //depot/projects/ia64/contrib/gcc/addresses.h#1 branch .. //depot/projects/ia64/contrib/gcc/alias.c#11 integrate .. //depot/projects/ia64/contrib/gcc/alias.h#1 branch .. //depot/projects/ia64/contrib/gcc/alloc-pool.c#2 integrate .. //depot/projects/ia64/contrib/gcc/alloc-pool.h#2 integrate .. //depot/projects/ia64/contrib/gcc/ansidecl.h#7 delete .. //depot/projects/ia64/contrib/gcc/attribs.c#7 integrate .. //depot/projects/ia64/contrib/gcc/basic-block.h#7 integrate .. //depot/projects/ia64/contrib/gcc/bb-reorder.c#6 integrate .. //depot/projects/ia64/contrib/gcc/bitmap.c#6 integrate .. //depot/projects/ia64/contrib/gcc/bitmap.h#5 integrate .. //depot/projects/ia64/contrib/gcc/bt-load.c#2 integrate .. //depot/projects/ia64/contrib/gcc/builtin-attrs.def#4 integrate .. //depot/projects/ia64/contrib/gcc/builtin-types.def#5 integrate .. //depot/projects/ia64/contrib/gcc/builtins.c#12 integrate .. //depot/projects/ia64/contrib/gcc/builtins.def#4 integrate .. //depot/projects/ia64/contrib/gcc/c-aux-info.c#5 integrate .. //depot/projects/ia64/contrib/gcc/c-common.c#14 integrate .. //depot/projects/ia64/contrib/gcc/c-common.def#5 integrate .. //depot/projects/ia64/contrib/gcc/c-common.h#11 integrate .. //depot/projects/ia64/contrib/gcc/c-config-lang.in#2 integrate .. //depot/projects/ia64/contrib/gcc/c-convert.c#5 integrate .. //depot/projects/ia64/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/ia64/contrib/gcc/c-decl.c#18 integrate .. //depot/projects/ia64/contrib/gcc/c-dump.c#3 integrate .. //depot/projects/ia64/contrib/gcc/c-errors.c#4 integrate .. //depot/projects/ia64/contrib/gcc/c-format.c#11 integrate .. //depot/projects/ia64/contrib/gcc/c-format.h#1 branch .. //depot/projects/ia64/contrib/gcc/c-gimplify.c#1 branch .. //depot/projects/ia64/contrib/gcc/c-incpath.c#2 integrate .. //depot/projects/ia64/contrib/gcc/c-incpath.h#2 integrate .. //depot/projects/ia64/contrib/gcc/c-lang.c#7 integrate .. //depot/projects/ia64/contrib/gcc/c-lex.c#10 integrate .. //depot/projects/ia64/contrib/gcc/c-objc-common.c#9 integrate .. //depot/projects/ia64/contrib/gcc/c-objc-common.h#1 branch .. //depot/projects/ia64/contrib/gcc/c-omp.c#1 branch .. //depot/projects/ia64/contrib/gcc/c-opts.c#5 integrate .. //depot/projects/ia64/contrib/gcc/c-parse.in#10 delete .. //depot/projects/ia64/contrib/gcc/c-parser.c#1 branch .. //depot/projects/ia64/contrib/gcc/c-pch.c#3 integrate .. //depot/projects/ia64/contrib/gcc/c-ppoutput.c#4 integrate .. //depot/projects/ia64/contrib/gcc/c-pragma.c#8 integrate .. //depot/projects/ia64/contrib/gcc/c-pragma.h#6 integrate .. //depot/projects/ia64/contrib/gcc/c-pretty-print.c#3 integrate .. //depot/projects/ia64/contrib/gcc/c-pretty-print.h#3 integrate .. //depot/projects/ia64/contrib/gcc/c-semantics.c#7 integrate .. //depot/projects/ia64/contrib/gcc/c-tree.h#9 integrate .. //depot/projects/ia64/contrib/gcc/c-typeck.c#15 integrate .. //depot/projects/ia64/contrib/gcc/c.opt#3 integrate .. //depot/projects/ia64/contrib/gcc/caller-save.c#5 integrate .. //depot/projects/ia64/contrib/gcc/calls.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cfg.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cfganal.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cfgbuild.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cfgcleanup.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cfgexpand.c#1 branch .. //depot/projects/ia64/contrib/gcc/cfghooks.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cfghooks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cfglayout.h#4 integrate .. //depot/projects/ia64/contrib/gcc/cfgloop.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cfgloop.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cfgloopanal.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cfgloopmanip.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cfgrtl.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cgraph.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cgraph.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cgraphunit.c#2 integrate .. //depot/projects/ia64/contrib/gcc/choose-temp.c#3 delete .. //depot/projects/ia64/contrib/gcc/collect2.c#10 integrate .. //depot/projects/ia64/contrib/gcc/collect2.h#5 integrate .. //depot/projects/ia64/contrib/gcc/combine.c#12 integrate .. //depot/projects/ia64/contrib/gcc/common.opt#3 integrate .. //depot/projects/ia64/contrib/gcc/concat.c#2 delete .. //depot/projects/ia64/contrib/gcc/conditions.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config.build#2 integrate .. //depot/projects/ia64/contrib/gcc/config.gcc#11 integrate .. //depot/projects/ia64/contrib/gcc/config.host#3 integrate .. //depot/projects/ia64/contrib/gcc/config.in#10 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha-modes.def#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha-protos.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.c#12 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.h#9 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.md#10 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/crtfastmath.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/elf.h#8 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/ev4.md#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/ev5.md#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/ev6.md#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/freebsd.h#11 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/gnu.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/lib1funcs.asm#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/linux-elf.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/linux.h#7 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/netbsd.h#7 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/openbsd.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/osf.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/osf5.h#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/qrnnd.asm#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-alpha#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-crtfm#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-ieee#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-osf-pthread#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-osf4#5 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-unicosmk#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-vms#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/t-vms64#2 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/unicosmk.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/va_list.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-cc.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-crt0-64.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-crt0.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-dwarf2.asm#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-dwarf2eh.asm#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-ld.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-psxcrt0-64.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms-psxcrt0.c#4 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms64.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/vms_tramp.asm#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/x-vms#3 delete .. //depot/projects/ia64/contrib/gcc/config/alpha/xm-vms.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/arm/README-interworking#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/aof.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/aout.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm-cores.def#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm-generic.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm-protos.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm-tune.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm.c#9 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.md#9 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm1020e.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm1026ejs.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm1136jfs.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/arm926ejs.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/bpabi.S#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/bpabi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/bpabi.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/cirrus.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/coff.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/constraints.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/crti.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/crtn.asm#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/ecos-elf.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/elf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/fpa.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/freebsd.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/gentune.sh#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/ieee754-df.S#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/ieee754-sf.S#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/iwmmxt.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/kaos-arm.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/kaos-strongarm.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/lib1funcs.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/libgcc-bpabi.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/libunwind.S#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/linux-eabi.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/linux-elf.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/linux-gas.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/mmintrin.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/netbsd-elf.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/netbsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/pe.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/pe.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/pe.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/pr-support.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/rtems-elf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/semi.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/semiaof.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/strongarm-coff.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/strongarm-elf.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/strongarm-pe.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/symbian.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/t-arm#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/t-arm-coff#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-arm-elf#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-bpabi#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/t-linux#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-linux-eabi#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-pe#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-semi#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-strongarm-elf#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-strongarm-pe#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-symbian#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/t-wince-pe#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-xscale-coff#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/t-xscale-elf#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/uclinux-elf.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/unaligned-funcs.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/unknown-elf.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/unwind-arm.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/unwind-arm.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/vfp.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/arm/vxworks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/wince-pe.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/xscale-coff.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/xscale-elf.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin-64.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/darwin-c.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin-crt2.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin-crt3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin-sections.def#1 branch .. //depot/projects/ia64/contrib/gcc/config/darwin.c#6 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/darwin.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/darwin9.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/dbx.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/dbxcoff.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/dbxelf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/dfp-bit.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/dfp-bit.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/elfos.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/floatunsidf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/floatunsisf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/floatunsitf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/floatunsixf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/fp-bit.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/fp-bit.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-nthr.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#19 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/frv/cmovd.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/cmovh.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/cmovw.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv-abi.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv-asm.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv-modes.def#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv-protos.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frv.md#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frvbegin.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/frvend.c#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/lib1funcs.asm#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/modi.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/frv/t-frv#3 delete .. //depot/projects/ia64/contrib/gcc/config/frv/uitod.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/frv/uitof.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/frv/ulltod.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/frv/ulltof.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/frv/umodi.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/gnu.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/gofast.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/host-darwin.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/host-darwin.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/host-hpux.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/host-linux.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/host-solaris.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/athlon.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/att.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/beos-elf.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/biarch64.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/bsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/constraints.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/crtdll.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/crtfastmath.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/cygming.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/cygming.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/cygwin.asm#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/cygwin.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/cygwin1.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/cygwin2.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/darwin.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/darwin64.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/djgpp.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/djgpp.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/driver-i386.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/emmintrin.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd-aout.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#24 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd64.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/gas.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/gmm_malloc.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/gmon-sol2.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/gnu.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/gthr-win32.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/host-cygwin.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/host-i386-darwin.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/host-mingw32.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/i386-aout.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-coff.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-interix.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-interix3.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-modes.def#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-protos.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.c#15 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.h#16 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.md#12 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/i386elf.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/k6.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/kaos-i386.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/kfreebsd-gnu.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/kfreebsdgnu.h#2 delete .. //depot/projects/ia64/contrib/gcc/config/i386/knetbsd-gnu.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/linux-aout.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/i386/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/linux.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/linux64.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/lynx-ng.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/lynx.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/mingw32.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/mm3dnow.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/mmintrin.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/mmx.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/moss.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/netbsd-elf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/netbsd64.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/netware-crt0.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/netware-libgcc.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/netware-libgcc.def#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/netware-libgcc.exp#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/netware.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/nto.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/nwld.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/nwld.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/openbsd.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/openbsdelf.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/pentium.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/pmm_malloc.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/pmmintrin.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/ppro.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/ptx4-i.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/rtemself.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sco5.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sco5.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/sol2-10.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/sol2-c1.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sol2-ci.asm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sol2-cn.asm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sol2-gc1.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sol2.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sse.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/svr3.ifile#2 delete .. //depot/projects/ia64/contrib/gcc/config/i386/svr3dbx.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/svr3gas.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/svr3z.ifile#2 delete .. //depot/projects/ia64/contrib/gcc/config/i386/sync.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/sysv3.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/sysv4-cpp.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sysv4.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/sysv5.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-crtfm#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-cygming#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-darwin#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-darwin64#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-gmm_malloc#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-gthr-win32#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-linux64#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-mingw32#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-nwld#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-pmm_malloc#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-rtems-i386#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-sol2#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-sol2-10#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/t-udk#2 delete .. //depot/projects/ia64/contrib/gcc/config/i386/t-vxworks#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/t-vxworksae#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/udk.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/i386/unix.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/uwin.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/vsta.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/i386/vxworks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/vxworksae.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/winnt-cxx.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/winnt-stubs.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/winnt.c#7 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/x-cygwin#3 branch .. //depot/projects/ia64/contrib/gcc/config/i386/x-darwin#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/x-i386#1 branch .. //depot/projects/ia64/contrib/gcc/config/i386/x-mingw32#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/x86-64.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/xm-cygwin.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/xm-djgpp.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/xm-mingw32.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/xmmintrin.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/crtbegin.asm#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/crtend.asm#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/crtfastmath.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/crti.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/crtn.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/fde-glibc.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/freebsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/hpux.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64-c.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64-protos.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64.c#8 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64.md#7 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/ia64intrin.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/ilp32.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/itanium1.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/itanium2.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/lib1funcs.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/linux.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/quadlib.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/sync.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/ia64/sysv4.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/t-hpux#5 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/t-ia64#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/unwind-ia64.c#7 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/unwind-ia64.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/vect.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/interix.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/interix3.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/kaos.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/kfreebsd-gnu.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/kfreebsdgnu.h#2 delete .. //depot/projects/ia64/contrib/gcc/config/knetbsd-gnu.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/libgloss.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/linux-aout.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/linux.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/linux.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/lynx-ng.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/lynx.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/lynx.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/memcmp.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/memcpy.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/memmove.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/memset.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/24k.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/3000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4100.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4130.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4300.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4600.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/4k.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/5000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/5400.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/5500.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/5k.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/6000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/7000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/9000.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/constraints.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/crti.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/crtn.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/dbxmdebug.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/elf.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/elforion.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/generic.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/iris.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/iris5.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/iris6.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/irix-crti.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/irix-crtn.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/linux.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/linux64.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips-dsp.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips-modes.def#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips-protos.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips-ps-3d.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/mips16.S#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/netbsd.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/openbsd.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/r3900.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/rtems.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/sb1.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/sdb.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/sr71k.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-elf#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-gofast#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-iris#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-iris6#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-isa3264#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-linux64#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-mips#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-r3900#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-rtems#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-sb1#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-slibgcc-irix#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-sr71k#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-vr#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/t-vxworks#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/vr.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/vr4120-div.S#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/vxworks.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/mips/windiss.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/netbsd-aout.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/netbsd-elf.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/netbsd.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/openbsd-oldgas.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/openbsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/ptx4.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/40x.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/440.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/603.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/6xx.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/7450.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/7xx.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/8540.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix41.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix43.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix51.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix52.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix64.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec-defs.h#3 delete .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.md#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/biarch64.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/constraints.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/crtsavres.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-asm.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-fallback.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-fpsave.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-ldouble-format#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#2 delete .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-ldouble.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-libgcc.10.4.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-libgcc.10.5.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-tramp.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-vecsave.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin-world.asm#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin64.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin7.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/darwin8.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/default64.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/e500-double.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabi-ci.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabi-cn.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabi.asm#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabi.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabialtivec.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabisim.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/eabispe.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/gnu.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/host-darwin.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/host-ppc64-darwin.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/kaos-ppc.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/libgcc-ppc-glibc.ver#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux-unwind.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.h#10 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/linuxaltivec.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linuxspe.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/lynx.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/lynxbase.h#2 delete .. //depot/projects/ia64/contrib/gcc/config/rs6000/mpc.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/netbsd.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/power4.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/power5.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/ppc64-fp.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/rios1.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rios2.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-c.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-protos.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.c#13 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.md#12 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs64.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rtems.h#7 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/secureplt.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/sfp-machine.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/sol-ci.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sol-cn.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/spe.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/spe.md#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sync.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#13 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4le.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-aix43#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-aix52#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-beos#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-darwin#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-darwin8#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-fprules#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-fprules-fpbit#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-fprules-softfp#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-lynx#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-ppccomm#5 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-rtems#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-vxworks#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/t-vxworksae#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/tramp.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/vxworks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/vxworksae.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/windiss.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/x-darwin#2 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/x-darwin64#1 branch .. //depot/projects/ia64/contrib/gcc/config/rs6000/xcoff.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/rtems.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/2064.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/2084.md#2 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/constraints.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/fixdfdi.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/libgcc-glibc.ver#3 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/linux.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/s390-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390-protos.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390.md#5 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/s390.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/s390x.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/t-crtstuff#2 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/t-linux#3 branch .. //depot/projects/ia64/contrib/gcc/config/s390/t-linux64#3 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/t-tpf#2 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/tpf-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/tpf.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/s390/tpf.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/s390/tpf.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/README#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/adddf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/addsf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/addtf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/divdf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/divsf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/divtf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/double.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/eqdf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/eqsf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/eqtf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/extenddftf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/extended.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/extendsfdf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/extendsftf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixdfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixdfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixsfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixsfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixtfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixtfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunsdfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunsdfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunssfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunssfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunstfdi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/fixunstfsi.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatdidf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatdisf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatditf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatsidf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatsisf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatsitf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatundidf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatundisf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatunditf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatunsidf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatunsisf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/floatunsitf.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/gedf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/gesf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/getf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/ledf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/lesf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/letf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/muldf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/mulsf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/multf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/negdf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/negsf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/negtf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/op-1.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/op-2.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/op-4.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/op-8.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/op-common.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/quad.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/single.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/soft-fp.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/subdf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/subsf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/subtf3.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/t-softfp#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/truncdfsf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/trunctfdf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/trunctfsf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/unorddf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/unordsf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/soft-fp/unordtf2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2-10.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2-6.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2-c.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2-protos.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2.c#1 branch .. //depot/projects/ia64/contrib/gcc/config/sol2.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/aout.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/biarch64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/crtfastmath.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/cypress.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/elf.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#11 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/hypersparc.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/linux-unwind.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/linux.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/linux64.h#9 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/lite.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/litecoff.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/liteelf.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/little-endian.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/long-double-switch.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/netbsd-elf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/niagara.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/openbsd.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/openbsd1-64.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/openbsd64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/pbd.h#6 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/predicates.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/rtemself.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-64.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-bi.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-c1.asm#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-ci.asm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-cn.asm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gas-bi.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gas.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sp-elf.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/sp64-aout.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/sp64-elf.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sp86x-elf.h#5 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc-modes.def#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc-protos.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.c#13 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.h#8 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.md#10 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/sparclet.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/supersparc.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sync.md#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/sysv4-only.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sysv4.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-linux#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/t-linux64#6 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-openbsd#2 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/t-sp86x#2 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/t-sparclite#3 delete .. //depot/projects/ia64/contrib/gcc/config/sparc/ultra1_2.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/ultra3.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/svr3.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/svr4.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/t-darwin#4 integrate .. //depot/projects/ia64/contrib/gcc/config/t-dfprules#1 branch .. //depot/projects/ia64/contrib/gcc/config/t-kfreebsd-gnu#2 delete .. //depot/projects/ia64/contrib/gcc/config/t-libunwind-elf#2 integrate .. //depot/projects/ia64/contrib/gcc/config/t-linux#4 integrate .. //depot/projects/ia64/contrib/gcc/config/t-linux-gnulibc1#3 delete .. //depot/projects/ia64/contrib/gcc/config/t-lynx#1 branch .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-darwin#3 integrate .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-elf-ver#6 integrate .. //depot/projects/ia64/contrib/gcc/config/t-slibgcc-sld#5 integrate .. //depot/projects/ia64/contrib/gcc/config/t-sol2#1 branch .. //depot/projects/ia64/contrib/gcc/config/t-vxworks#2 integrate .. //depot/projects/ia64/contrib/gcc/config/usegas.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/vx-common.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/vxlib.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/vxworks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/vxworks.opt#1 branch .. //depot/projects/ia64/contrib/gcc/config/vxworksae.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/windiss.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/x-darwin#1 branch .. //depot/projects/ia64/contrib/gcc/config/x-hpux#1 branch .. //depot/projects/ia64/contrib/gcc/config/x-linux#5 integrate .. //depot/projects/ia64/contrib/gcc/config/x-solaris#2 integrate .. //depot/projects/ia64/contrib/gcc/configure#14 integrate .. //depot/projects/ia64/contrib/gcc/configure.ac#4 integrate .. //depot/projects/ia64/contrib/gcc/conflict.c#4 integrate .. //depot/projects/ia64/contrib/gcc/convert.c#6 integrate .. //depot/projects/ia64/contrib/gcc/convert.h#4 integrate .. //depot/projects/ia64/contrib/gcc/coretypes.h#2 integrate .. //depot/projects/ia64/contrib/gcc/coverage.c#3 integrate .. //depot/projects/ia64/contrib/gcc/coverage.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cp-demangle.c#6 delete .. //depot/projects/ia64/contrib/gcc/cp-demangle.h#2 delete .. //depot/projects/ia64/contrib/gcc/cp-demint.c#2 delete .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog#16 integrate .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1993#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1994#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1995#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1996#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1997#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1998#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-1999#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-2000#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-2001#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-2002#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-2003#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog-2004#1 branch .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog.1#4 delete .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog.2#4 delete .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog.3#2 delete .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog.egcs#2 delete .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog.tree-ssa#1 branch .. //depot/projects/ia64/contrib/gcc/cp/Make-lang.in#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/NEWS#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/call.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/class.c#12 integrate .. //depot/projects/ia64/contrib/gcc/cp/config-lang.in#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-gimplify.c#1 branch .. //depot/projects/ia64/contrib/gcc/cp/cp-lang.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-objcp-common.c#1 branch .. //depot/projects/ia64/contrib/gcc/cp/cp-objcp-common.h#1 branch .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.def#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.h#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/cvt.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/cxx-pretty-print.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/cxx-pretty-print.h#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl.c#16 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl.h#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl2.c#16 integrate .. //depot/projects/ia64/contrib/gcc/cp/dump.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/error.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/except.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/expr.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/friend.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/g++spec.c#7 integrate .. //depot/projects/ia64/contrib/gcc/cp/init.c#15 integrate .. //depot/projects/ia64/contrib/gcc/cp/lang-specs.h#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/lex.c#9 integrate .. //depot/projects/ia64/contrib/gcc/cp/lex.h#5 delete .. //depot/projects/ia64/contrib/gcc/cp/mangle.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/method.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/name-lookup.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/name-lookup.h#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/operators.def#6 integrate .. //depot/projects/ia64/contrib/gcc/cp/optimize.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/parser.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/pt.c#14 integrate .. //depot/projects/ia64/contrib/gcc/cp/ptree.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/repo.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/rtti.c#8 integrate .. //depot/projects/ia64/contrib/gcc/cp/search.c#12 integrate .. //depot/projects/ia64/contrib/gcc/cp/semantics.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cp/tree.c#11 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck.c#12 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck2.c#10 integrate .. //depot/projects/ia64/contrib/gcc/cplus-dem.c#6 delete .. //depot/projects/ia64/contrib/gcc/cppcharset.c#2 delete .. //depot/projects/ia64/contrib/gcc/cppdefault.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cppdefault.h#4 integrate .. //depot/projects/ia64/contrib/gcc/cpperror.c#5 delete .. //depot/projects/ia64/contrib/gcc/cppexp.c#7 delete .. //depot/projects/ia64/contrib/gcc/cppfiles.c#8 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 2 00:39: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 6BA4416A46E; Sat, 2 Jun 2007 00:39: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 0ECDD16A469 for ; Sat, 2 Jun 2007 00:39:20 +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 F1EA713C45E for ; Sat, 2 Jun 2007 00:39:19 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l520dJdh024296 for ; Sat, 2 Jun 2007 00:39:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l520d9pm024107 for perforce@freebsd.org; Sat, 2 Jun 2007 00:39:09 GMT (envelope-from marcel@freebsd.org) Date: Sat, 2 Jun 2007 00:39:09 GMT Message-Id: <200706020039.l520d9pm024107@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 120749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 00:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=120749 Change 120749 by marcel@marcel_xcllnt on 2007/06/02 00:38:13 IFC @120735 Affected files ... .. //depot/projects/e500/MAINTAINERS#2 integrate .. //depot/projects/e500/Makefile.inc1#3 integrate .. //depot/projects/e500/UPDATING#3 integrate .. //depot/projects/e500/bin/chflags/chflags.1#2 integrate .. //depot/projects/e500/bin/pax/ar_io.c#2 integrate .. //depot/projects/e500/bin/pax/file_subs.c#2 integrate .. //depot/projects/e500/bin/pax/pat_rep.c#2 integrate .. //depot/projects/e500/bin/pax/sel_subs.c#2 integrate .. //depot/projects/e500/bin/pax/tables.c#2 integrate .. //depot/projects/e500/contrib/file/ChangeLog#2 integrate .. //depot/projects/e500/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/e500/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/e500/contrib/file/Localstuff#2 integrate .. //depot/projects/e500/contrib/file/MAINT#2 integrate .. //depot/projects/e500/contrib/file/Magdir/animation#2 integrate .. //depot/projects/e500/contrib/file/Magdir/archive#2 integrate .. //depot/projects/e500/contrib/file/Magdir/audio#2 integrate .. //depot/projects/e500/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/e500/contrib/file/Magdir/cad#2 integrate .. //depot/projects/e500/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/e500/contrib/file/Magdir/commands#2 integrate .. //depot/projects/e500/contrib/file/Magdir/console#2 integrate .. //depot/projects/e500/contrib/file/Magdir/database#2 integrate .. //depot/projects/e500/contrib/file/Magdir/editors#2 integrate .. //depot/projects/e500/contrib/file/Magdir/elf#2 integrate .. //depot/projects/e500/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/e500/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/e500/contrib/file/Magdir/images#2 integrate .. //depot/projects/e500/contrib/file/Magdir/java#2 integrate .. //depot/projects/e500/contrib/file/Magdir/linux#2 integrate .. //depot/projects/e500/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/e500/contrib/file/Magdir/mach#2 integrate .. //depot/projects/e500/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/e500/contrib/file/Magdir/mime#2 integrate .. //depot/projects/e500/contrib/file/Magdir/mips#2 integrate .. //depot/projects/e500/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/e500/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/e500/contrib/file/Magdir/os2#2 integrate .. //depot/projects/e500/contrib/file/Magdir/os400#1 branch .. //depot/projects/e500/contrib/file/Magdir/perl#2 integrate .. //depot/projects/e500/contrib/file/Magdir/python#2 integrate .. //depot/projects/e500/contrib/file/Magdir/revision#2 integrate .. //depot/projects/e500/contrib/file/Magdir/riff#2 integrate .. //depot/projects/e500/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/e500/contrib/file/Magdir/sql#2 integrate .. //depot/projects/e500/contrib/file/Magdir/sun#2 integrate .. //depot/projects/e500/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/e500/contrib/file/Magdir/tex#2 integrate .. //depot/projects/e500/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/e500/contrib/file/Magdir/unicode#1 branch .. //depot/projects/e500/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/e500/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/e500/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/e500/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/e500/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/e500/contrib/file/Makefile.am#2 integrate .. //depot/projects/e500/contrib/file/Makefile.in#2 integrate .. //depot/projects/e500/contrib/file/README#2 integrate .. //depot/projects/e500/contrib/file/apprentice.c#2 integrate .. //depot/projects/e500/contrib/file/apptype.c#2 integrate .. //depot/projects/e500/contrib/file/ascmagic.c#2 integrate .. //depot/projects/e500/contrib/file/compress.c#2 integrate .. //depot/projects/e500/contrib/file/config.h.in#2 integrate .. //depot/projects/e500/contrib/file/configure#2 integrate .. //depot/projects/e500/contrib/file/configure.in#2 integrate .. //depot/projects/e500/contrib/file/file.c#2 integrate .. //depot/projects/e500/contrib/file/file.h#2 integrate .. //depot/projects/e500/contrib/file/fsmagic.c#2 integrate .. //depot/projects/e500/contrib/file/funcs.c#2 integrate .. //depot/projects/e500/contrib/file/install-sh#2 integrate .. //depot/projects/e500/contrib/file/is_tar.c#2 integrate .. //depot/projects/e500/contrib/file/magic.c#2 integrate .. //depot/projects/e500/contrib/file/magic.h#2 integrate .. //depot/projects/e500/contrib/file/magic.mime#2 integrate .. //depot/projects/e500/contrib/file/magic2mime#2 integrate .. //depot/projects/e500/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/e500/contrib/file/names.h#2 integrate .. //depot/projects/e500/contrib/file/patchlevel.h#2 integrate .. //depot/projects/e500/contrib/file/print.c#2 integrate .. //depot/projects/e500/contrib/file/readelf.c#2 integrate .. //depot/projects/e500/contrib/file/softmagic.c#2 integrate .. //depot/projects/e500/contrib/file/tar.h#2 integrate .. //depot/projects/e500/contrib/file/test.c#2 integrate .. //depot/projects/e500/contrib/gcc/gcc.c#3 integrate .. //depot/projects/e500/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/e500/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/e500/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/e500/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/e500/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/e500/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/e500/etc/defaults/periodic.conf#3 integrate .. //depot/projects/e500/etc/defaults/rc.conf#2 integrate .. //depot/projects/e500/etc/etc.amd64/ttys#2 integrate .. //depot/projects/e500/etc/etc.arm/ttys#2 integrate .. //depot/projects/e500/etc/etc.i386/ttys#2 integrate .. //depot/projects/e500/etc/etc.ia64/ttys#2 integrate .. //depot/projects/e500/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/e500/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/e500/etc/login.conf#2 integrate .. //depot/projects/e500/etc/network.subr#2 integrate .. //depot/projects/e500/etc/rc.d/cleanvar#2 integrate .. //depot/projects/e500/etc/rc.d/initrandom#2 integrate .. //depot/projects/e500/etc/rc.d/jail#2 integrate .. //depot/projects/e500/etc/rc.d/tmp#2 integrate .. //depot/projects/e500/etc/rc.d/var#2 integrate .. //depot/projects/e500/etc/root/dot.cshrc#2 integrate .. //depot/projects/e500/etc/root/dot.profile#2 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/e500/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/e500/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/e500/lib/libarchive/Makefile#2 integrate .. //depot/projects/e500/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/e500/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/e500/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/e500/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/e500/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/e500/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/e500/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/e500/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/e500/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/e500/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/e500/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/e500/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/e500/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/e500/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/e500/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/e500/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/e500/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/e500/lib/libarchive/test/README#2 integrate .. //depot/projects/e500/lib/libarchive/test/main.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test.h#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/e500/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/e500/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/e500/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/e500/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/e500/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/e500/lib/libc/i386/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/quad/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/regex/engine.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/stdtime/Symbol.map#2 integrate .. //depot/projects/e500/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/e500/lib/libfetch/Makefile#3 integrate .. //depot/projects/e500/lib/libfetch/fetch.3#2 integrate .. //depot/projects/e500/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/e500/lib/libmagic/config.h#2 integrate .. //depot/projects/e500/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/e500/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/e500/lib/libutil/flopen.c#2 integrate .. //depot/projects/e500/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/e500/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/e500/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/e500/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/e500/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/e500/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/e500/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/e500/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/e500/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/e500/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/e500/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/e500/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/e500/sbin/savecore/savecore.c#2 integrate .. //depot/projects/e500/share/man/man4/Makefile#3 integrate .. //depot/projects/e500/share/man/man4/bge.4#2 integrate .. //depot/projects/e500/share/man/man4/mmc.4#1 branch .. //depot/projects/e500/share/man/man4/mmcsd.4#1 branch .. //depot/projects/e500/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/e500/share/man/man4/ng_car.4#2 integrate .. //depot/projects/e500/share/man/man4/pcm.4#2 integrate .. //depot/projects/e500/share/man/man4/pty.4#2 integrate .. //depot/projects/e500/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/e500/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/e500/share/man/man5/make.conf.5#2 integrate .. //depot/projects/e500/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/e500/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/e500/share/man/man9/locking.9#2 integrate .. //depot/projects/e500/share/misc/bsd-family-tree#2 integrate .. //depot/projects/e500/share/mk/Makefile#2 integrate .. //depot/projects/e500/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/e500/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/e500/share/skel/dot.cshrc#2 integrate .. //depot/projects/e500/share/skel/dot.profile#2 integrate .. //depot/projects/e500/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/e500/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/e500/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/e500/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/e500/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/e500/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/e500/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/e500/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/e500/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/e500/sys/arm/arm/intr.c#2 integrate .. //depot/projects/e500/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/e500/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/e500/sys/arm/conf/AVILA#2 integrate .. //depot/projects/e500/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/e500/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/e500/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/e500/sys/boot/i386/Makefile#2 integrate .. //depot/projects/e500/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/e500/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/e500/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/e500/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/e500/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/e500/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/e500/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/e500/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/e500/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/e500/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/e500/sys/cam/README.quirks#1 branch .. //depot/projects/e500/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/e500/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/e500/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/e500/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/e500/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/e500/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/e500/sys/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/e500/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/e500/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/e500/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/e500/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/e500/sys/conf/files#4 integrate .. //depot/projects/e500/sys/conf/kern.mk#3 integrate .. //depot/projects/e500/sys/conf/options#3 integrate .. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/e500/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/e500/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/e500/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/e500/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/e500/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/e500/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/e500/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/e500/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/e500/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/e500/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/e500/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/e500/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/e500/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/e500/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/e500/sys/dev/em/README#2 integrate .. //depot/projects/e500/sys/dev/em/if_em.c#3 integrate .. //depot/projects/e500/sys/dev/en/midway.c#2 integrate .. //depot/projects/e500/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/e500/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/e500/sys/dev/md/md.c#4 integrate .. //depot/projects/e500/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/e500/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/e500/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/e500/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/e500/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/e500/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/e500/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/e500/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/e500/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/e500/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/e500/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/e500/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/e500/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/e500/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/e500/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/e500/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/e500/sys/dev/sound/clone.c#1 branch .. //depot/projects/e500/sys/dev/sound/clone.h#1 branch .. //depot/projects/e500/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/e500/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/e500/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/e500/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/e500/sys/dev/sound/unit.c#1 branch .. //depot/projects/e500/sys/dev/sound/unit.h#1 branch .. //depot/projects/e500/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/e500/sys/dev/sound/version.h#1 branch .. //depot/projects/e500/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/e500/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/e500/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/e500/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/e500/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/e500/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/e500/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/e500/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/e500/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/e500/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/e500/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/e500/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/e500/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/e500/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/e500/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/e500/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/e500/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/e500/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/e500/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/e500/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/e500/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/e500/sys/i386/i386/trap.c#2 integrate .. //depot/projects/e500/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/e500/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/e500/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/e500/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/e500/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/e500/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/e500/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/e500/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/e500/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/e500/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/e500/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/e500/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/e500/sys/kern/init_main.c#3 integrate .. //depot/projects/e500/sys/kern/kern_acct.c#3 integrate .. //depot/projects/e500/sys/kern/kern_alq.c#2 integrate .. //depot/projects/e500/sys/kern/kern_clock.c#3 integrate .. //depot/projects/e500/sys/kern/kern_conf.c#2 integrate .. //depot/projects/e500/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/e500/sys/kern/kern_event.c#2 integrate .. //depot/projects/e500/sys/kern/kern_exec.c#3 integrate .. //depot/projects/e500/sys/kern/kern_exit.c#3 integrate .. //depot/projects/e500/sys/kern/kern_fork.c#3 integrate .. //depot/projects/e500/sys/kern/kern_intr.c#2 integrate .. //depot/projects/e500/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/e500/sys/kern/kern_linker.c#2 integrate .. //depot/projects/e500/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/e500/sys/kern/kern_mib.c#3 integrate .. //depot/projects/e500/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/e500/sys/kern/kern_proc.c#2 integrate .. //depot/projects/e500/sys/kern/kern_resource.c#3 integrate .. //depot/projects/e500/sys/kern/kern_sig.c#3 integrate .. //depot/projects/e500/sys/kern/kern_sx.c#3 integrate .. //depot/projects/e500/sys/kern/kern_synch.c#3 integrate .. //depot/projects/e500/sys/kern/kern_thread.c#3 integrate .. //depot/projects/e500/sys/kern/link_elf.c#2 integrate .. //depot/projects/e500/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/e500/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/e500/sys/kern/subr_trap.c#3 integrate .. //depot/projects/e500/sys/kern/subr_witness.c#4 integrate .. //depot/projects/e500/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/e500/sys/kern/tty_cons.c#2 integrate .. //depot/projects/e500/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/e500/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/e500/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/e500/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/e500/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/e500/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/e500/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/e500/sys/kern/vnode_if.src#3 integrate .. //depot/projects/e500/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/e500/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/e500/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/e500/sys/net/ethernet.h#3 integrate .. //depot/projects/e500/sys/net/if_bridge.c#2 integrate .. //depot/projects/e500/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/e500/sys/netinet/sctp.h#3 integrate .. //depot/projects/e500/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/e500/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/e500/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/e500/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/e500/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/e500/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/e500/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/e500/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/e500/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/e500/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/e500/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/e500/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/e500/sys/netinet/sctputil.c#3 integrate .. //depot/projects/e500/sys/netinet/sctputil.h#3 integrate .. //depot/projects/e500/sys/netinet/tcp.h#3 integrate .. //depot/projects/e500/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/e500/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/e500/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/e500/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/e500/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/e500/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/e500/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/e500/sys/netinet6/in6.c#2 integrate .. //depot/projects/e500/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/e500/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/e500/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/e500/sys/netipsec/key.c#2 integrate .. //depot/projects/e500/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/e500/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/e500/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/e500/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/e500/sys/pci/ncr.c#2 integrate .. //depot/projects/e500/sys/powerpc/aim/clock.c#3 edit .. //depot/projects/e500/sys/powerpc/aim/machdep.c#3 edit .. //depot/projects/e500/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/e500/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit.c#3 integrate .. //depot/projects/e500/sys/security/audit/audit.h#2 integrate .. //depot/projects/e500/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/e500/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/e500/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/e500/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/e500/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/e500/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/e500/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/e500/sys/sys/conf.h#2 integrate .. //depot/projects/e500/sys/sys/filedesc.h#2 integrate .. //depot/projects/e500/sys/sys/proc.h#2 integrate .. //depot/projects/e500/sys/sys/resource.h#2 integrate .. //depot/projects/e500/sys/sys/resourcevar.h#2 integrate .. //depot/projects/e500/sys/sys/sx.h#3 integrate .. //depot/projects/e500/sys/sys/syslimits.h#2 integrate .. //depot/projects/e500/sys/sys/vmmeter.h#3 integrate .. //depot/projects/e500/sys/sys/vnode.h#3 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/e500/sys/vm/swap_pager.c#3 integrate .. //depot/projects/e500/sys/vm/uma_core.c#3 integrate .. //depot/projects/e500/sys/vm/vm_contig.c#3 integrate .. //depot/projects/e500/sys/vm/vm_fault.c#3 integrate .. //depot/projects/e500/sys/vm/vm_glue.c#3 integrate .. //depot/projects/e500/sys/vm/vm_map.c#3 integrate .. //depot/projects/e500/sys/vm/vm_meter.c#3 integrate .. //depot/projects/e500/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/e500/sys/vm/vm_object.c#3 integrate .. //depot/projects/e500/sys/vm/vm_page.c#3 integrate .. //depot/projects/e500/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/e500/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/e500/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/e500/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/e500/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/e500/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/e500/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/prime.sh#2 integrate .. //depot/projects/e500/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/e500/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/e500/usr.bin/file/config.h#2 integrate .. //depot/projects/e500/usr.bin/file/file.1#2 integrate .. //depot/projects/e500/usr.bin/file/magic.5#2 integrate .. //depot/projects/e500/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/e500/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/e500/usr.bin/less/lesspipe.sh#2 integrate .. //depot/projects/e500/usr.bin/make/main.c#2 integrate .. //depot/projects/e500/usr.bin/tar/Makefile#2 integrate .. //depot/projects/e500/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/e500/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/e500/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/e500/usr.bin/tar/read.c#2 integrate .. //depot/projects/e500/usr.bin/tar/write.c#2 integrate .. //depot/projects/e500/usr.sbin/dconschat/dconschat.c#2 integrate .. //depot/projects/e500/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/e500/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/e500/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/e500/usr.sbin/ppp/radius.h#2 integrate Differences ... ==== //depot/projects/e500/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -51,7 +51,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -em(4) tackerman Pre-commit review requested. +em(4) jfv Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/e500/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/e500/UPDATING#3 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/e500/bin/chflags/chflags.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/e500/bin/pax/ar_io.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/e500/bin/pax/file_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/e500/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/e500/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/e500/bin/pax/tables.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/e500/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 2 09:28: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 BBBC216A468; Sat, 2 Jun 2007 09:28: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 78ED816A469 for ; Sat, 2 Jun 2007 09:28:24 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 20ADB13C483 for ; Sat, 2 Jun 2007 09:28:24 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l529SOdY048392 for ; Sat, 2 Jun 2007 09:28:24 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l529SNV7048386 for perforce@freebsd.org; Sat, 2 Jun 2007 09:28:23 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 2 Jun 2007 09:28:23 GMT Message-Id: <200706020928.l529SNV7048386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 09:28:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120762 Change 120762 by thompsa@thompsa_heff on 2007/06/02 09:28:23 Fix a case where we transition to ASSOC and then fail to do anything further. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#37 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#37 (text+ko) ==== @@ -971,6 +971,13 @@ ieee80211_cancel_scan(ic); break; case IEEE80211_S_ASSOC: + /* + * If we are not transitioning from AUTH the resend the + * association request. + */ + if (ic->ic_state != IEEE80211_S_AUTH) + iwi_assoc(ic); + break; default: break; } From owner-p4-projects@FreeBSD.ORG Sat Jun 2 11:47:30 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 33ECD16A469; Sat, 2 Jun 2007 11:47: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 BF93A16A421 for ; Sat, 2 Jun 2007 11:47:29 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A473313C455 for ; Sat, 2 Jun 2007 11:47:29 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52BlTxP073039 for ; Sat, 2 Jun 2007 11:47:29 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52BlTCp073036 for perforce@freebsd.org; Sat, 2 Jun 2007 11:47:29 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 11:47:29 GMT Message-Id: <200706021147.l52BlTCp073036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 11:47:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=120765 Change 120765 by fli@fli_genesis on 2007/06/02 11:47:05 - Only duplicate the key if explicitly instructed to do so, most of the times the key is a part of the data object and it's simply unnecessary to duplicate it. - Add hashtbl_walk() which will traverse the hash table. - Some minor adjustments to comments. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#4 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#4 (text+ko) ==== @@ -341,7 +341,8 @@ for (i = 0; i < ht->ht_tblsz; i++) { TAILQ_FOREACH(he, &ht->ht_buckets[i].hb_table, he_next) { - free(he->he_key); + if (he->he_flags & HASHTBL_KEYDUP) + free(he->he_key); } } SLIST_FOREACH_SAFE(hep, &ht->ht_new, hep_next, hep2) { @@ -381,7 +382,7 @@ * Returns 0 on success, on failure -1 is returned */ int -hashtbl_add(struct hashtbl *ht, void *key, size_t keylen, void *data) +hashtbl_add(struct hashtbl *ht, void *key, size_t keylen, void *data, int flags) { uint32_t hval; struct hashentry *he; @@ -395,9 +396,15 @@ he->he_hash = hval; hval &= ht->ht_mask; + he->he_flags = flags; - he->he_key = malloc(keylen); - memcpy(he->he_key, key, keylen); + if (flags & HASHTBL_KEYDUP) { + he->he_key = malloc(keylen); + memcpy(he->he_key, key, keylen); + } + else { + he->he_key = key; + } he->he_keylen = keylen; he->he_data = data; TAILQ_INSERT_TAIL(&ht->ht_buckets[hval].hb_table, he, he_next); @@ -431,7 +438,8 @@ he = find(ht, hval, key, keylen); if (he != NULL) { TAILQ_REMOVE(&ht->ht_buckets[hval].hb_table, he, he_next); - free(he->he_key); + if (he->he_flags & HASHTBL_KEYDUP) + free(he->he_key); free_he(ht, he); return (0); } @@ -459,3 +467,21 @@ he = find(ht, hval, key, keylen); return (he != NULL) ? he->he_data : NULL; } + +/* + * Walk the hash table, cb will be called for every entry + * ht - hash table + * cb - Callback function + */ +void +hashtbl_walk(struct hashtbl *ht, hashtbl_cb cb) +{ + struct hashentry *he, *he2; + size_t i; + + for (i = 0; i < ht->ht_tblsz; i++) { + TAILQ_FOREACH_SAFE(he, &ht->ht_buckets[i].hb_table, he_next, he2) { + cb(ht, he->he_key, he->he_keylen, he->he_data); + } + } +} ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#4 (text+ko) ==== @@ -34,9 +34,10 @@ */ struct hashentry { TAILQ_ENTRY(hashentry) he_next; /* Next entry */ - uint32_t he_hash; /* Hash key */ - void *he_key; /* Key */ - size_t he_keylen; /* Key length */ + uint32_t he_hash; /* Computed hash */ + int he_flags; + void *he_key; /* Byte key */ + size_t he_keylen; /* Byte Key length */ void *he_data; /* Data object pointer */ }; @@ -72,10 +73,14 @@ SLIST_HEAD(, he_pool) ht_free; /* free hashentry objs */ }; +#define HASHTBL_KEYDUP 0x01 + +typedef void (hashtbl_cb)(struct hashtbl *, void *, size_t, void *); int hashtbl_init(struct hashtbl *, size_t, size_t, size_t); void hashtbl_destroy(struct hashtbl *); -int hashtbl_add(struct hashtbl *, void *, size_t, void *); +int hashtbl_add(struct hashtbl *, void *, size_t, void *, int); int hashtbl_del(struct hashtbl *, void *, size_t); void * hashtbl_find(struct hashtbl *, void *, size_t); +void hashtbl_walk(struct hashtbl *, hashtbl_cb); #endif /* _HASH_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 2 11:54:39 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 4890C16A46D; Sat, 2 Jun 2007 11:54:39 +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 CEE3516A469 for ; Sat, 2 Jun 2007 11:54:38 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BFE9313C46C for ; Sat, 2 Jun 2007 11:54:38 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52BscFS077538 for ; Sat, 2 Jun 2007 11:54:38 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52BsceY077530 for perforce@freebsd.org; Sat, 2 Jun 2007 11:54:38 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 11:54:38 GMT Message-Id: <200706021154.l52BsceY077530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 11:54:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=120766 Change 120766 by fli@fli_genesis on 2007/06/02 11:53:56 - Move generic debugging macros to its own file. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.h#2 (text+ko) ==== @@ -32,12 +32,6 @@ void log_init(int); void logger(int, const char *, ...); -#define DEBUG_NONE 0x0000 -#define DEBUG_WQUEUE 0x0001 -#define DEBUG_EVENT 0x0002 -#define DEBUG_STACK 0x0004 -#define DEBUG_MISC 0x0008 - #ifdef DEBUG extern int __debug_msg; #define dprintf(m, _msg, ...) do { \ From owner-p4-projects@FreeBSD.ORG Sat Jun 2 11:56: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 81F2016A469; Sat, 2 Jun 2007 11:56: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 217EB16A41F for ; Sat, 2 Jun 2007 11:56:42 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1201513C447 for ; Sat, 2 Jun 2007 11:56:42 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52BufP7079282 for ; Sat, 2 Jun 2007 11:56:41 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Buf38079276 for perforce@freebsd.org; Sat, 2 Jun 2007 11:56:41 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 11:56:41 GMT Message-Id: <200706021156.l52Buf38079276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 11:56:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=120767 Change 120767 by fli@fli_genesis on 2007/06/02 11:56:33 - Add debugging macros. - No need to hold read lock during event handle execution. - Style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#2 (text+ko) ==== @@ -24,10 +24,11 @@ * */ -#include -#include #include #include + +#include +#include #include #include #include @@ -36,6 +37,7 @@ #include "event.h" #include "wqueue.h" #include "log.h" +#include "debug.h" static int remove_event(struct eventlist *, struct event *, ev_arg *); static int event_engine(wq_arg); @@ -76,6 +78,7 @@ #ifdef HAVE_PTHREAD pthread_mutex_init(&evl->evl_mtx, NULL); #endif + MDNS_INIT_SET(evl, evl_magic); return (evl); } @@ -91,6 +94,7 @@ struct event *ev; int empty; + MDNS_INIT_ASSERT(evl, evl_magic); EVL_LOCK(evl); while (!TAILQ_EMPTY(&evl->evl_events)) { ev = TAILQ_FIRST(&evl->evl_events); @@ -107,6 +111,7 @@ #ifdef HAVE_PTHREAD pthread_mutex_destroy(&evl->evl_mtx); #endif + MDNS_INIT_UNSET(evl, evl_magic); free(evl); } else { @@ -130,9 +135,8 @@ int ret; ev = (struct event *)arg.ptr; + MDNS_INIT_ASSERT(ev, ev_magic); - /* Grab a read-lock during the time we execute the handler */ - EV_RLOCK(ev); switch (ev->ev_type) { case EVENT_TYPE_IO: ret = ev->ev_cb.ev_handler.io(&ev->ev_data.io, ev->ev_handler_arg); @@ -145,15 +149,15 @@ break; } - /* "Upgrade" to write-lock */ - EV_UNLOCK(ev); EV_WLOCK(ev); ev->ev_refcnt--; if (ev->ev_flags & EVENT_FLAG_DYING) { evl = ev->ev_evl; remove_event(evl, ev, NULL); } - EV_UNLOCK(ev); + else { + EV_UNLOCK(ev); + } return (0); } @@ -174,6 +178,7 @@ wq_arg wa; struct kevent kev; + MDNS_INIT_ASSERT(evl, evl_magic); EVL_LOCK(evl); kq = evl->evl_kq; EVL_UNLOCK(evl); @@ -219,14 +224,17 @@ } /* Exclusive event already in progress */ - if (ev->ev_flags & EVENT_FLAG_EX && ev->ev_refcnt > 0) { + if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_refcnt > 0) { + dprintf(DEBUG_EVENT, + "Exclusive event already in progress ev=%x", ev); EV_UNLOCK(ev); continue; } ev->ev_refcnt++; EV_UNLOCK(ev); - dprintf(DEBUG_EVENT, "Event fired, dispatched to queue=%x, ev=%x", wq, ev); + dprintf(DEBUG_EVENT, "Event fired, dispatched to queue=%x, ev=%x", + wq, ev); wa.ptr = ev; #ifdef HAVE_PTHREAD error = wq_enqueue(wq, event_engine, &wa); @@ -250,6 +258,7 @@ { pid_t self; + MDNS_INIT_ASSERT(evl, evl_magic); EVL_LOCK(evl); dprintf(DEBUG_EVENT, "Event exit called"); evl->evl_flags |= EVL_FLAG_DYING; @@ -282,6 +291,7 @@ ev_arg ev_arg_init; struct kevent kev; + MDNS_INIT_ASSERT(evl, evl_magic); ev = malloc(sizeof(struct event)); if (ev == NULL) return (-1); @@ -364,9 +374,10 @@ TAILQ_INSERT_TAIL(&evl->evl_events, ev, ev_evlist); EVL_UNLOCK(evl); } + MDNS_INIT_SET(ev, ev_magic); - dprintf(DEBUG_EVENT, "Event added type=%d, ev=%x, handler=%x", - type, ev, handler); + dprintf(DEBUG_EVENT, "Event added type=%d, id=%d, ev=%x, handler=%x", + type, ev->ev_id, ev, handler); return (ev->ev_id); } @@ -384,8 +395,7 @@ { struct event *ev = NULL; - dprintf(DEBUG_EVENT, "Removing event ev=%x", ev); - + MDNS_INIT_ASSERT(evl, evl_magic); EVL_LOCK(evl); TAILQ_FOREACH(ev, &evl->evl_events, ev_evlist) { if (ev->ev_id == id) @@ -397,12 +407,13 @@ return (-1); } EV_WLOCK(ev); + dprintf(DEBUG_EVENT, "Removing event ev=%x", ev); if (remove_event(evl, ev, arg) == 1) { EV_UNLOCK(ev); } - return (ev->ev_id); + return (0); } /* @@ -420,6 +431,9 @@ ev_arg ev_arg_init; struct kevent kev; + MDNS_INIT_ASSERT(evl, evl_magic); + MDNS_INIT_ASSERT(ev, ev_magic); + if (ev->ev_refcnt > 0) { dprintf(DEBUG_EVENT, "Event busy ev=%x, refcnt=%d", ev, ev->ev_refcnt); ev->ev_flags |= EVENT_FLAG_DYING; @@ -468,6 +482,7 @@ kev.flags |= EV_DELETE | EV_CLEAR; ret = kevent(evl->evl_kq, &kev, 1, NULL, 0, NULL); + MDNS_INIT_UNSET(ev, ev_magic); free(ev); dprintf(DEBUG_EVENT, "Event removed ev=%x", ev); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include "wqueue.h" +#include "debug.h" /* * Holds event id and backpointer to event list, included @@ -97,6 +98,7 @@ */ struct event; struct eventlist { + MAGIC(evl_magic); TAILQ_HEAD(, event) evl_events; /* list of events */ #ifdef HAVE_PTHREAD pthread_mutex_t evl_mtx; @@ -111,6 +113,7 @@ * Internal event structure, represents an event */ struct event { + MAGIC(ev_magic); TAILQ_ENTRY(event) ev_evlist; /* global event list */ struct eventlist *ev_evl; /* back-pointer to list */ #ifdef HAVE_PTHREAD From owner-p4-projects@FreeBSD.ORG Sat Jun 2 11:58: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 8752716A46C; Sat, 2 Jun 2007 11:58: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 4481716A400 for ; Sat, 2 Jun 2007 11:58:45 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3457113C44C for ; Sat, 2 Jun 2007 11:58:45 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52Bwjg0080992 for ; Sat, 2 Jun 2007 11:58:45 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Bwi3O080980 for perforce@freebsd.org; Sat, 2 Jun 2007 11:58:44 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 11:58:44 GMT Message-Id: <200706021158.l52Bwi3O080980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 11:58:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=120768 Change 120768 by fli@fli_genesis on 2007/06/02 11:58:24 Debugging and style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.c#2 (text+ko) ==== @@ -24,17 +24,17 @@ * */ -#include -#include +#include + +#include #include #include #include -#include #include -#include #include #include "log.h" +#include "debug.h" static int _isdaemon = 0; static const char *_pname = NULL; ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.c#2 (text+ko) ==== @@ -24,19 +24,21 @@ * */ +#include +#include + +#include #include -#include +#include #include #include #ifdef HAVE_PTHREAD #include #endif -#include -#include -#include #include "wqueue.h" #include "log.h" +#include "debug.h" #ifdef HAVE_PTHREAD static void * wq_worker(void *); @@ -69,6 +71,8 @@ { struct wq_tag *wqt; + MDNS_INIT_ASSERT(wq, wq_magic); + if (TAILQ_EMPTY(&wq->wq_free)) { wqt = malloc(sizeof(struct wq_tag)); bzero(wqt, sizeof(struct wq_tag)); @@ -79,7 +83,7 @@ wqt = TAILQ_FIRST(&wq->wq_free); TAILQ_REMOVE(&wq->wq_free, wqt, wqt_list); } - + MDNS_INIT_SET(wqt, wqt_magic); wq->wq_tags_used++; dprintf(DEBUG_WQUEUE, "%d tags, used %d", wq->wq_tags, wq->wq_tags_used); return (wqt); @@ -99,7 +103,9 @@ { int i; + MDNS_INIT_ASSERT(wq, wq_magic); TAILQ_INSERT_HEAD(&wq->wq_free, wqt, wqt_list); + MDNS_INIT_UNSET(wqt, wqt_magic); /* * De-allocate job tags if we have a large share of unused tags @@ -146,6 +152,7 @@ wq->wq_workers_max = max; wq->wq_workers_min = min; + MDNS_INIT_SET(wq, wq_magic); return (wq); } @@ -161,6 +168,7 @@ { struct wq_tag *wqt; + MDNS_INIT_ASSERT(wq, wq_magic); WQ_LOCK(wq); wq->wq_flags |= WQ_FLAGS_DYING; @@ -197,6 +205,7 @@ pthread_cond_destroy(&wq->wq_cond); pthread_attr_destroy(&wq->wq_attr); #endif + MDNS_INIT_UNSET(wq, wq_magic); free(wq); } @@ -213,6 +222,7 @@ struct wq_thread *thr; struct wq_tag *wqt; + MDNS_INIT_ASSERT(wq, wq_magic); if (wq->wq_flags & WQ_FLAGS_DYING) return (-1); @@ -262,6 +272,7 @@ struct wq_thread *thr; int id; + MDNS_INIT_ASSERT(wq, wq_magic); thr = malloc(sizeof(struct wq_thread)); if (thr == NULL) return (NULL); @@ -318,7 +329,7 @@ int error; wq = wqthr->wqthr_wq; - + MDNS_INIT_ASSERT(wq, wq_magic); WQ_LOCK(wq); wq->wq_workers_idle++; for (;;) { ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/wqueue.h#2 (text+ko) ==== @@ -33,6 +33,8 @@ #include #include +#include "debug.h" + struct wq_tag; struct wq_thread; @@ -40,6 +42,7 @@ * Thread work queue */ struct wqueue { + MAGIC(wq_magic); TAILQ_HEAD(, wq_tag) wq_queue; /* Job queue */ TAILQ_HEAD(, wq_tag) wq_free; /* Free job tags */ int wq_tags; /* Number of allocated tags */ @@ -73,6 +76,7 @@ */ typedef int (*wq_func)(const wq_arg); struct wq_tag { + MAGIC(wqt_magic); TAILQ_ENTRY(wq_tag) wqt_list; wq_func wqt_func; wq_arg wqt_func_arg; From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:05: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 B0EDD16A421; Sat, 2 Jun 2007 12:05: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 68BA816A400 for ; Sat, 2 Jun 2007 12:05:54 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8A113C44C for ; Sat, 2 Jun 2007 12:05:54 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52C5sdk089097 for ; Sat, 2 Jun 2007 12:05:54 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52C5srK089088 for perforce@freebsd.org; Sat, 2 Jun 2007 12:05:54 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:05:54 GMT Message-Id: <200706021205.l52C5srK089088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120769 Change 120769 by fli@fli_genesis on 2007/06/02 12:04:53 - Add and use MDNS_PKG_MAX_LEN instead of 9000 - Cap max number of bytes received via TCP to MDNS_PKG_MAX_LEN - Use IPv6 header size instead of IPv4 when calculating packet size. - Remove debugging macros that live in debug.h now. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#4 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#4 (text+ko) ==== @@ -24,27 +24,30 @@ * */ -#include -#include -#include -#include -#include #include #include +#include +#include +#include + #include +#include + #include #include + +#include +#include #include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include #include "mdns.h" #include "stack_mdns.h" +#include "debug.h" static int mdns_udp_open(struct mdns *, int); static int mdns_udp_close(struct mdns *, int); @@ -105,16 +108,15 @@ error = ioctl(sock, SIOCGIFMTU, &req); close(sock); /* - * IP-header (no options) and UDP-header - * XXX: Will there ever be ip-options present in multicast packets? + * IPv6-header and UDP-header */ -#define _HDR_OVERHEAD (20 + 8) +#define _HDR_OVERHEAD (40 + 8) if (error != 0) - md->md_maxpkgsz = 512; + md->md_maxpkgsz = MDNS_PKG_UDP_LEN; else { md->md_maxpkgsz = req.ifr_mtu - _HDR_OVERHEAD; - if (md->md_maxpkgsz > 9000) - md->md_maxpkgsz = 9000; + if (md->md_maxpkgsz > MDNS_PKG_MAX_LEN) + md->md_maxpkgsz = MDNS_PKG_MAX_LEN; } #undef _HDR_OVERHEAD @@ -872,8 +874,9 @@ pkg->p_len += n; MDNS_BUFLEN(buf) = n; } - if ((unsigned int)n < MDNS_BUFSZ(buf)) + if ((unsigned int)n < MDNS_BUFSZ(buf) || pkg->p_len >= MDNS_PKG_MAX_LEN) break; + buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); if (buf == NULL) return (-1); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#3 (text+ko) ==== @@ -28,22 +28,8 @@ #define _STACK_MDNS_H_ #include -#include - #include "stack_buf.h" -/* Structure initialization protection */ -#define MDNS_MAGIC_COOKIE 0xcafebabe -#ifdef DEBUG -#define MDNS_INIT_SET(_md, f) (_md)->f = MDNS_MAGIC_COOKIE; -#define MDNS_INIT_UNSET(_md, f) (_md)->f = ~MDNS_MAGIC_COOKIE; -#define MDNS_INIT_ASSERT(_md, f) assert((_md)->f == MDNS_MAGIC_COOKIE); -#else -#define MDNS_INIT_SET(_md, f) -#define MDNS_INIT_UNSET(_md, f) -#define MDNS_INIT_ASSERT(_md, f) -#endif - /* Multicast DNS constants */ #define MDNS_MCAST_INET "224.0.0.251" /* IPv4 multicast address */ #define MDNS_MCAST_INET6 "ff02::fb" /* IPv6 multicast address */ @@ -52,6 +38,7 @@ /* Header constants */ #define MDNS_PKG_LABEL_LEN 63 #define MDNS_PKG_UDP_LEN 512 /* legacy udp length */ +#define MDNS_PKG_MAX_LEN 9000 /* Maximum packet length */ #define MDNS_HEADER_LEN 12 #define MDNS_QSET_HLEN 4 /* qset header length */ #define MDNS_RRSET_HLEN 10 /* rrset header length */ From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:11: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 A24F316A46C; Sat, 2 Jun 2007 12:11:09 +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 608CE16A469 for ; Sat, 2 Jun 2007 12:11:09 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5102A13C43E for ; Sat, 2 Jun 2007 12:11:09 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CB9Gf094143 for ; Sat, 2 Jun 2007 12:11:09 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52CB8hl094127 for perforce@freebsd.org; Sat, 2 Jun 2007 12:11:08 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:11:08 GMT Message-Id: <200706021211.l52CB8hl094127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=120770 Change 120770 by fli@fli_genesis on 2007/06/02 12:10:09 - No need to to UTF8 {en,de}coding during packet {de}construction, it can be deferred until later. - Make sure to do name decompression on resource data that needs it, such as PTR, CNAME and SRV. - Fix some comments. - Follow debug changes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#4 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ struct mdns_packet; struct mdns { - uint32_t md_magic; + MAGIC(md_magic); char md_ifnam[IFNAMSIZ + 1]; int md_ifindex; int md_flags; @@ -116,7 +116,7 @@ typedef int (*md_lock)(void *); typedef int (*md_unlock)(void *); struct mdns_pkgchain { - uint32_t pc_magic; + MAGIC(pc_magic); TAILQ_HEAD(, mdns_packet) pc_head; /* packet list */ int pc_list_len; /* packet list length */ int pc_flags; @@ -183,23 +183,23 @@ * MDNS resource set */ struct mdns_rrset { + char r_name[MDNS_RECORD_LEN + 1]; /* rrset name */ uint16_t r_class; /* rrset class */ uint16_t r_type; /* Record type */ + int r_cflush; /* cache flush */ uint32_t r_ttl; /* Time to live */ uint16_t r_datalen; /* Length of resource data */ - int r_cflush; /* cache flush */ char *r_data; /* Resource data */ - wchar_t r_name[MDNS_RECORD_LEN + 1]; /* rrset name */ }; /* * MDNS question/query set */ struct mdns_qset { + char q_name[MDNS_RECORD_LEN + 1]; /* qname */ uint16_t q_class; /* qset class */ uint16_t q_type; /* query type */ int q_unicast; /* unicast desired */ - wchar_t q_name[MDNS_RECORD_LEN + 1]; /* qname */ }; int mdns_init(struct mdns *, struct mdns_bufpool *, const char *); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ static int name_compress(struct hashtbl *, char *, size_t, char *, size_t *, int); static int name_decompress(char *, char *, size_t, char *, size_t); +static inline char * res_decode(char *, uint16_t *, uint16_t, char *, size_t); static inline void free_pkg(struct mdns_packet *, struct mdns_bufpool *); @@ -373,7 +374,6 @@ i = 0; /* * Turn into a normal DNS label without compression. - * ``rdst'' will contain the same name but with label pointers reversed. */ while (p != str) { if (*p == '.') { @@ -409,7 +409,7 @@ break; offset = pkg_offset; - hashtbl_add(ht, p, q - p, (void *)(int)offset); + hashtbl_add(ht, p, q - p, (void *)(int)offset, 0); pkg_offset += (*p + 1); p += *p + 1; } @@ -472,6 +472,53 @@ } /* + * Some resource types requires special attention as their resource data + * contains names that might have been name compressed. + */ +static inline char * +res_decode(char *res, uint16_t *reslen, uint16_t type, char *buf, size_t pkglen) +{ + int error; + char *p; + + if ((res + *reslen) > (buf + pkglen)) + return (NULL); + + switch (type) { + case mdns_t_srv: + p = malloc(MDNS_RECORD_LEN + 6); + if (p == NULL) + return (NULL); + memcpy(p, res, 6); + error = name_decompress(res + 6, p + 6, MDNS_RECORD_LEN, buf, pkglen); + if (error != 0) { + free(p); + return (NULL); + } + *reslen = strlen(p + 6) + 6; + break; + case mdns_t_ptr: + case mdns_t_cname: + p = malloc(MDNS_RECORD_LEN); + if (p == NULL) + return (NULL); + error = name_decompress(res, p, MDNS_RECORD_LEN, buf, pkglen); + if (error != 0) { + free(p); + return (NULL); + } + *reslen = strlen(p); + break; + default: + p = malloc(*reslen); + if (p == NULL) + return (NULL); + memcpy(p, res, *reslen); + } + return (p); +} + +/* * Set DNS header on the current chain * pc - Package chain * id - Transaction id (only non-zero with legacy unicast clients) @@ -561,13 +608,13 @@ mdns_pkg_addquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs, int unicast) { - char nam[MDNS_RECORD_LEN + 1], namc[MDNS_RECORD_LEN]; + char namc[MDNS_RECORD_LEN]; struct mdns_packet *pkg, *hpkg; struct mdns_bufpool *bp; struct mdns_buf *buf; struct mdns_header *h; struct mdns_qsec qsec; - ssize_t qname_len, namlen, namlen2; + size_t namlen, namclen; int i, error, flags; uint16_t class; @@ -584,8 +631,8 @@ } buf = pkg->p_bufseg(p_questions); - qname_len = wcslen(qs->q_name); - i = qname_len + 1 + MDNS_QSET_HLEN; + namlen = strlen(qs->q_name); + i = namlen + 1 + MDNS_QSET_HLEN; /* * Expand packet chains, buffer chains and buffers if needed @@ -619,24 +666,16 @@ } } - namlen = utf8_encode(qs->q_name, nam, MDNS_RECORD_LEN); - if (namlen < 0) { - errno = EINVAL; - return (-1); - } - if (pkg->p_nc_tbl == NULL) { pkg->p_nc_tbl = malloc(sizeof(struct hashtbl)); - hashtbl_init(pkg->p_nc_tbl, 128); + hashtbl_init(pkg->p_nc_tbl, 8, 256, 5); } - namlen2 = MDNS_RECORD_LEN; - error = name_compress(pkg->p_nc_tbl, nam, namlen, namc, &namlen2, + namclen = MDNS_RECORD_LEN; + error = name_compress(pkg->p_nc_tbl, qs->q_name, namlen, namc, &namclen, pkg->p_len); - if (error != 0) { + if (error != 0) return (-1); - } - namlen = namlen2; memcpy(MDNS_BUFPOS(buf), namc, namlen); MDNS_BUFLEN(buf) += namlen; @@ -711,18 +750,19 @@ static int addres(struct mdns_pkgchain *pc, int section, struct mdns_rrset *rs, int flush) { - char nam[MDNS_RECORD_LEN + 1], namc[MDNS_RECORD_LEN]; + char namc[MDNS_RECORD_LEN]; struct mdns_packet *pkg; struct mdns_bufpool *bp; struct mdns_buf *buf; struct mdns_header *h; - ssize_t namlen, namlen2; + size_t namlen, namclen; int i, error, flags; uint16_t class; struct mdns_rsec rsec; pkg = pc->pc_pkg; - namlen = wcslen(rs->r_name); + + namlen = strlen(rs->r_name); i = namlen + 1 + MDNS_RRSET_HLEN + rs->r_datalen; bp = pc->pc_md->md_bp; @@ -802,25 +842,18 @@ } } - namlen = utf8_encode(rs->r_name, nam, MDNS_RECORD_LEN); - if (namlen < 0) { - errno = EINVAL; - return (-1); - } - if (pkg->p_nc_tbl == NULL) { pkg->p_nc_tbl = malloc(sizeof(struct hashtbl)); - hashtbl_init(pkg->p_nc_tbl, 128); + hashtbl_init(pkg->p_nc_tbl, 8, 256, 5); } - namlen2 = MDNS_RECORD_LEN; - error = name_compress(pkg->p_nc_tbl, nam, namlen, namc, &namlen2, + namclen = MDNS_RECORD_LEN; + error = name_compress(pkg->p_nc_tbl, rs->r_name, namlen, namc, &namclen, pkg->p_len); if (error != 0) { errno = EINVAL; return (-1); } - namlen = namlen2; memcpy(MDNS_BUFPOS(buf), namc, namlen); MDNS_BUFLEN(buf) += namlen; @@ -870,7 +903,6 @@ static int getres(struct mdns_packet *pkg, int section, int entry, void *set) { - char nam[MDNS_RECORD_LEN + 1]; struct mdns_rsec rsec; struct mdns_qsec qsec; struct mdns_header *h; @@ -879,9 +911,8 @@ struct mdns_qset *qs = (struct mdns_qset *)set; char *p, ***offsets, **offset, *end; int error, i, j, *last_offset, entries; - ssize_t namlen; uint16_t tmp[3], rlen; - wchar_t *wp; + char *wp; if (pkg->p_bufseg(p_hdr) == NULL) { hbuf = MDNS_BUFH(&pkg->p_buflist); @@ -1025,21 +1056,16 @@ } } + wp = (p_isrrset(section)) ? rs->r_name : qs->q_name; + /* * This routine asumes that the packet is available in one single buffer */ - error = name_decompress(p, nam, MDNS_RECORD_LEN, + error = name_decompress(p, wp, MDNS_RECORD_LEN, MDNS_BUF(buf), MDNS_BUFLEN(buf)); if (error != 0) goto invalidpkg; - wp = (p_isrrset(section)) ? rs->r_name : qs->q_name; - namlen = strlen(nam); /* XXX: should be merged with name_decompress */ - - namlen = utf8_decode(nam, namlen, wp, MDNS_RECORD_LEN); - if (namlen < 0) - goto invalidpkg; - end = MDNS_BUF(buf) + MDNS_BUFLEN(buf); p = skipname(p, end); if (p == NULL) @@ -1057,12 +1083,13 @@ rs->r_ttl = ntohl(rsec.rs_ttl); rs->r_datalen = ntohs(rsec.rs_rdlen); - if (p + rs->r_datalen > end) + p += MDNS_RRSET_HLEN; + rs->r_data = res_decode(p, &rs->r_datalen, rs->r_type, + MDNS_BUF(buf), MDNS_BUFLEN(buf)); + if (rs->r_data == NULL) { + rs->r_datalen = 0; goto invalidpkg; - rs->r_data = malloc(rs->r_datalen); - if (rs->r_data == NULL) - goto invalidpkg; - memcpy(rs->r_data, p, rs->r_datalen); + } } else { if (p + MDNS_QSET_HLEN > end) From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:18: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 E3A1D16A46C; Sat, 2 Jun 2007 12:18: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 8646816A400 for ; Sat, 2 Jun 2007 12:18:20 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5EF0B13C44B for ; Sat, 2 Jun 2007 12:18:20 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CIKdZ001170 for ; Sat, 2 Jun 2007 12:18:20 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52CIJoC001158 for perforce@freebsd.org; Sat, 2 Jun 2007 12:18:19 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:18:19 GMT Message-Id: <200706021218.l52CIJoC001158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:18:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120773 Change 120773 by fli@fli_genesis on 2007/06/02 12:18:10 Add a mDNS record database. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:26: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 46A8616A469; Sat, 2 Jun 2007 12:26: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 089BB16A41F for ; Sat, 2 Jun 2007 12:26:31 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ED92A13C458 for ; Sat, 2 Jun 2007 12:26:30 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CQUJQ009491 for ; Sat, 2 Jun 2007 12:26:30 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52CQUNV009482 for perforce@freebsd.org; Sat, 2 Jun 2007 12:26:30 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:26:30 GMT Message-Id: <200706021226.l52CQUNV009482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:26:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=120774 Change 120774 by fli@fli_genesis on 2007/06/02 12:25:30 - Add a mDNS record cache (record database consumer). - Add structures related to self-claimed records (not complete). - Add some interface specific flags, MIF_DYING Interface was lost, waiting for resources to free. MIF_LINKCHG Link up/down switch in progress. - Add a list of per-interface active events. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#2 (text+ko) ==== @@ -31,10 +31,13 @@ #ifdef HAVE_PTHREAD #include #endif +#include #include "wqueue.h" #include "event.h" #include "mdns.h" +#include "record.h" +#include "debug.h" #ifdef HAVE_PTHREAD #define RW_RLOCK(g,f) pthread_rwlock_rdlock(&(g)->f) @@ -71,18 +74,97 @@ }; /* + * Cache resouce record + */ +struct cache_res { + MAGIC(cr_magic); + struct record_res cr_res; + TAILQ_ENTRY(cache_res) cr_next; + uint32_t cr_ttl_rel; + uint32_t cr_ttl_abs; + time_t cr_ctime; +}; + +/* + * Cache record set + */ +struct cache { + struct records c_recs; + int c_timer; + TAILQ_HEAD(, cache_res) c_list; /* time delta list */ +}; + +/* Event identifier */ +struct md_if_ev { + TAILQ_ENTRY(md_if_ev) ifev_next; + int ifev_id; +}; + +/* * Interface state information */ struct md_if { + MAGIC(mif_magic); TAILQ_ENTRY(md_if) mif_next; #ifdef HAVE_PTHREAD pthread_rwlock_t mif_lock; #endif struct md_glob *mif_glob; /* back pointer */ + int mif_refcnt; int mif_index; /* interface index */ int mif_flags; -#define MDIF_LINKUP 0x0001 +#define MIF_DYING 0x0001 /* Interface is going away */ +#define MIF_LINKUP 0x0002 /* Link is up (carrier) */ +#define MIF_LINKCHG 0x0004 /* Link state change pending */ + TAILQ_HEAD(, md_if_ev) mif_evlist; /* Events on this iface */ + int mif_tmr; struct mdns mif_handle; /* low-level mdns stack handle */ + struct cache mif_cache; + char mif_ifnam[IFNAMSIZ]; +}; + + +/* + * Self-claimed record state + */ +enum { + DBRES_PROBING, /* Probing for uniqness */ + DBRES_ANNOUNCING, /* Annonucing a uniq name */ + DBRES_OK, /* Record is OK */ + DBRES_CONFLICT, /* Conflict with other peer */ + DBRES_UNKNOWN, /* Unknown state */ + DBRES_INVALID /* Has invalid rdata */ +}; + +struct db_res { + struct record_res ds_res; + uint32_t ds_ttl; + int ds_state; +#define DBRES_SHARED 0x0001 +#define DBRES_UNIQUE 0x0002 + int ds_flags; + /* vartag rdata */ }; +struct db_rec { + struct record dc_rec; + /* vartag name */ +}; + +struct db { + struct records db_recs; +}; + + +/* cache.c */ +void cache_init(struct cache *); +void cache_destroy(struct cache *); +int cache_add(struct cache *, struct mdns_rrset *, struct record_res **); +int cache_del(struct cache *, struct record_res *); +struct record_res * cache_find(struct cache *, char *, uint16_t); +struct record_res * cache_find_next(struct record_res *); +void cache_purge(struct cache *, time_t, char *, uint16_t); +void cache_clean(struct cache *); +void cache_set_ttl(struct cache *, struct record_res *, uint32_t); + #endif /* _MDNSD_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:35: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 3952216A468; Sat, 2 Jun 2007 12:35: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 D793116A46B for ; Sat, 2 Jun 2007 12:35:43 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C724C13C448 for ; Sat, 2 Jun 2007 12:35:43 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CZhQ6018915 for ; Sat, 2 Jun 2007 12:35:43 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52CZhK3018909 for perforce@freebsd.org; Sat, 2 Jun 2007 12:35:43 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:35:43 GMT Message-Id: <200706021235.l52CZhK3018909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:35:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=120775 Change 120775 by fli@fli_genesis on 2007/06/02 12:34:55 - Add a generic timer functions tmr_{start,stop} - Add a periodic cache cleaner. - Add link up/down and address add/remove events. - Add basic packet parsing to pkgprocess(), including caching. - Add wrapper functions to interface locks. - Move socket and read-ready event setup to its own function. - Add cache initialization to interface setup. - Add if_del() that frees resources allocated to an interface. - Add get_linkstatus() returns current link status for an interface. - Add if_indextodata() returns ifindex -> struct md_if - Debugging and style fixes. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#2 (text+ko) ==== @@ -24,15 +24,23 @@ * */ +#include +#include +#include + +#include +#include +#include +#include + +#include +#include #include #include +#include +#include #include #include -#include -#include -#include -#include -#include #include "mdnsd.h" #include "log.h" @@ -43,6 +51,9 @@ int stack_unlock(void *); static struct md_if * if_new(struct md_glob *, const char *); +static int if_del(struct md_glob *, struct md_if *); +static inline int if_aquire(struct md_if *, int); +static inline void if_release(struct md_if *, int); int sig(struct event_sig *, ev_arg); int sig_init(int, struct event_sig *, ev_arg); @@ -50,10 +61,101 @@ int evh_udp_recv(const struct event_io *, const ev_arg); int evh_tcp_recv(const struct event_io *, const ev_arg); int evh_tcpcli(const struct event_io *, const ev_arg); +int evh_routesock_init(int, struct event_io *, ev_arg); +int evh_routesock(struct event_io *, ev_arg); + +int tmr_start(struct md_glob *, uint32_t, ev_handler_tmr, void *); +void tmr_stop(struct md_glob *, int); +static int evh_cacheclean(const struct event_tmr *, const ev_arg); static void usage(char *); /* + * Generic timer intialization + */ +static int +tmr_init(int what, struct event_tmr *ev, ev_arg arg) +{ + + switch (what) { + case EVENT_INIT_OPEN: + ev->evtmr_timeout = arg.int32; + break; + case EVENT_INIT_CLOSE: + break; + } + return (0); +} + +/* + * Start a timer, returns a unique timer identifier + */ +int +tmr_start(struct md_glob *g, uint32_t timeout, ev_handler_tmr handler, + void *arg) +{ + int id; + ev_arg eva, evai; + + evai.int32 = timeout; + eva.ptr = arg; + id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva, + tmr_init, &evai); + return (id); +} + +void +tmr_stop(struct md_glob *g, int timer) +{ + + event_del(g->g_evl, timer, NULL); +} + +/* + * Periodic cache cleaner, removes expired cache entries + */ +static int +evh_cacheclean(const struct event_tmr *ev, const ev_arg arg) +{ + struct md_if *mif = arg.ptr; + + if (if_aquire(mif, 1) != 0) + return (0); + cache_clean(&mif->mif_cache); + if_release(mif, 1); + return (0); +} + +/* + * Link state change. + * This routine is called 3 seconds after the real link state change + * occured, this is to catch and ignore sporadic link changes. + */ +static int +evh_linkchg(const struct event_tmr *ev, const ev_arg arg) +{ + struct md_if *mif = arg.ptr; + + if (if_aquire(mif, 1) != 0) + return (0); + mif->mif_flags &= ~MIF_LINKCHG; + tmr_stop(mif->mif_glob, mif->mif_tmr); + if (mif->mif_flags & MIF_LINKUP) { + mif->mif_flags &= ~MIF_LINKUP; + cache_destroy(&mif->mif_cache); + cache_init(&mif->mif_cache); + dprintf(DEBUG_MISC, "Link state change to DOWN on %s", mif->mif_ifnam); + } + else { + mif->mif_flags |= MIF_LINKUP; + /* TODO: call verify unique records */ + dprintf(DEBUG_MISC, "Link state change to UP on %s", mif->mif_ifnam); + } + if_release(mif, 1); + return (0); +} + +/* * Signal handler to SIG{INT,HUP} */ int @@ -107,12 +209,15 @@ pkgprocess(struct md_if *mif, struct mdns_pkgchain *pc, int type, struct sockaddr *from, socklen_t fromlen) { + struct mdns_packet *pkg; + struct mdns_rrset rs; + struct mdns_qset qs; + struct mdns_head hdr; + int i, error; #ifdef DEBUG char addr[SOCK_MAXADDRLEN+1]; void *sinaddr = NULL; -#endif -#ifdef DEBUG switch (from->sa_family) { case AF_INET: sinaddr = &((struct sockaddr_in *)from)->sin_addr; @@ -121,12 +226,49 @@ case AF_INET6: sinaddr = &((struct sockaddr_in6 *)from)->sin6_addr; break; -#endif +#endif /* INET6 */ } inet_ntop(from->sa_family, sinaddr, addr, SOCK_MAXADDRLEN); - dprintf(DEBUG_MISC, "Packet from: %s", addr); -#endif + dprintf(DEBUG_RECV, "Packet received peer=%s, if=%s", addr, mif->mif_ifnam); +#endif /* DEBUG */ + + pkg = mdns_pkgchain_curpkg(pc); + mdns_pkg_gethdr(pkg, &hdr); + dprintf(DEBUG_RECV, "questions=%d, answers=%d, authority=%d", + hdr.h_cquestion, hdr.h_canswer, hdr.h_cauth); + + if (hdr.h_flags & MDNS_HEAD_QUERY) { + for (i = 0; i < hdr.h_cquestion; i++) { + error = mdns_pkg_getquestion(pkg, i, &qs); + if (error != 0) + break; + + /* TODO: check db and reply. Do not reply if answer is + in answer section with ttl > own ttl/2 */ + } + } + else if (hdr.h_flags & MDNS_HEAD_RESP) { + for (i = 0; i < hdr.h_canswer; i++) { + error = mdns_pkg_getanswer(pkg, i, &rs); + if (error != 0) + break; + /* TODO: check db for conflicts */ + /* TODO: check for waiting clients */ + /* TODO: check for pending questions matching this */ + /* TODO: check for pending answers matching this */ + + /* + * Purge records older than 1 second if this is supposed to + * be a uniqe rrset (cache flush bit set) + */ + if (rs.r_cflush) + cache_purge(&mif->mif_cache, 1, rs.r_name, rs.r_type); + error = cache_add(&mif->mif_cache, &rs, NULL); + if (error == 1) + free(rs.r_data); + } + } return (0); } @@ -158,7 +300,7 @@ #endif } - RW_RLOCK(mif, mif_lock); + if_aquire(mif, 0); /* * Initialize a packet chain, receive the packet and hand it to the @@ -169,7 +311,10 @@ n = mdns_recv(&mif->mif_handle, &pc, sa.sa_family, saptr, &salen); if (n <= 0) { - dprintf(DEBUG_MISC, "Failed to read anything from socket"); + if (n == 0) { + dprintf(DEBUG_RECV, "No data on UDP socket sock=%d, mif=%x", + fd, mif); + } error = -1; goto out; } @@ -179,7 +324,7 @@ out: mdns_pkgchain_free(&mif->mif_handle, &pc); - RW_UNLOCK(mif, mif_lock); + if_release(mif, 0); return (error); } @@ -213,8 +358,9 @@ error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcp_recv, &eva, evh_ioread_init, &evai); - if (error < 0) + if (error < 0) { dprintf(DEBUG_EVENT, "Failed to add event to TCP client sock"); + } #ifdef DEBUG switch (sa.sa_family) { @@ -228,7 +374,7 @@ #endif } inet_ntop(sa.sa_family, sinaddr, addr, SOCK_MAXADDRLEN); - dprintf(DEBUG_MISC, "TCP connection from: %s, sock=%d\n", addr, sock); + dprintf(DEBUG_RECV, "TCP connection from: %s, sock=%d\n", addr, sock); #endif RW_UNLOCK(g, g_lock); @@ -250,14 +396,18 @@ socklen_t salen; fd = ev->evio_fd; - RW_RLOCK(mif, mif_lock); + if (if_aquire(mif, 0) != 0) + return (-1); mdns_pkgchain_init(&mif->mif_handle, &pc, MDNS_PC_CONT, stack_lock, stack_unlock, mif); n = mdns_tcp_recv(&mif->mif_handle, fd, &pc); if (n <= 0) { - dprintf(DEBUG_MISC, "Failed to read anything from socket"); + if (n == 0) { + dprintf(DEBUG_RECV, "No data on TCP socket sock=%d, mif=%x", + fd, mif); + } error = -1; goto out; } @@ -270,7 +420,7 @@ out: mdns_pkgchain_free(&mif->mif_handle, &pc); - RW_UNLOCK(mif, mif_lock); + if_release(mif, 0); return (error); } @@ -284,8 +434,8 @@ struct md_if *mif; mif = (struct md_if *)arg; - RW_UNLOCK(mif, mif_lock); - RW_WLOCK(mif, mif_lock); + if_release(mif, 0); + if_aquire(mif, 1); return (0); } @@ -299,8 +449,8 @@ struct md_if *mif; mif = (struct md_if *)arg; - RW_UNLOCK(mif, mif_lock); - RW_RLOCK(mif, mif_lock); + if_release(mif, 1); + if_aquire(mif, 0); return (0); } @@ -337,43 +487,68 @@ return (0); } +static inline int +if_aquire(struct md_if *mif, int write) +{ + RW_WLOCK(mif, mif_lock); + if (mif->mif_flags & MIF_DYING) { + RW_UNLOCK(mif, mif_lock); + return (-1);; + } + mif->mif_refcnt++; + if (!write) { + RW_UNLOCK(mif, mif_lock); + RW_RLOCK(mif, mif_lock); + } + return (0); +} + +static inline void +if_release(struct md_if *mif, int write) +{ + + if (!write) { + RW_UNLOCK(mif, mif_lock); + RW_WLOCK(mif, mif_lock); + } + + mif->mif_refcnt--; + if ((mif->mif_flags & MIF_DYING) && mif->mif_refcnt == 0) { + MDNS_INIT_UNSET(mif, mif_magic); + free(mif); + } + else { + RW_UNLOCK(mif, mif_lock); + } +} + +#define ADD2EVLIST(mif, id) { \ + struct md_if_ev *ifev; \ + ifev = malloc(sizeof(struct md_if_ev)); \ + ifev->ifev_id = id; \ + TAILQ_INSERT_TAIL(&mif->mif_evlist, ifev, ifev_next); \ +} + /* - * Allocate a new interface + * Intialize sockets and hooks up read-ready events */ -static struct md_if * -if_new(struct md_glob *g, const char *ifnam) +static void +setup_socks(struct md_if *mif) { - struct md_if *mif; + struct md_glob *g; int i, error, *socks, socklen; ev_arg eva, evai; - mif = malloc(sizeof(struct md_if)); - if (mif == NULL) - return (NULL); - bzero(mif, sizeof(struct md_if)); - mif->mif_index = if_nametoindex(ifnam); - if (mif->mif_index == 0) - goto out; - - /* Initialize low-level mdns stack on this interface */ - error = mdns_init(&mif->mif_handle, g->g_bp, ifnam); - if (error != 0) - goto out; - - RW_INIT(mif, mif_lock, NULL); - RW_WLOCK(mif, mif_lock); - mif->mif_glob = g; - + g = mif->mif_glob; eva.ptr = mif; - /* Open up UDP and TCP INET sockets */ error = mdns_open(&mif->mif_handle, MDNS_UDP, PF_INET); if (error != 0) - logger(LOG_ERR,"Failed to setup multicast UDP sockets (INET)"); + logger(LOG_ERR, "Failed to setup multicast UDP sockets (INET)"); error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET); if (error != 0) - logger(LOG_ERR,"Failed to setup TCP sockets (INET)"); + logger(LOG_ERR, "Failed to setup TCP sockets (INET)"); /* Install read-ready event to UDP INET socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET, &socklen); @@ -381,18 +556,27 @@ evai.fd = socks[0]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_udp_recv, &eva, evh_ioread_init, &evai); - if (error < 0) - dprintf(DEBUG_EVENT, "Failed to add event to UDP INET socks"); + if (error >= 0) { + ADD2EVLIST(mif, error); + } + else { + dprintf(DEBUG_EVENT, "Failed to add read event for UDP (INET)"); + } } + /* Install read-ready event to TCP INET socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_TCP, PF_INET, &socklen); if (socklen > 0) { for (i = 0; i < socklen; i++) { evai.fd = socks[i]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, &eva, evh_ioread_init, &evai); - if (error < 0) - dprintf(DEBUG_EVENT, "Failed to add event to TCP INET sock"); + if (error >= 0) { + ADD2EVLIST(mif, error); + } + else { + dprintf(DEBUG_EVENT, "Failed to add read event to TCP (INET)"); + } } } @@ -403,7 +587,7 @@ logger(LOG_ERR, "Failed to setup multicast UDP sockets (INET6)"); error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET6); if (error != 0) - logger(LOG_ERR,"Failed to setup TCP sockets (INET6)"); + logger(LOG_ERR, "Failed to setup TCP sockets (INET6)"); /* Install read-ready event to UDP INET6 socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET6, &socklen); @@ -411,34 +595,269 @@ evai.fd = socks[0]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_udp_recv, &eva, evh_ioread_init, &evai); - if (error < 0) - dprintf(DEBUG_EVENT, "Failed to add event to UDP INET6 socks"); + if (error >= 0) { + ADD2EVLIST(mif, error); + } + else { + dprintf(DEBUG_EVENT, "Failed to add read event for UDP (INET6)"); + } } + + /* Install read-ready event to TCP INET6 socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_TCP, PF_INET6, &socklen); if (socklen > 0) { for (i = 0; i < socklen; i++) { evai.fd = socks[i]; error = event_add(g->g_evl, EVENT_TYPE_IO, evh_tcpcli, &eva, evh_ioread_init, &evai); - if (error < 0) - dprintf(DEBUG_EVENT, "Failed to add event to TCP INET6 sock"); + if (error >= 0) { + ADD2EVLIST(mif, error); + } + else { + dprintf(DEBUG_EVENT, "Failed to add read event to TCP (INET6)"); + } } } #endif +} +#undef ADD2EVLIST + +/* + * Get link status for an interface + */ +static int +get_linkstatus(const char *ifnam) +{ + struct ifmediareq ifmr; + int fd, error; + + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) + return (LINK_STATE_UNKNOWN); + + memset(&ifmr, 0, sizeof(ifmr)); + strlcpy(ifmr.ifm_name, ifnam, sizeof(ifmr.ifm_name)); + error = ioctl(fd, SIOCGIFMEDIA, &ifmr); + if (error < 0) { + close(fd); + return (LINK_STATE_UNKNOWN); + } + close(fd); + + if (ifmr.ifm_status & IFM_AVALID) { + if (ifmr.ifm_status & IFM_ACTIVE) + return (LINK_STATE_UP); + else + return (LINK_STATE_DOWN); + } + return (LINK_STATE_UNKNOWN); +} + + +/* + * Allocate a new interface + */ +static struct md_if * +if_new(struct md_glob *g, const char *ifnam) +{ + struct md_if *mif; + int error; + + mif = malloc(sizeof(struct md_if)); + if (mif == NULL) + return (NULL); + bzero(mif, sizeof(struct md_if)); + mif->mif_index = if_nametoindex(ifnam); + if (mif->mif_index == 0) + goto out; + strncpy(mif->mif_ifnam, ifnam, IFNAMSIZ); + /* Initialize low-level mdns stack on this interface */ + error = mdns_init(&mif->mif_handle, g->g_bp, ifnam); + if (error != 0) + goto out; + + RW_INIT(mif, mif_lock, NULL); + RW_WLOCK(mif, mif_lock); + mif->mif_glob = g; + TAILQ_INIT(&mif->mif_evlist); + cache_init(&mif->mif_cache); + mif->mif_cache.c_timer = tmr_start(g, 1000, evh_cacheclean, mif); + if (get_linkstatus(ifnam) != LINK_STATE_DOWN) + mif->mif_flags |= MIF_LINKUP; + setup_socks(mif); + MDNS_INIT_SET(mif, mif_magic); + RW_UNLOCK(mif, mif_lock); + RW_WLOCK(g, g_lock); TAILQ_INSERT_TAIL(&g->g_ifs, mif, mif_next); RW_UNLOCK(g, g_lock); - RW_UNLOCK(mif, mif_lock); + logger(LOG_NOTICE, "Added interface %s", mif->mif_ifnam); - logger(LOG_NOTICE, "Added interface %s", ifnam); - return (mif); out: free(mif); return (NULL); } +/* + * Remove an interface + */ +static int +if_del(struct md_glob *g, struct md_if *mif) +{ + struct md_if_ev *ifev, *ifev2; + + MDNS_INIT_ASSERT(mif, mif_magic); + + if (if_aquire(mif, 1) != 0) + return (-1); + mif->mif_flags |= MIF_DYING; + + RW_WLOCK(g, g_lock); + TAILQ_REMOVE(&g->g_ifs, mif, mif_next); + RW_UNLOCK(g, g_lock); + + TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { + event_del(g->g_evl, ifev->ifev_id, NULL); + free(ifev); + } + tmr_stop(g, mif->mif_cache.c_timer); + + mdns_destroy(&mif->mif_handle); + cache_destroy(&mif->mif_cache); + + logger(LOG_NOTICE, "Removed interface %s", mif->mif_ifnam); + if_release(mif, 1); + return (0); +} + +static struct md_if * +if_indextodata(struct md_glob *g, int index) +{ + struct md_if *mif; + + TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { + if (index == mif->mif_index) + return (mif); + } + return (NULL); +} + +/* + * Routing socket event handler initialization + */ +int +evh_routesock_init(int what, struct event_io *ev, ev_arg arg) +{ + int sock; + + switch (what) { + case EVENT_INIT_OPEN: + sock = socket(AF_ROUTE, SOCK_RAW, 0); + if (sock < 0) + return (-1); + ev->evio_fd = sock; + ev->evio_dir = EVENT_IO_READ; + break; + case EVENT_INIT_CLOSE: + close(ev->evio_fd); + break; + } + return (0); +} + +/* + * Routing socket event handler + * This will monitor a routing socket and add/remove interfaces as + * appropriate. + */ +int +evh_routesock(struct event_io *ev, ev_arg arg) +{ +#define RS_BUFLEN (sizeof(struct rt_msghdr) + 512) + struct md_glob *g = (struct md_glob *)arg.ptr; + struct md_if *mif; + struct if_msghdr *ifm; + int len, sock; + char *next, *lim; + struct md_if_ev *ifev, *ifev2; + char buf[RS_BUFLEN], ifnam[IFNAMSIZ]; + + sock = ev->evio_fd; + + len = read(sock, buf, RS_BUFLEN); + if (len <= 0) + return (0); + + lim = buf + len; + for (next = buf; next < lim; next += ifm->ifm_msglen) { + ifm = (struct if_msghdr *) next; + if (ifm->ifm_flags & IFF_LOOPBACK) + continue; + + RW_RLOCK(g, g_lock); + mif = if_indextodata(g, ifm->ifm_index); + RW_UNLOCK(g, g_lock); + + if (ifm->ifm_type == RTM_IFINFO) { + if (ifm->ifm_flags & IFF_UP && mif == NULL) { + if (ifm->ifm_flags & IFF_MULTICAST) + if (if_indextoname(ifm->ifm_index, ifnam) != NULL) + if_new(g, ifnam); + } + else if (!(ifm->ifm_flags & IFF_UP) && mif != NULL) { + if_del(g, mif); + } + else { + if (if_aquire(mif, 1) != 0) + continue; + + if (mif->mif_flags & MIF_LINKCHG) { + tmr_stop(g, mif->mif_tmr); + mif->mif_flags &= ~MIF_LINKCHG; + dprintf(DEBUG_MISC, + "Link on %s re-restored, ignoring state change", + mif->mif_ifnam); + } + else if ((ifm->ifm_data.ifi_link_state == LINK_STATE_UP && + !(mif->mif_flags & MIF_LINKUP)) || + (ifm->ifm_data.ifi_link_state == LINK_STATE_DOWN && + mif->mif_flags & MIF_LINKUP)) { + mif->mif_flags |= MIF_LINKCHG; + mif->mif_tmr = tmr_start(g, 3000, evh_linkchg, mif); + } + + if_release(mif, 1); + } + } + else if (mif == NULL) { + continue; + } + + /* This is a bit crude */ + if (ifm->ifm_type == RTM_NEWADDR || ifm->ifm_type == RTM_DELADDR || + ifm->ifm_type == RTM_NEWMADDR) { + if_aquire(mif, 1); + TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { + event_del(g->g_evl, ifev->ifev_id, NULL); + free(ifev); + } + mdns_close(&mif->mif_handle, MDNS_UDP, PF_INET); + mdns_close(&mif->mif_handle, MDNS_TCP, PF_INET); +#ifdef INET6 + mdns_close(&mif->mif_handle, MDNS_UDP, PF_INET6); + mdns_close(&mif->mif_handle, MDNS_TCP, PF_INET6); +#endif + setup_socks(mif); + if_release(mif, 1); + } + } + + return (0); +#undef RS_BUFLEN +} + static void usage(char *exec) { @@ -452,6 +871,7 @@ int error, ch, nodaemon = 0; char *ifnam, *cfgfile = NULL; struct ifaddrs *ifap, *ifa; + struct md_if *mif, *mif2; struct md_glob glob; ev_arg eva; @@ -512,9 +932,9 @@ event_add(glob.g_evl, EVENT_TYPE_SIG, sig, NULL, sig_init, &eva); /* Add interfaces that are up */ - error = getifaddrs(&ifap); - if (error != 0) - err(EXIT_FAILURE, "getifaddrs"); + error = getifaddrs(&ifap); + if (error != 0) + err(EXIT_FAILURE, "getifaddrs"); ifnam = NULL; for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { if (ifa->ifa_flags & IFF_LOOPBACK || @@ -527,9 +947,17 @@ } freeifaddrs(ifap); + eva.ptr = &glob; + event_add(glob.g_evl, EVENT_TYPE_IO, evh_routesock, &eva, + evh_routesock_init, NULL); + /* Launch the event dispatcher */ error = event_dispatch(glob.g_evl, glob.g_wq); + TAILQ_FOREACH_SAFE(mif, &glob.g_ifs, mif_next, mif2) { + if_del(&glob, mif); + } + wq_destroy(glob.g_wq); event_destroy(glob.g_evl); mdns_bufpool_destroy(glob.g_bp); From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:37: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 7856B16A468; Sat, 2 Jun 2007 12:37: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 2D7C216A41F for ; Sat, 2 Jun 2007 12:37:47 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1E56413C448 for ; Sat, 2 Jun 2007 12:37:47 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CbkAq020796 for ; Sat, 2 Jun 2007 12:37:47 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Cbk9c020784 for perforce@freebsd.org; Sat, 2 Jun 2007 12:37:46 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:37:46 GMT Message-Id: <200706021237.l52Cbk9c020784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:37:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=120776 Change 120776 by fli@fli_genesis on 2007/06/02 12:36:56 - Debugging and style fixes. - Fix header protection defines in stack_buf.h Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#5 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.h#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#5 (text+ko) ==== @@ -24,12 +24,13 @@ * */ +#include #include +#include #include -#include -#include #include "stack_buf.h" +#include "debug.h" struct mdns_bufpool * mdns_bufpool_init(size_t, int, bp_lock, bp_unlock, void *arg); @@ -54,6 +55,7 @@ bp->bp_unlock = unlock; bp->bp_lockarg = arg; TAILQ_INIT(&bp->bp_list); + MDNS_INIT_SET(bp, bp_magic); return (bp); } @@ -63,6 +65,7 @@ struct mdns_buf *buf; int ret; + MDNS_INIT_ASSERT(bp, bp_magic); MDNS_BP_LOCK(bp); while (!TAILQ_EMPTY(&bp->bp_list)) { @@ -75,8 +78,10 @@ ret = TAILQ_EMPTY(&bp->bp_list); MDNS_BP_UNLOCK(bp); - if (ret == 1) + if (ret == 1) { + MDNS_INIT_UNSET(bp, bp_magic); free(bp); + } return (ret); } @@ -84,6 +89,7 @@ mdns_bufpool_setsize(struct mdns_bufpool *bp, size_t len) { + MDNS_INIT_ASSERT(bp, bp_magic); MDNS_BP_LOCK(bp); bp->bp_defsz = len; MDNS_BP_UNLOCK(bp); @@ -94,6 +100,7 @@ { size_t len; + MDNS_INIT_ASSERT(bp, bp_magic); MDNS_BP_LOCK(bp); len = bp->bp_defsz; MDNS_BP_UNLOCK(bp); @@ -107,6 +114,8 @@ { struct mdns_buf *buf; + MDNS_INIT_ASSERT(bp, bp_magic); + if (!locked) MDNS_BP_LOCK(bp); @@ -144,6 +153,7 @@ TAILQ_INIT(&bh->bh_list); TAILQ_INSERT_TAIL(&bh->bh_list, buf, b_list); bh->bh_size++; + MDNS_INIT_SET(buf, b_magic); if (!locked) MDNS_BP_UNLOCK(bp); @@ -156,9 +166,12 @@ { int i; + MDNS_INIT_ASSERT(bp, bp_magic); + MDNS_INIT_ASSERT(buf, b_magic); if (!locked) MDNS_BP_LOCK(bp); + MDNS_INIT_UNSET(buf, b_magic); TAILQ_REMOVE(&bh->bh_list, buf, b_list); bh->bh_size--; if (!(buf->b_flags & MDNS_BUF_TEMP)) { @@ -193,6 +206,7 @@ { char *p; + MDNS_INIT_ASSERT(buf, b_magic); if (len == 0) len = buf->b_sz * 2; else if (len < buf->b_len) @@ -218,6 +232,9 @@ size_t len; struct mdns_bufhead bh2; + MDNS_INIT_ASSERT(bp, bp_magic); + MDNS_INIT_ASSERT(buf, b_magic); + if (MDNS_BUFHSZ(bh) <= 1) return (TAILQ_FIRST(&bh->bh_list)); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.h#4 (text+ko) ==== @@ -24,16 +24,19 @@ * */ -#ifndef _CORE_BUF_H_ -#define _CORE_BUF_H_ +#ifndef _STACK_BUF_H_ +#define _STACK_BUF_H_ #include #include +#include "debug.h" + /* * Buffer segment */ struct mdns_buf { + MAGIC(b_magic); TAILQ_ENTRY(mdns_buf) b_list; char *b_buf; /* raw byte buffer */ size_t b_sz; /* buffer size */ @@ -42,6 +45,9 @@ #define MDNS_BUF_TEMP 0x01 /* do not put back on free list after use */ }; +/* + * Handy buffer manipulation macros + */ #define MDNS_BUF(b) (b)->b_buf #define MDNS_BUFSZ(b) (b)->b_sz #define MDNS_BUFLEN(b) (b)->b_len @@ -64,7 +70,7 @@ * Buffer pool */ struct mdns_bufpool { - uint32_t bp_magic; + MAGIC(bp_magic); TAILQ_HEAD(, mdns_buf) bp_list; /* free list */ size_t bp_defsz; /* default segment size */ int bp_lim; /* max number of segments */ @@ -83,6 +89,9 @@ size_t bh_size; /* number of buffer segments in list */ }; +/* + * Handy buffer head manipulation macros + */ #define MDNS_BUFHEAD(bh) (bh)->bh_list #define MDNS_BUFH(bh) TAILQ_FIRST(&(bh)->bh_list) #define MDNS_BUFHSZ(bh) (bh)->bh_size @@ -97,5 +106,5 @@ void mdns_bufpool_setsize(struct mdns_bufpool *, size_t); size_t mdns_bufpool_getsize(struct mdns_bufpool *); -#endif /* _CORE_BUF_H_ */ +#endif /* _STACK_BUF_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 2 12:39: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 593D316A468; Sat, 2 Jun 2007 12:39: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 2A6DF16A400 for ; Sat, 2 Jun 2007 12:39:50 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1BB7913C465 for ; Sat, 2 Jun 2007 12:39:50 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52CdnlJ022522 for ; Sat, 2 Jun 2007 12:39:49 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Cdntl022513 for perforce@freebsd.org; Sat, 2 Jun 2007 12:39:49 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 12:39:49 GMT Message-Id: <200706021239.l52Cdntl022513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 12:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120777 Change 120777 by fli@fli_genesis on 2007/06/02 12:39:00 - Hook up new files to the build. - Be a bit more style.Makefile friendly. - Tweak DEBUG_MASK (a bit less noisy). Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#2 (text+ko) ==== @@ -1,17 +1,16 @@ -SRCS= stack_mdns.c stack_packet.c stack_buf.c \ - hash.c event.c wqueue.c log.c mdnsd.c -PROG= mdnsd +SRCS= stack_mdns.c stack_packet.c stack_buf.c hash.c event.c \ + wqueue.c log.c mdnsd.c record.c cache.c +PROG= mdnsd +WARNS?= 3 -CFLAGS += -Wall -g -DDEBUG -DDEBUG_MASK=0xff +CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0xfc .if !defined(WITHOUT_INET6) -CFLAGS += -DINET6 +CFLAGS+= -DINET6 .endif .if !defined(WITHOUT_LIBPTHREAD) -CFLAGS += -DHAVE_PTHREAD -LDFLAGS += -lpthread +CFLAGS+= -DHAVE_PTHREAD +LDFLAGS+= -lpthread .endif -WARNS?=3 - .include From owner-p4-projects@FreeBSD.ORG Sat Jun 2 14:39:46 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 F027C16A473; Sat, 2 Jun 2007 14:39: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 ACDD116A400 for ; Sat, 2 Jun 2007 14:39:45 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9DF3713C458 for ; Sat, 2 Jun 2007 14:39:45 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52EdjuS051366 for ; Sat, 2 Jun 2007 14:39:45 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Edj6g051339 for perforce@freebsd.org; Sat, 2 Jun 2007 14:39:45 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 14:39:45 GMT Message-Id: <200706021439.l52Edj6g051339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 14:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=120782 Change 120782 by rpaulo@rpaulo_epsilon on 2007/06/02 14:38:42 Need to use bus_set_resource() on the probe routine or else the IRQ will only be setup on the second time the module is loaded. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#6 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#5 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#6 $ * */ @@ -48,6 +48,8 @@ #include #include +#include + #include #include #include @@ -218,6 +220,9 @@ if (!model) return ENXIO; + if (isa_get_irq(dev) == -1) + bus_set_resource(dev, SYS_RES_IRQ, 0, ASMC_IRQ, 1); + device_set_desc(dev, model->smc_desc); return BUS_PROBE_GENERIC; From owner-p4-projects@FreeBSD.ORG Sat Jun 2 14:40: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 AE43C16A53B; Sat, 2 Jun 2007 14:40: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 88F9616A52C for ; Sat, 2 Jun 2007 14:40:47 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 539E113C447 for ; Sat, 2 Jun 2007 14:40:47 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52EelpW052455 for ; Sat, 2 Jun 2007 14:40:47 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52EekPq052449 for perforce@freebsd.org; Sat, 2 Jun 2007 14:40:46 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 14:40:46 GMT Message-Id: <200706021440.l52EekPq052449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 14:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120783 Change 120783 by rpaulo@rpaulo_epsilon on 2007/06/02 14:39:45 isa_if.h is needed. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/modules/asmc/Makefile#2 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/modules/asmc/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $P4: //depot/projects/soc2007/rpaulo-macbook/modules/asmc/Makefile#1 $ +# $P4: //depot/projects/soc2007/rpaulo-macbook/modules/asmc/Makefile#2 $ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/asmc KMOD= asmc -SRCS= asmc.c bus_if.h device_if.h +SRCS= asmc.c bus_if.h device_if.h isa_if.h .include From owner-p4-projects@FreeBSD.ORG Sat Jun 2 16:37:10 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 A76A016A46C; Sat, 2 Jun 2007 16:37:10 +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 4950A16A469 for ; Sat, 2 Jun 2007 16:37:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A89A13C44B for ; Sat, 2 Jun 2007 16:37:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52GbAxE066718 for ; Sat, 2 Jun 2007 16:37:10 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Gb9W2066712 for perforce@freebsd.org; Sat, 2 Jun 2007 16:37:09 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 16:37:09 GMT Message-Id: <200706021637.l52Gb9W2066712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 16:37:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=120785 Change 120785 by rpaulo@rpaulo_epsilon on 2007/06/02 16:37:03 Increase the iteration in asmc_wait() so that we wait long enough for the SMC command to complete. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#7 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#6 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#7 $ * */ @@ -492,7 +492,7 @@ val = val & ASMC_STATUS_MASK; - for (i = 0; i < 100; i++) { + for (i = 0; i < 1000; i++) { if ((inb(ASMC_CMDPORT) & ASMC_STATUS_MASK) == val) return 0; DELAY(10); From owner-p4-projects@FreeBSD.ORG Sat Jun 2 17:56:53 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 23FC416A473; Sat, 2 Jun 2007 17:56: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 EBE8F16A46D for ; Sat, 2 Jun 2007 17:56:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F70913C4B0 for ; Sat, 2 Jun 2007 17:56:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52HuqAk049380 for ; Sat, 2 Jun 2007 17:56:52 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Huq9A049371 for perforce@freebsd.org; Sat, 2 Jun 2007 17:56:52 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 17:56:52 GMT Message-Id: <200706021756.l52Huq9A049371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 17:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=120788 Change 120788 by rpaulo@rpaulo_epsilon on 2007/06/02 17:55:58 Add locking. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#7 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 $ * */ @@ -46,7 +46,8 @@ #include #include #include -#include +#include +#include #include @@ -239,6 +240,8 @@ model = asmc_match(dev); + mtx_init(&sc->sc_mtx, "asmc_mtx", NULL, MTX_SPIN); + asmc_init(dev); sc->sc_model = model; @@ -397,6 +400,8 @@ if (sc->sc_res) bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_res); + mtx_destroy(&sc->sc_mtx); + return 0; } @@ -510,7 +515,10 @@ asmc_key_read(device_t dev, const char *key, uint8_t *buf, uint8_t len) { int i, error = 1; + struct asmc_softc *sc = device_get_softc(dev); + mtx_lock_spin(&sc->sc_mtx); + outb(ASMC_CMDPORT, ASMC_CMDREAD); if (asmc_wait(dev, 0x0c)) goto out; @@ -531,6 +539,8 @@ error = 0; out: + mtx_unlock_spin(&sc->sc_mtx); + return error; } @@ -538,6 +548,9 @@ asmc_key_write(device_t dev, const char *key, uint8_t *buf, uint8_t len) { int i, error = -1; + struct asmc_softc *sc = device_get_softc(dev); + + mtx_lock_spin(&sc->sc_mtx); outb(ASMC_CMDPORT, ASMC_CMDWRITE); if (asmc_wait(dev, 0x0c)) @@ -559,6 +572,8 @@ error = 0; out: + mtx_unlock_spin(&sc->sc_mtx); + return error; } @@ -707,6 +722,7 @@ uint8_t buf[2]; int error; + /* no need to do locking here as asmc_key_read() already does it */ switch (key[3]) { case 'X': case 'Y': @@ -740,6 +756,9 @@ { uint8_t type; device_t dev = (device_t) arg; + struct asmc_softc *sc = device_get_softc(dev); + + mtx_lock_spin(&sc->sc_mtx); type = inb(ASMC_INTPORT); @@ -757,6 +776,8 @@ device_printf(dev, "%s unknown interrupt\n", __func__); } + mtx_unlock_spin(&sc->sc_mtx); + return 0; } ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#3 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 $ * */ @@ -49,6 +49,8 @@ int sc_rid; struct resource *sc_res; void *sc_cookie; + + struct mtx sc_mtx; }; struct asmc_model { From owner-p4-projects@FreeBSD.ORG Sat Jun 2 18:53:39 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 78A3A16A46C; Sat, 2 Jun 2007 18:53:39 +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 20E1816A46B for ; Sat, 2 Jun 2007 18:53:39 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.172]) by mx1.freebsd.org (Postfix) with ESMTP id 7524C13C447 for ; Sat, 2 Jun 2007 18:53:38 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by ug-out-1314.google.com with SMTP id u2so506076uge for ; Sat, 02 Jun 2007 11:53:37 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=nTVIjEcJ7J6oyDMVFpY8gAqJSCKl2eAGrpwspFJHrH7u2Wu7aHLETzD789hBt63dQp7P6OG0cwv44xhNx5/ZBrOUIB+J8w1s5h0ixKkPcRNtbzzYlAFH9ZZCmpb2raKwEd4FoL+Iy1UBAV/heUsvds/LemYO1lzEDQS5VufvQqs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=qmX5buozqsPdfxAJAZmwQESQ5H0cKc1+OX0wyDcrRtLNFCn7dRvp47MK0oJXRDbTd8+cPIhSP6IreKUGYKIwtFwrJ6Rjx4t4X0v591k3w0WUs/cTEoz4gJrgYGzG5IoHA4rHjDUyFOLIAK8VZaFkFDGdfVIqmgJCz47CeA5NnNQ= Received: by 10.67.99.1 with SMTP id b1mr1746040ugm.1180810417357; Sat, 02 Jun 2007 11:53:37 -0700 (PDT) Received: from ?151.75.242.86? ( [151.75.242.86]) by mx.google.com with ESMTP id q55sm424033ugq.2007.06.02.11.53.35; Sat, 02 Jun 2007 11:53:36 -0700 (PDT) Message-ID: <4661BC9E.9070603@FreeBSD.org> Date: Sat, 02 Jun 2007 20:53:18 +0200 From: Attilio Rao User-Agent: Thunderbird 1.5 (X11/20060526) MIME-Version: 1.0 To: Rui Paulo References: <200706021756.l52Huq9A049371@repoman.freebsd.org> In-Reply-To: <200706021756.l52Huq9A049371@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: Attilio Rao Cc: Perforce Change Reviews Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: attilio@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2007 18:53:39 -0000 Rui Paulo wrote: > http://perforce.freebsd.org/chv.cgi?CH=120788 > > Change 120788 by rpaulo@rpaulo_epsilon on 2007/06/02 17:55:58 > > Add locking. > > Affected files ... > > .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 edit > .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 edit > > Differences ... > > ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#7 $ > + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 $ > * > */ > > @@ -46,7 +46,8 @@ > #include > #include > #include > -#include > +#include > +#include > > #include You should mantain includes sorted by name (where possible). > @@ -239,6 +240,8 @@ > > model = asmc_match(dev); > > + mtx_init(&sc->sc_mtx, "asmc_mtx", NULL, MTX_SPIN); > + > asmc_init(dev); You don't need to write again 'mtx' in the description. Just add something descriptive for the mutexes (since you alredy know it is a spin mutexes). > @@ -740,6 +756,9 @@ > { > uint8_t type; > device_t dev = (device_t) arg; > + struct asmc_softc *sc = device_get_softc(dev); > + > + mtx_lock_spin(&sc->sc_mtx); > > type = inb(ASMC_INTPORT); > > @@ -757,6 +776,8 @@ > device_printf(dev, "%s unknown interrupt\n", __func__); > } > > + mtx_unlock_spin(&sc->sc_mtx); I'm not sure you really need to maintain the lock for so long. Probabilly, you just need for the duration of inb(). > ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#3 $ > + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 $ > * > */ > > @@ -49,6 +49,8 @@ > int sc_rid; > struct resource *sc_res; > void *sc_cookie; > + > + struct mtx sc_mtx; > }; The extra white-line is not needed and since mutexes are not so light, it would be better to put it on the top of the structure. Attilio From owner-p4-projects@FreeBSD.ORG Sat Jun 2 19:07: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 11FD816A47F; Sat, 2 Jun 2007 19:07:13 +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 C3E8116A400 for ; Sat, 2 Jun 2007 19:07:12 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.171]) by mx1.freebsd.org (Postfix) with ESMTP id 5AEDA13C43E for ; Sat, 2 Jun 2007 19:07:12 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by ug-out-1314.google.com with SMTP id u2so507831uge for ; Sat, 02 Jun 2007 12:07:11 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=a5Hk+p7xBWc2TeoNNXl/K14A9voE+1F+59m9VPVh+Fq8bvDO+TyY/ag23RcOW+iY4w598nMHgBzyjWrMiob/e2MvehPpJASI1En3+zxjktAthPrEWKqcHrlbDL5W5gwJ9FBkLxewluEHUSAYd/SGg+tFttlJRD+KSYbDfY5k4/o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=udsVl5KO7eYdYmw1+BVgJRzoKWP1fiDmB81w8fgTrwbQBnlafHYwY0BmN6e8PKakGOwVi8SIUCKDUNjBGwRsTy1LbFetAqQ/HwX2Mz/qvDwJuDYO3U58HILQcj5W7om7BHiuwbpLUU1B2z+ZEkIgpCM807gum/CNn3QyK7Tr++E= Received: by 10.67.20.3 with SMTP id x3mr1739906ugi.1180811231256; Sat, 02 Jun 2007 12:07:11 -0700 (PDT) Received: from ?151.75.242.86? ( [151.75.242.86]) by mx.google.com with ESMTP id y37sm1738641iky.2007.06.02.12.07.09; Sat, 02 Jun 2007 12:07:10 -0700 (PDT) Message-ID: <4661BFD0.1080107@FreeBSD.org> Date: Sat, 02 Jun 2007 21:06:56 +0200 From: Attilio Rao User-Agent: Thunderbird 1.5 (X11/20060526) MIME-Version: 1.0 To: Rui Paulo References: <200706021756.l52Huq9A049371@repoman.freebsd.org> In-Reply-To: <200706021756.l52Huq9A049371@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: Attilio Rao Cc: Perforce Change Reviews Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: attilio@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2007 19:07:13 -0000 Rui Paulo wrote: > http://perforce.freebsd.org/chv.cgi?CH=120788 > > Change 120788 by rpaulo@rpaulo_epsilon on 2007/06/02 17:55:58 > > Add locking. > > Affected files ... Ah, but it seems you don't use a "fast" interrupt handler, so you should not use a spinlock... spinlocks should only be used in fast interrupt handlers, otherwise you bring up all the disvantages of the model... Attilio From owner-p4-projects@FreeBSD.ORG Sat Jun 2 19:10: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 C3F6516A421; Sat, 2 Jun 2007 19: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 7AC6C16A46C for ; Sat, 2 Jun 2007 19:10:20 +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 53A1C13C484 for ; Sat, 2 Jun 2007 19:10:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52JAKir006146 for ; Sat, 2 Jun 2007 19:10:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52JAKDx006137 for perforce@freebsd.org; Sat, 2 Jun 2007 19:10:20 GMT (envelope-from sam@freebsd.org) Date: Sat, 2 Jun 2007 19:10:20 GMT Message-Id: <200706021910.l52JAKDx006137@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 120790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 19:10:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120790 Change 120790 by sam@sam_laptop on 2007/06/02 19:09:54 check the right place for IFF_RUNNING Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#38 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#38 (text+ko) ==== @@ -1609,7 +1609,7 @@ if (r & IWI_INTR_FATAL_ERROR) { device_printf(sc->sc_dev, "firmware error\n"); /* don't restart if the interface isn't up */ - if (sc->sc_ifp->if_flags & IFF_DRV_RUNNING) + if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); sc->flags &= ~IWI_FLAG_BUSY; From owner-p4-projects@FreeBSD.ORG Sat Jun 2 20:07: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 1FB6416A46E; Sat, 2 Jun 2007 20:07: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 DB6C916A46C for ; Sat, 2 Jun 2007 20:07:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B3FC313C4DE for ; Sat, 2 Jun 2007 20:07:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52K7W9G060757 for ; Sat, 2 Jun 2007 20:07:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52K7Wsx060754 for perforce@freebsd.org; Sat, 2 Jun 2007 20:07:32 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 20:07:32 GMT Message-Id: <200706022007.l52K7Wsx060754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 20:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=120794 Change 120794 by rpaulo@rpaulo_epsilon on 2007/06/02 20:06:56 Fix a couple of problems with locking: * don't use spin mutexes. * remove "_mtx" from the mutex description * in asmc_intr(), only lock during the inb instruction. * move sc_mtx to the beginning of the softc struct. Comments by: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#9 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#5 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#8 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#9 $ * */ @@ -240,7 +240,7 @@ model = asmc_match(dev); - mtx_init(&sc->sc_mtx, "asmc_mtx", NULL, MTX_SPIN); + mtx_init(&sc->sc_mtx, "asmc", NULL, MTX_DEF); asmc_init(dev); @@ -517,7 +517,7 @@ int i, error = 1; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock_spin(&sc->sc_mtx); + mtx_lock(&sc->sc_mtx); outb(ASMC_CMDPORT, ASMC_CMDREAD); if (asmc_wait(dev, 0x0c)) @@ -539,7 +539,7 @@ error = 0; out: - mtx_unlock_spin(&sc->sc_mtx); + mtx_unlock(&sc->sc_mtx); return error; } @@ -550,7 +550,7 @@ int i, error = -1; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock_spin(&sc->sc_mtx); + mtx_lock(&sc->sc_mtx); outb(ASMC_CMDPORT, ASMC_CMDWRITE); if (asmc_wait(dev, 0x0c)) @@ -572,7 +572,7 @@ error = 0; out: - mtx_unlock_spin(&sc->sc_mtx); + mtx_unlock(&sc->sc_mtx); return error; @@ -758,9 +758,9 @@ device_t dev = (device_t) arg; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock_spin(&sc->sc_mtx); - + mtx_lock(&sc->sc_mtx); type = inb(ASMC_INTPORT); + mtx_unlock(&sc->sc_mtx); switch (type) { case ASMC_SMS_INTFF: @@ -776,8 +776,6 @@ device_printf(dev, "%s unknown interrupt\n", __func__); } - mtx_unlock_spin(&sc->sc_mtx); - return 0; } ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#4 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#5 $ * */ @@ -31,6 +31,7 @@ struct asmc_softc { device_t sc_dev; + struct mtx sc_mtx; int sc_nfan; @@ -49,8 +50,6 @@ int sc_rid; struct resource *sc_res; void *sc_cookie; - - struct mtx sc_mtx; }; struct asmc_model { From owner-p4-projects@FreeBSD.ORG Sat Jun 2 20:08: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 0E5F416A47C; Sat, 2 Jun 2007 20:08: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 C748A16A474 for ; Sat, 2 Jun 2007 20:08:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B77B013C4F5 for ; Sat, 2 Jun 2007 20:08:34 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52K8YIr060885 for ; Sat, 2 Jun 2007 20:08:34 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52K8Yhd060878 for perforce@freebsd.org; Sat, 2 Jun 2007 20:08:34 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 20:08:34 GMT Message-Id: <200706022008.l52K8Yhd060878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 20:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=120796 Change 120796 by rpaulo@rpaulo_epsilon on 2007/06/02 20:08:24 Sort the headers by name. Noticed by: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#10 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#9 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#10 $ * */ @@ -39,15 +39,14 @@ #include #include -#include -#include -#include -#include #include #include -#include #include +#include #include +#include +#include +#include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 2 21:49: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 29F8916A46B; Sat, 2 Jun 2007 21:49: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 F34B616A468 for ; Sat, 2 Jun 2007 21:49:40 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4E0413C44C for ; Sat, 2 Jun 2007 21:49:40 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52LneCd067078 for ; Sat, 2 Jun 2007 21:49:40 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52LneTc067072 for perforce@freebsd.org; Sat, 2 Jun 2007 21:49:40 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 2 Jun 2007 21:49:40 GMT Message-Id: <200706022149.l52LneTc067072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 120802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 21:49:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=120802 Change 120802 by fli@fli_genesis on 2007/06/02 21:48:49 - Remove incorrect assertion. - Check return value from mdns_buf_alloc() Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#6 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#6 (text+ko) ==== @@ -233,7 +233,6 @@ struct mdns_bufhead bh2; MDNS_INIT_ASSERT(bp, bp_magic); - MDNS_INIT_ASSERT(buf, b_magic); if (MDNS_BUFHSZ(bh) <= 1) return (TAILQ_FIRST(&bh->bh_list)); @@ -248,6 +247,8 @@ bzero(&bh2, sizeof(struct mdns_bufhead)); buf = mdns_buf_alloc(bp, &bh2, len, 1); + if (buf == NULL) + return (NULL); while (!TAILQ_EMPTY(&bh->bh_list)) { buf2 = TAILQ_FIRST(&bh->bh_list); From owner-p4-projects@FreeBSD.ORG Sat Jun 2 22:42:46 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 8158A16A476; Sat, 2 Jun 2007 22:42:46 +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 181BA16A46E for ; Sat, 2 Jun 2007 22:42:46 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0885F13C48A for ; Sat, 2 Jun 2007 22:42:46 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52Mgjs5017483 for ; Sat, 2 Jun 2007 22:42:45 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52MgjvP017471 for perforce@freebsd.org; Sat, 2 Jun 2007 22:42:45 GMT (envelope-from andrew@freebsd.org) Date: Sat, 2 Jun 2007 22:42:45 GMT Message-Id: <200706022242.l52MgjvP017471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 120803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 22:42:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=120803 Change 120803 by andrew@andrew_hermies on 2007/06/02 22:42:01 Bump WARNS up to 6 Add get_base_dirs that takes a space seperated string of base directories and returns an array of strings of base directories. It doesn't handle directories with spaces in them as it will split them. Read the base_dirs value from the config file Affected files ... .. //depot/projects/soc2007/andrew-update/backend/Makefile#3 edit .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#4 edit .. //depot/projects/soc2007/andrew-update/backend/freebsd-config-control.conf#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/backend/Makefile#3 (text+ko) ==== @@ -4,4 +4,6 @@ MAN= +WARNS= 6 + .include ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#4 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -49,8 +50,9 @@ #define DEFAULT_CONFIG_FILE "/etc/freebsd-update-control.conf" #define UPDATE_DATA_DIR "/var/db/freebsd-update" -static int has_update(const char *); -static void* look_for_updates(void *); +static int has_update(const char *); +static void *look_for_updates(void *); +static char **get_base_dirs(char *); /* * Looks for updates on the system with a root of basedir @@ -160,11 +162,72 @@ return NULL; } +/* + * Takes in a string of space seperated directories and returns + * a NULL terminated array of pointers to each directory + */ +char ** +get_base_dirs(char *str) +{ + char *ptr, **ret; + int dir_count; + + /* An empty string will contain no directories */ + if (str == NULL || str[0] == '\0') + return NULL; + + /* Count the number of dirs to read */ + dir_count = 0; + ptr = str; + while (ptr != NULL) { + /* Skip leading spaces */ + while (ptr[0] == ' ') + *ptr++; + + ptr = strchr(ptr, ' '); + dir_count++; + } + + /* + * There must be at least one directory utherwise + * the empty string check would have returned + */ + assert(dir_count > 0); + + /* create an array to hold pointers to the dir names */ + ret = calloc((dir_count + 1) * sizeof(char *), 1); + + + /* Set the point the ret array to the directories */ + dir_count = 0; + ptr = str; + while (ptr != NULL) { + /* Skip leading spaces */ + while (ptr[0] == ' ') + *ptr++; + + /* Point to the directory name */ + ret[dir_count] = ptr; + ptr = strchr(ptr, ' '); + + /* Make the previous directory null terminated */ + if (ptr != NULL) { + ptr[0] = '\0'; + *ptr++; + } + + dir_count++; + } + ret[dir_count] = NULL; + + return ret; +} + int main(int argc __unused, char *argv[] __unused) { - const char *base_dirs[] = { "/", NULL }; const char *config_file; + char *basedirs_string, **base_dirs; int config_fd; properties config_data; char ch; @@ -186,6 +249,8 @@ argc -= optind; argv += optind; + basedirs_string = NULL; + /* Read in the config file */ config_fd = open(config_file, O_RDONLY); if (config_fd == -1 && errno != ENOENT) { @@ -197,11 +262,28 @@ if (config_data == NULL) { errx(1, "Could not read the config file"); } + + basedirs_string = strdup(property_find(config_data, + "base_dirs")); + if (basedirs_string == NULL) { + errx(1, "Malloc failed"); + } + properties_free(config_data); } + /* Read in the base dirs */ + base_dirs = get_base_dirs(basedirs_string); + if (base_dirs == NULL) { + errx(1, "No base dirs were given, set base_dirs in %s", + config_file); + } + look_for_updates(base_dirs); + if (base_dirs != NULL) + free(base_dirs); + free(basedirs_string); return 0; } From owner-p4-projects@FreeBSD.ORG Sat Jun 2 23:33: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 C9ECF16A468; Sat, 2 Jun 2007 23:33: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 8817616A41F for ; Sat, 2 Jun 2007 23:33:56 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7966213C45D for ; Sat, 2 Jun 2007 23:33:56 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52NXuqX069600 for ; Sat, 2 Jun 2007 23:33:56 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52NXuTY069591 for perforce@freebsd.org; Sat, 2 Jun 2007 23:33:56 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sat, 2 Jun 2007 23:33:56 GMT Message-Id: <200706022333.l52NXuTY069591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 120804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 23:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=120804 Change 120804 by rpaulo@rpaulo_epsilon on 2007/06/02 23:32:56 Don't include as style(9) says. Noticed by: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#11 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#10 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#11 $ * */ @@ -46,7 +46,6 @@ #include #include #include -#include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 2 23:54: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 DAEBF16A421; Sat, 2 Jun 2007 23:54:36 +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 A2DDC16A46E for ; Sat, 2 Jun 2007 23:54:36 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 93DA613C448 for ; Sat, 2 Jun 2007 23:54:36 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l52Nsa6h087965 for ; Sat, 2 Jun 2007 23:54:36 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l52Nsa5U087959 for perforce@freebsd.org; Sat, 2 Jun 2007 23:54:36 GMT (envelope-from andrew@freebsd.org) Date: Sat, 2 Jun 2007 23:54:36 GMT Message-Id: <200706022354.l52Nsa5U087959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 120808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2007 23:54:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120808 Change 120808 by andrew@andrew_hermies on 2007/06/02 23:53:55 Create a thread to look for updates. There will be another thread created to do any IPC required later. Affected files ... .. //depot/projects/soc2007/andrew-update/backend/Makefile#4 edit .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/Makefile#4 (text+ko) ==== @@ -1,5 +1,6 @@ PROG= facund-be +CFLAGS+=-pthread LDADD+= -lutil -lmd MAN= ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ * */ +#include + #include #include #include @@ -226,6 +228,7 @@ int main(int argc __unused, char *argv[] __unused) { + pthread_t update_thread; const char *config_file; char *basedirs_string, **base_dirs; int config_fd; @@ -279,7 +282,8 @@ config_file); } - look_for_updates(base_dirs); + pthread_create(&update_thread, NULL, look_for_updates, base_dirs); + pthread_join(update_thread, NULL); if (base_dirs != NULL) free(base_dirs);