From owner-p4-projects@FreeBSD.ORG Sun Jun 17 02:45: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 37D2216A46E; Sun, 17 Jun 2007 02:45: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 D2F6E16A468; Sun, 17 Jun 2007 02:45:58 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 53E3E13C448; Sun, 17 Jun 2007 02:45:58 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id E47A1690B56; Sun, 17 Jun 2007 03:42:42 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id A3914690B62; Sun, 17 Jun 2007 03:42:42 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DSBL, RCVD_IN_SORBS_DUL autolearn=no version=3.1.7 Received: from epsilon.local.fnop.net (unknown [83.144.140.180]) by core.fnop.net (Postfix) with ESMTP id C37A8690B56; Sun, 17 Jun 2007 03:42:39 +0100 (WEST) Date: Sun, 17 Jun 2007 03:45:47 +0100 Message-ID: <86lkejcn8k.wl%rpaulo@fnop.net> From: Rui Paulo To: "Attilio Rao" In-Reply-To: <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <86myzeq67f.wl%rpaulo@fnop.net> <4666B730.9080908@FreeBSD.org> <200706081351.54281.jhb@freebsd.org> <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/21.3 Mule/5.0 (SAKAKI) X-cite-me: rpaulo MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: ClamAV using ClamSMTP Cc: Rui Paulo , Perforce Change Reviews , Rui Paulo , John Baldwin Subject: Re: 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: Sun, 17 Jun 2007 02:45:59 -0000 At Fri, 8 Jun 2007 20:00:18 +0200, Attilio Rao wrote: > > 2007/6/8, John Baldwin : > > On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: > > > Rui Paulo wrote: > > > > > > > > If I'm not doing something wrong, I need to use spin locks on my > > > > interrupt handler, or else witness_checkorder will complain with > > > > "blockable sleep lock". > > > > > > > > Note that I'm using FILTERs. > > > > > > So you are doing this in the wrong way. > > > In order to use correctly filters, please note that the support for them > > > is compile time choosen, so you need to wrapper all filter specific > > > parts using INTR_FILTER compat macro. > > > > Actually, if you only use a filter and not an ithread handler, you can do that > > now w/o needing to have any #ifdef INTR_FILTER stuff. > > In the case your kernel doesn't use filters (!INTR_FILTER) and you > pass a filter, it is automatically mapped to work as a fast handler? Ok, I've looked at sio(4) to see how it was setting up a fast intr handler. Does the following diff look correct? Thanks. ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 - /home/rpaulo/p4/rpaulo-macbook/dev/asmc/asmc.c ==== --- /tmp/tmp.96695.67 2007-06-17 03:44:50.000000000 +0100 +++ /home/rpaulo/p4/rpaulo-macbook/dev/asmc/asmc.c 2007-06-17 03:44:17.000000000 +0100 @@ -77,11 +77,8 @@ static int asmc_fan_getvalue(device_t, c static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); static void asmc_sms_calibrate(device_t); -#ifdef INTR_FILTER static int asmc_sms_intr(void *); -#else static void asmc_sms_fastintr(void *); -#endif static void asmc_sms_printintr(device_t, uint8_t); /* @@ -236,7 +233,7 @@ static int asmc_attach(device_t dev) { int i, j; - int error; + int ret; char name[2]; struct asmc_softc *sc = device_get_softc(dev); struct asmc_model *model; @@ -378,16 +375,21 @@ asmc_attach(device_t dev) goto out; } -#ifdef INTR_FILTER - error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC | INTR_MPSAFE, - asmc_sms_intr, NULL, dev, &sc->sc_cookie); -#else - error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, - NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); -#endif - if (error) { + ret = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC | INTR_MPSAFE, + asmc_sms_intr, NULL, dev, &sc->sc_cookie); + + if (ret) { + ret = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC | INTR_MPSAFE, + NULL, asmc_sms_fastintr, dev, + &sc->sc_cookie); + if (ret == 0) + device_printf(dev, "unable to setup fast interrupt. " + "Using normal mode.\n"); + } + + if (ret) { device_printf(dev, "unable to setup SMS IRQ\n"); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_res); @@ -760,7 +762,6 @@ asmc_sms_calibrate(device_t dev) asmc_sms_read(dev, ASMC_KEY_SMS_Z, &sc->sms_rest_z); } -#ifdef INTR_FILTER static int asmc_sms_intr(void *arg) { @@ -776,7 +777,7 @@ asmc_sms_intr(void *arg) return (FILTER_HANDLED); } -#else + static void asmc_sms_fastintr(void *arg) { @@ -790,7 +791,7 @@ asmc_sms_fastintr(void *arg) asmc_sms_printintr(dev, type); } -#endif /* INTR_FILTER */ + static void asmc_sms_printintr(device_t dev, uint8_t type) -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Sun Jun 17 03: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 5926416A46B; Sun, 17 Jun 2007 03:18: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 118C816A468 for ; Sun, 17 Jun 2007 03:18:21 +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 012D613C43E for ; Sun, 17 Jun 2007 03:18:21 +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 l5H3IKW7034980 for ; Sun, 17 Jun 2007 03:18:20 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5H3IK2V034965 for perforce@freebsd.org; Sun, 17 Jun 2007 03:18:20 GMT (envelope-from andrew@freebsd.org) Date: Sun, 17 Jun 2007 03:18:20 GMT Message-Id: <200706170318.l5H3IK2V034965@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 121817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 03:18:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=121817 Change 121817 by andrew@andrew_hermies on 2007/06/17 03:17:56 Add object handeling functions that will be used with elements Affected files ... .. //depot/projects/soc2007/andrew-update/lib/Makefile#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_object.h#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ LIB=facund -SRCS=facund_connection.c facund_server.c +SRCS=facund_connection.c facund_object.c facund_server.c WARNS=6 ==== //depot/projects/soc2007/andrew-update/lib/facund_private.h#3 (text+ko) ==== @@ -28,11 +28,30 @@ #ifndef FACUND_PRIVATE_H #define FACUND_PRIVATE_H +#include "facund_object.h" + #include #include #include +struct facund_object { + enum facund_type obj_type; + int obj_assigned; + enum facund_object_error obj_error; + + /* Used when this is part of an array */ + struct facund_object *obj_parent; + + int32_t obj_int; /* Used in bool, int and uint types */ + char *obj_string; /* Used in string type */ + struct facund_object **obj_array;/* Used in array type */ + size_t obj_array_count; + + /* Used for indenting arrays */ + unsigned int obj_depth; +}; + struct facund_conn { int do_unlink; /* If true unlink the socket on close */ struct sockaddr_un local; /* The local connection */ @@ -42,6 +61,9 @@ int fd; /* The fd to the remote device */ XML_Parser parser; + char current_call[32]; + char call_id[8]; + struct facund_object *call_arg; }; #endif /* FACUND_PRIVATE_H */ From owner-p4-projects@FreeBSD.ORG Sun Jun 17 04:15: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 06F6016A46E; Sun, 17 Jun 2007 04:15: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 7D02A16A474 for ; Sun, 17 Jun 2007 04:15:33 +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 6CDE313C48A for ; Sun, 17 Jun 2007 04:15:33 +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 l5H4FXqa022743 for ; Sun, 17 Jun 2007 04:15:33 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5H4FWvM022733 for perforce@freebsd.org; Sun, 17 Jun 2007 04:15:32 GMT (envelope-from andrew@freebsd.org) Date: Sun, 17 Jun 2007 04:15:32 GMT Message-Id: <200706170415.l5H4FWvM022733@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 121821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 04:15:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121821 Change 121821 by andrew@andrew_hermies on 2007/06/17 04:15:16 Start to allow calls to be made to the backend. All it does is print the Name, ID and arguments of the call. There is error checking but it dosn't send a response to the front end indicating the error. Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#4 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#4 (text+ko) ==== @@ -25,17 +25,22 @@ * */ +#include #include #include #include #include "facund_connection.h" +#include "facund_object.h" #include "facund_private.h" #define BUF_SIZE 128 +static void facund_server_call(struct facund_conn *, const char *,const char *, + struct facund_object *); static void facund_server_start_tag(void *, const XML_Char *, const XML_Char**); static void facund_server_end_tag(void *, const XML_Char *); +static void facund_server_text(void *, const XML_Char *, int); /* * Waits for a client to connect and send the start message @@ -54,8 +59,9 @@ } XML_SetUserData(conn->parser, conn); - XML_SetStartElementHandler(conn->parser, facund_server_start_tag); - XML_SetEndElementHandler(conn->parser, facund_server_end_tag); + XML_SetElementHandler(conn->parser, facund_server_start_tag, + facund_server_end_tag); + XML_SetCharacterDataHandler(conn->parser, facund_server_text); str = ""; facund_send(conn, str, strlen(str)); @@ -104,17 +110,79 @@ } static void +facund_server_call(struct facund_conn *conn __unused, const char *name, const char *id, struct facund_object *arg) +{ + printf("Call: %s\nID: %s\nArg:\n", name, id); + facund_object_print(arg); + putchar('\n'); +} + +static void facund_server_start_tag(void *data, const XML_Char *name, - const XML_Char **attrs __unused) + const XML_Char **attrs) { struct facund_conn *conn; - //char str[1024]; + char str[1024]; printf("> %s\n", name); conn = data; - //snprintf(str, 1024, "", name); - //facund_send(conn, str, strlen(str)); + if (conn->current_call[0] == '\0' && strcmp(name, "call") == 0) { + unsigned int i; + const char *call_name, *id; + if (attrs == NULL) { + /* TODO: Return an error */ + return; + } + call_name = id = NULL; + for (i = 0; attrs[i] != NULL && attrs[i+1] != NULL; i += 2) { + if (strcmp(attrs[i], "name") == 0) { + if (call_name != NULL) { + /* TODO: Return an error */ + return; + } + call_name = attrs[i]; + } else if (strcmp(attrs[i], "id") == 0) { + if (id != NULL) { + /* TODO: Return an error */ + return; + } + id = attrs[i]; + } else { + /* TODO: Return an error */ + return; + } + } + strlcpy(conn->current_call, call_name, + sizeof(conn->current_call)); + strlcpy(conn->call_id, id, sizeof(conn->call_id)); + } else if (strcmp(name, "data") == 0) { + struct facund_object *obj; + + if (attrs == NULL) { + /* TODO: Return an error */ + return; + } + obj = NULL; + + if (strcmp(attrs[0], "type") == 0 && attrs[1] != NULL && + attrs[2] == NULL) { + obj = facund_object_new_from_typestr(attrs[1]); + } + + if (obj == NULL) { + /* TODO: Return an error */ + return; + } + + if (conn->call_arg != NULL) { + facund_object_array_append(conn->call_arg, obj); + } + conn->call_arg = obj; + } else { + snprintf(str, 1024, "", name); + facund_send(conn, str, strlen(str)); + } } static void @@ -126,11 +194,52 @@ printf("< %s\n", name); conn = data; - if (strcmp(name, "facund-client") == 0) { + if (strcmp(name, "call") == 0) { + facund_server_call(conn, conn->current_call, conn->call_id, + conn->call_arg); + conn->current_call[0] = '\0'; + conn->call_id[0] = '\0'; + /* TODO: Free the call_arg */ + conn->call_arg = NULL; + } else if (strcmp(name, "data") == 0) { + /* + * Set the argument to the item's parent + * if it has one. ie. it's in an array + */ + if (conn->call_arg->obj_parent != NULL) { + conn->call_arg = conn->call_arg->obj_parent; + } + } else if (strcmp(name, "facund-client") == 0) { snprintf(str, 1024, ""); facund_send(conn, str, strlen(str)); - } else { - snprintf(str, 1024, "", name); - facund_send(conn, str, strlen(str)); + } +} + +static void +facund_server_text(void *data, const XML_Char *str, int len) +{ + struct facund_conn *conn; + char *text; + + conn = (struct facund_conn *)data; + if (conn->call_arg == NULL) { + return; + } else if (conn->call_arg->obj_assigned == 1) { + /* TODO: Return an error */ + return; + } else if (conn->call_arg->obj_type == FACUND_ARRAY) { + /* Arrays must not have any text within them */ + /* TODO: Return an error */ + return; + } + + text = malloc((len + 1) * sizeof(char)); + if (text == NULL) { + /* TODO: Return an error */ + return; } + strlcpy(text, str, len + 1); + facund_object_set_from_str(conn->call_arg, text); + + free(text); } From owner-p4-projects@FreeBSD.ORG Sun Jun 17 04: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 3592216A46F; Sun, 17 Jun 2007 04: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 E0CA016A46B for ; Sun, 17 Jun 2007 04:42:15 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CE6A013C46C for ; Sun, 17 Jun 2007 04:42:15 +0000 (UTC) (envelope-from sephe@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 l5H4gFmC068680 for ; Sun, 17 Jun 2007 04:42:15 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5H4g8xl068412 for perforce@freebsd.org; Sun, 17 Jun 2007 04:42:08 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 17 Jun 2007 04:42:08 GMT Message-Id: <200706170442.l5H4g8xl068412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 121827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 04:42:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=121827 Change 121827 by sephe@sephe_enigma:sam_wifi on 2007/06/17 04:41:20 IFC @121815 (loopback wpa_supplicant inactive-deauth-reassoc fix) Affected files ... .. //depot/projects/wifi/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/wifi/contrib/diff/AUTHORS#1 branch .. //depot/projects/wifi/contrib/diff/COPYING#2 integrate .. //depot/projects/wifi/contrib/diff/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/diff/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/Makefile.in#2 delete .. //depot/projects/wifi/contrib/diff/NEWS#2 integrate .. //depot/projects/wifi/contrib/diff/README#2 integrate .. //depot/projects/wifi/contrib/diff/THANKS#1 branch .. //depot/projects/wifi/contrib/diff/TODO#1 branch .. //depot/projects/wifi/contrib/diff/analyze.c#2 delete .. //depot/projects/wifi/contrib/diff/bootstrap#1 branch .. //depot/projects/wifi/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/wifi/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/wifi/contrib/diff/config.h#2 integrate .. //depot/projects/wifi/contrib/diff/config.hin#2 delete .. //depot/projects/wifi/contrib/diff/configure#2 delete .. //depot/projects/wifi/contrib/diff/configure.in#2 delete .. //depot/projects/wifi/contrib/diff/context.c#2 delete .. //depot/projects/wifi/contrib/diff/diagmeet.note#2 delete .. //depot/projects/wifi/contrib/diff/diff.c#3 delete .. //depot/projects/wifi/contrib/diff/diff.h#2 delete .. //depot/projects/wifi/contrib/diff/diff.texi#2 delete .. //depot/projects/wifi/contrib/diff/diff3.c#2 delete .. //depot/projects/wifi/contrib/diff/dir.c#2 delete .. //depot/projects/wifi/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/wifi/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/wifi/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/wifi/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/wifi/contrib/diff/doc/version.texi#1 branch .. //depot/projects/wifi/contrib/diff/ed.c#2 delete .. //depot/projects/wifi/contrib/diff/exgettext#1 branch .. //depot/projects/wifi/contrib/diff/ifdef.c#2 delete .. //depot/projects/wifi/contrib/diff/install-sh#2 delete .. //depot/projects/wifi/contrib/diff/io.c#2 delete .. //depot/projects/wifi/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/basename.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/error.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/error.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exit.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/wifi/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/regex.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/regex.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/wifi/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/wifi/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/man/cmp.1#1 branch .. //depot/projects/wifi/contrib/diff/man/diff.1#1 branch .. //depot/projects/wifi/contrib/diff/man/diff3.1#1 branch .. //depot/projects/wifi/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/wifi/contrib/diff/normal.c#2 delete .. //depot/projects/wifi/contrib/diff/prepend_args.c#2 delete .. //depot/projects/wifi/contrib/diff/prepend_args.h#2 delete .. //depot/projects/wifi/contrib/diff/sdiff.c#2 delete .. //depot/projects/wifi/contrib/diff/side.c#2 delete .. //depot/projects/wifi/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/wifi/contrib/diff/src/analyze.c#1 branch .. //depot/projects/wifi/contrib/diff/src/cmp.c#1 branch .. //depot/projects/wifi/contrib/diff/src/context.c#1 branch .. //depot/projects/wifi/contrib/diff/src/diff.c#1 branch .. //depot/projects/wifi/contrib/diff/src/diff.h#1 branch .. //depot/projects/wifi/contrib/diff/src/diff3.c#1 branch .. //depot/projects/wifi/contrib/diff/src/dir.c#1 branch .. //depot/projects/wifi/contrib/diff/src/ed.c#1 branch .. //depot/projects/wifi/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/wifi/contrib/diff/src/io.c#1 branch .. //depot/projects/wifi/contrib/diff/src/normal.c#1 branch .. //depot/projects/wifi/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/wifi/contrib/diff/src/side.c#1 branch .. //depot/projects/wifi/contrib/diff/src/system.h#1 branch .. //depot/projects/wifi/contrib/diff/src/util.c#1 branch .. //depot/projects/wifi/contrib/diff/stamp-h.in#2 delete .. //depot/projects/wifi/contrib/diff/system.h#2 delete .. //depot/projects/wifi/contrib/diff/util.c#2 delete .. //depot/projects/wifi/contrib/diff/version.c#2 delete .. //depot/projects/wifi/contrib/diff/xmalloc.c#2 delete .. //depot/projects/wifi/contrib/less/main.c#4 integrate .. //depot/projects/wifi/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#5 integrate .. //depot/projects/wifi/etc/pam.d/atrun#1 branch .. //depot/projects/wifi/etc/pam.d/imap#3 integrate .. //depot/projects/wifi/etc/pam.d/pop3#3 integrate .. //depot/projects/wifi/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/diff/diff.1#3 delete .. //depot/projects/wifi/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/wifi/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/wifi/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/wifi/include/arpa/inet.h#5 integrate .. //depot/projects/wifi/lib/libc/inet/inet_ntoa.c#5 integrate .. //depot/projects/wifi/lib/libc/net/inet.3#8 integrate .. //depot/projects/wifi/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/wifi/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/wifi/lib/libkvm/kvm.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_amd64.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_i386.c#6 integrate .. //depot/projects/wifi/lib/libkvm/kvm_private.h#5 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.8#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_nologin/pam_nologin.c#4 integrate .. //depot/projects/wifi/lib/libutil/login_cap.3#4 integrate .. //depot/projects/wifi/lib/libutil/login_cap.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_log.c#4 integrate .. //depot/projects/wifi/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/wifi/libexec/atrun/Makefile#2 integrate .. //depot/projects/wifi/libexec/atrun/atrun.c#3 integrate .. //depot/projects/wifi/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/wifi/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#23 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#16 integrate .. //depot/projects/wifi/sbin/mknod/mknod.c#3 integrate .. //depot/projects/wifi/share/man/man4/Makefile#39 integrate .. //depot/projects/wifi/share/man/man4/nfe.4#6 integrate .. //depot/projects/wifi/share/man/man4/rum.4#2 integrate .. //depot/projects/wifi/share/man/man4/ural.4#12 integrate .. //depot/projects/wifi/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/wifi/share/man/man5/Makefile#10 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#18 integrate .. //depot/projects/wifi/share/man/man5/tmpfs.5#1 branch .. //depot/projects/wifi/share/man/man5/xfs.5#1 branch .. //depot/projects/wifi/share/man/man9/selrecord.9#3 integrate .. //depot/projects/wifi/share/misc/committers-ports.dot#7 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#13 integrate .. //depot/projects/wifi/sys/arm/include/intr.h#6 integrate .. //depot/projects/wifi/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.c#5 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/wifi/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/wifi/sys/conf/NOTES#43 integrate .. //depot/projects/wifi/sys/conf/files#56 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#17 integrate .. //depot/projects/wifi/sys/conf/options#36 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/wifi/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/wifi/sys/dev/fb/boot_font.c#7 integrate .. //depot/projects/wifi/sys/dev/fb/creator.c#8 integrate .. //depot/projects/wifi/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/wifi/sys/dev/fb/gallant12x22.h#3 delete .. //depot/projects/wifi/sys/dev/fb/gfb.h#4 integrate .. //depot/projects/wifi/sys/dev/fb/machfb.c#4 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/wifi/sys/dev/mc146818/mc146818.c#5 integrate .. //depot/projects/wifi/sys/dev/mc146818/mc146818var.h#4 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/wifi/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/wifi/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#17 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#21 integrate .. //depot/projects/wifi/sys/dev/sound/clone.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/clone.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.h#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.h#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.c#17 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/dsp.h#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_rate.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder_volume.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sndstat.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#13 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/vchan.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#18 integrate .. //depot/projects/wifi/sys/dev/sound/version.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/ehcivar.h#10 integrate .. //depot/projects/wifi/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/ohcivar.h#8 integrate .. //depot/projects/wifi/sys/dev/usb/uhci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uhcivar.h#7 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/usb.h#7 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#11 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/wifi/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/wifi/sys/i386/i386/trap.c#17 integrate .. //depot/projects/wifi/sys/i386/isa/clock.c#13 integrate .. //depot/projects/wifi/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/wifi/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/wifi/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/wifi/sys/kern/kern_exec.c#25 integrate .. //depot/projects/wifi/sys/kern/kern_exit.c#23 integrate .. //depot/projects/wifi/sys/kern/kern_fork.c#21 integrate .. //depot/projects/wifi/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/wifi/sys/kern/kern_ntptime.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_priv.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_resource.c#17 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#27 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#31 integrate .. //depot/projects/wifi/sys/modules/Makefile#40 integrate .. //depot/projects/wifi/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/wifi/sys/net/bpf.c#23 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#15 integrate .. //depot/projects/wifi/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/wifi/sys/net/if_types.h#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#59 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate .. //depot/projects/wifi/sys/netinet/igmp.h#4 integrate .. //depot/projects/wifi/sys/netinet/in.c#17 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#10 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#12 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#13 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#7 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/wifi/sys/netipsec/key.c#5 integrate .. //depot/projects/wifi/sys/netipx/ipx.c#5 integrate .. //depot/projects/wifi/sys/netipx/ipx.h#6 integrate .. //depot/projects/wifi/sys/netipx/ipx_if.h#5 integrate .. //depot/projects/wifi/sys/netipx/ipx_ip.c#8 delete .. //depot/projects/wifi/sys/netipx/ipx_ip.h#6 delete .. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#9 integrate .. //depot/projects/wifi/sys/netsmb/smb_smb.c#4 integrate .. //depot/projects/wifi/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/wifi/sys/pci/if_ste.c#14 integrate .. //depot/projects/wifi/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/wifi/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#10 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/wifi/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#20 integrate .. //depot/projects/wifi/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/wifi/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/wifi/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/wifi/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/eeprom.c#7 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/rtc.c#6 integrate .. //depot/projects/wifi/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/wifi/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/wifi/sys/sys/priv.h#6 integrate .. //depot/projects/wifi/sys/sys/tree.h#5 integrate .. //depot/projects/wifi/sys/vm/vm_contig.c#16 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#24 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#22 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#10 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/wifi/sys/vm/vm_pageq.c#11 integrate .. //depot/projects/wifi/sys/vm/vm_phys.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#14 integrate .. //depot/projects/wifi/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/wifi/tools/regression/tmpfs/Makefile#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_create#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_dots#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_exec#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_link#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_mount#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_pipes#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_read_write#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_readdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_remove#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_rename#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_setattr#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_sizes#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_sockets#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_symlink#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_times#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_truncate#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_vnd#1 branch .. //depot/projects/wifi/tools/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#24 integrate .. //depot/projects/wifi/usr.bin/rpcgen/rpc_svcout.c#6 integrate .. //depot/projects/wifi/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/wifi/usr.bin/systat/tcp.c#3 integrate .. //depot/projects/wifi/usr.bin/top/machine.c#8 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.8#4 integrate .. //depot/projects/wifi/usr.sbin/dconschat/dconschat.c#5 integrate .. //depot/projects/wifi/usr.sbin/mtree/mtree.8#9 integrate .. //depot/projects/wifi/usr.sbin/powerd/powerd.c#10 integrate Differences ... ==== //depot/projects/wifi/contrib/diff/COPYING#2 (text+ko) ==== @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -279,7 +279,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -305,14 +305,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. ==== //depot/projects/wifi/contrib/diff/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,2100 @@ +2004-04-13 Paul Eggert + + * NEWS, configure.ac (AC_INIT): Version 2.8.7. + * configure.ac (AM_GNU_GETTEXT_VERSION): Add. + (XGETTEXT): Restore from pre-2004-04-12 version. This fixes + a bug that lost many msgids in doc/diffutils.pot. + * bootstrap: New file. + * exgettext: Don't generate a temporary file, as this runs afoul + of "make distcheck" which operates with read-only directories. + * Makefile.am (EXTRA_DIST): Add bootstrap. + Remove config/config.rpath as it is deduced automatically these days. + +2004-04-12 Paul Eggert + + * NEWS, configure.ac (AC_INIT): Version 2.8.6. + + * NEWS: Add news for 2.8.4, 2.8.6. + + * README: Move copyright notice to end. Defer to "configure + --help" for special "configure" options. Suggest latest libiconv. + Update version numbers of Autoconf etc. to current. + + * configure.ac: Quote various arguments better. + (AC_CONFIG_MACRO_DIR): Add call, specifying "m4". + (AC_CONFIG_HEADER): Replaces AM_CONFIG_HEADER. + (gl_USE_SYSTEM_EXTENSIONS): Replaces AC_GNU_SOURCE. + (AC_ISC_POSIX): Remove; nobody ports to ancient ISC any more. + (AC_PROG_CPP, AC_PROG_INSTALL, AC_C_INLINE, + AC_HEADER_STDBOOL, AC_HEADER_STDC, AM_GNU_GETTEXT, XGETTEXT, + AC_HEADER_STAT, AC_FUNC_VPRINTF, jm_FUNC_GLIBC_UNLOCKED_IO, + jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC, jm_FUNC_REALLOC, + jm_PREREQ_C_STACK, jm_PREREQ_ERROR, jm_PREREQ_HARD_LOCALE, + jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX, AC_FUNC_FNMATCH_GNU, jm_AC_DOS): + Remove; not needed here, as our files don't use them directly + or we rely on gnulib modules. + (AC_C_CONST): Remove; we assume C89 now. + (AC_CHECK_HEADERS): Remove libintl.h, limits.h, stdlib.h, string.h, + time.h. + (AC_CHECK_TYPE): Remove ptrdiff_t, ssize_t. + (AC_CHECK_FUNCS): Remove diraccess, strchr, strerror, tmpnam). + (AC_REPLACE_FUNCS): Remove memchr, mkstemp, strcasecmp. + (GNULIB_AUTOCONF_SNIPPET): Add call. This replaces much of + the above. + (AC_CONFIG_FILES): Remove lib/posix/Makefile. + (AC_CONFIG_COMMANDS): Remove. + + * doc/diff.texi (dircategory): Change to "Text creation and + manipulation" from "GNU packages". + (Translations): New node. + (Overview): Improve quality of algorithm citations. + (Binary): -q doesn't exactly cause diff to assume files are binary. + (Normal): Place after Side by Side, since it's less important. + (Detailed Context, Detailed Unified, Detailed ed, + Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal): + Place at end of menu. + (Detailed Unified): Mention that fractional timestamps are + omitted on hosts that don't support them. + Mention what happens when hunks contain just one line. + (Line Group Formats, Reject Names): Fix duplicate-word typos. + (Comparing Directories): Trailing white space and empty lines are + ignored in the -X file. + (diff Options): Add --strip-trailing-cr. + (Projects): gnu -> gvc@gnu.org. + + * lib/Makefile.am (SUBDIRS): Remove. + (EXTRA_DIST, noinst_HEADERS): Remove most entries. + (libdiffutils_a_SOURCES): Now just lib_SOURCES. + (lib_SOURCES): New macro. + (DISTCLEANFILES, MOSTLYCLEANFILES): Set to empty now. + (gnulib.mk): Include: this does most of the work eliminated + by the above changes. + + * lib/inttostr.c (inttostr): Protect i < 0 by compile-time + test intended to suppress compiler warnings. + * lib/inttostr.h: Include limits.h unilaterally. + (CHAR_BIT): Remove. + (PARAMS): Remove; all uses changed. + * lib/setmode.c (__attribute__): New macro. + (set_binary_mode): Define only if HAVE_SETMODE_DOS. + Otherwise define a dummy static char, as C89 requires + that we define something. + * lib/setmode.h (set_binary_mode): Return true, not 1. + + * src/analyze.c, src/context.c, src/diff.c, src/io.c, src/util.c: + Do not include regex.h, as diff.h does this now. + + * src/cmp.c: Sort includes. Include , . + (specify_comparison_type): Don't report an error if the comparison + type has already been specified the same way as this one. + + * src/cmp.c (usage): Mention exit status. + * src/diff.c (option_help_msgid): Likewise. + * src/diff3.c (usage): Likewise. + * src/sdiff.c (usage): Likewise. + + * src/cmp.c (main): Adjust to latest gnulib c_stack_action + calling conventions. + * src/diff.c (main): Likewise. + * src/diff3.c (main): Likewise. + * src/sdiff.c (main): Likewise. + + * src/cmp.c (main): Adjust to latest version_etc calling conventions. + * src/diff.c (main): Likewise. + * src/diff3.c (main): Likewise. + * src/sdiff.c (main): Likewise. + + * src/diff.c: Include . + (binary): Define to true if not declared. + (longopts): Set tabsize flag to 1. + (main): Don't output nanoseconds if platform lacks them. + Don't treat files as binary if !binary. + (set_mtime_to_now): Use 0, not NULL. + (compare_files): Mark files as nonexistent if it looks like + 'patch' created inaccessible regular empty files to denote + nonexistent backups. Don't compare such files. + Clear st_* members of status of nonexistent file. + Remove now-unnecessary tests. + + * src/diff.h: Include regex.h, unlocked-io.h. + (struct file_data.changed): Now char *, not bool *, to save + space on hosts where bool takes more space than char. + All uses changed. + + * src/diff3.c: Include unlocked-io.h. + (strip_trailing_cr): New var. + (STRIP_TRAILING_CR_OPTION): New enum. + (longopts, main, option_help_msgid, read_diff): + Add --strip-trailing-cr support. + (read_diff): Exit with status 126 (not 127) if errno != ENOENT + after failed execvp in child. Report this in parent. + + * src/dir.c: Include . + (failed_locale_specific_sorting): Renamed from failed_strcoll. + All uses changed. + (compare_names): Don't invoke strcasecmp first thing when + ignore_file_name_case; if locale_specific_sorting, we should + just use that. + + * src/ifdef.c (next_line): Remove; replace with... + (next_line0, next_line1): New vars. + (print_ifdef_script, print_ifdef_hunk): + Use them to fix line-number computation bug. + + * src/io.c (find_and_hash_each_line): Don't convert char * + to unsigned char *; just leave pointers as char *. This + lessens the number of potentially-dangerous casts. + * src/util.c (lines_differ): Likewise. + + * src/sdiff.c: Include , . + (check_child_status): Renamed from ck_editor_status, and + accept a new arg MAX_OK_STATUS. All callers changed. + Handle status 126/127 as per POSIX. + (edit): Likewise. + (main): Likewise. Fix getopt typo: -E wasn't supported. + + * src/system.h (S_IRWXU, S_IRWXG, S_IRWXO): Define if not defined. + (S_IXUSR, S_IXGRP, S_IXOTH): Remove. + Include unconditionally, since we can assume C89 now. + Likewise for , . + (getenv, EXIT_SUCCESS, EXIT_FAILURE, SSIZE_MAX, strchr, strrchr, + memcmp, memcpy): Remove decl; no longer needed. + (strcasecoll, strcasecmp): Define if not built in. + (CTYPE_DOMAIN, ISPRINT, ISSPACE, TOLOWER, _tolower, errno): Remove; + we now assume C89 or better. All uses changed. + Include unconditionally now, since gnulib supports it + if the C compiler doesn't. All boolean uses of 0 and 1 now + changed to false and true. + (lin_is_printable_as_long_int): Renamed from lin_is_printable_as_long. + + * src/util.c (begin_output): Fix bug: 0 wasn't cast to char * arg, + which led to undefined behavior on 64-bit hosts. + Use more-standard test for exit status 126 versus 127. + (finish_output): Likewise. + (analyze_hunk): Do not cast bool to int. + +2004-03-15 Paul Eggert + + * src/cmp.c (main): Don't consider two files with the same name to + be the same, if their initial skip values differ. This fixes a + bug reported by Hideki Iwamoto in + . + +2004-03-11 Paul Eggert + + * src/analyze.c (diag): Return void, not lin, since the return + value wasn't needed. All callers changed. + (diag, diff_2_files): + Use 'true' and 'false' instead of '1' and '0', when appropriate. + (compareseq): Use lin const * local variables instead of lin *. + Don't bother checking diag's return value. + (shift_boundaries, build_reverse_script, build_script, diff_2_files): + Use char arrays, not bool arrays, since + sizeof (bool) might be greater than 1. + +2004-02-09 Paul Eggert + + * m4/setmode.m4 (AC_FUNC_SETMODE_DOS): AC_LIBOBJ(setmode) if + we would return true. + +2002-10-14 Paul Eggert + + * src/Makefile.am (diff3.$(OBJEXT), diff.$(OBJEXT), + sdiff.$(OBJEXT)): Rename from (misspelled) diff3.$(OBJECT), + diff.$(OBJECT), sdiff.$(OBJECT). Patch by Paul D. Smith in + . + Bug reported by Chris Bainbridge. + +2002-10-13 Paul Eggert + + * src/Makefile.am (MOSTLYCLEANFILES): Add paths.ht. + (paths.h): Send output to paths.ht first, and then rename to + paths.h at the end. This avoids problems if the disk is full. + It also works around what appears to be a bug with GNU make -j + (3.79.1); see . + +2002-06-27 Paul Eggert + + * NEWS, configure.ac (AC_INIT): Version 2.8.4. + + * config/config.sub: Sync with latest version maintained in other + packages. + + * lib/file-type.h: Protect against double inclusion. Detect + whether has been included. Fix from Jim Meyering. + + * src/analyze.c (briefly_report): Don't say "Binary files differ", + since one of the files may not be a binary file. + Bug reported by Dan Jacobson. + +2002-06-22 Paul Eggert + + * lib/c-stack.c (segv_handler, c_stack_action) [! defined + SA_SIGINFO]: Do not assume SA_SIGINFO behavior. + Bug reported by Jim Meyering on NetBSD 1.5.2. + +2002-06-16 Paul Eggert + + * NEWS, configure.ac (AC_INIT): Version 2.8.3. + + * config/depcomp, config/missing, README: Update to automake 1.6.2. + + * po/LINGUAS: Add en_US. + * po/en_US.po: New file. + * po/POTFILES.in: Remove lib/freesoft.c. + Add lib/file-type.c, lib/version-etc.c, lib/xmalloc.c. + +2002-06-15 Paul Eggert + + * doc/diff.texi (Special Files): Document behavior of symlink + loops. + + * lib/Makefile.am (noinst_HEADERS): Remove freesoft.h. + Add version-etc.h. + (libdiffutils_a_SOURCES): Remove freesoft.c. Add version-etc.c. + * lib/freesoft.c, lib/freesoft.h: Remove. + * lib/version-etc.h (PARAMS): Remove; we now assume C89 at least. + + * lib/version-etc.h (version_etc): Remove package and version args. + (version_etc_copyright): Remove. + * lib/version-etc.c: Likewise. + Do not include unlocked-io.h; no longer needed. + Include gettext.h rather than libinto.h. + (_): Define unconditionally. + (version_etc): Adjust wording to match current GNU coding standards. + Translate "(C)" if possible. + + * lib/version-etc.c, lib/version-etc.h: New files, taken from + fileutils. + + * src/Makefile.am (cmp_SOURCES, diff3_SOURCES, sdiff_SOURCES, + diff_SOURCES): Remove version.c. + (MAINTAINERCLEANFILES, $(srcdir)/version.c): Remove. + + * src/cmp.c: Include version-etc.h, not freesoft.h. + (copyright_notice): Remove. + (main): Use version_etc to print version. + * src/diff.c, src/diff3.c, src/sdiff.c: Likewise. + + * src/cmp.c (version_string): Remove decl. + * src/diff.h, src/diff3.c, src/sdiff.c: Likewise. + +2002-06-11 Paul Eggert + + * lib/fnmatch.c, lib/fnmatch_loop.c (WIDE_CHAR_SUPPORT): + New macro. Use it uniformly instead of + (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H). + It also uses HAVE_BTOWC, to fix a porting bug on Solaris 2.5.1 + reported by Vin Shelton. + * m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for btowc. + + * NEWS, configure.ac (AC_INIT): Version 2.8.2. + + * ABOUT-NLS, config/config.guess, config/config.sub, + config/depcomp, config/texinfo.tex, lib/posix/regex.h, + m4/c-bs-a.m4, m4/gettext.m4, m4/gnu-source.m4, m4/lib-link.m4, + m4/malloc.m4: + Update to recent version (maintained in other packages). + * m4/prereq.m4 (jm_PREREQ_EXCLUSIVE): AC_FUNC_FNMATCH_GNU + no longer takes a lib. + + * README: Incorporate contents from INSTALLME. + * INSTALLME: Remove. + * Makefile.am (EXTRA_DIST): Remove INSTALLME. + + * configure.ac (AC_GNU_SOURCE): Move up, so that it affects + later compilations properly. + (DEFAULT_DIFF_PROGRAM, AC_TYPE_SIGNAL): Remove. + (jm_AC_TYPE_INTMAX_T): Add. + (AC_FUNC_FNMATCH_GNU): Use this, instead of AC_FUNC_FNMATCH. + (AC_CONFIG_LINKS): regex.hin renamed from regex_.h. + + * doc/diff.texi: Reword "@option{-f} and @option{--foo}" to + "@option{-f} or @option{--foo}". + Use @acronym instead of @sc where appropriate. + (Specified Lines): Renamed from Specified Folding. + (Comparison, Blank Lines): + Clarify wordings for Blank Lines and Specified Lines nodes. + (Binary): Mention --verbose and --print-bytes. + (Tabs, sdiff Option Summary, diff Options): + New option --tabsize=COLUMNS. + + * lib/Makefile.am (EXTRA_DIST): Add fnmatch_loop.c. + (noinst_HEADERS): fnmatch_.h renamed from fnmatch.hin. + regex_.h renamed from regex.hin. + Add file-type.h. + (libdiffutils_a_SOURCES): Add file-type.c. + (DISTCLEANFILES): Remove fnmatch.hno, regex.hno. + + * lib/c-stack.c (__attribute__): New macro. + (EOVERFLOW): Define if not defined. + (stack_t): Define to struct sigaltstack if not defined or declared. + Include , if available. + Include if DEBUG. + Do not include or . + (c_stack_die): Remove info and context args. All uses changed. + (segv_action): Likewise. + (alternate_signal_stack): Change uintmax_t to long, to ease porting. + (get_stack_location, min_address_from_argv, max_address_from_argv, + null_action): New functions. + (stack_base, stack_size): New vars. + (segv_handler): context arg may not be used. + Use global stack_base, stack_size if + ! HAVE_XSI_STACK_OVERFLOW_HEURISTIC. + Add debug code. + Invoke die (rather than segv_action) to exit. + (c_stack_action): Accept new argv arg, and simpler handler arg. + All uses changed. Move code into new functions above. + Allow null action. + [! (defined SA_ONSTACK && defined _SC_PAGESIZE)]: Assume all segvs + are stack overflows. + (main) [DEBUG]: Describe what output should be like. + + * lib/c-stack.h (siginfo_t, c_stack_die): Remove decl. + + * lib/file-type.c, lib/file-type.h: New files. These contain code + that was in src/diff.c, but is now librarified and spiffed up a + bit. Jim Meyering suggested this. + + * lib/fnmatch.c (alloca, __builtin_expect): Define for non-GCC hosts. + : Include only if HAVE_STRINGS_H. + : Include if we include stdlib.h. + Do not comment out all code if ! HAVE_FNMATCH_GNU. + (getenv): Do not declare if HAVE_DECL_GETENV. + (__strchrnul, __wcschrnul): Remove; not used. + (MEMPCPY): Use mempcpy if not _LIBC; use memcpy if neither _LIBC + nor HAVE_MEMPCPY. + (FOLD) [HANDLE_MULTIBYTE]: Do not pass wide char to ISUPPER. + (STRLEN, STRCAT, MEMPCPY) [HANDLE_MULTIBYTE && !defined _LIBC]: + Use wcslen rather than __wcslen, and likewise for wcscat, wmempcpy. + (MEMPCPY) [HANDLE_MULTIBYTE]: Use wmempcpy if not _LIBC; use wmemcpy + if neither _LIBC nor HAVE_WMEMPCPY. + * lib/fnmatch_.h (__const): Do not define to empty, as this breaks + Sun cc. The code doesn't work with K&R anyway. + * lib/fnmatch_loop.c (struct patternlist.str): Size 1, not 0, + as C89 requires this. + (NEW_PATTERN): Use offsetof, not sizeof, since str now has size 1. + * lib/fnmatch_.h: Import from glibc fnmatch.h. + * lib/fnmatch.c, lib/fnmatch_loop.c: Import from glibc. + + * lib/posixver.c: Include posixver.h. + + * lib/regex_.h: Renamed from lib/regex.hin. + + * m4/c-stack.m4 (jm_PREREQ_C_STACK): Do not AC_REQUIRE + jm_AC_TYPE_UINTMAX_T and do not use uintmax_t. + Check for sys/resource.h, uccontext.h. + Check for decls and existence of getcontext, sigaltstack. + Check for stack_t. + + * m4/codeset.m4, m4/glibc21.m4, m4/lcmessage.m4: Remove. + + * m4/fnmatch.m4: Update to latest Autoconf CVS for AC_FUNC_FNMATCH_GNU. + * m4/gnu-source.m4: Likewise, for AC_GNU_SOURCE (renamed from + AC__GNU_SOURCE). + + * m4/mbstate_t.m4 (AC_TYPE_MBSTATE_T): Renamed from AC_MBSTATE_T. + All uses changed. Upgrade to recent Autoconf CVS. + + * m4/stdbool.m4 (AC_HEADER_STDBOOL): Do not cast pointer to + bool in integer constant expression; C99 does not allow it. + Reported by Bruno Haible. + + * po/LINGUAS: Add hu, pt_BR. + * po/hu.po, po/pt_BR.po: New files. + + * src/Makefile.am (noinst_HEADERS): Remove diff.h. + (DEFS): Remove. + (diff_sources): Add diff.h. + (MOSTLYCLEANFILES): New macro. + (cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend + on paths.h. + (paths.h): New rule. + + * src/analyze.c, src/cmp.c, src/diff.c, src/diff3.c, src/io.c, + src/sdiff.c: Include . + + * src/cmp.c: Include paths.h. + (copyright_notice): Renamed from copyright_string. + Now a msgid, so that copyright symbol can be translated. + All uses changed. + * src/diff.c, src/diff3.c, src/sdiff.c: Likewise. + + * src/diff.c: Include posixver.h. + (TABSIZE_OPTION): New constant. + (main): Allow widths up to SIZE_MAX. + (filetype): Move to lib/file-type.c and rename to file_type. + All uses changed. + + * src/diff.c (longopts, main, usage): New option --tabsize=COLUMNS. + * src/io.c (find_and_hash_each_line): Likewise. + + * src/diff.h (TAB_WIDTH): Remove. + (tabsize): New decl. + (sdiff_half_width, sdiff_column2_offset): Now size_t rather than + unsigned int. + + * src/diff3.c (skipwhite, readnum): New functions. + (process_diff_control): Use them. + (SKIPWHITE, READNUM): Remove. + (read_diff): Don't worry about errno == ENOEXEC. + + * src/sdiff.c (catchsig, signal_handler, initial_action): Signal + handlers return void, not RETSIGTYPE, since we no longer support + K&R. + (TABSIZE_OPTION): New constant. + (longopts, usage, main): New option --tabsize=COLUMNS. + (cleanup): New arg signo. All uses changed. + (ck_editor_status, main, edit): Don't worry about ENOEXEC. + + * src/side.c (tab_from_to, print_half_line, print_1sdiff_line): + New option --tabsize=COLUMNS. + + * src/system.h (S_ISBLK, S_ISCHR, S_ISDIR, S_ISFIFO, S_ISREG, + S_ISSOCK): Remove; now in lib/file-type.h. + + * src/util.c (finish_output): Check for ENOEXEC. + (lines_differ, output_1_line): New option --tabsize=COLUMNS. + (analyze_hunk): If -b or -w is also specified, -B now considers + lines to be empty if they contain only white space. + +2002-04-05 Paul Eggert + + * NEWS, configure.ac (AC_INIT): Version 2.8.1. + + * configure.ac (AC_HEADER_STDBOOL): Add. + (AC_CHECK_HEADERS): Remove stdbool.h. + * m4/stdbool.m4: New file. + * m4/prereq.m4 (jm_PREREQ_EXCLUDE): + Use AC_HEADER_STDBOOL rather than AC_CHECK_HEADERS(stdbool.h). + (jm_PREREQ_HASH): Likewise. + + * src/system.h (SSIZE_MAX): Define if limits.h doesn't. + + * src/analyze.c (diff_2_files): Assign PTRDIFF_MAX - 1 to a + size_t variable, just in case there's a problem with ptrdiff_t + versus size_t. + + * lib/cmpbuf.c (errno): Remove decl; K&R C is no longer supported. + Include limits.h. + (SIZE_MAX, SSIZE_MAX): Define if standard headers don't. + (MIN): New macro. + (block_read): Do not attempt to read more than SSIZE_MAX bytes, as the + resulting behavior is implementation-defined. Work around bug in + Tru64 5.1, which can't read more than INT_MAX bytes at a time. + * src/cmp.c (cmp): Use block_read instead of read, to work + around Tru64 5.1 bug. + * src/diff3.c (read_diff): Likewise. + * src/diff3.c: Include cmpbuf.h. + + * THANKS: Add Ulrich Drepper. + + * INSTALLME: Mention GNU texinfo. + + * doc/diff.texi: + Use new @copying directive. + Put @contents first, not last, since Texinfo now suggests this. + Fix bug in -w documentation noted by Karl Berry. + Mention links for speedup. + New node "Speedups" for future speedups. + Just say "Index", not "Concept Index". + +2002-03-26 Paul Eggert + + * src/Makefile.am: + (INCLUDES): Remove this obsolete macro, replacing it with: + (AM_CPPFLAGS): New macro. + +2002-03-26 Albert Chin-A-Young + + * src/Makefile.am (datadir): Remove, as it conflicts with --datadir. + +2002-03-26 Paul Eggert + + * doc/diff.texi (dircategory GNU packages): Fix typo: a "* " was + missing before the menu entry. Bug diagnosed by Adam Heath. + Also, put this dircategory after the Individual utilities dircategory, + to work around a compatibility problem with Debian install-info. + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 17 10:51: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 4656316A46B; Sun, 17 Jun 2007 10:51: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 039CE16A400 for ; Sun, 17 Jun 2007 10:51:12 +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 E671113C44B for ; Sun, 17 Jun 2007 10:51:11 +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 l5HApBws058606 for ; Sun, 17 Jun 2007 10:51:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HAp9m1058407 for perforce@freebsd.org; Sun, 17 Jun 2007 10:51:09 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 17 Jun 2007 10:51:09 GMT Message-Id: <200706171051.l5HAp9m1058407@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 121844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 10:51:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=121844 Change 121844 by rpaulo@rpaulo_epsilon on 2007/06/17 10:50:09 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/intr.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#13 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/advansys.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/advlib.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/adwcam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aha/aha.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aicvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/amd/amd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/asr/asr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/buslogic/bt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/boot_font.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/creator.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gallant12x22.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gfb.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mly/mly.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccard/pccard.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/re/if_re.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ess.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/ich.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/solo.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/version.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/trm/trm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umass.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_port.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_subr.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/wds/wd7000.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i386/cpufreq/smist.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_priv.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/tmpfs/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/igmp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/in.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/key.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netsmb/smb_smb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/pci/if_ste.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pci/ncr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/trap.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/priv.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/tree.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageq.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.82 2007/06/11 17:57:24 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $"); #include #include @@ -841,7 +841,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - bus_addr_t lastaddr; + bus_addr_t lastaddr = 0; int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.587 2007/05/31 22:52:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.588 2007/06/17 04:27:45 mjacob Exp $"); /* * Manages physical address maps. @@ -1645,6 +1645,9 @@ continue; pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_collect"); + } tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, ("pmap_collect: wired pte %#lx", tpte)); @@ -2060,6 +2063,9 @@ PMAP_LOCK(pmap); pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_remove_all"); + } tpte = pte_load_clear(pte); if (tpte & PG_W) pmap->pm_stats.wired_count--; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.231 2007/06/04 18:25:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $"); /* * Routines to handle clock hardware. @@ -53,12 +53,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -931,4 +934,100 @@ DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0); DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0); + +/* + * Linux-style /dev/nvram driver + * + * cmos ram starts at bytes 14 through 128, for a total of 114 bytes. + * bytes 16 through 31 are checksummed at byte 32. + * Unlike Linux, you have to take care of the checksums yourself. + * The driver exposes byte 14 as file offset 0. + */ + +#define NVRAM_FIRST RTC_DIAG /* 14 */ +#define NVRAM_LAST 128 + +static d_open_t nvram_open; +static d_read_t nvram_read; +static d_write_t nvram_write; + +static struct cdev *nvram_dev; + +static struct cdevsw nvram_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, + .d_open = nvram_open, + .d_read = nvram_read, + .d_write = nvram_write, + .d_name = "nvram", +}; + +static int +nvram_open(struct cdev *dev __unused, int flags, int fmt __unused, + struct thread *td) +{ + int error = 0; + + if (flags & FWRITE) + error = securelevel_gt(td->td_ucred, 0); + + return (error); +} + +static int +nvram_read(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + v = rtcin(nv_off); + error = uiomove(&v, 1, uio); + } + return (error); + +} + +static int +nvram_write(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + error = uiomove(&v, 1, uio); + writertc(nv_off, v); + } + return (error); +} + +static int +nvram_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch (type) { + case MOD_LOAD: + nvram_dev = make_dev(&nvram_cdevsw, 0, + UID_ROOT, GID_KMEM, 0640, "nvram"); + break; + case MOD_UNLOAD: + case MOD_SHUTDOWN: + destroy_dev(nvram_dev); + break; + default: + return (EOPNOTSUPP); + } + return (0); +} +DEV_MODULE(nvram, nvram_modevent, NULL); + #endif /* DEV_ISA */ ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/intr.h#2 (text+ko) ==== @@ -32,14 +32,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $ * */ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ -#ifdef CPU_ARM9 +#ifdef CPU_XSCALE_81342 +#define NIRQ 128 +#elif defined(CPU_ARM9) #define NIRQ 64 #else #define NIRQ 32 ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.8 2006/11/02 00:26:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.9 2007/06/17 00:17:15 marius Exp $"); #include #include "openfirm.h" @@ -41,7 +41,6 @@ extern char bootprog_date[]; extern char bootprog_maker[]; -phandle_t chosen; u_int32_t acells; static char bootargs[128]; @@ -64,24 +63,22 @@ uint64_t memsize(void) { - ihandle_t meminstance; - phandle_t memory; + phandle_t memoryp; struct ofw_reg reg[4]; struct ofw_reg2 reg2[8]; int i; u_int64_t sz, memsz; - OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance)); - memory = OF_instance_to_package(meminstance); + memoryp = OF_instance_to_package(memory); if (acells == 1) { - sz = OF_getprop(memory, "reg", ®, sizeof(reg)); + sz = OF_getprop(memoryp, "reg", ®, sizeof(reg)); sz /= sizeof(struct ofw_reg); for (i = 0, memsz = 0; i < sz; i++) memsz += reg[i].size; } else if (acells == 2) { - sz = OF_getprop(memory, "reg", ®2, sizeof(reg2)); + sz = OF_getprop(memoryp, "reg", ®2, sizeof(reg2)); sz /= sizeof(struct ofw_reg2); for (i = 0, memsz = 0; i < sz; i++) @@ -107,7 +104,6 @@ OF_init(openfirm); root = OF_finddevice("/"); - chosen = OF_finddevice("/chosen"); acells = 1; OF_getprop(root, "#address-cells", &acells, sizeof(acells)); ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.10 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ LIB= ofw INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ - ofw_time.c openfirm.c openfirm_mmu.c + ofw_time.c openfirm.c CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_console.c#2 (text+ko) ==== @@ -27,15 +27,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.11 2005/10/20 10:39:09 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.12 2007/06/17 00:17:15 marius Exp $"); #include #include "bootstrap.h" #include "openfirm.h" -int console; - static void ofw_cons_probe(struct console *cp); static int ofw_cons_init(int); void ofw_cons_putchar(int); @@ -59,10 +57,7 @@ static void ofw_cons_probe(struct console *cp) { - phandle_t chosen; - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)); OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)); cp->c_flags |= C_PRESENTIN|C_PRESENTOUT; ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_net.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.10 2005/03/02 20:12:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.11 2007/06/17 00:17:15 marius Exp $"); #include #include @@ -179,12 +179,11 @@ static void ofwn_init(struct iodesc *desc, void *machdep_hint) { - phandle_t chosen, netdev; + phandle_t netdev; char path[64]; char *ch; int pathlen; - chosen = OF_finddevice("/chosen"); pathlen = OF_getprop(chosen, "bootpath", path, 64); if ((ch = index(path, ':')) != NULL) *ch = '\0'; ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.13 2006/10/09 04:43:07 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.15 2007/06/17 00:17:15 marius Exp $"); #include @@ -66,39 +66,24 @@ int (*openfirmware)(void *); +phandle_t chosen; ihandle_t mmu; ihandle_t memory; -/* Initialiaser */ +/* Initialiser */ void OF_init(int (*openfirm)(void *)) { - phandle_t chosen; openfirmware = openfirm; - chosen = OF_finddevice("/chosen"); - OF_getprop(chosen, "memory", &memory, sizeof(memory)); - if (memory == 0) - panic("failed to get memory ihandle"); - OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)); - if (mmu == 0) - panic("failed to get mmu ihandle"); -} - -phandle_t -OF_chosennode(void) -{ - static phandle_t chosen; - - if (chosen) - return (chosen); - - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); - - return (chosen); + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + if (OF_getprop(chosen, "memory", &memory, sizeof(memory)) == -1) + OF_exit(); + if (OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)) == -1) + OF_exit(); } /* @@ -110,23 +95,21 @@ OF_test(char *name) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t service; - cell_t missing; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t service; + cell_t missing; } args = { (cell_t)"test", 1, 1, - 0, - 0 }; args.service = (cell_t)name; if (openfirmware(&args) == -1) - return -1; - return (int)args.missing; + return (-1); + return (args.missing); } /* Return firmware millisecond count. */ @@ -134,19 +117,18 @@ OF_milliseconds() { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t ms; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t ms; } args = { (cell_t)"milliseconds", 0, 1, - 0 }; - + openfirmware(&args); - return (int)args.ms; + return (args.ms); } /* @@ -158,23 +140,21 @@ OF_peer(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t next; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t next; } args = { (cell_t)"peer", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.next; + return (-1); + return (args.next); } /* Return the first child of this node or 0. */ @@ -182,23 +162,21 @@ OF_child(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t child; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t child; } args = { (cell_t)"child", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.child; + return (-1); + return (args.child); } /* Return the parent of this node or 0. */ @@ -206,23 +184,21 @@ OF_parent(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t parent; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t parent; } args = { (cell_t)"parent", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.parent; + return (-1); + return (args.parent); } /* Return the package handle that corresponds to an instance handle. */ @@ -230,23 +206,21 @@ OF_instance_to_package(ihandle_t instance) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t package; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t instance; + cell_t package; } args = { (cell_t)"instance-to-package", 1, 1, - 0, - 0 }; - - args.instance = (u_int)instance; + + args.instance = instance; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.package; + return (-1); + return (args.package); } /* Get the length of a property of a package. */ @@ -254,26 +228,23 @@ OF_getproplen(phandle_t package, char *propname) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t proplen; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t proplen; } args = { (cell_t)"getproplen", 2, 1, - 0, - 0, - 0 }; - args.package = (u_int)package; + args.package = package; args.propname = (cell_t)propname; if (openfirmware(&args) == -1) - return -1; - return (int)args.proplen; + return (-1); + return (args.proplen); } /* Get the value of a property of a package. */ @@ -281,32 +252,27 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t buflen; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t buf; + cell_t buflen; + cell_t size; } args = { (cell_t)"getprop", 4, 1, - 0, - 0, - 0, - 0, - 0 }; - - args.package = (u_int)package; + + args.package = package; args.propname = (cell_t)propname; args.buf = (cell_t)buf; - args.buflen = (u_int)buflen; + args.buflen = buflen; if (openfirmware(&args) == -1) - return -1; - return (int)args.size; + return (-1); + return (args.size); } /* Get the next property of a package. */ @@ -314,29 +280,25 @@ OF_nextprop(phandle_t package, char *previous, char *buf) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t previous; - cell_t buf; - cell_t flag; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t previous; + cell_t buf; + cell_t flag; } args = { (cell_t)"nextprop", 3, 1, - 0, - 0, - 0, - 0 }; - args.package = (u_int)package; + args.package = package; args.previous = (cell_t)previous; args.buf = (cell_t)buf; if (openfirmware(&args) == -1) - return -1; - return (int)args.flag; + return (-1); + return (args.flag); } /* Set the value of a property of a package. */ @@ -345,32 +307,27 @@ OF_setprop(phandle_t package, char *propname, void *buf, int len) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t len; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t buf; + cell_t len; + cell_t size; } args = { (cell_t)"setprop", 4, 1, - 0, - 0, - 0, - 0, - 0 }; - - args.package = (u_int)package; + + args.package = package; args.propname = (cell_t)propname; args.buf = (cell_t)buf; - args.len = (u_int)len; + args.len = len; if (openfirmware(&args) == -1) - return -1; - return (int)args.size; + return (-1); + return (args.size); } /* Convert a device specifier to a fully qualified pathname. */ @@ -378,29 +335,25 @@ OF_canon(const char *device, char *buf, int len) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t device; - cell_t buf; - cell_t len; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t device; + cell_t buf; + cell_t len; + cell_t size; } args = { (cell_t)"canon", 3, 1, - 0, - 0, - 0, - 0 }; - + args.device = (cell_t)device; args.buf = (cell_t)buf; - args.len = (cell_t)len; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 17 11: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 D3BE416A46B; Sun, 17 Jun 2007 11:34: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 ABF6A16A468 for ; Sun, 17 Jun 2007 11:34:05 +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 9C88913C458 for ; Sun, 17 Jun 2007 11:34:05 +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 l5HBY514033217 for ; Sun, 17 Jun 2007 11:34:05 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HBY5I5033193 for perforce@freebsd.org; Sun, 17 Jun 2007 11:34:05 GMT (envelope-from andrew@freebsd.org) Date: Sun, 17 Jun 2007 11:34:05 GMT Message-Id: <200706171134.l5HBY5I5033193@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 121847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 11:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=121847 Change 121847 by andrew@andrew_hermies on 2007/06/17 11:33:57 Use calloc rather than malloc/memset When the back end receives the close of the facund-client element set the connection to be closed. This fixes a bug where the connection would never be closed. If the backend sends a ping call respond with a . This is just for testing and will be removed when calls are implemented properly. Use the correct values for the call name and ID Ignore the for now. It will be used later to find the supported version of the protocol. Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_connection.c#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#4 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_connection.c#3 (text+ko) ==== @@ -49,13 +49,11 @@ { struct facund_conn *conn; - conn = malloc(sizeof(struct facund_conn)); + conn = calloc(1, sizeof(struct facund_conn)); if (conn == NULL) { return NULL; } - memset(conn, 0, sizeof(struct facund_conn)); - conn->do_unlink = 0; conn->local.sun_family = AF_LOCAL; ==== //depot/projects/soc2007/andrew-update/lib/facund_private.h#4 (text+ko) ==== @@ -59,6 +59,8 @@ socklen_t sock_len; /* sizeof(remote) */ int sock; /* The socket fd */ int fd; /* The fd to the remote device */ + int close; /* True when we should + * close the connection */ XML_Parser parser; char current_call[32]; ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#5 (text+ko) ==== @@ -80,6 +80,10 @@ char *buf; ssize_t len; + if (conn->close == 1) { + return 1; + } + buf = XML_GetBuffer(conn->parser, BUF_SIZE); if (buf == NULL) return -1; @@ -110,8 +114,15 @@ } static void -facund_server_call(struct facund_conn *conn __unused, const char *name, const char *id, struct facund_object *arg) +facund_server_call(struct facund_conn *conn, const char *name, const char *id, + struct facund_object *arg) { + /* This is not really a valid command. It is just used for testing */ + if (strcmp(name, "ping") == 0) { + const char *msg = ""; + facund_send(conn, msg, strlen(msg)); + return; + } printf("Call: %s\nID: %s\nArg:\n", name, id); facund_object_print(arg); putchar('\n'); @@ -141,13 +152,13 @@ /* TODO: Return an error */ return; } - call_name = attrs[i]; + call_name = attrs[i + 1]; } else if (strcmp(attrs[i], "id") == 0) { if (id != NULL) { /* TODO: Return an error */ return; } - id = attrs[i]; + id = attrs[i + 1]; } else { /* TODO: Return an error */ return; @@ -179,6 +190,8 @@ facund_object_array_append(conn->call_arg, obj); } conn->call_arg = obj; + } else if (strcmp(name, "facund-client") == 0) { + /* Pass */ } else { snprintf(str, 1024, "", name); facund_send(conn, str, strlen(str)); @@ -212,6 +225,7 @@ } else if (strcmp(name, "facund-client") == 0) { snprintf(str, 1024, ""); facund_send(conn, str, strlen(str)); + conn->close = 1; } } From owner-p4-projects@FreeBSD.ORG Sun Jun 17 11:45: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 2AB6B16A477; Sun, 17 Jun 2007 11:45: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 D538216A46B for ; Sun, 17 Jun 2007 11:45:19 +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 C5E6E13C45D for ; Sun, 17 Jun 2007 11:45:19 +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 l5HBjJ37045489 for ; Sun, 17 Jun 2007 11:45:19 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HBjJa1045478 for perforce@freebsd.org; Sun, 17 Jun 2007 11:45:19 GMT (envelope-from andrew@freebsd.org) Date: Sun, 17 Jun 2007 11:45:19 GMT Message-Id: <200706171145.l5HBjJa1045478@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 121848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 11:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=121848 Change 121848 by andrew@andrew_hermies on 2007/06/17 11:45:03 Create a thread to communicate with the back end Add a lock to syncronise the closing of the connection Send a ping to the back end to test interaction Stop reading data when the back end sends a The back and front ends can now communicate with each other. Currently they just send ping/pong messages untill the connection is closed though. Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#2 (text+ko) ==== @@ -26,10 +26,12 @@ import socket import facund.network +import threading -class Computer: +class Computer(threading.Thread): '''A class to describe each computer able to be connected to''' def __init__(self, name, host): + threading.Thread.__init__(self) self.__name = name self.__host = host self.__dirs = [] @@ -67,6 +69,9 @@ try: self.__connection = \ facund.network.Connection(self.__host) + + # Start the communication thread + self.start() except socket.error: print "Couldn't connect to " + self.__host self.__connection = None @@ -79,3 +84,7 @@ self.__connection.disconnect() self.__connection = None + def run(self): + '''The main communications thread''' + while self.__connection.interact(): + continue ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#5 (text+ko) ==== @@ -24,8 +24,9 @@ # SUCH DAMAGE. # +import socket +import threading import xml.sax.handler -import socket class Connection(xml.sax.handler.ContentHandler): '''A class that works as a client with the Facund XML IPC''' @@ -39,33 +40,47 @@ self.parser = xml.sax.make_parser() self.parser.setContentHandler(self) + self.__connected_lock = threading.Lock() + self.canClose = False # Mark the class as ready and able to disconnect self.isReady = True + self.socket.send("") + def disconnect(self): if self.isReady: self.isReady = False # Send a connection close self.socket.send("") - # Wait for the server to close the connection - while not self.canClose: - self.interact() + # Wait for the other end to close + self.__connected_lock.acquire() + self.__connected_lock.release() + self.parser.close() def interact(self): '''Reads data from the connection and passes it to the XML parser''' - data = self.socket.recv(self.bufSize) - self.parser.feed(data) + if not self.canClose: + data = self.socket.recv(self.bufSize) + self.parser.feed(data) + return True + return False + + def startElement(self, name, attributes): + print "> " + name + " " + str(attributes.items()) + if self.isReady and name == "pong": + self.socket.send("") - def startElement(self, name, attributes): - print "> " + name + if name == "facund-server": + self.__connected_lock.acquire() def endElement(self, name): print "< " + name # The server send a close message if name == "facund-server": + self.__connected_lock.release() self.canClose = True From owner-p4-projects@FreeBSD.ORG Sun Jun 17 15:08: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 19B2216A46B; Sun, 17 Jun 2007 15:08: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 E057A16A468 for ; Sun, 17 Jun 2007 15:08:30 +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 C546613C45D for ; Sun, 17 Jun 2007 15:08:30 +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 l5HF8Ubi066622 for ; Sun, 17 Jun 2007 15:08:30 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HF8U0T066592 for perforce@freebsd.org; Sun, 17 Jun 2007 15:08:30 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 17 Jun 2007 15:08:30 GMT Message-Id: <200706171508.l5HF8U0T066592@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 121853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 15:08:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=121853 Change 121853 by taleks@taleks_th on 2007/06/17 15:07:31 First step of TCP implementation. Added pxe_tcp_connection structure to handle connections. Added pxe_tcp module to available earlier header and functions to send packets. First variant of handhaking function pxe_tcp_connect() and pxe_tcp_callback function. Other minor changes to init TCP module in pxe_core and checking for NIC's ip to avoid broadcast return in pxe_arp. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#15 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#3 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#8 (text+ko) ==== @@ -132,6 +132,13 @@ ip4_src.ip = arp_reply->body.src_paddr; ip4_dst.ip = arp_reply->body.target_paddr; + if (ip4_src.ip == pxe_get_ip32(PXE_IP_MY)) { /* got broadcast send by us */ +#ifdef PXE_DEBUG_HELL + printf("arp request from myself ignored.\n"); +#endif + return (0); + } + #ifdef PXE_DEBUG printf("arp request from %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n\t to: %x:%x:%x:%x:%x:%x/%d.%d.%d.%d\n", mac_src[0], mac_src[1], mac_src[2], mac_src[3], mac_src[4], mac_src[5], @@ -179,8 +186,6 @@ if (arp_reply->hdr.operation != le2be16(PXE_ARPOP_REPLY) ) /* we don't need anything except replies on that stage */ return (0); - - /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier placed ARP entries. * MAC may be lost, so protocol must check this case when creating packet (cause * there used pointer to MAC in arp_table). May be better way is to panic if arp_table @@ -192,7 +197,7 @@ if (NULL != kmac) { #ifdef PXE_DEBUG uint8_t *octet = (uint8_t *)&arp_reply->body.src_paddr; - uint8_t *mac = arp_reply->body.src_hwaddr; +/* uint8_t *mac = arp_reply->body.src_hwaddr; */ printf("MAC of %d.%d.%d.%d already known: %x:%x:%x:%x:%x:%x\n", octet[0], octet[1], octet[2], octet[3], (*kmac)[0], (*kmac)[1], (*kmac)[2], (*kmac)[3], (*kmac)[4], (*kmac)[5] @@ -283,8 +288,9 @@ return (PXE_AWAIT_CONTINUE); break; - case PXE_AWAIT_FINISHTRY: /* don't handle finish of try */ - printf("\npxe_arp_await(): ARP reply timeout.\n"); + case PXE_AWAIT_FINISHTRY: + if (wait_data->mac == NULL) /* nothing got during try */ + printf("\npxe_arp_await(): ARP reply timeout.\n"); break; case PXE_AWAIT_END: /* wait ended */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#15 (text+ko) ==== @@ -266,6 +266,7 @@ pxe_icmp_init(); pxe_socket_init(); pxe_udp_init(); + pxe_tcp_init(); /* trying to get gateway/nameserver info from DHCP server */ pxe_dhcp_query(bootplayer.ident); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#8 (text+ko) ==== @@ -5,6 +5,7 @@ #include "pxe_filter.h" #include "pxe_mem.h" #include "pxe_sock.h" +#include "pxe_tcp.h" #include "pxe_udp.h" static PXE_SOCKET pxe_sockets[PXE_DEFAULT_SOCKETS]; /* storage for socket describing structures */ @@ -418,6 +419,16 @@ sock->filter = entry; sock->state = PXE_SOCKET_CONNECTED; + + if (proto == PXE_TCP_PROTOCOL) { + /* trying handshaking */ + if (pxe_tcp_connect(sock)) { + sock->state = PXE_SOCKET_ESTABLISHED; + } else { /* failed, cleanup */ + pxe_filter_remove(entry); + return (0); + } + } #ifdef PXE_DEBUG printf("pxe_connect(): socket %d connected, 0x%x:%d -> 0x%x:%d\n", socket, pxe_get_ip32(PXE_IP_MY), lport, ip, port); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#3 (text+ko) ==== @@ -8,6 +8,12 @@ #include #include #include "pxe_ip.h" +#include "pxe_sock.h" + +/* maximum existing connections at one time */ +#define PXE_MAX_TCP_CONNECTIONS 4 +/* TCP IP stack protocol number*/ +#define PXE_TCP_PROTOCOL 6 /* tcp packet flags */ #define PXE_TCP_FIN 0x01 @@ -24,9 +30,7 @@ #define PXE_TCP_SYN_SENT 0x01 /* active */ #define PXE_TCP_SYN_RECIEVED 0x02 /* sent & received SYN */ -#define PXE_TCP_ESTABLISHED 0x03 /* established connection, - * ready to send data - */ +#define PXE_TCP_ESTABLISHED 0x03 /* established connection */ #define PXE_TCP_CLOSE_WAIT 0x04 /* got FIN, waiting to close */ #define PXE_TCP_LAST_ACK 0x05 /* got FIN, closing and waiting FIN ACK */ @@ -35,29 +39,54 @@ #define PXE_TCP_FIN_WAIT2 0x08 /* got FIN ACK */ #define PXE_TCP_TIME_WAIT 0x09 /* closed, waiting 2MSL*/ -#define PXE_TCP_MARK 0xf0 /* mark busy sockets */ +typedef struct pxe_tcp_hdr { + + uint16_t src_port; /* local port */ + uint16_t dst_port; /* remote port */ + uint32_t sequence; /* seqence number */ + uint32_t ack_next; /* ACK'd number */ + uint8_t data_off; /* offset to data */ + uint8_t flags; /* TCP flags, see higher TCP_FLAG_ */ + uint16_t window_size; /* current window size */ + uint16_t checksum; /* packet checksum*/ + uint16_t urgent; /* urgent flags */ +} __packed PXE_TCP_HDR; + +typedef struct pxe_tcp_packet { + + PXE_IP_HDR iphdr; + PXE_TCP_HDR tcphdr; +} __packed PXE_TCP_PACKET; + +typedef struct pxe_tcp_connecton { + + uint8_t state; + uint32_t next_recv; + uint32_t next_send; + uint16_t src_port; + uint16_t dst_port; + uint32_t dst_ip; + PXE_BUFFER *recv; + PXE_BUFFER *send; + PXE_SOCKET *sock; + time_t last_sent; + time_t last_recv; +} PXE_TCP_CONNECTION; + +typedef struct pxe_tcp_wait_data { -typedef struct pxe_tcp_header { - uint16_t src_port; - uint16_t dst_port; - uint32_t sequence; - uint32_t ack; - uint8_t data_off; - uint8_t flags; - uint16_t window_size; - uint16_t check_sum; - uint16_t urgent; - uint8_t options[3]; - uint8_t align; -} PXE_TCP_HEADER; + uint8_t state; /* what state is waited for */ + PXE_TCP_CONNECTION *connection; /* which connection is monitored */ +} __packed PXE_TCP_WAIT_DATA; /* init tcp */ -int pxe_tcp_init(); +void pxe_tcp_init(); + +/* sends data */ +int pxe_tcp_send(PXE_TCP_CONNECTION *connection, uint16_t size, uint8_t tcp_flags); + +/* initates handshaking */ +int pxe_tcp_connect(PXE_SOCKET* sock); -/* send/recieve. Calling convention is still decided. */ -/* int pxe_tcp_send_packet(const pxe_socket* socket, void* data, - size_t size, uint8_t flags); - int pxe_tcp_recv_packet(const void* data, size_t size); -*/ #endif // PXE_TCP_H_INCLUDED From owner-p4-projects@FreeBSD.ORG Sun Jun 17 17:07: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 3667816A469; Sun, 17 Jun 2007 17:07: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 8A9F116A468 for ; Sun, 17 Jun 2007 17:07:33 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 763EF13C45A for ; Sun, 17 Jun 2007 17:07:33 +0000 (UTC) (envelope-from chub@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 l5HH7Xrq059627 for ; Sun, 17 Jun 2007 17:07:33 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HH7WKa059467 for perforce@freebsd.org; Sun, 17 Jun 2007 17:07:32 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 17 Jun 2007 17:07:32 GMT Message-Id: <200706171707.l5HH7WKa059467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 121859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 17:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121859 Change 121859 by chub@chub-msdosfs on 2007/06/17 17:04:07 Initial branching for msdosfs soc project. Affected files ... .. //depot/projects/soc2007/chub-msdosfs/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/fp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/pte.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/swi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/commands.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/help.common#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/interp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/loader.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/ls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/panic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/bsm/audit.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/README.quirks#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/00READ#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/TODO#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/cnode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_io.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/compat/opensolaris/sys/vnode.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 17 17:27: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 2E51D16A469; Sun, 17 Jun 2007 17:27: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 DB11D16A468 for ; Sun, 17 Jun 2007 17:27:58 +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 CB6F613C44B for ; Sun, 17 Jun 2007 17:27:58 +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 l5HHRwk0095725 for ; Sun, 17 Jun 2007 17:27:58 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HHRw3d095716 for perforce@freebsd.org; Sun, 17 Jun 2007 17:27:58 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 17 Jun 2007 17:27:58 GMT Message-Id: <200706171727.l5HHRw3d095716@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 121860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 17:27:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=121860 Change 121860 by rpaulo@rpaulo_epsilon on 2007/06/17 17:27:03 Add a new quirk: UQ_MS_IGNORE. Devices that need to be ignored by ums(4) (for example, if they need a specific driver) should use this quirk. This is the case of Apple's Internal trackpad found on MacBooks/PowerBooks. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#8 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#3 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#3 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#8 (text+ko) ==== @@ -179,6 +179,9 @@ if (err) return (UMATCH_NONE); + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE) + return (UMATCH_NONE); + if (hid_is_collection(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) ret = UMATCH_IFACECLASS; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#3 (text+ko) ==== @@ -135,7 +135,7 @@ ANY, { UQ_KBD_IGNORE }}, /* Devices that need special handling of the Fn key */ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_INTKBTP, - ANY, { UQ_KBD_FNKEY } }, + ANY, { UQ_KBD_FNKEY | UQ_MS_IGNORE } }, { 0, 0, 0, { 0 } } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#3 (text+ko) ==== @@ -58,6 +58,7 @@ #define UQ_HID_IGNORE 0x8000 /* device should be ignored by hid class */ #define UQ_KBD_IGNORE 0x18000 /* device should be ignored by both kbd and hid class */ #define UQ_KBD_FNKEY 0x40000 /* device needs special handling for the Fn key */ +#define UQ_MS_IGNORE 0x20000 /* device should be ignored by ums */ }; From owner-p4-projects@FreeBSD.ORG Sun Jun 17 18:56: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 7871B16A474; Sun, 17 Jun 2007 18:56: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 3E8F516A400 for ; Sun, 17 Jun 2007 18:56:13 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2EDA213C465 for ; Sun, 17 Jun 2007 18:56:13 +0000 (UTC) (envelope-from scottl@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 l5HIuDv9019832 for ; Sun, 17 Jun 2007 18:56:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HIuCcI019823 for perforce@freebsd.org; Sun, 17 Jun 2007 18:56:12 GMT (envelope-from scottl@freebsd.org) Date: Sun, 17 Jun 2007 18:56:12 GMT Message-Id: <200706171856.l5HIuCcI019823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 18:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=121867 Change 121867 by scottl@scottl-x64 on 2007/06/17 18:55:17 initial, incomplete whack at newbus locking. Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#12 (text+ko) ==== @@ -74,6 +74,7 @@ typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; typedef TAILQ_HEAD(device_list, device) device_list_t; +struct mtx newbus_lock; struct devclass { TAILQ_ENTRY(devclass) link; @@ -736,6 +737,7 @@ */ static devclass_list_t devclasses = TAILQ_HEAD_INITIALIZER(devclasses); +MTX_SYSINIT(newbus_lock, &newbus_lock, "Newbus internal lock", MTX_DEF); /** @@ -759,6 +761,8 @@ { devclass_t dc; + mtx_assert(&newbus_lock, MA_OWNED); + PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -810,7 +814,12 @@ devclass_t devclass_create(const char *classname) { - return (devclass_find_internal(classname, NULL, TRUE)); + devclass_t dc; + + mtx_lock(&newbus_lock); + dc = devclass_find_internal(classname, NULL, TRUE); + mtx_unlock(&newbus_lock); + return (dc); } /** @@ -824,7 +833,12 @@ devclass_t devclass_find(const char *classname) { - return (devclass_find_internal(classname, NULL, FALSE)); + devclass_t dc; + + mtx_lock(&newbus_lock); + dc = devclass_find_internal(classname, NULL, FALSE); + mtx_lock(&newbus_lock); + return (dc); } /** @@ -861,6 +875,7 @@ /* * Make sure the devclass which the driver is implementing exists. */ + mtx_lock(&newbus_lock); devclass_find_internal(driver->name, NULL, TRUE); dl->driver = driver; @@ -871,10 +886,16 @@ * Call BUS_DRIVER_ADDED for any existing busses in this class. */ for (i = 0; i < dc->maxunit; i++) - if (dc->devices[i]) + if (dc->devices[i]) { + /* XXX UNSAFE */ + mtx_unlock(&newbus_lock); BUS_DRIVER_ADDED(dc->devices[i], driver); + mtx_lock(&newbus_lock); + } + } bus_data_generation_update(); + mtx_unlock(&newbus_lock); return (0); } @@ -909,6 +930,7 @@ /* * Find the link structure in the bus' list of drivers. */ + mtx_lock(&newbus_lock); TAILQ_FOREACH(dl, &busclass->drivers, link) { if (dl->driver == driver) break; @@ -917,8 +939,10 @@ if (!dl) { PDEBUG(("%s not found in %s list", driver->name, busclass->name)); + mtx_unlock(&newbus_lock); return (ENOENT); } + TAILQ_REMOVE(&busclass->drivers, dl, link); /* * Disassociate from any devices. We iterate through all the @@ -935,14 +959,16 @@ dev = dc->devices[i]; if (dev->driver == driver && dev->parent && dev->parent->devclass == busclass) { + /* XXX UNSAFE */ + mtx_unlock(&newbus_lock); if ((error = device_detach(dev)) != 0) return (error); device_set_driver(dev, NULL); + mtx_lock(&newbus_lock); } } } - TAILQ_REMOVE(&busclass->drivers, dl, link); free(dl, M_BUS); /* XXX: kobj_mtx */ @@ -951,6 +977,7 @@ kobj_class_free((kobj_class_t) driver); bus_data_generation_update(); + mtx_unlock(&newbus_lock); return (0); } @@ -984,6 +1011,7 @@ /* * Find the link structure in the bus' list of drivers. */ + mtx_lock(&newbus_lock); TAILQ_FOREACH(dl, &busclass->drivers, link) { if (dl->driver == driver) break; @@ -992,6 +1020,7 @@ if (!dl) { PDEBUG(("%s not found in %s list", driver->name, busclass->name)); + mtx_unlock(&newbus_lock); return (ENOENT); } @@ -1010,12 +1039,16 @@ dev = dc->devices[i]; if (dev->driver == driver && dev->parent && dev->parent->devclass == busclass) { + /* XXX UNSAFE */ + mtx_unlock(&newbus_lock); if ((error = device_quiesce(dev)) != 0) return (error); + mtx_lock(&newbus_lock); } } } + mtx_unlock(&newbus_lock); return (0); } @@ -1051,12 +1084,15 @@ kobj_class_t devclass_find_driver(devclass_t dc, const char *classname) { + kobj_class_t kc = NULL; driverlink_t dl; + mtx_lock(&newbus_lock); dl = devclass_find_driver_internal(dc, classname); if (dl) - return (dl->driver); - return (NULL); + kc = dl->driver; + mtx_unlock(&newbus_lock); + return (kc); } /** @@ -1697,8 +1733,7 @@ int result, pri = 0; int hasclass = (child->devclass != 0); - GIANT_REQUIRED; - + mtx_lock(&newbus_lock); dc = dev->devclass; if (!dc) panic("device_probe_child: parent device has no devclass"); @@ -1707,8 +1742,10 @@ * If the state is already probed, then return. However, don't * return if we can rebid this object. */ - if (child->state == DS_ALIVE && (child->flags & DF_REBID) == 0) + if (child->state == DS_ALIVE && (child->flags & DF_REBID) == 0) { + mtx_unlock(&newbus_lock); return (0); + } for (; dc; dc = dc->parent) { for (dl = first_matching_driver(dc, child); @@ -1723,7 +1760,10 @@ resource_int_value(dl->driver->name, child->unit, "flags", &child->devflags); + /* XXX UNSAFE */ + mtx_unlock(&newbus_lock); result = DEVICE_PROBE(child); + mtx_lock(&newbus_lock); /* Reset flags and devclass before the next probe. */ child->devflags = 0; @@ -1815,9 +1855,11 @@ child->state = DS_ALIVE; bus_data_generation_update(); + mtx_unlock(&newbus_lock); return (0); } + mtx_unlock(&newbus_lock); return (ENXIO); } @@ -1854,13 +1896,16 @@ device_t *list; count = 0; + mtx_lock(&newbus_lock); TAILQ_FOREACH(child, &dev->children, link) { count++; } list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO); - if (!list) + if (!list) { + mtx_unlock(&newbus_lock); return (ENOMEM); + } count = 0; TAILQ_FOREACH(child, &dev->children, link) { @@ -1870,6 +1915,7 @@ *devlistp = list; *devcountp = count; + mtx_unlock(&newbus_lock); return (0); } @@ -2230,24 +2276,30 @@ devclass_t dc; int error; + mtx_lock(&newbus_lock); if (!classname) { if (dev->devclass) devclass_delete_device(dev->devclass, dev); + mtx_unlock(&newbus_lock); return (0); } if (dev->devclass) { printf("device_set_devclass: device class already set\n"); + mtx_unlock(&newbus_lock); return (EINVAL); } dc = devclass_find_internal(classname, NULL, TRUE); - if (!dc) + if (!dc) { + mtx_unlock(&newbus_lock); return (ENOMEM); + } error = devclass_add_device(dc, dev); bus_data_generation_update(); + mtx_unlock(&newbus_lock); return (error); } @@ -3729,7 +3781,9 @@ kobj_init((kobj_t) root_bus, (kobj_class_t) &root_driver); root_bus->driver = &root_driver; root_bus->state = DS_ATTACHED; + mtx_lock(&newbus_lock); root_devclass = devclass_find_internal("root", NULL, FALSE); + mtx_unlock(&newbus_lock); devinit(); return (0); @@ -3785,7 +3839,9 @@ kobj_class_t driver; dmd = (struct driver_module_data *)arg; + mtx_lock(&newbus_lock); bus_devclass = devclass_find_internal(dmd->dmd_busname, NULL, TRUE); + mtx_unlock(&newbus_lock); error = 0; switch (what) { @@ -3807,6 +3863,7 @@ * search for drivers in both devclasses for children * of a device using this driver. */ + mtx_lock(&newbus_lock); if (driver->baseclasses) { const char *parentname; parentname = driver->baseclasses[0]->name; @@ -3817,6 +3874,7 @@ *dmd->dmd_devclass = devclass_find_internal(driver->name, NULL, TRUE); } + mtx_unlock(&newbus_lock); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Sun Jun 17 21:52:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1099B16A473; Sun, 17 Jun 2007 21:52:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA20616A46D for ; Sun, 17 Jun 2007 21:52:50 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A723913C4BF for ; Sun, 17 Jun 2007 21:52:50 +0000 (UTC) (envelope-from gcooper@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 l5HLqogt014287 for ; Sun, 17 Jun 2007 21:52:50 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HLqo9x014281 for perforce@freebsd.org; Sun, 17 Jun 2007 21:52:50 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 17 Jun 2007 21:52:50 GMT Message-Id: <200706172152.l5HLqo9x014281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 121874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 21:52:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=121874 Change 121874 by gcooper@optimus-revised_pkgtools on 2007/06/17 21:52:29 Obsolete files -- didn't follow style(7). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/README#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/Symbol.map#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_close.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_conv.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_debug.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_delete.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_get.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_open.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_overflow.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_page.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_put.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_search.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_seq.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_split.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/bt_utils.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/btree.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/btree/extern.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/changelog#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/db/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/db/db.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/docs/hash.usenix.ps#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/docs/libtp.usenix.ps#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/README#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/extern.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash_bigkey.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash_buf.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash_func.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash_log2.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/hash_page.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/ndbm.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/hash/page.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/btree.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/dbm.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/dbopen.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/hash.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/mpool.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/man/recno.3#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/mpool/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/mpool/README#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/mpool/mpool.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/mpool/mpool.libtp#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/Makefile.inc#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/extern.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_close.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_delete.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_get.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_open.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_put.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_search.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_seq.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/rec_utils.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/recno/recno.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/Makefile#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/README#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/btree.tests/main.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/dbtest.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/driver2.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/makedb.sh#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/tcreat3.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/tdel.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/testit#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/thash4.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/tread2.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/tseq.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/hash.tests/tverify.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/lib/libc/db/test/run.test#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 17 22:05:07 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 66E0016A46E; Sun, 17 Jun 2007 22:05:07 +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 0833916A41F for ; Sun, 17 Jun 2007 22:05:07 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EB9ED13C46C for ; Sun, 17 Jun 2007 22:05:06 +0000 (UTC) (envelope-from gcooper@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 l5HM56I5033622 for ; Sun, 17 Jun 2007 22:05:06 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HM56Su033609 for perforce@freebsd.org; Sun, 17 Jun 2007 22:05:06 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 17 Jun 2007 22:05:06 GMT Message-Id: <200706172205.l5HM56Su033609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 121878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Jun 2007 22:05:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=121878 Change 121878 by gcooper@optimus-revised_pkgtools on 2007/06/17 22:04:23 -Some improvements in permissions handling -- fchmod(fh) vs vsystem("/usr/sbin/chmod [file]"); -Use calloc(..) without temp var instead of malloc(..)/bzero(..) with temp var. -Changed "success" goto target to "finished". Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/delete/perform.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/Makefile#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/add_del.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#2 (text+ko) ==== @@ -201,7 +201,7 @@ /* If this is a direct extract and we didn't want it, stop now */ if (inPlace && Fake) - goto success; + goto finished; /* Finally unpack the whole mess. If extract is null we already + did so so don't bother doing it again. */ @@ -248,7 +248,7 @@ warnx("package '%s' or its older version already installed%s", Plist.name, FailOnAlreadyInstalled ? "" : " (ignored)"); code = FailOnAlreadyInstalled != FALSE; - goto success; /* close enough for government work */ + goto finished; /* close enough for government work */ } /* Now check the packing list for conflicts */ @@ -272,7 +272,7 @@ } if(conflictsfound) { if(!Force) { - warnx("please use pkg_delete first to remove conflicting package(s) or -f to force installation"); + warnx("please use pkg_delete first to remove conflicting package(s) or -f to force install"); code = 1; goto bomb; } else @@ -287,10 +287,11 @@ continue; deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; if (Verbose) { - printf("Package '%s' depends on '%s'", Plist.name, p->name); - if (deporigin != NULL) - printf(" with '%s' origin", deporigin); + printf( "Package '%s' depends on '%s'", Plist.name, p->name); + if( deporigin != NULL) + printf(" with '%s' origin", deporigin); printf(".\n"); + } if (isinstalledpkg(p->name) <= 0 && !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { @@ -374,24 +375,26 @@ /* Look for the requirements file */ if (fexists(REQUIRE_FNAME)) { - vsystem("/bin/chmod +x %s", REQUIRE_FNAME); /* be sure */ - if (Verbose) - printf("Running requirements file first for %s..\n", Plist.name); - if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, Plist.name)) { - warnx("package %s fails requirements %s", pkg_fullname, - Force ? "installing anyway" : "- not installed"); - if (!Force) { - code = 1; - goto success; /* close enough for government work */ - } + +#define POST_EXEC_WARN_FORMAT_STR "package %s doesn't meet requirements %s" + + char post_exec_warn_str[ strlen(POST_EXEC_WARN_FORMAT_STR) - 2*(2) + strlen(pkg_fullname) + strlen("installing anyway") + 1 ]; + + sprintf( post_exec_warn_str, POST_EXEC_WARN_FORMAT_STR, pkg_fullname, ( Force ? "installing anyway" : "- not installed" ) ); + + if( ( code = pkg_add_del_script_chmod_and_exec( REQUIRE_FNAME, Plist, "INSTALL", 0, + "Running requirements file first for", + post_exec_warn_str ) ) + && !Force ) { + goto finished; } + } /* * Test whether to use the old method of passing tokens to installation * scripts, and set appropriate variables.. */ - if (fexists(POST_INSTALL_FNAME)) { new_m = 1; sprintf(post_script, "%s", POST_INSTALL_FNAME); @@ -407,15 +410,14 @@ /* If we're really installing, and have an installation file, run it */ if (!NoInstall && fexists(pre_script)) { - vsystem("/bin/chmod +x %s", pre_script); /* make sure */ - if (Verbose) - printf("Running pre-install for %s..\n", Plist.name); - if (!Fake && vsystem("./%s %s %s", pre_script, Plist.name, pre_arg)) { - warnx("install script returned error status"); - unlink(pre_script); - code = 1; - goto success; /* nothing to uninstall yet */ + + if( ( code = pkg_add_del_script_chmod_and_exec( pre_script, Plist, pre_arg, 1, + "Running pre-install script for", + "pre-install script exec returned non-zero status" ) + ) ) { + goto finished; } + } /* Now finally extract the entire show if we're not going direct */ @@ -423,28 +425,29 @@ extract_plist(".", &Plist); if (!Fake && fexists(MTREE_FNAME)) { - if (Verbose) - printf("Running mtree for %s..\n", Plist.name); + p = find_plist(&Plist, PLIST_CWD); - if (Verbose) - printf("mtree -U -f %s -d -e -p %s >%s\n", MTREE_FNAME, p ? p->name : "/", _PATH_DEVNULL); + + if (Verbose) { + printf( "Running mtree for %s..\nmtree -U -f %s -d -e -p %s >%s\n", + Plist.name, MTREE_FNAME, ( p ? p->name : "/" ), _PATH_DEVNULL ); + } if (!Fake) { - if (vsystem("/usr/sbin/mtree -U -f %s -d -e -p %s >%s", MTREE_FNAME, p ? p->name : "/", _PATH_DEVNULL)) + if (vsystem("/usr/sbin/mtree -U -f %s -d -e -p %s >%s", MTREE_FNAME, ( p ? p->name : "/" ), _PATH_DEVNULL)) warnx("mtree returned a non-zero status - continuing"); } } /* Run the installation script one last time? */ if (!NoInstall && fexists(post_script)) { - vsystem("/bin/chmod +x %s", post_script); /* make sure */ - if (Verbose) - printf("Running post-install for %s..\n", Plist.name); - if (!Fake && vsystem("./%s %s %s", post_script, Plist.name, post_arg)) { - warnx("install script returned error status"); - unlink(post_script); - code = 1; - goto fail; + + if( ( code = pkg_add_del_script_chmod_and_exec( post_script, Plist, post_arg, 1, + "Running post-install script for", + "post-install script exec returned non-zero status" ) + ) ) { + goto fail; } + } /* Time to record the deed? */ @@ -463,10 +466,15 @@ LogDir); bzero(LogDir, FILENAME_MAX); code = 1; - goto success; /* close enough for government work */ + goto finished; /* close enough for government work */ } /* Make sure pkg_info can read the entry */ - vsystem("/bin/chmod a+rx %s", LogDir); + int LogDir_fh = open(LogDir, O_RDONLY); + struct stat LogDir_stat; + + if(0 != fstat(LogDir_fh, &LogDir_stat)) { + fchmod(LogDir_fh, 0555); /* Ensure log dir is executable/readible to all */ + } move_file(".", DESC_FNAME, LogDir); move_file(".", COMMENT_FNAME, LogDir); if (fexists(INSTALL_FNAME)) @@ -486,9 +494,9 @@ sprintf(contents, "%s/%s", LogDir, CONTENTS_FNAME); contfile = fopen(contents, "w"); if (!contfile) { - warnx("can't open new contents file '%s'! can't register pkg", + warnx("Can't open new contents file '%s'; can't register package!", contents); - goto success; /* can't log, but still keep pkg */ + goto finished; /* can't log, but still keep pkg */ } write_plist(&Plist, contfile); fclose(contfile); @@ -502,8 +510,8 @@ NULL; if (Verbose) { printf("Trying to record dependency on package '%s'", p->name); - if (deporigin != NULL) - printf(" with '%s' origin", deporigin); + if(deporigin != NULL) + printf(" with '%s' origin ", deporigin ); printf(".\n"); } @@ -547,25 +555,23 @@ fputs(buf, stdout); putc('\n', stdout); (void) fclose(fp); - } else { - if (!Fake) { - warnx("cannot open %s as display file", buf); - } + } else if (!Fake) { + warnx("cannot open %s as display file", buf); } } - goto success; + goto finished; bomb: code = 1; - goto success; + goto finished; fail: /* Nuke the whole (installed) show, XXX but don't clean directories */ if (!Fake) delete_package(FALSE, FALSE, &Plist); - success: + finished: /* delete the packing list contents */ free_plist(&Plist); leave_playpen(); @@ -575,21 +581,19 @@ static int sanity_check(char *pkg) { - int code = 0; - if (!fexists(CONTENTS_FNAME)) { warnx("package %s has no CONTENTS file!", pkg); - code = 1; + return 1; } else if (!fexists(COMMENT_FNAME)) { warnx("package %s has no COMMENT file!", pkg); - code = 1; + return 1; } else if (!fexists(DESC_FNAME)) { warnx("package %s has no DESC file!", pkg); - code = 1; + return 1; } - return code; + return 0; } void @@ -599,11 +603,11 @@ if (!in_cleanup) { in_cleanup = 1; - if (sig) + if (sig) printf("Signal %d received, cleaning up..\n", sig); - if (!Fake && zapLogDir && LogDir[0]) + if (!Fake && zapLogDir && LogDir[0]) vsystem("%s -rf %s", REMOVE_CMD, LogDir); - leave_playpen(); + leave_playpen(); } if (sig) exit(1); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/delete/perform.c#2 (text+ko) ==== @@ -222,15 +222,20 @@ setenv(PKG_PREFIX_VNAME, p->name, 1); if (fexists(REQUIRE_FNAME)) { - if (Verbose) - printf("Executing 'require' script.\n"); - vsystem("/bin/chmod +x %s", REQUIRE_FNAME); /* be sure */ - if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) { - warnx("package %s fails requirements %s", pkg, - Force ? "" : "- not deleted"); - if (!Force) - return 1; + +#define FORCE_DEL_STR "- not deleted" +#define POST_EXEC_WARN_FORMAT_STR "package %s fails requirements %s" + + /* Length of const message str + length of message str + length of 'force' string + null */ + char post_exec_warn_msg[ strlen(POST_EXEC_WARN_FORMAT_STR) - (2*2) + strlen(pkg) + strlen(FORCE_DEL_STR) + 1 ]; + + sprintf(post_exec_warn_msg, POST_EXEC_WARN_FORMAT_STR, pkg, ( Force ? "" : FORCE_DEL_STR ) ); + + if(pkg_add_del_script_chmod_and_exec(REQUIRE_FNAME, Plist, "DEINSTALL", 0, + "Executing 'require' script for", post_exec_warn_msg)) { + return 1; } + } /* @@ -253,13 +258,10 @@ if (!NoDeInstall && pre_script != NULL && fexists(pre_script)) { if (Fake) printf("Would execute de-install script at this point.\n"); - else { - vsystem("/bin/chmod +x %s", pre_script); /* make sure */ - if (vsystem("./%s %s %s", pre_script, pkg, pre_arg)) { - warnx("deinstall script returned error status"); - if (!Force) - return 1; - } + else if(pkg_add_del_script_chmod_and_exec(pre_script, Plist, pre_arg, 0, + "Executing deinstall pre-script for", "Deinstall pre-script exec returned non-zero status") + && !Force) { + return 1; } } @@ -310,13 +312,10 @@ if (!NoDeInstall && post_script != NULL && fexists(post_script)) { if (Fake) printf("Would execute post-deinstall script at this point.\n"); - else { - vsystem("/bin/chmod +x %s", post_script); /* make sure */ - if (vsystem("./%s %s %s", post_script, pkg, post_arg)) { - warnx("post-deinstall script returned error status"); - if (!Force) - return 1; - } + else if(pkg_add_del_script_chmod_and_exec(post_script, Plist, pre_arg, 0, + "Executing deinstall post-script for", "Deinstall post-script exec returned non-zero status") + && !Force) { + return 1; } } ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ LIB= install INTERNALLIB= SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c \ - deps.c version.c pkgwrap.c url.c + deps.c version.c pkgwrap.c url.c add_del.c WARNS?= 3 WFORMAT?= 1 ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/lib.h#2 (text+ko) ==== @@ -146,6 +146,10 @@ STAILQ_HEAD(reqr_by_head, reqr_by_entry); /* Prototypes */ + +/* _add / _delete consolidation */ +int pkg_add_del_script_chmod_and_exec(const char *, const Package, const char *, const int, const char *, const char *); + /* Misc */ int vsystem(const char *, ...); char *vpipe(const char *, ...); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/pen.c#2 (text+ko) ==== @@ -110,8 +110,7 @@ errx(2, "%s: can't mkdir '%s'", __func__, pen); } - if (Verbose) { - if (sz) + if (Verbose && sz) { fprintf(stderr, "Requested space: %d bytes, free space: %lld bytes in %s\n", (int)sz, (long long)min_free(pen), pen); } ==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#2 (text+ko) ==== @@ -157,11 +157,7 @@ PackingList new_plist_entry(void) { - PackingList ret; - - ret = (PackingList)malloc(sizeof(struct _plist)); - bzero(ret, sizeof(struct _plist)); - return ret; + return (PackingList)calloc(1, sizeof(struct _plist)); } /* Free an entire packing list */ From owner-p4-projects@FreeBSD.ORG Mon Jun 18 02:17: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 070B916A46E; Mon, 18 Jun 2007 02:17:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ACE0316A468 for ; Mon, 18 Jun 2007 02:17:21 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 98A6813C45B for ; Mon, 18 Jun 2007 02:17:21 +0000 (UTC) (envelope-from ryanb@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 l5I2HL7n008136 for ; Mon, 18 Jun 2007 02:17:21 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5I2HJr4008075 for perforce@freebsd.org; Mon, 18 Jun 2007 02:17:19 GMT (envelope-from ryanb@FreeBSD.org) Date: Mon, 18 Jun 2007 02:17:19 GMT Message-Id: <200706180217.l5I2HJr4008075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 121886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 02:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=121886 Change 121886 by ryanb@ryanb_yuki on 2007/06/18 02:16:56 Integrate from -CURRENT. Haven't tested build yet. (Minor merging required.) Will test that on -CURRENT box next. (Presumably after the new gcc import, can no longer build -CURRENT from a 6.2-R machine.) Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/clone.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/clone.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/unit.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/unit.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/soundsystem/src/sys/dev/sound/version.h#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soundsystem/src/usr.sbin/mixer/mixer.8#2 integrate Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.42 2007/03/15 16:41:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.45 2007/06/17 06:10:40 ariff Exp $"); struct ad1816_info; @@ -318,7 +318,7 @@ ch->parent = ad1816; ch->channel = c; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, ad1816->parent_dmat, ad1816->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, ad1816->parent_dmat, 0, ad1816->bufsize) != 0) return NULL; return ch; } @@ -411,7 +411,7 @@ struct ad1816_info *ad1816 = ch->parent; int wr, reg; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; sndbuf_dma(ch->buffer, go); @@ -598,9 +598,7 @@ struct ad1816_info *ad1816; char status[SND_STATUSLEN], status2[SND_STATUSLEN]; - ad1816 = (struct ad1816_info *)malloc(sizeof *ad1816, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!ad1816) return ENXIO; - + ad1816 = malloc(sizeof(*ad1816), M_DEVBUF, M_WAITOK | M_ZERO); ad1816->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_ad1816 softc"); ad1816->io_rid = 2; ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.38 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.42 2007/06/17 06:10:40 ariff Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) @@ -97,7 +97,8 @@ bus_dma_tag_t parent_dmat; unsigned int bufsize; - int type, duplex:1, newspeed:1; + int type; + unsigned int duplex:1, newspeed:1; u_long bd_flags; /* board-specific flags */ struct ess_chinfo pch, rch; }; @@ -563,7 +564,7 @@ ch->parent = sc; ch->channel = c; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsize) != 0) return NULL; ch->dir = dir; ch->hwch = 1; @@ -610,7 +611,7 @@ { struct ess_chinfo *ch = data; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; switch (go) { @@ -808,10 +809,7 @@ char status[SND_STATUSLEN], buf[64]; int ver; - sc = (struct ess_info *)malloc(sizeof *sc, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!sc) - return ENXIO; - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->parent_dev = device_get_parent(dev); sc->bufsize = pcm_getbuffersize(dev, 4096, ESS_BUFFSIZE, 65536); if (ess_alloc_resources(sc, dev)) ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.108 2007/03/15 16:41:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.112 2007/06/17 06:10:40 ariff Exp $"); /* board-specific include files */ #include @@ -1152,7 +1152,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, mss->parent_dmat, mss->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, mss->parent_dmat, 0, mss->bufsize) != 0) return NULL; sndbuf_dmasetup(ch->buffer, (dir == PCMDIR_PLAY)? mss->drq1 : mss->drq2); return ch; @@ -1201,7 +1201,7 @@ struct mss_chinfo *ch = data; struct mss_info *mss = ch->parent; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; sndbuf_dma(ch->buffer, go); @@ -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; @@ -1979,10 +1979,7 @@ { struct mss_info *mss; - mss = (struct mss_info *)malloc(sizeof *mss, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!mss) - return ENXIO; - + mss = malloc(sizeof(*mss), M_DEVBUF, M_WAITOK | M_ZERO); mss->io_rid = 0; mss->conf_rid = -1; mss->irq_rid = 0; ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.94 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb16.c,v 1.97 2007/06/17 06:10:40 ariff Exp $"); #define SB16_BUFFSIZE 4096 #define PLAIN_SB16(x) ((((x)->bd_flags) & (BD_F_SB16|BD_F_SB16X)) == BD_F_SB16) @@ -681,7 +681,7 @@ ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, sb->parent_dmat, sb->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sb->parent_dmat, 0, sb->bufsize) != 0) return NULL; return ch; @@ -724,7 +724,7 @@ struct sb_chinfo *ch = data; struct sb_info *sb = ch->parent; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; if (go == PCMTRIG_START) @@ -813,10 +813,7 @@ uintptr_t ver; char status[SND_STATUSLEN], status2[SND_STATUSLEN]; - sb = (struct sb_info *)malloc(sizeof *sb, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!sb) - return ENXIO; - + sb = malloc(sizeof(*sb), M_DEVBUF, M_WAITOK | M_ZERO); sb->parent_dev = device_get_parent(dev); BUS_READ_IVAR(sb->parent_dev, dev, 1, &ver); sb->bd_id = ver & 0x0000ffff; ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.83 2007/02/23 13:47:33 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sb8.c,v 1.86 2007/06/17 06:10:41 ariff Exp $"); #define SB_DEFAULT_BUFSZ 4096 @@ -599,7 +599,7 @@ ch->channel = c; ch->dir = dir; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sb->parent_dmat, sb->bufsize) != 0) + if (sndbuf_alloc(ch->buffer, sb->parent_dmat, 0, sb->bufsize) != 0) return NULL; sndbuf_dmasetup(ch->buffer, sb->drq); return ch; @@ -637,7 +637,7 @@ { struct sb_chinfo *ch = data; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; sndbuf_dma(ch->buffer, go); @@ -714,10 +714,7 @@ char status[SND_STATUSLEN]; uintptr_t ver; - sb = (struct sb_info *)malloc(sizeof *sb, M_DEVBUF, M_NOWAIT | M_ZERO); - if (!sb) - return ENXIO; - + sb = malloc(sizeof(*sb), M_DEVBUF, M_WAITOK | M_ZERO); sb->parent_dev = device_get_parent(dev); BUS_READ_IVAR(device_get_parent(dev), dev, 1, &ver); sb->bd_id = ver & 0x0000ffff; ==== //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#4 (text) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.23 2007/03/15 14:57:54 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.24 2007/04/02 06:03:47 ariff Exp $"); #include #include @@ -1453,14 +1453,18 @@ switch (type) { case MOD_LOAD: retval = midi_load(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; case MOD_UNLOAD: retval = midi_unload(); +#if 0 if (retval == 0) retval = seq_modevent(mod, type, data); +#endif break; default: ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.24 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.27 2007/06/17 06:10:41 ariff Exp $"); /* Debugging macro's */ #undef DEB @@ -221,7 +221,7 @@ ch->buffer = b; snd_mtxunlock(sc->lock); - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; return ch; @@ -391,14 +391,20 @@ struct sc_chinfo *ch = data; struct sc_info *sc = ch->parent; + if (!PCMTRIG_COMMON(go)) + return 0; + snd_mtxlock(sc->lock); switch(go) { case PCMTRIG_START: als_playback_start(ch); break; + case PCMTRIG_STOP: case PCMTRIG_ABORT: als_playback_stop(ch); break; + default: + break; } snd_mtxunlock(sc->lock); return 0; @@ -489,6 +495,7 @@ case PCMTRIG_START: als_capture_start(ch); break; + case PCMTRIG_STOP: case PCMTRIG_ABORT: als_capture_stop(ch); break; @@ -798,11 +805,7 @@ u_int32_t data; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_als4000 softc"); sc->dev = dev; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.12 2007/03/16 17:18:17 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.18 2007/06/14 11:13:37 ariff Exp $"); #define ATI_IXP_DMA_RETRY_MAX 100 @@ -459,7 +459,7 @@ atiixp_unlock(sc); - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) == -1) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) == -1) return (NULL); atiixp_lock(sc); @@ -712,6 +712,9 @@ uint32_t value; int pollticks; + if (!PCMTRIG_COMMON(go)) + return (0); + atiixp_lock(sc); switch (go) { @@ -896,6 +899,7 @@ enable = atiixp_rd(sc, ATI_REG_IER); enable &= ~detected_codecs; atiixp_wr(sc, ATI_REG_IER, enable); + wakeup(sc); } /* acknowledge */ @@ -957,7 +961,7 @@ atiixp_lock(sc); val = sc->polling; atiixp_unlock(sc); - err = sysctl_handle_int(oidp, &val, sizeof(val), req); + err = sysctl_handle_int(oidp, &val, 0, req); if (err || req->newptr == NULL) return (err); @@ -1002,18 +1006,20 @@ polling = sc->polling; sc->polling = 0; - /* wait for the interrupts to happen */ - timeout = 100; - do { - msleep(sc, sc->lock, PWAIT, "ixpslp", 1); - if (sc->codec_not_ready_bits) - break; - } while (--timeout); + timeout = 10; + if (sc->codec_not_ready_bits == 0) { + /* wait for the interrupts to happen */ + do { + msleep(sc, sc->lock, PWAIT, "ixpslp", max(hz / 10, 1)); + if (sc->codec_not_ready_bits != 0) + break; + } while (--timeout); + } sc->polling = polling; atiixp_disable_interrupts(sc); - if (timeout == 0) { + if (sc->codec_not_ready_bits == 0 && timeout == 0) { device_printf(sc->dev, "WARNING: timeout during codec detection; " "codecs might be present but haven't interrupted\n"); @@ -1105,38 +1111,49 @@ { if (sc == NULL) return; + if (sc->registered_channels != 0) { + atiixp_lock(sc); + sc->polling = 0; + callout_stop(&sc->poll_timer); + atiixp_unlock(sc); + callout_drain(&sc->poll_timer); + } if (sc->codec) { ac97_destroy(sc->codec); sc->codec = NULL; } if (sc->ih) { bus_teardown_intr(sc->dev, sc->irq, sc->ih); - sc->ih = 0; + sc->ih = NULL; } if (sc->reg) { bus_release_resource(sc->dev, sc->regtype, sc->regid, sc->reg); - sc->reg = 0; + sc->reg = NULL; } if (sc->irq) { bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irqid, sc->irq); - sc->irq = 0; + sc->irq = NULL; } if (sc->parent_dmat) { bus_dma_tag_destroy(sc->parent_dmat); - sc->parent_dmat = 0; + sc->parent_dmat = NULL; } - if (sc->sgd_dmamap) { + if (sc->sgd_dmamap) bus_dmamap_unload(sc->sgd_dmat, sc->sgd_dmamap); - sc->sgd_dmamap = 0; + if (sc->sgd_table) { + bus_dmamem_free(sc->sgd_dmat, sc->sgd_table, sc->sgd_dmamap); + sc->sgd_table = NULL; } + sc->sgd_dmamap = NULL; if (sc->sgd_dmat) { bus_dma_tag_destroy(sc->sgd_dmat); - sc->sgd_dmat = 0; + sc->sgd_dmat = NULL; } if (sc->lock) { snd_mtxfree(sc->lock); sc->lock = NULL; } + free(sc, M_DEVBUF); } static int @@ -1164,11 +1181,7 @@ struct atiixp_info *sc; int i; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return (ENXIO); - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_atiixp softc"); sc->dev = dev; @@ -1303,7 +1316,6 @@ if (sc->st != 0 && sc->sh != 0) atiixp_disable_interrupts(sc); atiixp_release_resource(sc); - free(sc, M_DEVBUF); } return (0); } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.11 2007/02/23 13:47:34 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/au88x0.c,v 1.13 2007/06/17 06:10:41 ariff Exp $ */ #include @@ -332,7 +332,7 @@ struct au88x0_info *aui = arg; struct au88x0_chan_info *auci = au88x0_channel(aui, dir); - if (sndbuf_alloc(buf, aui->aui_dmat, aui->aui_bufsize) != 0) + if (sndbuf_alloc(buf, aui->aui_dmat, 0, aui->aui_bufsize) != 0) return (NULL); auci->auci_aui = aui; auci->auci_pcmchan = chan; @@ -572,10 +572,7 @@ uint32_t config; int error; - if ((aui = malloc(sizeof *aui, M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL) { - device_printf(dev, "failed to allocate softc\n"); - return (ENXIO); - } + aui = malloc(sizeof(*aui), M_DEVBUF, M_WAITOK | M_ZERO); aui->aui_dev = dev; /* Model-specific parameters */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.33 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.36 2007/06/17 06:10:41 ariff Exp $"); /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb @@ -303,7 +303,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, au->parent_dmat, AU_BUFFSIZE) != 0) + if (sndbuf_alloc(ch->buffer, au->parent_dmat, 0, AU_BUFFSIZE) != 0) return NULL; return ch; } @@ -339,12 +339,12 @@ struct au_chinfo *ch = data; struct au_info *au = ch->parent; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; if (ch->dir == PCMDIR_PLAY) { au_setadb(au, 0x11, (go)? 1 : 0); - if (!go) { + if (go != PCMTRIG_START) { au_wr(au, 0, 0xf800, 0, 4); au_wr(au, 0, 0xf804, 0, 4); au_delroute(au, 0x58); @@ -558,11 +558,7 @@ struct ac97_info *codec; char status[SND_STATUSLEN]; - if ((au = malloc(sizeof(*au), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + au = malloc(sizeof(*au), M_DEVBUF, M_WAITOK | M_ZERO); au->unit = device_get_unit(dev); data = pci_read_config(dev, PCIR_COMMAND, 2); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#5 (text+ko) ==== @@ -53,7 +53,7 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.40 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.44 2007/06/17 06:10:41 ariff Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 @@ -349,7 +349,7 @@ ch->spd = DSP_DEFAULT_SPEED; ch->buffer = b; ch->dma_active = 0; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { DEB(printf("cmichan_init failed\n")); return NULL; } @@ -475,12 +475,16 @@ struct sc_chinfo *ch = data; struct sc_info *sc = ch->parent; + if (!PCMTRIG_COMMON(go)) + return 0; + snd_mtxlock(sc->lock); if (ch->dir == PCMDIR_PLAY) { switch(go) { case PCMTRIG_START: cmi_ch0_start(sc, ch); break; + case PCMTRIG_STOP: case PCMTRIG_ABORT: cmi_ch0_stop(sc, ch); break; @@ -490,6 +494,7 @@ case PCMTRIG_START: cmi_ch1_start(sc, ch); break; + case PCMTRIG_STOP: case PCMTRIG_ABORT: cmi_ch1_stop(sc, ch); break; @@ -923,12 +928,7 @@ u_int32_t data; char status[SND_STATUSLEN]; - sc = malloc(sizeof(struct sc_info), M_DEVBUF, M_NOWAIT | M_ZERO); - if (sc == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_cmi softc"); data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); @@ -946,7 +946,8 @@ sc->st = rman_get_bustag(sc->reg); sc->sh = rman_get_bushandle(sc->reg); - cmi_midiattach(sc); + if (0) + cmi_midiattach(sc); sc->irqid = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.23 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.26 2007/06/17 06:10:41 ariff Exp $"); #define CS4281_DEFAULT_BUFSZ 16384 @@ -314,7 +314,7 @@ struct sc_chinfo *ch = (dir == PCMDIR_PLAY) ? &sc->pch : &sc->rch; ch->buffer = b; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) { + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { return NULL; } ch->parent = sc; @@ -425,6 +425,7 @@ adcdac_prog(ch); adcdac_go(ch, 1); break; + case PCMTRIG_STOP: case PCMTRIG_ABORT: adcdac_go(ch, 0); break; @@ -753,11 +754,7 @@ u_int32_t data; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->dev = dev; sc->type = pci_get_devid(dev); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.36 2007/02/23 19:40:13 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.37 2007/03/17 19:37:09 ariff Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 @@ -339,23 +339,31 @@ { csa_res *resp; sc_p scp; + struct sndcard_func *func; int err; scp = device_get_softc(dev); resp = &scp->res; - err = 0; - if (scp->midi != NULL) + if (scp->midi != NULL) { + func = device_get_ivars(scp->midi); err = device_delete_child(dev, scp->midi); - if (err) - return err; - scp->midi = NULL; + if (err != 0) + return err; + if (func != NULL) + free(func, M_DEVBUF); + scp->midi = NULL; + } - if (scp->pcm != NULL) + if (scp->pcm != NULL) { + func = device_get_ivars(scp->pcm); err = device_delete_child(dev, scp->pcm); - if (err) - return err; - scp->pcm = NULL; + if (err != 0) + return err; + if (func != NULL) + free(func, M_DEVBUF); + scp->pcm = NULL; + } bus_teardown_intr(dev, resp->irq, scp->ih); bus_release_resource(dev, SYS_RES_IRQ, resp->irq_rid, resp->irq); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.38 2007/02/23 13:47:34 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.41 2007/06/17 06:10:41 ariff Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -534,7 +534,7 @@ ch->channel = c; ch->buffer = b; ch->dir = dir; - if (sndbuf_alloc(ch->buffer, csa->parent_dmat, CS461x_BUFFSIZE) != 0) + if (sndbuf_alloc(ch->buffer, csa->parent_dmat, 0, CS461x_BUFFSIZE) != 0) return NULL; return ch; } @@ -569,7 +569,7 @@ struct csa_chinfo *ch = data; struct csa_info *csa = ch->parent; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; if (go == PCMTRIG_START) { @@ -777,9 +777,7 @@ struct ac97_info *codec; struct sndcard_func *func; - csa = malloc(sizeof(*csa), M_DEVBUF, M_NOWAIT | M_ZERO); - if (csa == NULL) - return (ENOMEM); + csa = malloc(sizeof(*csa), M_DEVBUF, M_WAITOK | M_ZERO); unit = device_get_unit(dev); func = device_get_ivars(dev); csa->binfo = func->varinfo; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.49 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.52 2007/06/17 06:10:41 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -490,7 +490,7 @@ ch->fmt = AFMT_U8; ch->spd = 8000; ch->run = 0; - if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, 0, sc->bufsz) != 0) return NULL; else { ch->lsnum = sc->pslotfree; @@ -545,7 +545,7 @@ struct sc_info *sc = ch->parent; int stereo; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; stereo = (ch->fmt & AFMT_STEREO)? 1 : 0; if (go == PCMTRIG_START) { @@ -621,7 +621,7 @@ ch->dir = dir; ch->fmt = AFMT_U8; ch->spd = 8000; - if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->buffer_dmat, 0, sc->bufsz) != 0) return NULL; else { ch->slot = (ch->num == DS1_RECPRIMARY)? sc->rbank + 2: sc->rbank; @@ -673,7 +673,7 @@ struct sc_info *sc = ch->parent; u_int32_t x; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; if (go == PCMTRIG_START) { ch->run = 1; @@ -943,11 +943,7 @@ struct ac97_info *codec = NULL; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_ds1 softc"); sc->dev = dev; subdev = (pci_get_subdevice(dev) << 16) | pci_get_subvendor(dev); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.65 2007/03/15 16:41:26 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.69 2007/06/17 06:10:42 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -87,7 +87,7 @@ struct emu_voice { int vnum; - int b16:1, stereo:1, busy:1, running:1, ismaster:1; + unsigned int b16:1, stereo:1, busy:1, running:1, ismaster:1; int speed; int start, end, vol; int fxrt1; /* FX routing */ @@ -795,7 +795,7 @@ struct sc_pchinfo *ch = data; struct sc_info *sc = ch->parent; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return 0; snd_mtxlock(sc->lock); @@ -895,7 +895,7 @@ break; } sc->rnum++; - if (sndbuf_alloc(ch->buffer, sc->parent_dmat, sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) return NULL; else { snd_mtxlock(sc->lock); @@ -958,6 +958,9 @@ struct sc_info *sc = ch->parent; u_int32_t val, sz; + if (!PCMTRIG_COMMON(go)) + return 0; + switch(sc->bufsz) { case 4096: sz = ADCBS_BUFSIZE_4096; @@ -1981,11 +1984,7 @@ int i, gotmic; char status[SND_STATUSLEN]; - if ((sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { - device_printf(dev, "cannot allocate softc\n"); - return ENXIO; - } - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_emu10k1 softc"); sc->dev = dev; sc->type = pci_get_devid(dev); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx-pcm.c#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/sound/pci/emu10kx-pcm.c,v 1.7 2007/03/15 16:41:26 ariff Exp $ + * $FreeBSD: src/sys/dev/sound/pci/emu10kx-pcm.c,v 1.10 2007/06/17 06:10:42 ariff Exp $ */ #include @@ -513,8 +513,9 @@ struct emu_pcm_pchinfo *ch = c_devinfo; struct emu_pcm_info *sc = ch->pcm; - if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) + if (!PCMTRIG_COMMON(go)) return (0); + snd_mtxlock(sc->lock); /* XXX can we trigger on parallel threads ? */ if (go == PCMTRIG_START) { emu_vsetup(ch->master, ch->fmt, ch->spd); @@ -602,7 +603,7 @@ ch->irqmask = INTE_ADCBUFENABLE; ch->iprmask = IPR_ADCBUFFULL | IPR_ADCBUFHALFFULL; - if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), sc->bufsz) != 0) + if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), 0, sc->bufsz) != 0) return (NULL); else { emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 18 06:42: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 41F0416A46C; Mon, 18 Jun 2007 06:42: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 149C816A41F for ; Mon, 18 Jun 2007 06:42:47 +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 F0FC013C455 for ; Mon, 18 Jun 2007 06:42:46 +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 l5I6gk3f079046 for ; Mon, 18 Jun 2007 06:42:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5I6gkp3079030 for perforce@freebsd.org; Mon, 18 Jun 2007 06:42:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 18 Jun 2007 06:42:46 GMT Message-Id: <200706180642.l5I6gkp3079030@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 121894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 06:42:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=121894 Change 121894 by hselasky@hselasky_mini_itx on 2007/06/18 06:42:17 Hi, My main hacking location did not have internet access, so here is a multiple changes submit. Summed up: 1) s/.endpoint = -1/.endpoint = UE_ADDR_ANY/g. Various people suggested this. 2) s/.direction = -1/.direction = UE_DIR_ANY/g. Various people suggested this. 3) The "interval" field has now got new meaning depending on the endpoint type in question. See the README for more info. This allows easy implementation of BULK-IN power saving for example. 4) USBD_SYNCHRONOUS was removed. Planned removal. 5) Automatic clear-stall mechanism was removed. Axe down and simplify. 6) New USB transfer flag, USBD_PIPE_BOF. See the README for more info. 7) Add "USBD_PIPE_BOF" where possibly needed. 8) Factored out and simplified clear stall callback into "usbd_clear_stall_callback()". This saves some code. 9) No more bombing out on clear stall failure. The system will go into an infinite loop trying to clear stall every "xfer->interval", currently 50, milliseconds. 10) Low level timeouts must be started from the "start" method and not the "enter" method. See OHCI/EHCI/UHCU drivers. This follows from change 3) 11) High-speed bInterval has a unit of 125us for the Interrupt endpoint (fix) Else the interval is given in units of 1ms. 12) Remove "bus->use_polling" variable. It is not used any more. Instead check the "cold" variable inside the "usbd_do_request_flags_mtx()" function. Also see the USBD_USE_POLLING flag if you need to use polling. 13) Some not yet finished structures sneaked into "usb.h" 14) Some nits. --HPS Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#14 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/README#14 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ufm.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#39 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#41 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#20 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#11 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#14 (text) ==== @@ -173,7 +173,7 @@ [ATAUSB_T_BBB_RESET1] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &atausb_t_bbb_reset1_callback, @@ -183,7 +183,7 @@ [ATAUSB_T_BBB_RESET2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &atausb_t_bbb_reset2_callback, @@ -193,7 +193,7 @@ [ATAUSB_T_BBB_RESET3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &atausb_t_bbb_reset3_callback, @@ -202,7 +202,7 @@ [ATAUSB_T_BBB_COMMAND] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = sizeof(struct bbb_cbw), .flags = USBD_USE_DMA, @@ -212,7 +212,7 @@ [ATAUSB_T_BBB_DATA_READ] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = ATAUSB_BULK_SIZE, .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), @@ -223,7 +223,7 @@ [ATAUSB_T_BBB_DATA_RD_CS] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &atausb_t_bbb_data_rd_cs_callback, @@ -232,7 +232,7 @@ [ATAUSB_T_BBB_DATA_WRITE] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = ATAUSB_BULK_SIZE, .flags = USBD_USE_DMA, @@ -243,7 +243,7 @@ [ATAUSB_T_BBB_DATA_WR_CS] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &atausb_t_bbb_data_wr_cs_callback, @@ -252,7 +252,7 @@ [ATAUSB_T_BBB_STATUS] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = sizeof(struct bbb_csw), .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), @@ -581,8 +581,9 @@ return; tr_setup: - usbd_clear_stall_tr_setup(xfer, sc->xfer[stall_xfer]); - usbd_clear_stall_tr_transferred(xfer, sc->xfer[stall_xfer]); + if (usbd_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { + goto tr_transferred; + } return; } ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#13 (text+ko) ==== @@ -455,7 +455,7 @@ uaudio_cfg_record_full_speed[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = UAUDIO_NFRAMES, @@ -465,7 +465,7 @@ [1] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = UAUDIO_NFRAMES, @@ -478,7 +478,7 @@ uaudio_cfg_record_high_speed[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = (UAUDIO_NFRAMES * 8), @@ -488,7 +488,7 @@ [1] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = (UAUDIO_NFRAMES * 8), @@ -501,7 +501,7 @@ uaudio_cfg_play_full_speed[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = UAUDIO_NFRAMES, @@ -511,7 +511,7 @@ [1] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = UAUDIO_NFRAMES, @@ -524,7 +524,7 @@ uaudio_cfg_play_high_speed[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = (UAUDIO_NFRAMES * 8), @@ -534,7 +534,7 @@ [1] = { .type = UE_ISOCHRONOUS, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = 0, /* use "wMaxPacketSize * frames" */ .frames = (UAUDIO_NFRAMES * 8), @@ -548,7 +548,7 @@ [0] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = (sizeof(usb_device_request_t) + 4), .callback = &uaudio_mixer_write_cfg_callback, .timeout = 1000, /* 1 second */ @@ -579,40 +579,42 @@ umidi_config[UMIDI_N_TRANSFER] = { [0] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = UMIDI_BULK_SIZE, - .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &umidi_bulk_write_callback, }, [1] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = UMIDI_BULK_SIZE, - .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &umidi_bulk_read_callback, }, [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &umidi_write_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &umidi_read_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, }; @@ -3289,32 +3291,11 @@ { struct umidi_chan *chan = xfer->priv_sc; struct usbd_xfer *xfer_other = chan->xfer[1]; - u_int32_t n; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - chan->flags &= ~UMIDI_FLAG_READ_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - chan->flags &= ~UMIDI_FLAG_READ_STALL; - - if (xfer->error != USBD_CANCELLED) { - for (n = 0; n < chan->max_cable; n++) { - if (chan->sub[n].read_open) { - usb_cdev_put_data_error(&(chan->sub[n].cdev)); - } - } + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + chan->flags &= ~UMIDI_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); } return; } @@ -3387,30 +3368,11 @@ { struct umidi_chan *chan = xfer->priv_sc; struct usbd_xfer *xfer_other = chan->xfer[0]; - u_int32_t n; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - chan->flags &= ~UMIDI_FLAG_WRITE_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - chan->flags &= ~UMIDI_FLAG_WRITE_STALL; - if (xfer->error != USBD_CANCELLED) { - for (n = 0; n < chan->max_cable; n++) { - if (chan->sub[n].write_open) { - usb_cdev_get_data_error(&(chan->sub[n].cdev)); - } - } + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + chan->flags &= ~UMIDI_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); } return; } ==== //depot/projects/usb/src/sys/dev/usb/README#14 (text+ko) ==== @@ -76,8 +76,10 @@ tr_transferred: /* read data from xfer->buffer if any */ + return; + tr_error: - /* print error message */ + /* print error message and clear stall for example */ return; } @@ -192,9 +194,26 @@ "-1" or "UE_DIR_ANY" will select the first matching endpoint. Else valid values are: "UE_DIR_IN" and "UE_DIR_OUT". This field is mandatory. -- The "interval" field selects the interrupt interval, for "type" = UE_INTERRUPT. - The "interval" is given in milliseconds. "0" selects the default - interrupt interval. +- The "interval" field selects the interrupt interval. The value of this + field is given in milliseconds and is independent of device speed. Depending + on the endpoint type, this field has different meaning: + + UE_INTERRUPT) + "0" use the default interrupt interval based on endpoint descriptor. + "Else" use the given value for polling rate. + + UE_ISOCHRONOUS) + "0" use default. + "Else" the value is ignored. + + UE_BULK) + UE_CONTROL) + "0" no transfer pre-delay. + "Else" a delay as given by this field in milliseconds is + inserted before the hardware is started when + "usbd_start_hardware()" is called. + NOTE: The transfer timeout, if any, is started after that + the pre-delay has elapsed! - The "timeout" field, if non-zero, will set the transfer timeout, in milliseconds. @@ -207,13 +226,6 @@ "index" should be used. - The "flags" field allows one to set flags for the transfer. Valid flags are: - USBD_SYNCHRONOUS - This flag can only be used with the default callback, - "usbd_default_callback()", and will cause the - "usbd_transfer_start()" function to sleep, exiting all - mutexes, until the transfer is finished. This flag is - depreciated. - USBD_FORCE_SHORT_XFER This flag forces the last USB packet sent to be short. A short packet has a length of less than "xfer->max_packet_size", which @@ -229,6 +241,10 @@ without exiting any mutexes, until the transfer is finished or has timed out. + NOTE: If polling is used the "timeout" field should be non-zero! + NOTE: USBD_CANCELLED is returned in case of timeout + instead of USBD_TIMEOUT! + USBD_USE_DMA This flag will cause the USB host controller driver to not allocate a second data buffer, "xfer->buffer". Instead of @@ -237,6 +253,29 @@ offset, src, len)" or "usbd_copy_out(&(xfer->buf_data), offset, dst, len)". This saves an extra data copy. + USBD_PIPE_BOF + This flag causes a failing USB transfer to remain first + in the PIPE queue except in the case of "xfer->error" equal + to "USBD_CANCELLED". No other USB transfers in the affected + PIPE queue will be started until either: + + 1) The failing USB transfer is stopped using "usbd_transfer_stop()". + 2) The failing USB transfer performs a successful transfer. + + The purpose of this flag is to avoid races when multiple + transfers are queued for execution on an USB endpoint, and + the first executing transfer fails leading to the need + for clearing of stall for example. In this case this flag + is used to prevent the following USB transfers from being + executed at the same time the clear-stall command is + executed on the USB control endpoint. + + "BOF" is short for "Block On Failure" + + NOTE: This flag should be set on all BULK and INTERRUPT + USB transfers which use an endpoint that can be shared + between userland and kernel. + - The "bufsize" field sets the total buffer size in bytes. If this field is zero, "wMaxPacketSize" will be used, multiplied by the "frames" field if the transfer type is isochronous. This is useful for ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#34 (text+ko) ==== @@ -2217,12 +2217,6 @@ } } - if(error) - { - /* next transfer needs to clear stall */ - xfer->pipe->clearstall = 1; - } - /* transfer transferred (no callback!) */ usbd_transfer_done(xfer,error); @@ -2686,12 +2680,6 @@ /**/ ehci_add_interrupt_info(sc, xfer); - if(xfer->timeout && (!(xfer->flags & USBD_USE_POLLING))) - { - __callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), - (void *)(void *)ehci_timeout, xfer); - } - /* enqueue transfer * (so that it can be aborted through pipe abort) */ @@ -2702,7 +2690,12 @@ static void ehci_device_isoc_fs_start(struct usbd_xfer *xfer) { - /* already started, nothing to do */ + /* start timeout, if any (should not be done by the enter routine) */ + if(xfer->timeout && (!(xfer->flags & USBD_USE_POLLING))) + { + __callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), + (void *)(void *)ehci_timeout, xfer); + } return; } @@ -3006,12 +2999,6 @@ /**/ ehci_add_interrupt_info(sc, xfer); - if(xfer->timeout && (!(xfer->flags & USBD_USE_POLLING))) - { - __callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), - (void *)(void *)ehci_timeout, xfer); - } - /* enqueue transfer * (so that it can be aborted through pipe abort) */ @@ -3022,7 +3009,12 @@ static void ehci_device_isoc_hs_start(struct usbd_xfer *xfer) { - /* already started, nothing to do */ + /* start timeout, if any (should not be done by the enter routine) */ + if(xfer->timeout && (!(xfer->flags & USBD_USE_POLLING))) + { + __callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), + (void *)(void *)ehci_timeout, xfer); + } return; } @@ -3848,9 +3840,9 @@ { if ((xfer->pipe->methods == &ehci_device_intr_methods) && (udev->speed == USB_SPEED_HIGH)) - usbd_std_transfer_setup(xfer, setup, 0x400, 0xC00, 3); + usbd_std_transfer_setup(udev, xfer, setup, 0x400, 0xC00, 3); else - usbd_std_transfer_setup(xfer, setup, 0x400, 0x400, 1); + usbd_std_transfer_setup(udev, xfer, setup, 0x400, 0x400, 1); nqh = 1; nqtd = (1+ /* SETUP */ 1+ /* STATUS */ 1 /* SHORTPKT */) + @@ -3858,7 +3850,7 @@ } else if(xfer->pipe->methods == &ehci_device_isoc_fs_methods) { - usbd_std_transfer_setup(xfer, setup, 188, 188, 1); + usbd_std_transfer_setup(udev, xfer, setup, 188, 188, 1); if(xfer->nframes == 0) { @@ -3882,7 +3874,7 @@ } else if(xfer->pipe->methods == &ehci_device_isoc_hs_methods) { - usbd_std_transfer_setup(xfer, setup, 0x400, 0xC00, 3); + usbd_std_transfer_setup(udev, xfer, setup, 0x400, 0xC00, 3); if(xfer->nframes == 0) { @@ -3906,7 +3898,7 @@ } else { - usbd_std_transfer_setup(xfer, setup, 0x400, 0x400, 1); + usbd_std_transfer_setup(udev, xfer, setup, 0x400, 0x400, 1); } } ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#26 (text+ko) ==== @@ -272,48 +272,50 @@ [0] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = (MCLBYTES + 2), - .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_FORCE_SHORT_XFER), .callback = &aue_bulk_write_callback, .timeout = 10000, /* 10 seconds */ }, [1] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN), - .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &aue_bulk_read_callback, }, [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &aue_bulk_write_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &aue_bulk_read_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [4] = { .type = UE_INTERRUPT, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .flags = USBD_SHORT_XFER_OK, + .flags = (USBD_PIPE_BOF|USBD_SHORT_XFER_OK), .bufsize = 0, /* use wMaxPacketSize */ .callback = &aue_intr_callback, }, @@ -321,11 +323,12 @@ [5] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &aue_intr_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, }; @@ -986,25 +989,12 @@ struct aue_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[4]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AUE_FLAG_INTR_STALL; - usbd_transfer_start(xfer_other); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AUE_FLAG_INTR_STALL; + usbd_transfer_start(xfer_other); + } return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AUE_FLAG_INTR_STALL; - DPRINTF(sc, 0, "interrupt read pipe stopped\n"); - return; } static void @@ -1054,25 +1044,12 @@ struct aue_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[1]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AUE_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + } return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AUE_FLAG_READ_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AUE_FLAG_READ_STALL; - DPRINTF(sc, 0, "bulk read pipe stopped\n"); - return; } static void @@ -1170,24 +1147,11 @@ struct aue_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[0]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AUE_FLAG_WRITE_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AUE_FLAG_WRITE_STALL; - DPRINTF(sc, 0, "bulk write pipe stopped\n"); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AUE_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + } return; } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#27 (text+ko) ==== @@ -231,23 +231,23 @@ [0] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = AXE_BULK_BUF_SIZE, - .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_FORCE_SHORT_XFER), .callback = &axe_bulk_write_callback, .timeout = 10000, /* 10 seconds */ }, [1] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, #if (MCLBYTES < 2048) #error "(MCLBYTES < 2048)" #endif .bufsize = MCLBYTES, - .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &axe_bulk_read_callback, .timeout = 0, /* no timeout */ }, @@ -255,28 +255,30 @@ [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &axe_bulk_write_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &axe_bulk_read_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [4] = { .type = UE_INTERRUPT, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .flags = USBD_SHORT_XFER_OK, + .flags = (USBD_PIPE_BOF|USBD_SHORT_XFER_OK), .bufsize = 0, /* use wMaxPacketSize */ .callback = &axe_intr_callback, }, @@ -284,11 +286,12 @@ [5] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &axe_intr_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, }; @@ -972,25 +975,12 @@ struct axe_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[4]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AXE_FLAG_INTR_STALL; - usbd_transfer_start(xfer_other); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AXE_FLAG_INTR_STALL; + usbd_transfer_start(xfer_other); + } return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AXE_FLAG_INTR_STALL; - DPRINTF(sc, 0, "interrupt read pipe stopped\n"); - return; } static void @@ -1027,25 +1017,12 @@ struct axe_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[1]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AXE_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + } return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AXE_FLAG_READ_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AXE_FLAG_READ_STALL; - DPRINTF(sc, 0, "bulk read pipe stopped\n"); - return; } #if (AXE_BULK_BUF_SIZE >= 0x10000) @@ -1194,24 +1171,11 @@ struct axe_softc *sc = xfer->priv_sc; struct usbd_xfer *xfer_other = sc->sc_xfer[0]; - USBD_CHECK_STATUS(xfer); - - tr_setup: - /* start clear stall */ - usbd_clear_stall_tr_setup(xfer, xfer_other); - return; - - tr_transferred: - usbd_clear_stall_tr_transferred(xfer, xfer_other); - - sc->sc_flags &= ~AXE_FLAG_WRITE_STALL; - usbd_transfer_start(xfer_other); - return; - - tr_error: - /* bomb out */ - sc->sc_flags &= ~AXE_FLAG_WRITE_STALL; - DPRINTF(sc, 0, "bulk write pipe stopped\n"); + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(sc, 0, "stall cleared\n"); + sc->sc_flags &= ~AXE_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + } return; } ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#20 (text+ko) ==== @@ -109,41 +109,43 @@ [0] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = (MCLBYTES + 4), - .flags = (USBD_USE_DMA|USBD_FORCE_SHORT_XFER), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_FORCE_SHORT_XFER), .callback = &cdce_bulk_write_callback, .timeout = 10000, /* 10 seconds */ }, [1] = { .type = UE_BULK, - .endpoint = -1, /* any */ + .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = (MCLBYTES + 4), - .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .flags = (USBD_PIPE_BOF|USBD_USE_DMA|USBD_SHORT_XFER_OK), .callback = &cdce_bulk_read_callback, }, [2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, .callback = &cdce_bulk_write_clear_stall_callback, .timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ - .direction = -1, + .direction = UE_DIR_ANY, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 18 08:36: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 415CA16A47A; Mon, 18 Jun 2007 08:36: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 0A3DA16A478 for ; Mon, 18 Jun 2007 08:36:52 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EED4E13C46A for ; Mon, 18 Jun 2007 08:36:51 +0000 (UTC) (envelope-from lulf@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 l5I8apNN082984 for ; Mon, 18 Jun 2007 08:36:51 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5I8apKE082969 for perforce@freebsd.org; Mon, 18 Jun 2007 08:36:51 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 18 Jun 2007 08:36:51 GMT Message-Id: <200706180836.l5I8apKE082969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 08:36:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=121899 Change 121899 by lulf@lulf_carrot on 2007/06/18 08:35:54 - Remove old comments, refer to plex instead of subdisk - Implement gv_init_plex which handles raid5 array initialization. It uses the same model as parity/rebuild operations in that it is a send and done function that handles issuing and handling finished init BIOs. - Update plexstate when a rebuild is complete, and make sure it's possible to take it up after a rebuild (set the CANGOUP bit). - Change GV_BIO_SUCCEED BIO flag to GV_BIO_INIT. This must be discussed further, but for now it's needed for the INIT operation since bio_cflags are only 8 bits, and it was unused. This may change in the future though. - Update volstate after sync is complete too. - Create naming consistency with these new types of functions. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#16 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#13 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#5 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#9 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#13 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#6 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#16 (text+ko) ==== @@ -605,8 +605,6 @@ newstate = *(int *)ev->arg2; flags = *(int *)ev->arg3; err = gv_set_sd_state(s, newstate, flags); - /* XXX: Handle these errors better, provide - * ERROR CODES.*/ if (err) printf("VINUM: error setting subdisk " "state: error code %d\n", err); @@ -620,8 +618,6 @@ newstate = *(int *)ev->arg2; flags = *(int *)ev->arg3; err = gv_set_drive_state(d, newstate, flags); - /* XXX: Handle these errors better, provide - * ERROR CODES.*/ if (err) printf("VINUM: error setting drive " "state: error code %d\n", err); @@ -677,7 +673,7 @@ break; } p->synced = 0; - gv_send_parity_bio(p, GV_BIO_CHECK | + gv_parity_request(p, GV_BIO_CHECK | GV_BIO_PARITY, 0); break; @@ -691,7 +687,7 @@ break; } p->synced = 0; - gv_send_parity_bio(p, GV_BIO_CHECK, 0); + gv_parity_request(p, GV_BIO_CHECK, 0); break; case GV_EVENT_START_PLEX: @@ -743,7 +739,7 @@ err = gv_detach_sd(s, 0); if (err) printf("VINUM: error detaching %s: " - "error code %d\n", p->name, err); + "error code %d\n", s->name, err); break; case GV_EVENT_THREAD_EXIT: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#14 (text+ko) ==== @@ -33,7 +33,6 @@ void gv_save_config(struct gv_softc *); /* geom_vinum_init.c */ -/*void gv_parityop(struct g_geom *, struct gctl_req *);*/ void gv_start_obj(struct g_geom *, struct gctl_req *); int gv_start_plex(struct gv_plex *); @@ -118,7 +117,8 @@ int gv_stripe_active(struct gv_plex *, struct bio *); -void gv_send_parity_bio(struct gv_plex *, int, off_t); +void gv_init_request(struct gv_sd *, off_t, caddr_t, off_t); +void gv_parity_request(struct gv_plex *, int, off_t); void gv_parityop(struct gv_softc *, struct gctl_req *); #endif /* !_GEOM_VINUM_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#8 (text+ko) ==== @@ -43,6 +43,7 @@ static int gv_start_vol(struct gv_volume *); static int gv_sync(struct gv_volume *); static int gv_rebuild_plex(struct gv_plex *); +static int gv_init_plex(struct gv_plex *); struct gv_sync_args { struct gv_volume *v; @@ -123,14 +124,13 @@ else if (p->org == GV_PLEX_RAID5) { if (p->state == GV_PLEX_DEGRADED) error = gv_rebuild_plex(p); -/* else - error = gv_init_plex(p);*/ + else + error = gv_init_plex(p); } return (error); } -#if 0 int gv_start_vol(struct gv_volume *v) { @@ -170,7 +170,6 @@ return (error); } -#endif static int gv_sync(struct gv_volume *v) @@ -237,15 +236,18 @@ p->flags |= GV_PLEX_SYNCING; p->synced = 0; - gv_send_parity_bio(p, GV_BIO_REBUILD, 0); + gv_parity_request(p, GV_BIO_REBUILD, 0); return (0); } -#if 0 static int gv_init_plex(struct gv_plex *p) { + struct gv_drive *d; struct gv_sd *s; + int error; + off_t start; + caddr_t data; KASSERT(p != NULL, ("gv_init_plex: NULL p")); @@ -254,13 +256,32 @@ return (EINPROGRESS); gv_set_sd_state(s, GV_SD_INITIALIZING, GV_SETSTATE_FORCE); s->init_size = GV_DFLT_SYNCSIZE; - kthread_create(gv_init_td, s, NULL, 0, 0, "gv_init %s", - s->name); + start = s->drive_offset + s->initialized; + d = s->drive_sc; + if (d == NULL) { + printf("VINUM: subdisk %s has no drive yet\n", s->name); + break; + } + /* + * Take the lock here since we need to avoid a race in + * gv_init_request if the BIO is completed before the lock is + * released. + */ + g_topology_lock(); + error = g_access(d->consumer, 0, 1, 0); + g_topology_unlock(); + if (error) { + printf("VINUM: error accessing consumer when " + "initializing %s\n", s->name); + break; /* XXX: Or continue..? */ + } + data = g_malloc(s->init_size, M_WAITOK | M_ZERO); + gv_init_request(s, start, data, s->init_size); } - return (0); } +#if 0 /* This thread is responsible for rebuilding a degraded RAID5 plex. */ void gv_rebuild_td(void *arg) ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#13 (text+ko) ==== @@ -45,8 +45,9 @@ struct gv_raid5_packet *); static int gv_normal_parity(struct gv_plex *, struct bio *, struct gv_raid5_packet *); -static void gv_parity_completed(struct gv_plex *, struct bio *); -static void gv_rebuild_completed(struct gv_plex *, struct bio *); +static void gv_parity_complete(struct gv_plex *, struct bio *); +static void gv_rebuild_complete(struct gv_plex *, struct bio *); +static void gv_init_complete(struct gv_plex *, struct bio *); static struct bio * gv_plexbuffer(struct gv_plex *, struct bio *, caddr_t, off_t, off_t, int *); @@ -368,10 +369,12 @@ /* Hand it over for checking or delivery. */ if (pbp->bio_cmd == BIO_WRITE && (pbp->bio_cflags & GV_BIO_CHECK)) { - gv_parity_completed(p, pbp); + gv_parity_complete(p, pbp); } else if (pbp->bio_cmd == BIO_WRITE && (pbp->bio_cflags & GV_BIO_REBUILD)) { - gv_rebuild_completed(p, pbp); + gv_rebuild_complete(p, pbp); + } else if (pbp->bio_cflags & GV_BIO_INIT) { + gv_init_complete(p, pbp); } else { g_io_deliver(pbp, pbp->bio_error); } @@ -473,12 +476,12 @@ * rebuild of degraded plexes as well as user initiated rebuilds/checks. */ void -gv_send_parity_bio(struct gv_plex *p, int flags, off_t offset) +gv_parity_request(struct gv_plex *p, int flags, off_t offset) { struct bio *bp; int error; - KASSERT(p != NULL, ("gv_send_parity_bio: NULL p")); + KASSERT(p != NULL, ("gv_parity_request: NULL p")); /* Make sure we don't have the lock. */ g_topology_assert_not(); @@ -531,10 +534,113 @@ } /* + * Handle a finished initialization BIO. + */ +static void +gv_init_complete(struct gv_plex *p, struct bio *bp) +{ + struct gv_drive *d; + struct g_consumer *cp; + struct gv_sd *s; + off_t start, length; + caddr_t data; + int error; + + s = bp->bio_caller1; + start = bp->bio_offset; + length = bp->bio_length; + error = bp->bio_error; + data = bp->bio_data; + + KASSERT(s != NULL, ("gv_init_complete: NULL s")); + d = s->drive_sc; + KASSERT(d != NULL, ("gv_init_complete: NULL d")); + cp = d->consumer; + KASSERT(cp != NULL, ("gv_init_complete: NULL cp")); + + g_destroy_bio(bp); + + /* + * First we need to find out if it was okay, and abort if it's not. + * Then we need to free previous buffers, find out the correct subdisk, + * as well as getting the correct starting point and length of the BIO. + */ + if (start >= s->drive_offset + s->size) { + /* Free the data we initialized. */ + if (data != NULL) + g_free(data); + g_topology_assert_not(); + g_topology_lock(); + g_access(cp, 0, -1, 0); + g_topology_unlock(); + if (error) { + gv_set_sd_state(s, GV_SD_STALE, GV_SETSTATE_FORCE | + GV_SETSTATE_CONFIG); + } else { + gv_set_sd_state(s, GV_SD_UP, GV_SETSTATE_CONFIG); + s->initialized = 0; + printf("VINUM: subdisk '%s' init: finished " + "successfully\n", s->name); + } + return; + } + s->initialized += length; + start += length; + gv_init_request(s, start, data, length); +} + +/* + * Create an initialization BIO and send it off to the consumer. Assume that + * we're given initialization data as parameter. + */ +void +gv_init_request(struct gv_sd *s, off_t start, caddr_t data, off_t length) +{ + struct gv_drive *d; + struct g_consumer *cp; + struct bio *bp, *cbp; + + KASSERT(s != NULL, ("gv_init_request: NULL s")); + d = s->drive_sc; + KASSERT(d != NULL, ("gv_init_request: NULL d")); + cp = d->consumer; + KASSERT(cp != NULL, ("gv_init_request: NULL cp")); + + bp = g_new_bio(); + if (bp == NULL) { + printf("VINUM: subdisk '%s' init: write failed at offset %jd" + " (drive offset %jd); out of memory\n", s->name, + (intmax_t)s->initialized, (intmax_t)start); + return; /* XXX: Error codes. */ + } + bp->bio_cmd = BIO_WRITE; + bp->bio_data = data; + bp->bio_done = gv_done; + bp->bio_error = 0; + bp->bio_length = length; + bp->bio_cflags |= GV_BIO_INIT; + bp->bio_offset = start; + bp->bio_caller1 = s; + + /* Then ofcourse, we have to clone it. */ + cbp = g_clone_bio(bp); + if (cbp == NULL) { + printf("VINUM: subdisk '%s' init: write failed at offset %jd" + " (drive offset %jd); out of memory\n", s->name, + (intmax_t)s->initialized, (intmax_t)start); + return; /* XXX: Error codes. */ + } + cbp->bio_done = gv_done; + cbp->bio_caller1 = s; + /* Send it off to the consumer. */ + g_io_request(cbp, cp); +} + +/* * Handle a finished parity write. */ static void -gv_parity_completed(struct gv_plex *p, struct bio *bp) +gv_parity_complete(struct gv_plex *p, struct bio *bp) { int error, flags; @@ -576,15 +682,16 @@ } /* Send down next. It will determine if we need to itself. */ - gv_send_parity_bio(p, flags, p->synced); + gv_parity_request(p, flags, p->synced); } /* * Handle a finished plex rebuild bio. */ static void -gv_rebuild_completed(struct gv_plex *p, struct bio *bp) +gv_rebuild_complete(struct gv_plex *p, struct bio *bp) { + struct gv_sd *s; int error, flags; off_t offset; @@ -617,11 +724,14 @@ gv_save_config(p->vinumconf); p->flags &= ~GV_PLEX_SYNCING; p->synced = 0; + /* Try to up all subdisks. */ + LIST_FOREACH(s, &p->subdisks, in_plex) + gv_update_sd_state(s); return; } /* Send down next. It will determine if we need to itself. */ - gv_send_parity_bio(p, flags, offset); + gv_parity_request(p, flags, offset); } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#5 (text+ko) ==== @@ -267,6 +267,8 @@ printf("GEOM_VINUM: sd %s is reviving\n", broken->name); gv_set_sd_state(broken, GV_SD_REVIVING, GV_SETSTATE_FORCE); + /* Set this bit now, but should be set at end. */ + broken->flags |= GV_SD_CANGOUP; break; case GV_SD_REVIVING: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#9 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#13 (text+ko) ==== @@ -112,7 +112,7 @@ #define GV_BIO_MALLOC 0x02 #define GV_BIO_ONHOLD 0x04 #define GV_BIO_SYNCREQ 0x08 -#define GV_BIO_SUCCEED 0x10 +#define GV_BIO_INIT 0x10 #define GV_BIO_REBUILD 0x20 #define GV_BIO_CHECK 0x40 #define GV_BIO_PARITY 0x80 ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -static void gv_sync_completed(struct gv_plex *, struct bio *); +static void gv_sync_complete(struct gv_plex *, struct bio *); void gv_volume_start(struct gv_softc *sc, struct bio *bp) @@ -132,7 +132,7 @@ pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { if (pbp->bio_cflags & GV_BIO_SYNCREQ) - gv_sync_completed(p, pbp); + gv_sync_complete(p, pbp); else { /* * If completed is a multiple of a number less @@ -175,9 +175,10 @@ * Handle a finished plex sync bio. */ static void -gv_sync_completed(struct gv_plex *to, struct bio *bp) +gv_sync_complete(struct gv_plex *to, struct bio *bp) { struct gv_plex *from, *p; + struct gv_sd *s; struct gv_volume *v; int err; @@ -200,6 +201,9 @@ printf("VINUM: syncing of %s from %s completed\n", to->name, from->name); to->flags &= ~GV_PLEX_SYNCING; + /* Update our state. */ + LIST_FOREACH(s, &to->subdisks, in_plex) + gv_update_sd_state(s); } else { err = gv_sync_request(from, to, bp->bio_offset + bp->bio_length, bp->bio_length, BIO_READ, NULL); @@ -225,8 +229,8 @@ } int -gv_sync_request(struct gv_plex *from, struct gv_plex *to, off_t offset, off_t - length, int type, caddr_t data) +gv_sync_request(struct gv_plex *from, struct gv_plex *to, off_t offset, + off_t length, int type, caddr_t data) { struct bio *bp; @@ -247,9 +251,6 @@ bp->bio_cflags |= GV_BIO_MALLOC; /* Free on the next run. */ bp->bio_data = data; -/* printf("Sending next bio:\n "); - g_print_bio(bp); - printf("\n");*/ /* Send down next. */ gv_plex_start(from, bp); return (0); From owner-p4-projects@FreeBSD.ORG Mon Jun 18 09:06: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 7967216A476; Mon, 18 Jun 2007 09:06: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 3776D16A46F for ; Mon, 18 Jun 2007 09:06:29 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2861613C44C for ; Mon, 18 Jun 2007 09:06:29 +0000 (UTC) (envelope-from zhouzhouyi@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 l5I96Tv8016986 for ; Mon, 18 Jun 2007 09:06:29 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5I96Tbo016983 for perforce@freebsd.org; Mon, 18 Jun 2007 09:06:29 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 18 Jun 2007 09:06:29 GMT Message-Id: <200706180906.l5I96Tbo016983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 09:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=121901 Change 121901 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/18 09:06:15 String manipulation during the mac checks when writing to the mactestpipe I plan to use bison to write a parser to parse the output of /dev/mactestpipe when constructing test programs Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#8 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#8 (text+ko) ==== @@ -1118,7 +1118,10 @@ mac_test_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_from_inpcb " + "with inplabel and mlabel:", + strlen("mac_test_create_mbuf_from_inpcb with inplabel and mlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, inplabel, vnode, mlabel); LABEL_CHECK(inplabel, MAGIC_INPCB); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_from_inpcb); @@ -1129,7 +1132,11 @@ mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_linklayer " + "with ifnetlabel and mbuflabel:", + strlen("mac_test_create_mbuf_linklayer with ifnetlabel " + "and mbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, ifnetlabel, vnode, mbuflabel); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_linklayer); @@ -1140,7 +1147,10 @@ mac_test_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_from_bpfdesc " + "with inplabel and mlabel:", + strlen("mac_test_create_mbuf_from_bpfdesc with bpflabel and mbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(vnode, bpflabel, vnode, mbuflabel); LABEL_CHECK(bpflabel, MAGIC_BPF); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_from_bpfdesc); @@ -1151,7 +1161,10 @@ mac_test_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_from_ifnet " + "with ifnetlabel and mbuflabel:", + strlen("mac_test_create_mbuf_from_ifnet with ifnetlabel and mbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, ifnetlabel, vnode, mbuflabel); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_from_ifnet); @@ -1163,7 +1176,12 @@ struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_multicast_encap " + "with oldmbuflabel ifnetlabel and newmbuflabel:", + strlen("mac_test_create_mbuf_multicast_encap " + "with oldmbuflabel ifnetlabel and newmbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL3(vnode, oldmbuflabel, ifnet, ifnetlabel, + vnode, newmbuflabel); LABEL_CHECK(oldmbuflabel, MAGIC_MBUF); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(newmbuflabel, MAGIC_MBUF); @@ -1176,7 +1194,11 @@ struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_mbuf_netlayer " + "with oldmbuflabel and newmbuflabel:", + strlen("mac_test_create_mbuf_netlayer " + "with oldmbuflabel and newmbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(vnode, oldmbuflabel, vnode, newmbuflabel); LABEL_CHECK(oldmbuflabel, MAGIC_MBUF); LABEL_CHECK(newmbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_netlayer); @@ -1187,7 +1209,11 @@ mac_test_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_fragment_match " + "with fragmentlabel and ipqlabel:", + strlen("mac_test_fragment_match " + "with fragmentlabel and ipqlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(vnode, fragmentlabel, vnode, ipqlabel); LABEL_CHECK(fragmentlabel, MAGIC_MBUF); LABEL_CHECK(ipqlabel, MAGIC_IPQ); COUNTER_INC(fragment_match); @@ -1199,7 +1225,9 @@ static void mac_test_reflect_mbuf_icmp(struct mbuf *m, struct label *mlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_reflect_mbuf_icmp with mlabel:", + strlen("mac_test_reflect_mbuf_icmp with mlabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, mlabel); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(reflect_mbuf_icmp); } @@ -1208,7 +1236,9 @@ static void mac_test_reflect_mbuf_tcp(struct mbuf *m, struct label *mlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_reflect_mbuf_tcp with mlabel:", + strlen("mac_test_reflect_mbuf_tcp with mlabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, mlabel); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(reflect_mbuf_tcp); } @@ -1218,7 +1248,10 @@ mac_test_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_relabel_ifnet " + "with ifnetlabel and newlabel:", + strlen("mac_test_relabel_ifnet with ifnetlabel and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, ifnetlabel, ifnet, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(newlabel, MAGIC_IFNET); @@ -1230,7 +1263,10 @@ mac_test_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_update_ipq " + "with fragmentlabel and ipqlabel:", + strlen("mac_test_update_ipq with fragmentlabel and ipqlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(vnode, fragmentlabel, vnode, ipqlabel); LABEL_CHECK(fragmentlabel, MAGIC_MBUF); LABEL_CHECK(ipqlabel, MAGIC_IPQ); COUNTER_INC(update_ipq); @@ -1241,7 +1277,10 @@ mac_test_inpcb_sosetlabel(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { - + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_inpcb_sosetlabel " + "with solabel and inplabel:", + strlen("mac_test_inpcb_sosetlabel with solabel and inplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(socket, solabel, socket, inplabel); LABEL_CHECK(solabel, MAGIC_SOCKET); LABEL_CHECK(inplabel, MAGIC_INPCB); COUNTER_INC(inpcb_sosetlabel); @@ -1258,6 +1297,13 @@ struct label *execlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_execve_transition " + "with old cr_label, new cr_label, filelabel, interpvplabel and execlabel", + strlen("mac_test_execve_transition " + "with old cr_label, new cr_label, filelabel, interpvplabel and execlabel")); + MACTEST_PIPE_SUBMIT_LABEL4(cred, old->cr_label, cred, new->cr_label, + vnode, filelabel, vnode, interpvplabel); + MACTEST_PIPE_SUBMIT_LABEL(vnode, execlabel); LABEL_CHECK(old->cr_label, MAGIC_CRED); LABEL_CHECK(new->cr_label, MAGIC_CRED); LABEL_CHECK(filelabel, MAGIC_VNODE); @@ -1273,6 +1319,12 @@ struct image_params *imgp, struct label *execlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_execve_will_transition " + "with old cr_label, filelabel, interpvplabel and execlabel:", + strlen("mac_test_execve_will_transition " + "with old cr_label, filelabel, interpvplabel and execlabel:")); + MACTEST_PIPE_SUBMIT_LABEL4(cred, old->cr_label, vnode, filelabel, + vnode, interpvplabel, vnode, execlabel); LABEL_CHECK(old->cr_label, MAGIC_CRED); LABEL_CHECK(filelabel, MAGIC_VNODE); LABEL_CHECK(interpvplabel, MAGIC_VNODE); @@ -1287,6 +1339,10 @@ mac_test_create_proc0(struct ucred *cred) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_proc0 " + "with cr_label:", + strlen("mac_test_create_proc0 with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(create_proc0); } @@ -1296,6 +1352,10 @@ mac_test_create_proc1(struct ucred *cred) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_create_proc1 " + "with cr_label:", + strlen("mac_test_create_proc1 with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(create_proc1); } @@ -1305,6 +1365,10 @@ mac_test_relabel_cred(struct ucred *cred, struct label *newlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_relabel_cred " + "with cr_label and newlabel:", + strlen("mac_test_relabel_cred with cr_label and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, cred, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(newlabel, MAGIC_CRED); COUNTER_INC(relabel_cred); @@ -1315,6 +1379,8 @@ mac_test_thread_userret(struct thread *td) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_thread_userret\n", + strlen("mac_test_thread_userret\n")); COUNTER_INC(thread_userret); } @@ -1326,6 +1392,10 @@ mac_test_cleanup_sysv_msgmsg(struct label *msglabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_cleanup_sysv_msgmsg " + "with msglabel:", + strlen("mac_test_cleanup_sysv_msgmsg with msglabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, msglabel); LABEL_CHECK(msglabel, MAGIC_SYSV_MSG); COUNTER_INC(cleanup_sysv_msgmsg); } @@ -1335,6 +1405,10 @@ mac_test_cleanup_sysv_msgqueue(struct label *msqlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_cleanup_sysv_msgqueue " + "with msqlabel:", + strlen("mac_test_cleanup_sysv_msgqueue with msqlabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, msqlabel); LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ); COUNTER_INC(cleanup_sysv_msgqueue); } @@ -1344,6 +1418,10 @@ mac_test_cleanup_sysv_sem(struct label *semalabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_cleanup_sysv_sem " + "with semalabel:", + strlen("mac_test_cleanup_sysv_sem with semalabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, semalabel); LABEL_CHECK(semalabel, MAGIC_SYSV_SEM); COUNTER_INC(cleanup_sysv_sem); } @@ -1353,6 +1431,10 @@ mac_test_cleanup_sysv_shm(struct label *shmlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_cleanup_sysv_shm " + "with shmlabel:", + strlen("mac_test_cleanup_sysv_shm with shmlabel:")); + MACTEST_PIPE_SUBMIT_LABEL(vnode, shmlabel); LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM); COUNTER_INC(cleanup_sysv_shm); } @@ -1366,6 +1448,10 @@ struct ifnet *ifnet, struct label *ifnetlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_bpfdesc_receive " + "with bpflabel and ifnetlabel:", + strlen("mac_test_check_bpfdesc_receive with bpflabel and ifnetlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(socket, bpflabel, ifnet, ifnetlabel); LABEL_CHECK(bpflabel, MAGIC_BPF); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); COUNTER_INC(check_bpfdesc_receive); @@ -1378,6 +1464,10 @@ mac_test_check_cred_relabel(struct ucred *cred, struct label *newlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_cred_relabel " + "with cr_label and newlabel:", + strlen("mac_test_check_cred_relabel with cr_label and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, cred, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(newlabel, MAGIC_CRED); COUNTER_INC(check_cred_relabel); @@ -1390,6 +1480,11 @@ mac_test_check_cred_visible(struct ucred *u1, struct ucred *u2) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_cred_visible " + "with u1 cr_label and u2 cr_label:", + strlen("mac_test_check_cred_visible " + "with u1 cr_label and u2 cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, u1->cr_label, cred, u2->cr_label); LABEL_CHECK(u1->cr_label, MAGIC_CRED); LABEL_CHECK(u2->cr_label, MAGIC_CRED); COUNTER_INC(check_cred_visible); @@ -1403,6 +1498,12 @@ struct label *ifnetlabel, struct label *newlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_ifnet_relabel " + "with cr_label, ifnetlabel and newlabel:", + strlen("mac_test_check_ifnet_relabel " + "with cr_label, ifnetlabel and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL3(cred, cred->cr_label, ifnet, ifnetlabel, + ifnet, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(newlabel, MAGIC_IFNET); @@ -1417,6 +1518,11 @@ struct mbuf *m, struct label *mbuflabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_ifnet_transmit " + "with ifnetlabel and mbuflabel:", + strlen("mac_test_check_ifnet_transmit " + "with ifnetlabel and mbuflabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, ifnetlabel, vnode, mbuflabel); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(check_ifnet_transmit); @@ -1430,6 +1536,11 @@ struct mbuf *m, struct label *mlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_inpcb_deliver " + "with inplabel and mlabel:", + strlen("mac_test_check_inpcb_deliver " + "with inplabel and mlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(ifnet, inplabel, vnode, mlabel); LABEL_CHECK(inplabel, MAGIC_INPCB); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(check_inpcb_deliver); @@ -1444,6 +1555,12 @@ struct label *msqklabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msgmsq " + "with cr_label, msglabel and msqklabel:", + strlen("mac_test_check_sysv_msgmsq " + "with cr_label, msglabel and msqklabel:")); + MACTEST_PIPE_SUBMIT_LABEL3(cred, cred->cr_label, vnode, msqklabel, + vnode, msglabel); LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ); LABEL_CHECK(msglabel, MAGIC_SYSV_MSG); LABEL_CHECK(cred->cr_label, MAGIC_CRED); @@ -1458,6 +1575,11 @@ struct label *msglabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msgrcv " + "with cr_label and msglabel:", + strlen("mac_test_check_sysv_msgrcv " + "with cr_label and msglabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msglabel); LABEL_CHECK(msglabel, MAGIC_SYSV_MSG); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msgrcv); @@ -1471,6 +1593,11 @@ struct label *msglabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msgrmid " + "with cr_label and msglabel:", + strlen("mac_test_check_sysv_msgrmid " + "with cr_label and msglabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msglabel); LABEL_CHECK(msglabel, MAGIC_SYSV_MSG); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msgrmid); @@ -1484,6 +1611,11 @@ struct label *msqklabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msqget " + "with cr_label and msqklabel:", + strlen("mac_test_check_sysv_msqget " + "with cr_label and msqklabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msqklabel); LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msqget); @@ -1497,6 +1629,11 @@ struct label *msqklabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msqsnd " + "with cr_label and msqklabel:", + strlen("mac_test_check_sysv_msqsnd " + "with cr_label and msqklabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msqklabel); LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msqsnd); @@ -1510,6 +1647,11 @@ struct label *msqklabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msqrcv " + "with cr_label and msqklabel:", + strlen("mac_test_check_sysv_msqrcv " + "with cr_label and msqklabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msqklabel); LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msqrcv); @@ -1523,6 +1665,11 @@ struct label *msqklabel, int cmd) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_msqctl " + "with cr_label and msqklabel:", + strlen("mac_test_check_sysv_msqctl " + "with cr_label and msqklabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, msqklabel); LABEL_CHECK(msqklabel, MAGIC_SYSV_MSQ); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_sysv_msqctl); @@ -1536,6 +1683,60 @@ struct label *semaklabel, int cmd) { + char * submitstring = NULL; + char cmdstring[10]; + + submitstring = malloc(256, M_MACTEST_PIPE, M_NOWAIT); + + if (submitstring){ + bzero(submitstring, 256); + bzero(cmdstring, 10); + + switch(cmd) { + case IPC_RMID: + strcpy(cmdstring,"IPC_RMID"); + break; + case IPC_SET: + strcpy(cmdstring,"IPC_SET"); + break; + case SETVAL: + strcpy(cmdstring,"SETVAL"); + break; + case SETALL: + strcpy(cmdstring,"SETALL"); + break; + case IPC_STAT: + strcpy(cmdstring,"IPC_STAT"); + break; + case GETVAL: + strcpy(cmdstring,"GETALL"); + break; + case GETPID: + strcpy(cmdstring,"GETPID"); + break; + case GETNCNT: + strcpy(cmdstring,"GETNCNT"); + break; + case GETZCNT: + strcpy(cmdstring,"GETZCNT"); + break; + case GETALL: + strcpy(cmdstring,"GETALL"); + break; + default: + strcpy(cmdstring,"NULL"); + break; + } + + sprintf(submitstring, "mac_test_check_sysv_semctl " + "with access type and cr_label and semaklabel:%s:", + cmdstring); + MACTEST_PIPE_SUBMIT_WITHPID(submitstring, + strlen(submitstring)); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, semaklabel); + free(submitstring, M_MACTEST_PIPE); + } + LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM); COUNTER_INC(check_sysv_semctl); @@ -1549,6 +1750,11 @@ struct label *semaklabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_semget " + "with cr_label and semaklabel:", + strlen("mac_test_check_sysv_semget " + "with cr_label and semaklabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, semaklabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM); COUNTER_INC(check_sysv_semget); @@ -1562,6 +1768,19 @@ struct label *semaklabel, size_t accesstype) { + char * submitstring = NULL; + submitstring = malloc(256, M_MACTEST_PIPE, M_NOWAIT); + bzero(submitstring, 256); + if (submitstring){ + sprintf(submitstring, "mac_test_check_sysv_semop " + "with access type and cr_label and semaklabel:%s:", + accesstype&SEM_R? (accesstype&SEM_A? "SEM_AR": "SEM_R"): + (accesstype&SEM_A? "SEM_A": "NULL")); + MACTEST_PIPE_SUBMIT_WITHPID(submitstring, + strlen(submitstring)); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, semaklabel); + free(submitstring, M_MACTEST_PIPE); + } LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(semaklabel, MAGIC_SYSV_SEM); COUNTER_INC(check_sysv_semop); From owner-p4-projects@FreeBSD.ORG Mon Jun 18 11:07: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 420E416A47D; Mon, 18 Jun 2007 11:07:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E12E16A4DA for ; Mon, 18 Jun 2007 11:07:28 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.186]) by mx1.freebsd.org (Postfix) with ESMTP id DE1CD13C44C for ; Mon, 18 Jun 2007 11:07:27 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so1724780mue for ; Mon, 18 Jun 2007 04:07:26 -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=GKBEDoiuVsKxhWh48O+YnEDQ1ulKe/ef2GoMVY+Y/6eSzDxfAKNoZj7ZXqUpvPTkjwlkAyFmKqB6Lb/gLQU6czaCAKznTJMYyepUR9hHN/WBXBE/xcTflKIaoan2yMlNM8LaJKRY6dJnAVXTi2fC42DAHy79/7c/Cdq4HiN0NsE= 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=sxyeBsqvLvN+CC8HjPZbYHmV2NWVvJrZ5zEw6PTIgioueXHP3+DwBZIUJ7i1ghIrwM44ExJ6oFgEC5z7NeWqMxGsBqhf8XRCEZ8ObsPJxl/Db8H2qeu6GtuW9iZeioFFcoyPtrr5n87a2IRZlbFgk+pWgjtoHSwxfqF5b05dfWk= Received: by 10.82.100.1 with SMTP id x1mr11014197bub.1182164846553; Mon, 18 Jun 2007 04:07:26 -0700 (PDT) Received: from ?172.31.5.25? ( [89.97.252.178]) by mx.google.com with ESMTP id d26sm177597nfh.2007.06.18.04.07.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jun 2007 04:07:26 -0700 (PDT) Message-ID: <46766753.3080807@FreeBSD.org> Date: Mon, 18 Jun 2007 13:06:59 +0200 From: Attilio Rao User-Agent: Thunderbird 1.5 (X11/20060526) MIME-Version: 1.0 To: Rui Paulo References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <86myzeq67f.wl%rpaulo@fnop.net> <4666B730.9080908@FreeBSD.org> <200706081351.54281.jhb@freebsd.org> <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> <86lkejcn8k.wl%rpaulo@fnop.net> In-Reply-To: <86lkejcn8k.wl%rpaulo@fnop.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: Attilio Rao Cc: Perforce Change Reviews , Rui Paulo , John Baldwin 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: Mon, 18 Jun 2007 11:07:30 -0000 Rui Paulo wrote: > At Fri, 8 Jun 2007 20:00:18 +0200, > Attilio Rao wrote: >> 2007/6/8, John Baldwin : >>> On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: >>>> Rui Paulo wrote: >>>>> If I'm not doing something wrong, I need to use spin locks on my >>>>> interrupt handler, or else witness_checkorder will complain with >>>>> "blockable sleep lock". >>>>> >>>>> Note that I'm using FILTERs. >>>> So you are doing this in the wrong way. >>>> In order to use correctly filters, please note that the support for them >>>> is compile time choosen, so you need to wrapper all filter specific >>>> parts using INTR_FILTER compat macro. >>> Actually, if you only use a filter and not an ithread handler, you can do that >>> now w/o needing to have any #ifdef INTR_FILTER stuff. >> In the case your kernel doesn't use filters (!INTR_FILTER) and you >> pass a filter, it is automatically mapped to work as a fast handler? > > Ok, I've looked at sio(4) to see how it was setting up a fast intr > handler. > > Does the following diff look correct? Thanks. > > ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 - /home/rpaulo/p4/rpaulo-macbook/dev/asmc/asmc.c ==== > --- /tmp/tmp.96695.67 2007-06-17 03:44:50.000000000 +0100 > +++ /home/rpaulo/p4/rpaulo-macbook/dev/asmc/asmc.c 2007-06-17 03:44:17.000000000 +0100 > @@ -77,11 +77,8 @@ static int asmc_fan_getvalue(device_t, c > static int asmc_temp_getvalue(device_t, const char *); > static int asmc_sms_read(device_t, const char *, int16_t *); > static void asmc_sms_calibrate(device_t); > -#ifdef INTR_FILTER > static int asmc_sms_intr(void *); > -#else > static void asmc_sms_fastintr(void *); > -#endif > static void asmc_sms_printintr(device_t, uint8_t); > > /* > @@ -236,7 +233,7 @@ static int > asmc_attach(device_t dev) > { > int i, j; > - int error; > + int ret; > char name[2]; > struct asmc_softc *sc = device_get_softc(dev); > struct asmc_model *model; > @@ -378,16 +375,21 @@ asmc_attach(device_t dev) > goto out; > } > > -#ifdef INTR_FILTER > - error = bus_setup_intr(dev, sc->sc_res, > - INTR_TYPE_MISC | INTR_MPSAFE, > - asmc_sms_intr, NULL, dev, &sc->sc_cookie); > -#else > - error = bus_setup_intr(dev, sc->sc_res, > - INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, > - NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); > -#endif > - if (error) { > + ret = bus_setup_intr(dev, sc->sc_res, > + INTR_TYPE_MISC | INTR_MPSAFE, > + asmc_sms_intr, NULL, dev, &sc->sc_cookie); > + > + if (ret) { > + ret = bus_setup_intr(dev, sc->sc_res, > + INTR_TYPE_MISC | INTR_MPSAFE, > + NULL, asmc_sms_fastintr, dev, > + &sc->sc_cookie); > + if (ret == 0) > + device_printf(dev, "unable to setup fast interrupt. " > + "Using normal mode.\n"); > + } > + > + if (ret) { > device_printf(dev, "unable to setup SMS IRQ\n"); > bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, > sc->sc_res); Generally, I don't like much the if (ret == 0) device_printf() since you are doing a probe-by-try and so it should not display in this way IMHO. Maybe having it under some debugging mechanism (e.g. KTR and similar) would be acceptable. My 2 cents. Attilio From owner-p4-projects@FreeBSD.ORG Mon Jun 18 11:29: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 402DF16A468; Mon, 18 Jun 2007 11:29:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F116E16A46D for ; Mon, 18 Jun 2007 11:29:27 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E0B8D13C458 for ; Mon, 18 Jun 2007 11:29:27 +0000 (UTC) (envelope-from lulf@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 l5IBTRE6044126 for ; Mon, 18 Jun 2007 11:29:27 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IBTRPB044118 for perforce@freebsd.org; Mon, 18 Jun 2007 11:29:27 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 18 Jun 2007 11:29:27 GMT Message-Id: <200706181129.l5IBTRPB044118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 11:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=121907 Change 121907 by lulf@lulf_carrot on 2007/06/18 11:28:48 - Enable gv_start_volume and hook it up into the build. - Remove old init/rebuild/sync threads. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#17 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#9 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#17 (text+ko) ==== @@ -699,7 +699,7 @@ case GV_EVENT_START_VOLUME: printf("VINUM: event 'start'\n"); v = ev->arg1; - /*gv_start_volume(v);*/ + gv_start_volume(v); break; case GV_EVENT_ATTACH_PLEX: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#9 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_init.c,v 1.11 2005/08/28 18:16:31 le Exp $"); - #include #include #include @@ -45,13 +44,6 @@ static int gv_rebuild_plex(struct gv_plex *); static int gv_init_plex(struct gv_plex *); -struct gv_sync_args { - struct gv_volume *v; - struct gv_plex *from; - struct gv_plex *to; - off_t syncsize; -}; - void gv_start_obj(struct g_geom *gp, struct gctl_req *req) { @@ -280,279 +272,3 @@ } return (0); } - -#if 0 -/* This thread is responsible for rebuilding a degraded RAID5 plex. */ -void -gv_rebuild_td(void *arg) -{ - struct bio *bp; - struct gv_plex *p; - struct g_consumer *cp; - struct gv_sync_args *sync; - u_char *buf; - off_t i; - int error; - - buf = NULL; - bp = NULL; - - sync = arg; - p = sync->to; - p->synced = 0; - cp = p->consumer; - - g_topology_lock(); - error = g_access(cp, 1, 1, 0); - if (error) { - g_topology_unlock(); - printf("GEOM_VINUM: rebuild of %s failed to access consumer: " - "%d\n", p->name, error); - kthread_exit(error); - } - g_topology_unlock(); - - buf = g_malloc(sync->syncsize, M_WAITOK); - - printf("GEOM_VINUM: rebuild of %s started\n", p->name); - i = 0; - for (i = 0; i < p->size; i += (p->stripesize * (p->sdcount - 1))) { -/* - if (i + sync->syncsize > p->size) - sync->syncsize = p->size - i; -*/ - bp = g_new_bio(); - if (bp == NULL) { - printf("GEOM_VINUM: rebuild of %s failed creating bio: " - "out of memory\n", p->name); - break; - } - bp->bio_cmd = BIO_WRITE; - bp->bio_done = NULL; - bp->bio_data = buf; - bp->bio_cflags |= GV_BIO_REBUILD; - bp->bio_offset = i; - bp->bio_length = p->stripesize; - - /* Schedule it down ... */ - g_io_request(bp, cp); - - /* ... and wait for the result. */ - error = biowait(bp, "gwrite"); - if (error) { - printf("GEOM_VINUM: rebuild of %s failed at offset %jd " - "errno: %d\n", p->name, i, error); - break; - } - g_destroy_bio(bp); - bp = NULL; - } - - if (bp != NULL) - g_destroy_bio(bp); - if (buf != NULL) - g_free(buf); - - g_topology_lock(); - g_access(cp, -1, -1, 0); - gv_save_config_all(p->vinumconf); - g_topology_unlock(); - - p->flags &= ~GV_PLEX_SYNCING; - p->synced = 0; - - /* Successful initialization. */ - if (!error) - printf("GEOM_VINUM: rebuild of %s finished\n", p->name); - - g_free(sync); - kthread_exit(error); -} - -void -gv_sync_td(void *arg) -{ - struct bio *bp; - struct gv_plex *p; - struct g_consumer *from, *to; - struct gv_sync_args *sync; - u_char *buf; - off_t i; - int error; - - sync = arg; - - from = sync->from->consumer; - to = sync->to->consumer; - - p = sync->to; - p->synced = 0; - - error = 0; - - g_topology_lock(); - error = g_access(from, 1, 0, 0); - if (error) { - g_topology_unlock(); - printf("GEOM_VINUM: sync from '%s' failed to access " - "consumer: %d\n", sync->from->name, error); - g_free(sync); - kthread_exit(error); - } - error = g_access(to, 0, 1, 0); - if (error) { - g_access(from, -1, 0, 0); - g_topology_unlock(); - printf("GEOM_VINUM: sync to '%s' failed to access " - "consumer: %d\n", p->name, error); - g_free(sync); - kthread_exit(error); - } - g_topology_unlock(); - - printf("GEOM_VINUM: plex sync %s -> %s started\n", sync->from->name, - sync->to->name); - for (i = 0; i < p->size; i+= sync->syncsize) { - /* Read some bits from the good plex. */ - buf = g_read_data(from, i, sync->syncsize, &error); - if (buf == NULL) { - printf("GEOM_VINUM: sync read from '%s' failed at " - "offset %jd; errno: %d\n", sync->from->name, i, - error); - break; - } - - /* - * Create a bio and schedule it down on the 'bad' plex. We - * cannot simply use g_write_data() because we have to let the - * lower parts know that we are an initialization process and - * not a 'normal' request. - */ - bp = g_new_bio(); - if (bp == NULL) { - printf("GEOM_VINUM: sync write to '%s' failed at " - "offset %jd; out of memory\n", p->name, i); - g_free(buf); - break; - } - bp->bio_cmd = BIO_WRITE; - bp->bio_offset = i; - bp->bio_length = sync->syncsize; - bp->bio_data = buf; - bp->bio_done = NULL; - - /* - * This hack declare this bio as part of an initialization - * process, so that the lower levels allow it to get through. - */ - bp->bio_cflags |= GV_BIO_SYNCREQ; - - /* Schedule it down ... */ - g_io_request(bp, to); - - /* ... and wait for the result. */ - error = biowait(bp, "gwrite"); - g_destroy_bio(bp); - g_free(buf); - if (error) { - printf("GEOM_VINUM: sync write to '%s' failed at " - "offset %jd; errno: %d\n", p->name, i, error); - break; - } - - /* Note that we have synced a little bit more. */ - p->synced += sync->syncsize; - } - - g_topology_lock(); - g_access(from, -1, 0, 0); - g_access(to, 0, -1, 0); - gv_save_config_all(p->vinumconf); - g_topology_unlock(); - - /* Successful initialization. */ - if (!error) - printf("GEOM_VINUM: plex sync %s -> %s finished\n", - sync->from->name, sync->to->name); - - p->flags &= ~GV_PLEX_SYNCING; - p->synced = 0; - - g_free(sync); - kthread_exit(error); -} - -void -gv_init_td(void *arg) -{ - struct gv_sd *s; - struct gv_drive *d; - struct g_geom *gp; - struct g_consumer *cp; - int error; - off_t i, init_size, start, offset, length; - u_char *buf; - - s = arg; - KASSERT(s != NULL, ("gv_init_td: NULL s")); - d = s->drive_sc; - KASSERT(d != NULL, ("gv_init_td: NULL d")); - gp = d->geom; - KASSERT(gp != NULL, ("gv_init_td: NULL gp")); - - cp = LIST_FIRST(&gp->consumer); - KASSERT(cp != NULL, ("gv_init_td: NULL cp")); - - s->init_error = 0; - init_size = s->init_size; - start = s->drive_offset + s->initialized; - offset = s->drive_offset; - length = s->size; - - buf = g_malloc(s->init_size, M_WAITOK | M_ZERO); - - g_topology_lock(); - error = g_access(cp, 0, 1, 0); - if (error) { - s->init_error = error; - g_topology_unlock(); - printf("GEOM_VINUM: subdisk '%s' init: failed to access " - "consumer; error: %d\n", s->name, error); - kthread_exit(error); - } - g_topology_unlock(); - - for (i = start; i < offset + length; i += init_size) { - error = g_write_data(cp, i, buf, init_size); - if (error) { - printf("GEOM_VINUM: subdisk '%s' init: write failed" - " at offset %jd (drive offset %jd); error %d\n", - s->name, (intmax_t)s->initialized, (intmax_t)i, - error); - break; - } - s->initialized += init_size; - } - - g_free(buf); - - g_topology_lock(); - g_access(cp, 0, -1, 0); - g_topology_unlock(); - if (error) { - s->init_error = error; - g_topology_lock(); - gv_set_sd_state(s, GV_SD_STALE, - GV_SETSTATE_FORCE | GV_SETSTATE_CONFIG); - g_topology_unlock(); - } else { - g_topology_lock(); - gv_set_sd_state(s, GV_SD_UP, GV_SETSTATE_CONFIG); - g_topology_unlock(); - s->initialized = 0; - printf("GEOM_VINUM: subdisk '%s' init: finished successfully\n", - s->name); - } - kthread_exit(error); -} -#endif From owner-p4-projects@FreeBSD.ORG Mon Jun 18 11:32: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 980BD16A473; Mon, 18 Jun 2007 11:32: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 6B91616A46E for ; Mon, 18 Jun 2007 11:32:32 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B10C13C46A for ; Mon, 18 Jun 2007 11:32:32 +0000 (UTC) (envelope-from lulf@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 l5IBWW7m047553 for ; Mon, 18 Jun 2007 11:32:32 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IBWWiZ047542 for perforce@freebsd.org; Mon, 18 Jun 2007 11:32:32 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 18 Jun 2007 11:32:32 GMT Message-Id: <200706181132.l5IBWWiZ047542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 11:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121908 Change 121908 by lulf@lulf_carrot on 2007/06/18 11:31:35 - Make gvinum stop printing out the list all the time. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#8 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#8 (text+ko) ==== @@ -360,7 +360,6 @@ warnx("create failed: %s", errstr); } gctl_free(req); - gvinum_list(0, NULL); } /* Detach a plex or subdisk from its parent. */ @@ -823,7 +822,6 @@ return; } gctl_free(req); - gvinum_list(0, NULL); } void @@ -858,7 +856,6 @@ return; } gctl_free(req); - gvinum_list(0, NULL); printf("gvinum configuration obliterated\n"); } @@ -928,7 +925,6 @@ } gctl_free(req); - gvinum_list(0, NULL); } void From owner-p4-projects@FreeBSD.ORG Mon Jun 18 11:47:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D2C816A478; Mon, 18 Jun 2007 11:47: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 41BC316A400 for ; Mon, 18 Jun 2007 11:47:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2FD4E13C489 for ; Mon, 18 Jun 2007 11:47:55 +0000 (UTC) (envelope-from lulf@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 l5IBlts5062194 for ; Mon, 18 Jun 2007 11:47:55 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IBlpRM062129 for perforce@freebsd.org; Mon, 18 Jun 2007 11:47:51 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 18 Jun 2007 11:47:51 GMT Message-Id: <200706181147.l5IBlpRM062129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 11:47:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=121910 Change 121910 by lulf@lulf_carrot on 2007/06/18 11:47:13 - Integrate my main gvinum SoC branch. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_main/Makefile#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/Makefile.inc1#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.i386#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/NOTES#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.i386#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sparc64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/conf/options.arm#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/geom_kern.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_state.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/Makefile#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/conf/PAE#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/trap.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/kdb.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/isa/npx.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_alq.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_event.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_idle.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_intr.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kse.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_priv.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_switch.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_tc.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_time.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/ksched.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_core.c#2 delete .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_lock.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_prof.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_smp.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_generic.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sys_process.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/tty_cons.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/modules/Makefile#4 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/acct.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/callout.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/conf.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/filedesc.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/param.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/pcpu.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/priv.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/proc.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resource.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sched.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/socket.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sx.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/syslimits.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/thr.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/turnstile.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/umtx.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/swap_pager.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/uma_int.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_contig.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_phys.c#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_phys.h#1 branch .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_main/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/lulf/gvinum_main/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.340 2007/04/02 21:32:44 marcel Exp $ +# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $ # # The user-driven targets are: # @@ -17,9 +17,14 @@ # kernel - buildkernel + installkernel. # doxygen - Build API documentation of the kernel, needs doxygen. # update - Convenient way to update your source tree (cvs). -# check-old - Print a list of old files/directories in the system. -# delete-old - Delete obsolete files and directories interactively. -# delete-old-libs - Delete obsolete libraries interactively. +# check-old - List obsolete directories/files/libraries. +# check-old-dirs - List obsolete directories. +# check-old-files - List obsolete files. +# check-old-libs - List obsolete libraries. +# delete-old - Delete obsolete directories/files/libraries. +# delete-old-dirs - Delete obsolete directories. +# delete-old-files - Delete obsolete files. +# delete-old-libs - Delete obsolete libraries. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -70,8 +75,10 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildenvvars buildkernel buildworld check-old \ - checkdpadd clean cleandepend cleandir delete-old delete-old-libs \ +TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ + check-old check-old-dirs check-old-files check-old-libs \ + checkdpadd clean cleandepend cleandir \ + delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributeworld distrib-dirs distribution doxygen \ everything hierarchy install installcheck installkernel \ installkernel.debug reinstallkernel reinstallkernel.debug \ ==== //depot/projects/soc2007/lulf/gvinum_main/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd 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} @@ -994,21 +994,31 @@ # libraries: cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs; +# +# static libgcc.a prerequisite for shared libc +# +_prereq_libs= gnu/lib/libgcc + # These dependencies are not automatically generated: # -# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all -# shared libraries for ELF. +# gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before +# all shared libraries for ELF. # -_startup_libs= gnu/lib/csu gnu/lib/libgcc +_startup_libs= gnu/lib/csu .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf .else _startup_libs+= lib/csu/${MACHINE_ARCH} .endif +_startup_libs+= gnu/lib/libgcc +_startup_libs+= lib/libc + +gnu/lib/libgcc__L: lib/libc__L _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ @@ -1016,7 +1026,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1068,6 +1078,18 @@ lib/libradius__L: lib/libmd__L .endif +.for _lib in ${_prereq_libs} +${_lib}__PL: .PHONY +.if exists(${.CURDIR}/${_lib}) + ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_lib}; \ + ${MAKE} DIRPRFX=${_lib}/ obj; \ + ${MAKE} DIRPRFX=${_lib}/ depend; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install +.endif +.endfor + .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) @@ -1091,6 +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/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} @@ -1114,7 +1137,10 @@ .include -.if make(delete-old) || make(delete-old-libs) || make(check-old) +.if make(check-old) || make(check-old-dirs) || \ + make(check-old-files) || make(check-old-libs) || \ + make(delete-old) || make(delete-old-dirs) || \ + make(delete-old-files) || make(delete-old-libs) # # check for / delete old files section @@ -1135,18 +1161,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @for file in ${OLD_FILES}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}"; \ fi; \ - fi -.endfor + done # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1183,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @for file in ${OLD_FILES}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,51 +1201,42 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @for file in ${OLD_LIBS}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}"; \ fi; \ - fi -.endfor + done @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @for file in ${OLD_LIBS}; do \ + if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done delete-old-dirs: @echo ">>> Removing old directories" -.for dir in ${OLD_DIRS} -# Don't fail if an old directory isn't empty. - @if [ -d "${DESTDIR}/${dir}" ]; then \ - rmdir -v "${DESTDIR}/${dir}" || true; \ - else \ - if [ -L "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + @for dir in ${OLD_DIRS}; do \ + if [ -d "${DESTDIR}/$${dir}" ]; then \ + rmdir -v "${DESTDIR}/$${dir}" || true; \ + elif [ -L "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ - fi -.endfor + done @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" -.for dir in ${OLD_DIRS} - @if [ -d "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir}"; \ - else \ - if [ -L "${DESTDIR}/${dir}" ]; then \ - echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + @for dir in ${OLD_DIRS}; do \ + if [ -d "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir}"; \ + elif [ -L "${DESTDIR}/$${dir}" ]; then \ + echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \ fi; \ - fi -.endfor + done delete-old: delete-old-files delete-old-dirs @echo "To remove old libraries run '${MAKE} delete-old-libs'." ==== //depot/projects/soc2007/lulf/gvinum_main/sbin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.165 2007/01/23 09:18:25 rodrigc Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.166 2007/06/12 21:31:39 phk Exp $ .include @@ -73,6 +73,7 @@ quotacheck \ rcorder \ reboot \ + recoverdisk \ restore \ route \ routed \ ==== //depot/projects/soc2007/lulf/gvinum_main/sbin/gvinum/gvinum.c#3 (text+ko) ==== @@ -55,7 +55,9 @@ #include "gvinum.h" +void gvinum_attach(int, char **); void gvinum_create(int, char **); +void gvinum_detach(int, char **); void gvinum_help(void); void gvinum_list(int, char **); void gvinum_move(int, char **); @@ -112,6 +114,43 @@ exit(0); } +/* Attach a plex to a volume or a subdisk to a plex. */ +void +gvinum_attach(int argc, char **argv) +{ + struct gctl_req *req; + const char *errstr; + int rename; + off_t offset; + + rename = 0; + offset = -1; + if (argc < 3) { + warnx("usage:\tattach [rename] " + "[]\n" + "\tattach [rename]"); + } + if (argc > 3) { + if (!strcmp(argv[3], "rename")) { + rename = 1; + if (argc == 5) + offset = strtol(argv[4], NULL, 0); + } else + offset = strtol(argv[3], NULL, 0); + } + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "attach"); + gctl_ro_param(req, "child", -1, argv[1]); + gctl_ro_param(req, "parent", -1, argv[2]); + gctl_ro_param(req, "offset", sizeof(off_t), &offset); + gctl_ro_param(req, "rename", sizeof(int), &rename); + errstr = gctl_issue(req); + if (errstr != NULL) + warnx("attach failed: %s", errstr); + gctl_free(req); +} + void gvinum_create(int argc, char **argv) { @@ -321,7 +360,45 @@ warnx("create failed: %s", errstr); } gctl_free(req); - gvinum_list(0, NULL); +} + +/* Detach a plex or subdisk from its parent. */ +void +gvinum_detach(int argc, char **argv) +{ + const char *errstr; + struct gctl_req *req; + int flags, i; + + optreset = 1; + optind = 1; + while ((i = getopt(argc, argv, "f")) != -1) { + switch(i) { + case 'f': + flags |= GV_FLAG_F; + break; + default: + warn("invalid flag: %c", i); + return; + } + } + argc -= optind; + argv += optind; + if (argc != 1) { + warnx("usage: detach [-f] | "); + return; + } + + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "detach"); + gctl_ro_param(req, "object", -1, argv[0]); + gctl_ro_param(req, "flags", sizeof(int), &flags); + + errstr = gctl_issue(req); + if (errstr != NULL) + warnx("detach failed: %s", errstr); + gctl_free(req); } void @@ -332,6 +409,12 @@ " Check the parity blocks of a RAID-5 plex.\n" "create description-file\n" " Create as per description-file or open editor.\n" + "attach plex volume [rename]\n" + "attach subdisk plex [offset] [rename]\n" + " Attach a plex to a volume, or a subdisk to a plex\n" + "detach [-f] [plex | subdisk]\n" + " Detach a plex or a subdisk from the volume or plex to\n" + " which it is attached.\n" "l | list [-r] [-v] [-V] [volume | plex | subdisk]\n" " List information about specified objects.\n" "ld [-r] [-v] [-V] [volume]\n" @@ -554,8 +637,7 @@ gvinum_parityop(int argc, char **argv, int rebuild) { struct gctl_req *req; - int flags, i, rv; - off_t offset; + int flags, i; const char *errstr; char *op, *msg; @@ -592,7 +674,18 @@ return; } - do { + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, op); + gctl_ro_param(req, "rebuild", sizeof(int), &rebuild); + gctl_ro_param(req, "flags", sizeof(int), &flags); + gctl_ro_param(req, "plex", -1, argv[0]); + + errstr = gctl_issue(req); + if (errstr) + warnx("%s\n", errstr); + gctl_free(req); +/* do { rv = 0; req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); @@ -621,16 +714,16 @@ } fflush(stdout); - /* Clear the -f flag. */ + Clear the -f flag. flags &= ~GV_FLAG_F; - } while (rv >= 0); + } while (rv >= 0);*/ - if ((rv == 2) && (flags & GV_FLAG_V)) { +/* if ((rv == 2) && (flags & GV_FLAG_V)) { if (rebuild) printf("Rebuilt parity on %s\n", argv[0]); else printf("%s has correct parity\n", argv[0]); - } + }*/ } void @@ -729,7 +822,6 @@ return; } gctl_free(req); - gvinum_list(0, NULL); } void @@ -764,7 +856,6 @@ return; } gctl_free(req); - gvinum_list(0, NULL); printf("gvinum configuration obliterated\n"); } @@ -834,7 +925,6 @@ } gctl_free(req); - gvinum_list(0, NULL); } void @@ -880,6 +970,10 @@ gvinum_create(argc, argv); else if (!strcmp(argv[0], "exit") || !strcmp(argv[0], "quit")) exit(0); + else if (!strcmp(argv[0], "attach")) + gvinum_attach(argc, argv); + else if (!strcmp(argv[0], "detach")) + gvinum_detach(argc, argv); else if (!strcmp(argv[0], "help")) gvinum_help(); else if (!strcmp(argv[0], "list") || !strcmp(argv[0], "l")) ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.amd64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.24 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.arm#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.33 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.ia64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.70 2007/06/02 21:30:39 marcel Exp $ # # Makefile for FreeBSD # @@ -16,8 +16,6 @@ # after which config should be rerun for all machines. # -GCC3= you bet - # Which version of config(8) is required. %VERSREQ= 600004 ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.175 2007/05/16 17:23:53 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.powerpc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.285 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sparc64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.40 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/Makefile.sun4v#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3 2007/05/16 17:23:54 wkoszek Exp $ # # Makefile for FreeBSD # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1424 2007/05/09 15:55:45 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1432 2007/06/13 14:01:42 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -151,6 +151,7 @@ options GEOM_NOP # Test class. options GEOM_PART_APM # Apple partitioning options GEOM_PART_GPT # GPT partitioning +options GEOM_PART_MBR # MBR partitioning options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. options GEOM_SHSEC # Shared secret. @@ -185,7 +186,6 @@ # not recommended for production use at this time. # options SCHED_4BSD -#options SCHED_CORE #options SCHED_ULE ##################################################################### @@ -227,11 +227,6 @@ # and WITNESS options. options MUTEX_NOINLINE -# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters -# when a contested mutex is released rather than just awaking the highest -# priority waiter. -options MUTEX_WAKE_ALL - # RWLOCK_NOINLINE forces rwlock operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is @@ -521,7 +516,6 @@ #options FAST_IPSEC #new IPsec (cannot define w/ IPSEC) options IPX #IPX/SPX communications protocols -options IPXIP #IPX in IP encapsulation (not available) options NCP #NetWare Core protocol @@ -669,6 +663,7 @@ options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4) options NETGRAPH_BPF options NETGRAPH_BRIDGE +options NETGRAPH_CAR options NETGRAPH_CISCO options NETGRAPH_DEFLATE options NETGRAPH_DEVICE @@ -790,6 +785,9 @@ device wlan_tkip #802.11 TKIP support device wlan_xauth #802.11 external authenticator support device wlan_acl #802.11 MAC ACL support +device wlan_amrr #AMRR transmit rate control algorithm +device wlan_scan_ap #802.11 AP mode scanning +device wlan_scan_sta #802.11 STA mode scanning device token #Generic TokenRing device fddi #Generic FDDI device arcnet #Generic Arcnet @@ -1627,6 +1625,7 @@ device mlx # Mylex DAC960 device amr # AMI MegaRAID device mfi # LSI MegaRAID SAS +device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG # ==== //depot/projects/soc2007/lulf/gvinum_main/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1204 2007/05/09 07:07:24 scottl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1220 2007/06/13 14:01:42 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -340,6 +340,8 @@ contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp +crypto/camellia/camellia.c optional crypto | ipsec ipsec_esp +crypto/camellia/camellia-api.c optional crypto | ipsec ipsec_esp crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmb crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmb crypto/rc4/rc4.c optional netgraph_mppc_encryption @@ -512,9 +514,12 @@ 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 +dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci dev/cxgb/common/cxgb_ael1002.c optional cxgb pci dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci @@ -754,6 +759,7 @@ dev/mfi/mfi_pci.c optional mfi pci dev/mfi/mfi_disk.c optional mfi dev/mfi/mfi_linux.c optional mfi compat_linux +dev/mfi/mfi_cam.c optional mfip scbus dev/mii/acphy.c optional miibus | acphy dev/mii/amphy.c optional miibus | amphy dev/mii/bmtphy.c optional miibus | bmtphy @@ -763,6 +769,7 @@ # XXX only xl cards? dev/mii/exphy.c optional miibus | exphy dev/mii/gentbi.c optional miibus | gentbi +dev/mii/icsphy.c optional miibus | icsphy # XXX only fxp cards? dev/mii/inphy.c optional miibus | inphy dev/mii/ip1000phy.c optional miibus | ip1000phy @@ -910,6 +917,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 @@ -1252,6 +1261,7 @@ geom/part/g_part_if.m standard geom/part/g_part_apm.c optional geom_part_apm geom/part/g_part_gpt.c optional geom_part_gpt +geom/part/g_part_mbr.c optional geom_part_mbr geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 geom/shsec/g_shsec.c optional geom_shsec @@ -1421,9 +1431,8 @@ kern/p1003_1b.c standard kern/posix4_mib.c standard 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 @@ -1551,13 +1560,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 @@ -1582,6 +1591,8 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan +net/mppcc.c optional netgraph_mppc_compression +net/mppcd.c optional netgraph_mppc_compression net/netisr.c standard net/ppp_deflate.c optional ppp_deflate net/ppp_tty.c optional ppp @@ -1604,11 +1615,17 @@ net80211/ieee80211_crypto_tkip.c optional wlan_tkip net80211/ieee80211_crypto_wep.c optional wlan_wep net80211/ieee80211_freebsd.c optional wlan +net80211/ieee80211_ht.c optional wlan net80211/ieee80211_input.c optional wlan net80211/ieee80211_ioctl.c optional wlan net80211/ieee80211_node.c optional wlan net80211/ieee80211_output.c optional wlan +net80211/ieee80211_power.c optional wlan net80211/ieee80211_proto.c optional wlan +net80211/ieee80211_regdomain.c optional wlan +net80211/ieee80211_scan.c optional wlan +net80211/ieee80211_scan_ap.c optional wlan_scan_ap +net80211/ieee80211_scan_sta.c optional wlan_scan_sta >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 18 14:05: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 04AE016A473; Mon, 18 Jun 2007 14:05: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 A7F9416A46D for ; Mon, 18 Jun 2007 14:05:43 +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 9678013C46E for ; Mon, 18 Jun 2007 14:05:43 +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 l5IE5hQ3006481 for ; Mon, 18 Jun 2007 14:05:43 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IE5hD0006472 for perforce@freebsd.org; Mon, 18 Jun 2007 14:05:43 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 18 Jun 2007 14:05:43 GMT Message-Id: <200706181405.l5IE5hD0006472@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 121913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 14:05:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=121913 Change 121913 by rpaulo@rpaulo_epsilon on 2007/06/18 14:04:50 Don't depend on INTR_FILTER compile time option to setup a fast interrupt handler. bus_setup_intr() takes care of that already. New code adapted from sio(4) (which setups a fast interrupt handler). It's probably not the best way to do this, but I'm following existing practices. Discussed with: Attilio Rao, John Baldwin Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#14 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#14 (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#13 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#14 $ * */ @@ -77,11 +77,8 @@ static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); static void asmc_sms_calibrate(device_t); -#ifdef INTR_FILTER static int asmc_sms_intr(void *); -#else static void asmc_sms_fastintr(void *); -#endif static void asmc_sms_printintr(device_t, uint8_t); /* @@ -236,7 +233,7 @@ asmc_attach(device_t dev) { int i, j; - int error; + int ret; char name[2]; struct asmc_softc *sc = device_get_softc(dev); struct asmc_model *model; @@ -378,16 +375,21 @@ goto out; } -#ifdef INTR_FILTER - error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC | INTR_MPSAFE, - asmc_sms_intr, NULL, dev, &sc->sc_cookie); -#else - error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, - NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); -#endif - if (error) { + ret = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC | INTR_MPSAFE, + asmc_sms_intr, NULL, dev, &sc->sc_cookie); + + if (ret) { + ret = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC | INTR_MPSAFE, + NULL, asmc_sms_fastintr, dev, + &sc->sc_cookie); + if (ret == 0) + device_printf(dev, "unable to setup fast interrupt. " + "Using normal mode.\n"); + } + + if (ret) { device_printf(dev, "unable to setup SMS IRQ\n"); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_res); @@ -760,7 +762,6 @@ asmc_sms_read(dev, ASMC_KEY_SMS_Z, &sc->sms_rest_z); } -#ifdef INTR_FILTER static int asmc_sms_intr(void *arg) { @@ -776,7 +777,7 @@ return (FILTER_HANDLED); } -#else + static void asmc_sms_fastintr(void *arg) { @@ -790,7 +791,7 @@ asmc_sms_printintr(dev, type); } -#endif /* INTR_FILTER */ + static void asmc_sms_printintr(device_t dev, uint8_t type) From owner-p4-projects@FreeBSD.ORG Mon Jun 18 14:06: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 A9A3C16A46F; Mon, 18 Jun 2007 14:06: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 84CF816A469 for ; Mon, 18 Jun 2007 14:06: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 60E2613C48A for ; Mon, 18 Jun 2007 14:06: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 l5IE6jWS007655 for ; Mon, 18 Jun 2007 14:06:45 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IE6j4C007648 for perforce@freebsd.org; Mon, 18 Jun 2007 14:06:45 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 18 Jun 2007 14:06:45 GMT Message-Id: <200706181406.l5IE6j4C007648@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 121914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 14:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=121914 Change 121914 by rpaulo@rpaulo_epsilon on 2007/06/18 14:06:34 Move the usb quirk check a little above to avoid a memory leak. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#9 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#9 (text+ko) ==== @@ -169,6 +169,9 @@ void *desc; usbd_status err; + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE) + return (UMATCH_NONE); + if (!uaa->iface) return (UMATCH_NONE); id = usbd_get_interface_descriptor(uaa->iface); @@ -179,9 +182,6 @@ if (err) return (UMATCH_NONE); - if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE) - return (UMATCH_NONE); - if (hid_is_collection(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) ret = UMATCH_IFACECLASS; From owner-p4-projects@FreeBSD.ORG Mon Jun 18 16:57: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 3B7CF16A46B; Mon, 18 Jun 2007 16:57:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D978D16A468 for ; Mon, 18 Jun 2007 16:57:27 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C895413C45B for ; Mon, 18 Jun 2007 16:57:27 +0000 (UTC) (envelope-from scottl@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 l5IGvRc1043749 for ; Mon, 18 Jun 2007 16:57:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IGvRit043742 for perforce@freebsd.org; Mon, 18 Jun 2007 16:57:27 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 16:57:27 GMT Message-Id: <200706181657.l5IGvRit043742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 16:57:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=121923 Change 121923 by scottl@scottl-deimos on 2007/06/18 16:57:09 Another round of newbus/devclass locking. Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#13 (text+ko) ==== @@ -74,7 +74,7 @@ typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; typedef TAILQ_HEAD(device_list, device) device_list_t; -struct mtx newbus_lock; +struct mtx devclass_lock; struct devclass { TAILQ_ENTRY(devclass) link; @@ -737,7 +737,7 @@ */ static devclass_list_t devclasses = TAILQ_HEAD_INITIALIZER(devclasses); -MTX_SYSINIT(newbus_lock, &newbus_lock, "Newbus internal lock", MTX_DEF); +MTX_SYSINIT(devclass_lock, &devclass_lock, "Newbus internal lock", MTX_DEF); /** @@ -761,7 +761,7 @@ { devclass_t dc; - mtx_assert(&newbus_lock, MA_OWNED); + mtx_assert(&devclass_lock, MA_OWNED); PDEBUG(("looking for %s", classname)); if (!classname) @@ -816,9 +816,9 @@ { devclass_t dc; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); dc = devclass_find_internal(classname, NULL, TRUE); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (dc); } @@ -835,9 +835,9 @@ { devclass_t dc; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); dc = devclass_find_internal(classname, NULL, FALSE); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); return (dc); } @@ -875,7 +875,7 @@ /* * Make sure the devclass which the driver is implementing exists. */ - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); devclass_find_internal(driver->name, NULL, TRUE); dl->driver = driver; @@ -888,14 +888,14 @@ for (i = 0; i < dc->maxunit; i++) if (dc->devices[i]) { /* XXX UNSAFE */ - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); BUS_DRIVER_ADDED(dc->devices[i], driver); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); } } bus_data_generation_update(); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } @@ -930,7 +930,7 @@ /* * Find the link structure in the bus' list of drivers. */ - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); TAILQ_FOREACH(dl, &busclass->drivers, link) { if (dl->driver == driver) break; @@ -939,7 +939,7 @@ if (!dl) { PDEBUG(("%s not found in %s list", driver->name, busclass->name)); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (ENOENT); } TAILQ_REMOVE(&busclass->drivers, dl, link); @@ -960,11 +960,11 @@ if (dev->driver == driver && dev->parent && dev->parent->devclass == busclass) { /* XXX UNSAFE */ - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); if ((error = device_detach(dev)) != 0) return (error); device_set_driver(dev, NULL); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); } } } @@ -977,7 +977,7 @@ kobj_class_free((kobj_class_t) driver); bus_data_generation_update(); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } @@ -1011,7 +1011,7 @@ /* * Find the link structure in the bus' list of drivers. */ - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); TAILQ_FOREACH(dl, &busclass->drivers, link) { if (dl->driver == driver) break; @@ -1020,7 +1020,7 @@ if (!dl) { PDEBUG(("%s not found in %s list", driver->name, busclass->name)); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (ENOENT); } @@ -1040,15 +1040,15 @@ if (dev->driver == driver && dev->parent && dev->parent->devclass == busclass) { /* XXX UNSAFE */ - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); if ((error = device_quiesce(dev)) != 0) return (error); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); } } } - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } @@ -1087,11 +1087,11 @@ kobj_class_t kc = NULL; driverlink_t dl; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); dl = devclass_find_driver_internal(dc, classname); if (dl) kc = dl->driver; - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (kc); } @@ -1116,9 +1116,15 @@ device_t devclass_get_device(devclass_t dc, int unit) { + device_t dev; + + mtx_lock(&devclass_lock); if (dc == NULL || unit < 0 || unit >= dc->maxunit) - return (NULL); - return (dc->devices[unit]); + dev = NULL; + else + dev = dc->devices[unit]); + mtx_unlock(&devclass_lock); + return (dev); } /** @@ -1165,10 +1171,13 @@ int count, i; device_t *list; + mtx_lock(&devclass_lock); count = devclass_get_count(dc); list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO); - if (!list) + if (!list) { + mtx_unlock(&devclass_lock); return (ENOMEM); + } count = 0; for (i = 0; i < dc->maxunit; i++) { @@ -1177,6 +1186,7 @@ count++; } } + mtx_unlock(&devclass_lock); *devlistp = list; *devcountp = count; @@ -1230,8 +1240,8 @@ * * @param dc the devclass to examine */ -int -devclass_get_count(devclass_t dc) +static int +_devclass_get_count(devclass_t dc) { int count, i; @@ -1242,6 +1252,17 @@ return (count); } +int +devclass_get_count(devclass_t dc) +{ + int count; + + mtx_lock(&devclass_lock); + count = _devlcass_get_count(dc); + mtx_unlock(&devclass_lock); + return (count); +} + /** * @brief Get the maximum unit number used in a devclass * @@ -1250,10 +1271,21 @@ * * @param dc the devclass to examine */ +static int +_devclass_get_maxunit(devclass_t dc) +{ + return (dc->maxunit); +} + int devclass_get_maxunit(devclass_t dc) { - return (dc->maxunit); + int maxunit; + + mtx_lock(&devlcass_lock); + maxunit = _devclass_get_maxunit(dc); + mtx_unlock(&devclass_lock); + return (maxunit); } /** @@ -1333,6 +1365,7 @@ { int unit = *unitp; + mtx_assert(&devclass_lock, MA_OWNED); PDEBUG(("unit %d in devclass %s", unit, DEVCLANAME(dc))); /* If we were given a wired unit number, check for existing device */ @@ -1474,7 +1507,9 @@ PDEBUG(("%s at %s as unit %d", name, DEVICENAME(parent), unit)); if (name) { + mtx_lock(&devclass_lock); dc = devclass_find_internal(name, NULL, TRUE); + mtx_unlock(&devclass_lock); if (!dc) { printf("make_device: can't find device class %s\n", name); @@ -1504,10 +1539,13 @@ dev->flags |= DF_WILDCARD; if (name) { dev->flags |= DF_FIXEDCLASS; + mtx_lock(&devclass_lock); if (devclass_add_device(dc, dev)) { + mtx_unlock(&devclass_lock); kobj_delete((kobj_t) dev, M_BUS); return (NULL); } + mtx_unlock(&devclass_lock); } dev->ivars = NULL; dev->softc = NULL; @@ -1733,7 +1771,7 @@ int result, pri = 0; int hasclass = (child->devclass != 0); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); dc = dev->devclass; if (!dc) panic("device_probe_child: parent device has no devclass"); @@ -1743,7 +1781,7 @@ * return if we can rebid this object. */ if (child->state == DS_ALIVE && (child->flags & DF_REBID) == 0) { - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } @@ -1761,9 +1799,9 @@ "flags", &child->devflags); /* XXX UNSAFE */ - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); result = DEVICE_PROBE(child); - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); /* Reset flags and devclass before the next probe. */ child->devflags = 0; @@ -1855,11 +1893,11 @@ child->state = DS_ALIVE; bus_data_generation_update(); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (ENXIO); } @@ -1896,14 +1934,14 @@ device_t *list; count = 0; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); TAILQ_FOREACH(child, &dev->children, link) { count++; } list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO); if (!list) { - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (ENOMEM); } @@ -1915,7 +1953,7 @@ *devlistp = list; *devcountp = count; - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } @@ -2276,30 +2314,30 @@ devclass_t dc; int error; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); if (!classname) { if (dev->devclass) devclass_delete_device(dev->devclass, dev); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (0); } if (dev->devclass) { printf("device_set_devclass: device class already set\n"); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (EINVAL); } dc = devclass_find_internal(classname, NULL, TRUE); if (!dc) { - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (ENOMEM); } error = devclass_add_device(dc, dev); bus_data_generation_update(); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); return (error); } @@ -2552,7 +2590,9 @@ if (err) return (err); dev->unit = unit; + mtx_lock(&devclass_lock); err = devclass_add_device(dc, dev); + mtx_unlock(&devclass_lock); if (err) return (err); @@ -3781,9 +3821,9 @@ kobj_init((kobj_t) root_bus, (kobj_class_t) &root_driver); root_bus->driver = &root_driver; root_bus->state = DS_ATTACHED; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); root_devclass = devclass_find_internal("root", NULL, FALSE); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); devinit(); return (0); @@ -3839,9 +3879,9 @@ kobj_class_t driver; dmd = (struct driver_module_data *)arg; - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); bus_devclass = devclass_find_internal(dmd->dmd_busname, NULL, TRUE); - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); error = 0; switch (what) { @@ -3863,7 +3903,7 @@ * search for drivers in both devclasses for children * of a device using this driver. */ - mtx_lock(&newbus_lock); + mtx_lock(&devclass_lock); if (driver->baseclasses) { const char *parentname; parentname = driver->baseclasses[0]->name; @@ -3874,7 +3914,7 @@ *dmd->dmd_devclass = devclass_find_internal(driver->name, NULL, TRUE); } - mtx_unlock(&newbus_lock); + mtx_unlock(&devclass_lock); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Mon Jun 18 18:00: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 0458116A46D; Mon, 18 Jun 2007 18:00: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 CD10016A400 for ; Mon, 18 Jun 2007 18:00:44 +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 A3EFA13C465 for ; Mon, 18 Jun 2007 18:00:44 +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 l5II0iu0043812 for ; Mon, 18 Jun 2007 18:00:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5II0idC043799 for perforce@freebsd.org; Mon, 18 Jun 2007 18:00:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 18 Jun 2007 18:00:44 GMT Message-Id: <200706181800.l5II0idC043799@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 121925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 18:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=121925 Change 121925 by hselasky@hselasky_mini_itx on 2007/06/18 18:00:10 Remove "usbd_transfer_start_safe()" and fix a regression with regard to "usbd_do_request()" calls without Giant locked. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#42 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#13 (text+ko) ==== @@ -625,7 +625,9 @@ /* start the interrupt endpoint */ - usbd_transfer_start_safe(sc->sc_xfer[0]); + mtx_lock(sc->sc_xfer[0]->priv_mtx); + usbd_transfer_start(sc->sc_xfer[0]); + mtx_unlock(sc->sc_xfer[0]->priv_mtx); return 0; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#42 (text+ko) ==== @@ -644,7 +644,6 @@ void usbd_std_ctrl_copy_out(struct usbd_xfer *xfer); uint8_t usbd_std_ctrl_enter(struct usbd_xfer *xfer); void usbd_start_hardware(struct usbd_xfer *xfer); -void usbd_transfer_start_safe(struct usbd_xfer *xfer); void usbd_transfer_start(struct usbd_xfer *xfer); void usbd_transfer_stop(struct usbd_xfer *xfer); void __usbd_callback(struct usbd_xfer *xfer); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#27 (text+ko) ==== @@ -697,15 +697,6 @@ return; } -void -usbd_transfer_start_safe(struct usbd_xfer *xfer) -{ - mtx_lock(xfer->priv_mtx); - usbd_transfer_start(xfer); - mtx_unlock(xfer->priv_mtx); - return; -} - /*---------------------------------------------------------------------------* * usbd_transfer_start - start an USB transfer * @@ -1221,12 +1212,16 @@ usbd_copy_in(&(xfer->buf_data), sizeof(*req), data, length); } - if (mtx) { - usbd_transfer_start(xfer); - } else { - usbd_transfer_start_safe(xfer); + if (mtx == NULL) { + /* XXX This code will go away + * when we have fixed all the + * callers + */ + mtx_lock(xfer->priv_mtx); } + usbd_transfer_start(xfer); + while (xfer->flags & USBD_DEV_TRANSFERRING) { level = mtx_drop_recurse(xfer->priv_mtx); @@ -1238,6 +1233,11 @@ mtx_pickup_recurse(xfer->priv_mtx, level); } + if (mtx == NULL) { + /* XXX */ + mtx_unlock(xfer->priv_mtx); + } + if(req->bmRequestType & UT_READ) { usbd_copy_out(&(xfer->buf_data), sizeof(*req), data, length); From owner-p4-projects@FreeBSD.ORG Mon Jun 18 19:18: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 3755A16A46D; Mon, 18 Jun 2007 19:18: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 CCF3A16A469 for ; Mon, 18 Jun 2007 19:18:17 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B7B5C13C480 for ; Mon, 18 Jun 2007 19:18:17 +0000 (UTC) (envelope-from scottl@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 l5IJIH1A076081 for ; Mon, 18 Jun 2007 19:18:17 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IJHMxe075318 for perforce@freebsd.org; Mon, 18 Jun 2007 19:17:22 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 19:17:22 GMT Message-Id: <200706181917.l5IJHMxe075318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 19:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=121929 Change 121929 by scottl@scottl-deimos on 2007/06/18 19:16:35 Partial integrate, cam_xpt.c|h left undone for now. Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/tsc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/kdb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/asm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/intr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/kdb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/profile.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pte.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#12 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/smbios.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/common/main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/README.quirks#1 branch .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.i386#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.ia64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.pc98#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.powerpc#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.sparc64#6 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#23 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#25 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#14 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#13 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#8 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#13 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_htable.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_proxy.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_scan.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_sync.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ipl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#6 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/scottl-camlock/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/scottl-camlock/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_timer.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahbreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athrate.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/awi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/awivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_os.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/LICENSE#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/README#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.c#10 delete .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_hw.h#9 delete .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em_osdep.h#7 delete .. //depot/projects/scottl-camlock/src/sys/dev/en/midway.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/boot_font.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/gallant12x22.h#4 delete .. //depot/projects/scottl-camlock/src/sys/dev/fb/gfb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdma.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohcivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwevar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwip.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwipvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm_intr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_ioctl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfireg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphyreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_init.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_log_fc.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_log_sas.h#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_raid.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_sas.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpilib/mpi_targ.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.dat.gz.uu#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/yarrow.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbsh/if_sbsh.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/clone.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/clone.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/als4000.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/au88x0.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/vibes.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/channel.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_fmt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/unit.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/unit.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/version.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scmouse.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_includes.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/dsbr100io.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ehcivar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/hid.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_axereg.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cdce.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cdcereg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_cuereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_kue.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_kuereg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ruereg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_uralreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ohcivar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/rio500_usb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/udbp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uftdi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhcivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ukbd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ulpt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umct.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/ums.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uplcom.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/urio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mem.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_port.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi_util.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdivar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/uvscom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_ctl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_status.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/umapfs/umap_vnops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/gdb/gdb_packet.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_ctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_disk.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_kern.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_slice.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/PAE#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/io_apic.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/support.s#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/swtch.s#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/kdb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pcpu.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/proc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/smp.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/atpic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/npx.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#13 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia32/ia32_trap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mca.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/kdb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/vmparam.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mtxpool.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_tc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_time.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/ksched.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#8 delete .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_mbpool.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_prof.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_ipc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_cons.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_cluster.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vnode_if.src#9 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/mcount.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#22 integrate .. //depot/projects/scottl-camlock/src/sys/modules/bge/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/crypto/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dcons/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/ip_mroute_mod/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mfi/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/mii/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/rum/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/twa/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/wlan_scan_ap/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/wlan_scan_sta/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/net/ethernet.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_fwsubr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_media.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_types.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/net/pfil.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/pfkeyv2.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/_ieee80211.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_acl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_wep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_power.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_power.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_radiotap.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_regdomain.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_regdomain.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.h#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_ap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_car.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_car.h#1 branch .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_vlan.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_cksum.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.h#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 18 22:11:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65E3D16A46F; Mon, 18 Jun 2007 22:11: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 14A5616A46B for ; Mon, 18 Jun 2007 22:11:55 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F298A13C457 for ; Mon, 18 Jun 2007 22:11:54 +0000 (UTC) (envelope-from scottl@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 l5IMBsST098985 for ; Mon, 18 Jun 2007 22:11:54 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMBsq2098972 for perforce@freebsd.org; Mon, 18 Jun 2007 22:11:54 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 22:11:54 GMT Message-Id: <200706182211.l5IMBsq2098972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 22:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=121937 Change 121937 by scottl@scottl-deimos on 2007/06/18 22:11:39 Integrate cam_xpt.h Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#11 integrate .. //depot/user/scottl/ufsj/src/sbin/tunefs/tunefs.c#5 edit .. //depot/user/scottl/ufsj/src/sys/ufs/ufs/ufs_journal.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#11 (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/cam/cam_xpt.h,v 1.8 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -80,6 +80,8 @@ void xpt_rescan(union ccb *ccb); void xpt_lock_buses(void); void xpt_unlock_buses(void); +cam_status xpt_register_async(int event, ac_callback_t *cbfunc, + void *cbarg, struct cam_path *path); cam_status xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph, path_id_t path_id, ==== //depot/user/scottl/ufsj/src/sbin/tunefs/tunefs.c#5 (text+ko) ==== @@ -76,6 +76,7 @@ void usage(void); void printfs(void); int create_journal(struct fs *, const char *dev); +daddr_t get_free_block(struct fs *, int *); int main(int argc, char *argv[]) @@ -442,53 +443,69 @@ int create_journal(struct fs *fs, const char *dev) { - struct ufsj_superblock jsb; - struct ufs_args args; - struct stat jstat; - char jbuf; - int j, error; + struct ufsj_superblock *jsb; + daddr_t jblock, blkno; + uint32_t bavail, maxjblocks, jblocks; + int lastcg; if ((fs->fs_flags & FS_UNCLEAN) || (fs->fs_clean == 0)) { warnx("%s filesystem not clean", dev); return (-1); } - bzero(&args, sizeof(args)); - args.fspec = (char *)dev; - if (mount("ufs", "/mnt", 0, &args) < 0) { - warnx("Could not mount %s: %d", dev, error); - return (error); + /* + * Calculate the journal size + */ + bavail = freespace(fs, fs->fs_minfree); + maxjblocks = (fs->fs_bsize - (sizeof(struct ufsj_superblock) + + sizeof(daddr_t) / sizeof(daddr_t))) / sizeof(daddr_t); + jblocks = MIN(bavail * (1 - fs->fs_minfree), maxjblocks); + printf("bavail= %d, maxjblocks= %d, jblocks= %d\n", bavail, maxjblocks, + jblocks); + + /* + * Allocate the journal superblock + */ + jsb = malloc(fs->fs_bsize); + if (jsb == NULL) { + warnx("Cannot allocate memory for journal\n"); + return (-1); } - j = open("/mnt/.ffsjournal", O_CREAT|O_TRUNC|O_RDWR, 0600); - if (j < 0) { - warnx("Could not open journal file: %d", errno); - return (errno); + /* + * Allocate a block for the journal superblock to reside in. + */ + lastcg = 0; + jblock = get_free_block(fs, &lastcg); + if (jblock == 0) { + free(jsb); + warnx("Cannot allocate journal superblock on %s\n", dev); + return (-1); } - bzero(&jsb, sizeof(struct ufsj_superblock)); - jsb.j_magic = UFSJ_MAGIC; - jsb.j_fsmagic = fs->fs_magic; - jsb.j_flags = J_ENABLED; - write(j, &jsb, sizeof(struct ufsj_superblock)); - if (lseek(j, 1024 * 1024 - 1, SEEK_SET) < 0) { - warnx("Could not seek journal file: %d", errno); - close(j); - unlink("/mnt/.ffsjournal"); - return (EIO); - } - jbuf = 0; - write(j, &jbuf, 1); - close(j); - bzero(&jstat, sizeof(struct stat)); - if (stat("/mnt/.ffsjournal", &jstat) != 0) { - warnx("Could not stat journal file: %d", errno); - unlink("/mnt/.ffsjournal"); - return (EIO); - } - fs->fs_journal_inode = jstat.st_ino; - fs->fs_flags |= FS_JOURNAL; - unmount("/mnt", 0); + return (0); } +daddr_t +get_free_block(struct fs *fs, int *lastcg) +{ +#if 0 + struct cg *cg; + daddr_t fbbaddr; + int i, error; + + for (i = *lastcg; i < fs->fs_ncg; i++) { + if ((error = cgread1(&disk, i)) < 0) { + warnx("Error %d reading cg %d\n", error, i); + return (0); + } + cg = &disk.d_cg; + fbbaddr = cg->cg_freeoff + cgstart(fs, i); + printf("Reading free block bitmap for cg %d at %ld\n", i, fbbaddr); + break; + } +#endif + printf("CGSIZE= %d\n", CGSIZE(fs)); + return (0); +} ==== //depot/user/scottl/ufsj/src/sys/ufs/ufs/ufs_journal.c#8 (text+ko) ==== @@ -124,12 +124,20 @@ printf("Checking journal superblock\n"); jsb = (struct ufsj_superblock *)jbp->b_data; - if ((jsb->j_magic != UFSJ_MAGIC) || (jsb->j_fsmagic != fs->fs_magic) || - ((jsb->j_flags & J_ENABLED) == 0)) { - error = 0; /* XXX Does this really warrant an error? */ + if ((jsb->j_magic != UFSJ_MAGIC) || (jsb->j_fsmagic != fs->fs_magic)) { + printf("v_usecount= %d\n", jvp->v_usecount); + printf("Bad journal magic\n"); + printf("0x%x 0x%x 0x%x 0x%x\n", jsb->j_magic, UFSJ_MAGIC, jsb->j_fsmagic, fs->fs_magic); + error = EINVAL; goto out; } + printf("v_usecount= %d\n", jvp->v_usecount); + if ((jsb->j_flags & J_ENABLED) == 0) { + printf("Journal is not enabled\n"); + error = 0; + goto out; + } journal->gen = jsb->j_gen; journal->start = jsb->j_start; journal->len = jsb->j_len; @@ -143,7 +151,9 @@ ump->um_journal = journal; flags = jsb->j_flags; jvp->v_vflag |= VV_SYSTEM; + printf("v_usecount= %d\n", jvp->v_usecount); brelse(jbp); + printf("v_usecount= %d\n", jvp->v_usecount); jbp = NULL; mtx_init(&journal->jmtx, "jmtx", "Journal lock", MTX_DEF); @@ -161,12 +171,19 @@ printf("Journal started\n"); mp->mnt_flag |= MNT_JOURNAL; + printf("v_usecount= %d\n", jvp->v_usecount); return (0); out: - if (jbp != NULL) + printf("v_usecount= %d\n", jvp->v_usecount); + if (jbp != NULL) { + printf("releasing jbp\n"); brelse(jbp); + } + printf("releasing vnode ref\n"); + printf("v_usecount= %d\n", jvp->v_usecount); vrele(jvp); + printf("v_usecount= %d\n", jvp->v_usecount); free(journal, M_UFSMNT); return (error); } @@ -182,24 +199,28 @@ struct vnode *jvp; int error, jflags; + printf("ufsj_stop: called\n"); + if ((mp->mnt_flag | MNT_JOURNAL) != 0) + return (0); ump = VFSTOUFS(mp); - journal = ump->um_journal; + if ((journal = ump->um_journal) == NULL) + return (0); jflags = 0; jvp = journal->jvp; + jbp = NULL; ufsj_flush(journal); if (journal->head != 0 && journal->tail != 0) { jflags = J_DIRTY; printf("Warning, journal not flushed\n"); - } - - if ((error = VFS_VGET(mp, journal->fs->fs_journal_inode, LK_NOWAIT | - LK_EXCLUSIVE, &jvp)) != 0) { + vput(jvp); + error = EIO; goto out; } printf("ufsj_stop: reading jsb\n"); + VOP_LOCK(jvp, LK_EXCLUSIVE|LK_RETRY, td); if ((error = bread(jvp, journal->jsb_off, JSBLOCKSIZE, NOCRED, &jbp)) == 0) { jsb = (struct ufsj_superblock *)jbp->b_data; @@ -211,11 +232,11 @@ if ((error = bwrite(jbp)) != 0) printf("Error %d writing journal superblock!\n", error); } else { - printf("ufsj_stop: read of sb failed\n"); + printf("ufsj_stop: read of sb failed: %d\n", error); brelse(jbp); } - vn_close(jvp, FREAD|FWRITE, td->td_ucred, td); + vput(jvp); vflush(mp, 0, flags, td); out: @@ -323,6 +344,7 @@ static int ufsj_replay(struct ufs_journal *journal) { + printf("ufsj_replay\n"); return (0); } From owner-p4-projects@FreeBSD.ORG Mon Jun 18 22:27: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 7CF0D16A46E; Mon, 18 Jun 2007 22:27: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 25E1516A46D for ; Mon, 18 Jun 2007 22:27:15 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1639B13C46A for ; Mon, 18 Jun 2007 22:27:15 +0000 (UTC) (envelope-from scottl@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 l5IMRE1L027051 for ; Mon, 18 Jun 2007 22:27:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMREnS027036 for perforce@freebsd.org; Mon, 18 Jun 2007 22:27:14 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 22:27:14 GMT Message-Id: <200706182227.l5IMREnS027036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 22:27:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=121940 Change 121940 by scottl@scottl-deimos on 2007/06/18 22:27:12 Step through rev 1.184 of cam_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#66 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#66 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.184 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -995,7 +995,7 @@ */ xsoftc.xpt_config_hook = (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_TEMP, M_NOWAIT | M_ZERO); + M_CAMXPT, M_NOWAIT | M_ZERO); if (xsoftc.xpt_config_hook == NULL) { printf("xpt_attach: Cannot malloc config hook " "- failing attach\n"); @@ -1004,7 +1004,7 @@ xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_TEMP); + free (xsoftc.xpt_config_hook, M_CAMXPT); printf("xpt_attach: config_intrhook_establish failed " "- failing attach\n"); } @@ -4653,7 +4653,6 @@ return (device); } -void xpt_devise_transport(struct cam_path *path) { struct ccb_pathinq cpi; @@ -5273,7 +5272,7 @@ /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_TEMP); + free(xsoftc.xpt_config_hook, M_CAMXPT); xsoftc.xpt_config_hook = NULL; } From owner-p4-projects@FreeBSD.ORG Mon Jun 18 22:29: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 C21A416A473; Mon, 18 Jun 2007 22:29: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 98B2216A400 for ; Mon, 18 Jun 2007 22:29:18 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 895A913C48C for ; Mon, 18 Jun 2007 22:29:18 +0000 (UTC) (envelope-from scottl@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 l5IMTILj033239 for ; Mon, 18 Jun 2007 22:29:18 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMTIbK033231 for perforce@freebsd.org; Mon, 18 Jun 2007 22:29:18 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 22:29:18 GMT Message-Id: <200706182229.l5IMTIbK033231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 22:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=121942 Change 121942 by scottl@scottl-deimos on 2007/06/18 22:28:45 Step through rev 1.185 of cam_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#67 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#67 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.184 2007/05/14 21:48:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.185 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -5317,6 +5317,39 @@ xpt_free_ccb(done_ccb); } +cam_status +xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, + struct cam_path *path) +{ + struct ccb_setasync csa; + cam_status status; + int xptpath = 0; + + if (path == NULL) { + mtx_lock(&xsoftc.xpt_lock); + status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); + return (status); + } + xptpath = 1; + } + + xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); + csa.ccb_h.func_code = XPT_SASYNC_CB; + csa.event_enable = event; + csa.callback = cbfunc; + csa.callback_arg = cbarg; + xpt_action((union ccb *)&csa); + status = csa.ccb_h.status; + if (xptpath) { + xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); + } + return (status); +} + static void xptaction(struct cam_sim *sim, union ccb *work_ccb) { From owner-p4-projects@FreeBSD.ORG Mon Jun 18 22:31: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 D3B8D16A46D; Mon, 18 Jun 2007 22:31: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 81CD016A400 for ; Mon, 18 Jun 2007 22:31:21 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72EE913C517 for ; Mon, 18 Jun 2007 22:31:21 +0000 (UTC) (envelope-from scottl@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 l5IMVLjj037066 for ; Mon, 18 Jun 2007 22:31:21 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMVLkl037050 for perforce@freebsd.org; Mon, 18 Jun 2007 22:31:21 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 22:31:21 GMT Message-Id: <200706182231.l5IMVLkl037050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 22:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=121943 Change 121943 by scottl@scottl-deimos on 2007/06/18 22:30:47 Step through rev 1.186 Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#68 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#68 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.185 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); #include #include @@ -660,6 +660,7 @@ error = ENOTSUP; break; } + xpt_release_bus(bus); break; } /* @@ -3608,7 +3609,6 @@ void xpt_print_path(struct cam_path *path) { - mtx_assert(path->bus->sim->mtx, MA_OWNED); if (path == NULL) printf("(nopath): "); From owner-p4-projects@FreeBSD.ORG Mon Jun 18 22:36: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 9F44D16A46B; Mon, 18 Jun 2007 22:36: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 4EEBA16A421 for ; Mon, 18 Jun 2007 22:36:32 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3FE4A13C487 for ; Mon, 18 Jun 2007 22:36:32 +0000 (UTC) (envelope-from scottl@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 l5IMaWxO053606 for ; Mon, 18 Jun 2007 22:36:32 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5IMaVpC053600 for perforce@freebsd.org; Mon, 18 Jun 2007 22:36:31 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 22:36:31 GMT Message-Id: <200706182236.l5IMaVpC053600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 22:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121945 Change 121945 by scottl@scottl-deimos on 2007/06/18 22:35:30 Step through rev 1.188 Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#69 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#69 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.188 2007/06/04 18:25:02 dwmalone Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#3 (text+ko) ==== @@ -842,7 +842,7 @@ int error, bool; bool = cam_srch_hi; - error = sysctl_handle_int(oidp, &bool, sizeof(bool), req); + error = sysctl_handle_int(oidp, &bool, 0, req); if (error != 0 || req->newptr == NULL) return (error); if (bool == 0 || bool == 1) { From owner-p4-projects@FreeBSD.ORG Mon Jun 18 23:45: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 A603F16A468; Mon, 18 Jun 2007 23:45: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 7B2B916A400 for ; Mon, 18 Jun 2007 23:45:02 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6C22B13C468 for ; Mon, 18 Jun 2007 23:45:02 +0000 (UTC) (envelope-from scottl@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 l5INj2e4082251 for ; Mon, 18 Jun 2007 23:45:02 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5INj2xC082235 for perforce@freebsd.org; Mon, 18 Jun 2007 23:45:02 GMT (envelope-from scottl@freebsd.org) Date: Mon, 18 Jun 2007 23:45:02 GMT Message-Id: <200706182345.l5INj2xC082235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 121950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Jun 2007 23:45:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=121950 Change 121950 by scottl@scottl-deimos on 2007/06/18 23:44:02 Track rev 1.189 of cam_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#70 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.h#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#70 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.188 2007/06/04 18:25:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.189 2007/06/17 05:55:53 scottl Exp $"); #include #include @@ -967,7 +967,7 @@ xpt_sim->max_ccbs = 16; mtx_lock(&xsoftc.xpt_lock); - if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { + if ((status = xpt_bus_register(xpt_sim, NULL, 0)) != CAM_SUCCESS) { printf("xpt_attach: xpt_bus_register failed with status %#x," " failing attach\n", status); return (EINVAL); @@ -3789,7 +3789,7 @@ * availible, the bus will be probed. */ int32_t -xpt_bus_register(struct cam_sim *sim, u_int32_t bus) +xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus) { struct cam_eb *new_bus; struct cam_eb *old_bus; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.h#3 (text+ko) ==== @@ -112,6 +112,7 @@ struct timeval last_reset; u_int32_t refcount; u_int generation; + device_t parent_dev; }; void xpt_find_quirk(struct cam_ed *device); From owner-p4-projects@FreeBSD.ORG Tue Jun 19 09:41: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 6962116A46B; Tue, 19 Jun 2007 09:41:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 138EC16A469 for ; Tue, 19 Jun 2007 09:41:28 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 059B113C46C for ; Tue, 19 Jun 2007 09:41:28 +0000 (UTC) (envelope-from zhouzhouyi@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 l5J9fRgG069357 for ; Tue, 19 Jun 2007 09:41:27 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5J9fRcS069351 for perforce@freebsd.org; Tue, 19 Jun 2007 09:41:27 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 19 Jun 2007 09:41:27 GMT Message-Id: <200706190941.l5J9fRcS069351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 09:41:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=121963 Change 121963 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/19 09:40:26 Finish all the mac_test hooks for pipe, editing mac_test.c mac_test_private.h to settle concurrency problems Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#9 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#6 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#9 (text+ko) ==== @@ -163,6 +163,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_bpfdesc_label\n", strlen("mac_test_init_bpfdesc_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_BPF); COUNTER_INC(init_bpfdesc_label); } @@ -173,6 +174,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_cred_label\n", strlen("mac_test_init_cred_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_CRED); COUNTER_INC(init_cred_label); } @@ -183,6 +185,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_devfs_label\n", strlen("mac_test_init_devfs_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_DEVFS); COUNTER_INC(init_devfs_label); } @@ -199,6 +202,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_ifnet_label\n", strlen("mac_test_init_ifnet_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_IFNET); COUNTER_INC(init_ifnet_label); } @@ -209,6 +213,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_inpcb_label\n", strlen("mac_test_init_inpcb_label\n")); + MACTEST_PIPE_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_inpcb_label() at %s:%d", __FILE__, @@ -225,6 +230,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_sysv_msgmsg_label\n", strlen("mac_test_init_sysv_msgmsg_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSG); COUNTER_INC(init_sysv_msg_label); } @@ -235,6 +241,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_sysv_msgqueue_label\n", strlen("mac_test_init_sysv_msgqueue_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSQ); COUNTER_INC(init_sysv_msq_label); } @@ -245,6 +252,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_sysv_sem_label\n", strlen("mac_test_init_sysv_sem_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SEM); COUNTER_INC(init_sysv_sem_label); } @@ -255,6 +263,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_sysv_shm_label\n", strlen("mac_test_init_sysv_shm_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SHM); COUNTER_INC(init_sysv_shm_label); } @@ -265,6 +274,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_ipq_label\n", strlen("mac_test_init_ipq_label\n")); + MACTEST_PIPE_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_ipq_label() at %s:%d", __FILE__, @@ -281,6 +291,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_mbuf_label\n", strlen("mac_test_init_mbuf_label\n")); + MACTEST_PIPE_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_mbuf_label() at %s:%d", __FILE__, @@ -297,6 +308,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_mount_label\n", strlen("mac_test_init_mount_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_MOUNT); COUNTER_INC(init_mount_label); } @@ -308,6 +320,7 @@ MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_socket_label\n", strlen("mac_test_init_socket_label\n")); + MACTEST_PIPE_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_label() at %s:%d", __FILE__, @@ -324,6 +337,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_socket_peer_label\n", strlen("mac_test_init_socket_peer_label\n")); + MACTEST_PIPE_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_peer_label() at %s:%d", __FILE__, @@ -340,6 +354,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_pipe_label\n", strlen("mac_test_init_pipe_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_PIPE); COUNTER_INC(init_pipe_label); } @@ -350,6 +365,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_posix_sem_label\n", strlen("mac_test_init_posix_sem_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_POSIX_SEM); COUNTER_INC(init_posix_sem_label); } @@ -360,6 +376,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_proc_label\n", strlen("mac_test_init_proc_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_PROC); COUNTER_INC(init_proc_label); } @@ -370,6 +387,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_init_vnode_label\n", strlen("mac_test_init_vnode_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_INIT(label, MAGIC_VNODE); COUNTER_INC(init_vnode_label); } @@ -380,6 +398,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_bpfdesc_label\n", strlen("mac_test_destroy_bpfdesc_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_BPF); COUNTER_INC(destroy_bpfdesc_label); } @@ -390,6 +409,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_cred_label\n", strlen("mac_test_destroy_cred_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_CRED); COUNTER_INC(destroy_cred_label); } @@ -400,6 +420,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_devfs_label\n", strlen("mac_test_destroy_devfs_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_DEVFS); COUNTER_INC(destroy_devfs_label); } @@ -410,6 +431,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_ifnet_label\n", strlen("mac_test_destroy_ifnet_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IFNET); COUNTER_INC(destroy_ifnet_label); } @@ -420,6 +442,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_inpcb_label\n", strlen("mac_test_destroy_inpcb_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_INPCB); COUNTER_INC(destroy_inpcb_label); } @@ -430,6 +453,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_sysv_msgmsg_label\n", strlen("mac_test_destroy_sysv_msgmsg__label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSG); COUNTER_INC(destroy_sysv_msg_label); } @@ -440,6 +464,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_sysv_msgqueue_label\n", strlen("mac_test_destroy_sysv_msgqueue_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSQ); COUNTER_INC(destroy_sysv_msq_label); } @@ -450,6 +475,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_sysv_sem_label\n", strlen("mac_test_destroy_sysv_sem_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SEM); COUNTER_INC(destroy_sysv_sem_label); } @@ -460,6 +486,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_sysv_shm_label\n", strlen("mac_test_destroy_sysv_shm_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SHM); COUNTER_INC(destroy_sysv_shm_label); } @@ -470,6 +497,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_ipq_label\n", strlen("mac_test_destroy_ipq_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IPQ); COUNTER_INC(destroy_ipq_label); } @@ -480,6 +508,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_mbuf_label\n", strlen("mac_test_destroy_mbuf_label\n")); + MACTEST_PIPE_DO_SUBMIT; /* * If we're loaded dynamically, there may be mbufs in flight that * didn't have label storage allocated for them. Handle this @@ -498,6 +527,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_mount_label\n", strlen("mac_test_destroy_mount_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_MOUNT); COUNTER_INC(destroy_mount_label); } @@ -508,6 +538,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_socket_label\n", strlen("mac_test_destroy_socket_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_label); } @@ -518,6 +549,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_socket_peer_label\n", strlen("mac_test_destroy_socket_peer_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_peer_label); } @@ -528,6 +560,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_pipe_label\n", strlen("mac_test_destroy_pipe_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PIPE); COUNTER_INC(destroy_pipe_label); } @@ -538,6 +571,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_posix_sem_label\n", strlen("mac_test_destroy_posix_sem_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_POSIX_SEM); COUNTER_INC(destroy_posix_sem_label); } @@ -548,6 +582,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_proc_label\n", strlen("mac_test_destroy_proc_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PROC); COUNTER_INC(destroy_proc_label); } @@ -558,6 +593,7 @@ { MACTEST_PIPE_SUBMIT_WITHPID("mac_test_destroy_vnode_label\n", strlen("mac_test_destroy_vnode_label\n")); + MACTEST_PIPE_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_VNODE); COUNTER_INC(destroy_vnode_label); } @@ -1301,9 +1337,8 @@ "with old cr_label, new cr_label, filelabel, interpvplabel and execlabel", strlen("mac_test_execve_transition " "with old cr_label, new cr_label, filelabel, interpvplabel and execlabel")); - MACTEST_PIPE_SUBMIT_LABEL4(cred, old->cr_label, cred, new->cr_label, - vnode, filelabel, vnode, interpvplabel); - MACTEST_PIPE_SUBMIT_LABEL(vnode, execlabel); + MACTEST_PIPE_SUBMIT_LABEL5(cred, old->cr_label, cred, new->cr_label, + vnode, filelabel, vnode, interpvplabel, vnode, execlabel); LABEL_CHECK(old->cr_label, MAGIC_CRED); LABEL_CHECK(new->cr_label, MAGIC_CRED); LABEL_CHECK(filelabel, MAGIC_VNODE); @@ -1381,6 +1416,7 @@ MACTEST_PIPE_SUBMIT_WITHPID("mac_test_thread_userret\n", strlen("mac_test_thread_userret\n")); + MACTEST_PIPE_DO_SUBMIT; COUNTER_INC(thread_userret); } @@ -1729,7 +1765,7 @@ } sprintf(submitstring, "mac_test_check_sysv_semctl " - "with access type and cr_label and semaklabel:%s:", + "with cmd and cr_label and semaklabel:%s:", cmdstring); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -1794,6 +1830,18 @@ struct label *shmseglabel, int shmflg) { + char * submitstring = NULL; + submitstring = malloc(256, M_MACTEST_PIPE, M_NOWAIT); + bzero(submitstring, 256); + if (submitstring){ + sprintf(submitstring, "mac_test_check_sysv_shmat " + "with shmflg and cr_label and shmseglabel:%s:", + (shmflg & SHM_RDONLY)? "SHM_RDONLY" : "SHM_RND"); + MACTEST_PIPE_SUBMIT_WITHPID(submitstring, + strlen(submitstring)); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, shmseglabel); + free(submitstring, M_MACTEST_PIPE); + } LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); COUNTER_INC(check_sysv_shmat); @@ -1807,6 +1855,41 @@ struct label *shmseglabel, int cmd) { + char * submitstring = NULL; + char cmdstring[10]; + + submitstring = malloc(256, M_MACTEST_PIPE, M_NOWAIT); + + if (submitstring){ + bzero(submitstring, 256); + bzero(cmdstring, 10); + + switch(cmd) { + case IPC_RMID: + strcpy(cmdstring,"IPC_RMID"); + break; + case IPC_SET: + strcpy(cmdstring,"IPC_SET"); + break; + case IPC_STAT: + strcpy(cmdstring,"IPC_STAT"); + break; + case SHM_STAT: + strcpy(cmdstring,"SHM_STAT"); + break; + default: + strcpy(cmdstring,"NULL"); + break; + } + + sprintf(submitstring, "mac_test_check_sysv_shmctl " + "with cmd and cr_label and shmseglabel:%s:", + cmdstring); + MACTEST_PIPE_SUBMIT_WITHPID(submitstring, + strlen(submitstring)); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, shmseglabel); + free(submitstring, M_MACTEST_PIPE); + } LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); COUNTER_INC(check_sysv_shmctl); @@ -1820,6 +1903,11 @@ struct label *shmseglabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_shmdt " + "with cr_label and shmseglabel:", + strlen("mac_test_check_sysv_shmdt " + "with cr_label and shmseglabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, shmseglabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); COUNTER_INC(check_sysv_shmdt); @@ -1833,6 +1921,11 @@ struct label *shmseglabel, int shmflg) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_sysv_shmget " + "with cr_label and shmseglabel:", + strlen("mac_test_check_sysv_shmget " + "with cr_label and shmseglabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, shmseglabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(shmseglabel, MAGIC_SYSV_SHM); COUNTER_INC(check_sysv_shmget); @@ -1845,6 +1938,11 @@ mac_test_check_kenv_dump(struct ucred *cred) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kenv_dump " + "with cr_label:", + strlen("mac_test_check_kenv_dump " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_kenv_dump); @@ -1856,6 +1954,11 @@ mac_test_check_kenv_get(struct ucred *cred, char *name) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kenv_get " + "with cr_label:", + strlen("mac_test_check_kenv_get " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_kenv_get); @@ -1867,6 +1970,11 @@ mac_test_check_kenv_set(struct ucred *cred, char *name, char *value) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kenv_set " + "with cr_label:", + strlen("mac_test_check_kenv_set " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_kenv_set); @@ -1878,6 +1986,11 @@ mac_test_check_kenv_unset(struct ucred *cred, char *name) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kenv_unset " + "with cr_label:", + strlen("mac_test_check_kenv_unset " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_kenv_unset); @@ -1890,6 +2003,11 @@ struct label *label) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kld_load " + "with cr_label and vp label:", + strlen("mac_test_check_kld_load " + "with cr_label and vp label:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(label, MAGIC_VNODE); COUNTER_INC(check_kld_load); @@ -1902,6 +2020,11 @@ mac_test_check_kld_stat(struct ucred *cred) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_kld_stat " + "with cr_label:", + strlen("mac_test_check_kld_stat " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_kld_stat); @@ -1914,6 +2037,11 @@ struct label *mplabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_mount_stat " + "with cr_label and mplabel:", + strlen("mac_test_check_mount_stat " + "with cr_label and mplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, mplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(mplabel, MAGIC_MOUNT); COUNTER_INC(check_mount_stat); @@ -1927,6 +2055,11 @@ struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_ioctl " + "with cr_label and pipelabel:", + strlen("mac_test_check_pipe_ioctl " + "with cr_label and pipelabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, pipe, pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(check_pipe_ioctl); @@ -1940,6 +2073,11 @@ struct label *pipelabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_poll " + "with cr_label and pipelabel:", + strlen("mac_test_check_pipe_poll " + "with cr_label and pipelabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, pipe, pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(check_pipe_poll); @@ -1953,6 +2091,11 @@ struct label *pipelabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_read " + "with cr_label and pipelabel:", + strlen("mac_test_check_pipe_read " + "with cr_label and pipelabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, pipe, pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(check_pipe_read); @@ -1966,6 +2109,12 @@ struct label *pipelabel, struct label *newlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_relabel " + "with cr_label pipelabel and newlabel:", + strlen("mac_test_check_pipe_relabel " + "with cr_label pipelabel and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL3(cred, cred->cr_label, pipe, pipelabel, + pipe, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); LABEL_CHECK(newlabel, MAGIC_PIPE); @@ -1980,6 +2129,11 @@ struct label *pipelabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_stat " + "with cr_label and pipelabel:", + strlen("mac_test_check_pipe_stat " + "with cr_label and pipelabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, pipe, pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(check_pipe_stat); @@ -1993,6 +2147,11 @@ struct label *pipelabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_pipe_write " + "with cr_label and pipelabel:", + strlen("mac_test_check_pipe_write " + "with cr_label and pipelabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, pipe, pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(check_pipe_write); @@ -2006,6 +2165,11 @@ struct label *ks_label) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_posix_sem " + "with cr_label and ks_label:", + strlen("mac_test_check_posix_sem " + "with cr_label and ks_label:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, ks_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(ks_label, MAGIC_POSIX_SEM); COUNTER_INC(check_posix_sem); @@ -2018,6 +2182,11 @@ mac_test_check_proc_debug(struct ucred *cred, struct proc *p) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_debug " + "with cr_label:", + strlen("mac_test_check_proc_debug " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_debug); @@ -2030,6 +2199,11 @@ mac_test_check_proc_sched(struct ucred *cred, struct proc *p) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_sched " + "with cr_label:", + strlen("mac_test_check_proc_sched " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_sched); @@ -2042,6 +2216,11 @@ mac_test_check_proc_signal(struct ucred *cred, struct proc *p, int signum) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_signal " + "with cr_label and proc label:", + strlen("mac_test_check_proc_signal " + "with cr_label and proc label:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_signal); @@ -2054,6 +2233,11 @@ mac_test_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setaudit " + "with cr_label:", + strlen("mac_test_check_proc_setaudit " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setaudit); @@ -2065,6 +2249,11 @@ mac_test_check_proc_setauid(struct ucred *cred, uid_t auid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setauid " + "with cr_label:", + strlen("mac_test_check_proc_setauid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setauid); @@ -2076,6 +2265,11 @@ mac_test_check_proc_setuid(struct ucred *cred, uid_t uid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setuid " + "with cr_label:", + strlen("mac_test_check_proc_setuid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setuid); @@ -2087,6 +2281,11 @@ mac_test_check_proc_seteuid(struct ucred *cred, uid_t euid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_seteuid " + "with cr_label:", + strlen("mac_test_check_proc_seteuid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_euid); @@ -2098,6 +2297,11 @@ mac_test_check_proc_setgid(struct ucred *cred, gid_t gid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setgid " + "with cr_label:", + strlen("mac_test_check_proc_setgid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setgid); @@ -2109,6 +2313,11 @@ mac_test_check_proc_setegid(struct ucred *cred, gid_t egid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setegid " + "with cr_label:", + strlen("mac_test_check_proc_setegid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setegid); @@ -2121,6 +2330,11 @@ gid_t *gidset) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setgroups " + "with cr_label:", + strlen("mac_test_check_proc_setgroups " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setgroups); @@ -2132,6 +2346,11 @@ mac_test_check_proc_setreuid(struct ucred *cred, uid_t ruid, uid_t euid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setreuid " + "with cr_label:", + strlen("mac_test_check_proc_setreuid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setreuid); @@ -2143,6 +2362,11 @@ mac_test_check_proc_setregid(struct ucred *cred, gid_t rgid, gid_t egid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setregid " + "with cr_label:", + strlen("mac_test_check_proc_setregid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setregid); @@ -2155,6 +2379,11 @@ uid_t suid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setresuid " + "with cr_label:", + strlen("mac_test_check_proc_setresuid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setresuid); @@ -2167,6 +2396,11 @@ gid_t sgid) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_setresgid " + "with cr_label:", + strlen("mac_test_check_proc_setresgid " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_setresgid); @@ -2178,6 +2412,11 @@ mac_test_check_proc_wait(struct ucred *cred, struct proc *p) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_proc_wait " + "with cr_label and proc label:", + strlen("mac_test_check_proc_wait " + "with cr_label and proc label:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, cred, p->p_ucred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(p->p_ucred->cr_label, MAGIC_CRED); COUNTER_INC(check_proc_wait); @@ -2191,6 +2430,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_accept " + "with cr_label and solabel:", + strlen("mac_test_check_socket_accept " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_accept); @@ -2204,6 +2448,11 @@ struct label *solabel, struct sockaddr *sa) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_bind " + "with cr_label and solabel:", + strlen("mac_test_check_socket_bind " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_bind); @@ -2217,6 +2466,11 @@ struct label *solabel, struct sockaddr *sa) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_connect " + "with cr_label and solabel:", + strlen("mac_test_check_socket_connect " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_connect); @@ -2230,6 +2484,11 @@ struct mbuf *m, struct label *mlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_deliver " + "with solabel and mlabel:", + strlen("mac_test_check_socket_deliver " + "with solabel and mlabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(socket, solabel, vnode, mlabel); LABEL_CHECK(solabel, MAGIC_SOCKET); LABEL_CHECK(mlabel, MAGIC_MBUF); COUNTER_INC(check_socket_deliver); @@ -2243,6 +2502,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_listen " + "with cr_label and solabel:", + strlen("mac_test_check_socket_listen " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_listen); @@ -2256,6 +2520,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_poll " + "with cr_label and solabel:", + strlen("mac_test_check_socket_poll " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_poll); @@ -2269,6 +2538,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_receive " + "with cr_label and solabel:", + strlen("mac_test_check_socket_receive " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_receive); @@ -2282,6 +2556,12 @@ struct label *solabel, struct label *newlabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_relabel " + "with cr_label solabel and newlabel:", + strlen("mac_test_check_socket_relabel " + "with cr_label solabel and newlabel:")); + MACTEST_PIPE_SUBMIT_LABEL3(cred, cred->cr_label, socket, solabel, + socket, newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); LABEL_CHECK(newlabel, MAGIC_SOCKET); @@ -2296,6 +2576,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_send " + "with cr_label and solabel:", + strlen("mac_test_check_socket_send " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_send); @@ -2309,6 +2594,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_stat " + "with cr_label and solabel:", + strlen("mac_test_check_socket_stat " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_stat); @@ -2322,6 +2612,11 @@ struct label *solabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_socket_visible " + "with cr_label and solabel:", + strlen("mac_test_check_socket_visible " + "with cr_label and solabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, socket, solabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(solabel, MAGIC_SOCKET); COUNTER_INC(check_socket_visible); @@ -2335,6 +2630,11 @@ struct label *vplabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_acct " + "with cr_label and vplabel:", + strlen("mac_test_check_system_acct " + "with cr_label and vplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(check_system_acct); @@ -2347,6 +2647,11 @@ mac_test_check_system_audit(struct ucred *cred, void *record, int length) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_audit " + "with cr_label:", + strlen("mac_test_check_system_audit " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_system_audit); @@ -2359,6 +2664,11 @@ struct label *vplabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_auditctl " + "with cr_label and vplabel:", + strlen("mac_test_check_system_auditctl " + "with cr_label and vplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(check_system_auditctl); @@ -2371,6 +2681,11 @@ mac_test_check_system_auditon(struct ucred *cred, int cmd) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_auditon " + "with cr_label:", + strlen("mac_test_check_system_auditon " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_system_auditon); @@ -2382,6 +2697,11 @@ mac_test_check_system_reboot(struct ucred *cred, int how) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_reboot " + "with cr_label:", + strlen("mac_test_check_system_reboot " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_system_reboot); @@ -2394,6 +2714,11 @@ struct label *vplabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_swapoff " + "with cr_label and vplabel:", + strlen("mac_test_check_system_swapoff " + "with cr_label and vplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(check_system_swapoff); @@ -2407,6 +2732,11 @@ struct label *vplabel) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_swapon " + "with cr_label and vplabel:", + strlen("mac_test_check_system_swapon " + "with cr_label and vplabel:")); + MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(check_system_swapon); @@ -2420,6 +2750,11 @@ void *arg1, int arg2, struct sysctl_req *req) { + MACTEST_PIPE_SUBMIT_WITHPID("mac_test_check_system_sysctl " + "with cr_label:", + strlen("mac_test_check_system_sysctl " + "with cr_label:")); + MACTEST_PIPE_SUBMIT_LABEL(cred, cred->cr_label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); COUNTER_INC(check_system_sysctl); @@ -2432,6 +2767,54 @@ struct label *vplabel, int acc_mode) { + if (vplabel != NULL && SLOT(vplabel) != MAGIC_MACTESTPIPE){ + char * submitstring = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 19 11:23: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 BC43516A46F; Tue, 19 Jun 2007 11:23: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 8553A16A468 for ; Tue, 19 Jun 2007 11:23:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 78D2013C43E for ; Tue, 19 Jun 2007 11:23:55 +0000 (UTC) (envelope-from lulf@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 l5JBNtL6066860 for ; Tue, 19 Jun 2007 11:23:55 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JBNteU066847 for perforce@freebsd.org; Tue, 19 Jun 2007 11:23:55 GMT (envelope-from lulf@FreeBSD.org) Date: Tue, 19 Jun 2007 11:23:55 GMT Message-Id: <200706191123.l5JBNteU066847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 11:23:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=121968 Change 121968 by lulf@lulf_carrot on 2007/06/19 11:23:28 - Use the correct function. - Add it to global header. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#18 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#15 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#10 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#18 (text+ko) ==== @@ -699,7 +699,7 @@ case GV_EVENT_START_VOLUME: printf("VINUM: event 'start'\n"); v = ev->arg1; - gv_start_volume(v); + gv_start_vol(v); break; case GV_EVENT_ATTACH_PLEX: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#15 (text+ko) ==== @@ -35,6 +35,7 @@ /* geom_vinum_init.c */ void gv_start_obj(struct g_geom *, struct gctl_req *); int gv_start_plex(struct gv_plex *); +int gv_start_vol(struct gv_volume *); /* geom_vinum_list.c */ void gv_ld(struct g_geom *, struct gctl_req *, struct sbuf *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#10 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -static int gv_start_vol(struct gv_volume *); static int gv_sync(struct gv_volume *); static int gv_rebuild_plex(struct gv_plex *); static int gv_init_plex(struct gv_plex *); From owner-p4-projects@FreeBSD.ORG Tue Jun 19 12: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 1EBC516A478; Tue, 19 Jun 2007 12:15:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C0A3716A46F for ; Tue, 19 Jun 2007 12:15:21 +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 A3E9313C4B0 for ; Tue, 19 Jun 2007 12:15:21 +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 l5JCFLB8018054 for ; Tue, 19 Jun 2007 12:15:21 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JCEFHj016977 for perforce@freebsd.org; Tue, 19 Jun 2007 12:14:15 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 19 Jun 2007 12:14:15 GMT Message-Id: <200706191214.l5JCEFHj016977@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 121969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 12:15:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=121969 Change 121969 by zec@zec_tca51 on 2007/06/19 12:13:49 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/vimage/src/sys/arm/include/intr.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/vimage/src/sys/arm/include/pte.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/vimage/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/vimage/src/sys/cam/README.quirks#1 branch .. //depot/projects/vimage/src/sys/cam/cam.c#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/vimage/src/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#9 integrate .. //depot/projects/vimage/src/sys/conf/files#11 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#4 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#4 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#4 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/vimage/src/sys/conf/kern.mk#3 integrate .. //depot/projects/vimage/src/sys/conf/options#11 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 delete .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/vimage/src/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/amd/amd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/vimage/src/sys/dev/asr/asr.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/awi/awivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/vimage/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/vimage/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/vimage/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/vimage/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/em/README#3 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/vimage/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/vimage/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/creator.c#4 integrate .. //depot/projects/vimage/src/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/vimage/src/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/vimage/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/vimage/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/vimage/src/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/clone.c#1 branch .. //depot/projects/vimage/src/sys/dev/sound/clone.h#1 branch .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/unit.c#1 branch .. //depot/projects/vimage/src/sys/dev/sound/unit.h#1 branch .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/version.h#1 branch .. //depot/projects/vimage/src/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/vimage/src/sys/dev/trm/trm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ums.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#5 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/vimage/src/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/vimage/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/vimage/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/vimage/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/vimage/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#6 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/vimage/src/sys/i386/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/vimage/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_idle.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_kse.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_ntptime.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_subr.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_switch.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/vimage/src/sys/kern/ksched.c#3 integrate .. //depot/projects/vimage/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/vimage/src/sys/kern/sched_core.c#4 delete .. //depot/projects/vimage/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_prof.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#5 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/vimage/src/sys/kern/sysv_ipc.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#7 integrate .. //depot/projects/vimage/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/vimage/src/sys/libkern/mcount.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#7 integrate .. //depot/projects/vimage/src/sys/modules/bge/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ip_mroute_mod/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/mii/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/wlan_scan_ap/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/wlan_scan_sta/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#9 integrate .. //depot/projects/vimage/src/sys/net/ethernet.h#5 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/vimage/src/sys/net/if.h#4 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.h#4 integrate .. //depot/projects/vimage/src/sys/net/if_media.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_types.h#2 integrate .. //depot/projects/vimage/src/sys/net/pfil.h#2 integrate .. //depot/projects/vimage/src/sys/net/route.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_power.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_power.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_ap.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#1 add .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#11 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.h#3 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#13 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#11 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#2 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#11 edit .. //depot/projects/vimage/src/sys/netinet/udp_var.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#15 edit .. //depot/projects/vimage/src/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#2 integrate .. //depot/projects/vimage/src/sys/netipx/ipx.c#4 integrate .. //depot/projects/vimage/src/sys/netipx/ipx.h#4 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_ip.c#4 delete .. //depot/projects/vimage/src/sys/netipx/ipx_ip.h#4 delete .. //depot/projects/vimage/src/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/vimage/src/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/pci/if_ste.c#3 integrate .. //depot/projects/vimage/src/sys/pci/ncr.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/db_interface.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.c#2 delete .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci_if.m#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/vimage/src/sys/sun4v/include/cache.h#2 delete .. //depot/projects/vimage/src/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/vimage/src/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/vimage/src/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/vimage/src/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/bus_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tick.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/vnex.c#4 integrate .. //depot/projects/vimage/src/sys/sys/acct.h#2 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/filedesc.h#4 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#5 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mutex.h#5 integrate .. //depot/projects/vimage/src/sys/sys/param.h#8 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#5 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#11 integrate .. //depot/projects/vimage/src/sys/sys/resource.h#3 integrate .. //depot/projects/vimage/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sched.h#4 integrate .. //depot/projects/vimage/src/sys/sys/socket.h#3 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#6 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#8 integrate .. //depot/projects/vimage/src/sys/sys/syslimits.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 19 14:30: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 1AA4F16A473; Tue, 19 Jun 2007 14:30: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 DD98F16A46D for ; Tue, 19 Jun 2007 14:30:20 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D092E13C4BD for ; Tue, 19 Jun 2007 14:30:20 +0000 (UTC) (envelope-from lulf@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 l5JEUKRo058172 for ; Tue, 19 Jun 2007 14:30:20 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JEUKRp058163 for perforce@freebsd.org; Tue, 19 Jun 2007 14:30:20 GMT (envelope-from lulf@FreeBSD.org) Date: Tue, 19 Jun 2007 14:30:20 GMT Message-Id: <200706191430.l5JEUKRp058163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 121973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 14:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=121973 Change 121973 by lulf@lulf_carrot on 2007/06/19 14:29:20 - Implement delayed write when syncing plexes. This way we can still have the plex mounted and read/write to it when it's syncing. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#7 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#3 (text+ko) ==== @@ -351,6 +351,8 @@ v->vinumconf = sc; LIST_INIT(&v->plexes); LIST_INSERT_HEAD(&sc->volumes, v, volume); + v->wqueue = g_malloc(sizeof(struct bio_queue_head), M_WAITOK | M_ZERO); + bioq_init(v->wqueue); } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#14 (text+ko) ==== @@ -361,6 +361,8 @@ struct g_provider *provider; /* Provider of this volume. */ + struct bio_queue_head *wqueue; /* BIO delayed request queue. */ + struct gv_plex *last_read_plex; struct gv_softc *vinumconf; /* Pointer to the vinum config. */ }; ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include -static void gv_sync_complete(struct gv_plex *, struct bio *); +static int gv_sync_complete(struct gv_plex *, struct bio *); void gv_volume_start(struct gv_softc *sc, struct bio *bp) @@ -63,8 +63,14 @@ /* * Try to find a good plex where we can send the request to, * round-robin-style. The plex either has to be up, or it's a - * degraded RAID5 plex. + * degraded RAID5 plex. Check if we have delayed requests. Put + * this request on the delayed queue if so. This makes sure that + * we don't read old values. */ + if (bioq_first(v->wqueue) != NULL) { + bioq_insert_tail(v->wqueue, bp); + break; + } lp = v->last_read_plex; if (lp == NULL) lp = LIST_FIRST(&v->plexes); @@ -93,6 +99,14 @@ case BIO_WRITE: case BIO_DELETE: + /* Delay write-requests if any plex is synchronizing. */ + LIST_FOREACH(p, &v->plexes, in_volume) { + if (p->state == GV_PLEX_SYNCING) { + bioq_insert_tail(v->wqueue, bp); + return; + } + } + /* Give the BIO to each plex of this volume. */ LIST_FOREACH(p, &v->plexes, in_volume) { if (p->state < GV_PLEX_DEGRADED) @@ -174,12 +188,13 @@ /* * Handle a finished plex sync bio. */ -static void +static int gv_sync_complete(struct gv_plex *to, struct bio *bp) { struct gv_plex *from, *p; struct gv_sd *s; struct gv_volume *v; + struct gv_softc *sc; int err; g_topology_assert_not(); @@ -187,6 +202,7 @@ err = 0; from = bp->bio_caller2; v = to->vol_sc; + sc = v->vinumconf; /* If it was a read, write it. */ if (bp->bio_cmd == BIO_READ) { @@ -210,22 +226,35 @@ } } g_destroy_bio(bp); + /* Clean up if there was an error. */ if (err) { + to->flags &= ~GV_PLEX_SYNCING; printf("VINUM: error syncing plexes: error code %d\n", err); - return; } /* Check if all plexes are synced, and lower refcounts. */ g_topology_lock(); LIST_FOREACH(p, &v->plexes, in_volume) { - if (p->flags & GV_PLEX_SYNCING) - goto cleanup; + if (p->flags & GV_PLEX_SYNCING) { + g_topology_unlock(); + return (-1); + } } /* If we came here, all plexes are synced, and we're free. */ gv_access(v->provider, -1, -1, 0); + g_topology_unlock(); printf("VINUM: plex sync completed\n"); -cleanup: - g_topology_unlock(); + + /* Issue all delayed requests. */ + bp = bioq_takefirst(v->wqueue); + while (bp != NULL) { +/* gv_volume_start(v, bp);*/ + mtx_lock(&sc->queue_mtx); + bioq_disksort(sc->bqueue, bp); + mtx_unlock(&sc->queue_mtx); + bp = bioq_takefirst(v->wqueue); + } + return (0); } int From owner-p4-projects@FreeBSD.ORG Tue Jun 19 15:16: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 C447C16A46B; Tue, 19 Jun 2007 15:16: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 76BB416A469 for ; Tue, 19 Jun 2007 15:16:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6742913C484 for ; Tue, 19 Jun 2007 15:16:21 +0000 (UTC) (envelope-from jhb@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 l5JFGLJU000575 for ; Tue, 19 Jun 2007 15:16:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JFGKMq000572 for perforce@freebsd.org; Tue, 19 Jun 2007 15:16:20 GMT (envelope-from jhb@freebsd.org) Date: Tue, 19 Jun 2007 15:16:20 GMT Message-Id: <200706191516.l5JFGKMq000572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 121978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 15:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=121978 Change 121978 by jhb@jhb_mutex on 2007/06/19 15:15:46 Pullup additional tests from jhb_lock branch (such as a test for the various cases of the sx recursion stuff). Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#38 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#38 (text+ko) ==== @@ -72,7 +72,7 @@ static int event_max; static struct crash_event **event_start, **event_stop; static struct rwlock baz; -static struct sx foo, bar, bar2; +static struct sx foo, bar, bar2, qux; static struct cv event_cv; static struct mtx event_mtx, test_mtx, test1_mtx, test2_mtx; static struct proc *kthread; @@ -87,6 +87,32 @@ /* Events. */ static void +sx_recurse(void) +{ + + sx_init_flags(&qux, "qux", SX_RECURSE); + sx_xlock(&qux); + sx_xlock(&qux); + kdb_enter("qux should be recursed"); + sx_xunlock(&qux); + if (sx_try_xlock(&qux) == 0) + panic("try_xlock failed!"); + sx_xunlock(&qux); + sx_xunlock(&qux); + sx_destroy(&qux); + sx_init(&qux, "qux"); + sx_xlock(&qux); + if (sx_try_xlock(&qux)) + panic("try_xlock worked!"); + printf("nested xlock should go boom\n"); + sx_xlock(&qux); + sx_xunlock(&qux); + sx_xunlock(&qux); + sx_destroy(&qux); +} +CRASH_EVENT("test sx xlock recurse", sx_recurse); + +static void cv_sx(void) { struct cv blah; @@ -169,6 +195,30 @@ CRASH_EVENT("test rw_sleep()", sleep_rw); static void +lock_destroyed_sx(void) +{ + + sx_init(&qux, "qux"); + sx_destroy(&qux); + kdb_enter("examine qux"); + sx_xlock(&qux); + kdb_enter("examine again"); +} +CRASH_EVENT("lock destroyed sx", lock_destroyed_sx); + +static void +lock_destroyed_rw(void) +{ + + rw_init(&baz, "baz"); + rw_destroy(&baz); + kdb_enter("examine baz"); + rw_wlock(&baz); + kdb_enter("examine again"); +} +CRASH_EVENT("lock destroyed rwlock", lock_destroyed_rw); + +static void lock_destroyed_mtx(void) { From owner-p4-projects@FreeBSD.ORG Tue Jun 19 15:22: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 946B616A46B; Tue, 19 Jun 2007 15:22: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 2D69C16A400 for ; Tue, 19 Jun 2007 15:22:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1DAD413C45A for ; Tue, 19 Jun 2007 15:22:32 +0000 (UTC) (envelope-from imp@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 l5JFMWTb002734 for ; Tue, 19 Jun 2007 15:22:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JFLY69001852 for perforce@freebsd.org; Tue, 19 Jun 2007 15:21:34 GMT (envelope-from imp@freebsd.org) Date: Tue, 19 Jun 2007 15:21:34 GMT Message-Id: <200706191521.l5JFLY69001852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 15:22:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121979 Change 121979 by imp@imp_paco-paco on 2007/06/19 15:21:11 IFC @121953 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#22 integrate .. //depot/projects/arm/src/UPDATING#17 integrate .. //depot/projects/arm/src/cddl/lib/Makefile#3 integrate .. //depot/projects/arm/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/arm/src/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/arm/src/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/arm/src/contrib/diff/AUTHORS#1 branch .. //depot/projects/arm/src/contrib/diff/COPYING#2 integrate .. //depot/projects/arm/src/contrib/diff/ChangeLog#2 integrate .. //depot/projects/arm/src/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/arm/src/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/arm/src/contrib/diff/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/diff/Makefile.in#2 delete .. //depot/projects/arm/src/contrib/diff/NEWS#2 integrate .. //depot/projects/arm/src/contrib/diff/README#2 integrate .. //depot/projects/arm/src/contrib/diff/THANKS#1 branch .. //depot/projects/arm/src/contrib/diff/TODO#1 branch .. //depot/projects/arm/src/contrib/diff/analyze.c#2 delete .. //depot/projects/arm/src/contrib/diff/bootstrap#1 branch .. //depot/projects/arm/src/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/arm/src/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/arm/src/contrib/diff/config.h#2 integrate .. //depot/projects/arm/src/contrib/diff/config.hin#2 delete .. //depot/projects/arm/src/contrib/diff/configure#2 delete .. //depot/projects/arm/src/contrib/diff/configure.in#2 delete .. //depot/projects/arm/src/contrib/diff/context.c#2 delete .. //depot/projects/arm/src/contrib/diff/diagmeet.note#2 delete .. //depot/projects/arm/src/contrib/diff/diff.c#2 delete .. //depot/projects/arm/src/contrib/diff/diff.h#2 delete .. //depot/projects/arm/src/contrib/diff/diff.texi#2 delete .. //depot/projects/arm/src/contrib/diff/diff3.c#2 delete .. //depot/projects/arm/src/contrib/diff/dir.c#2 delete .. //depot/projects/arm/src/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/arm/src/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/arm/src/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/arm/src/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/arm/src/contrib/diff/doc/version.texi#1 branch .. //depot/projects/arm/src/contrib/diff/ed.c#2 delete .. //depot/projects/arm/src/contrib/diff/exgettext#1 branch .. //depot/projects/arm/src/contrib/diff/ifdef.c#2 delete .. //depot/projects/arm/src/contrib/diff/install-sh#2 delete .. //depot/projects/arm/src/contrib/diff/io.c#2 delete .. //depot/projects/arm/src/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/basename.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/error.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/error.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/exit.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/arm/src/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/regex.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/regex.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/arm/src/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/arm/src/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/diff/man/cmp.1#1 branch .. //depot/projects/arm/src/contrib/diff/man/diff.1#1 branch .. //depot/projects/arm/src/contrib/diff/man/diff3.1#1 branch .. //depot/projects/arm/src/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/arm/src/contrib/diff/normal.c#2 delete .. //depot/projects/arm/src/contrib/diff/prepend_args.c#2 delete .. //depot/projects/arm/src/contrib/diff/prepend_args.h#2 delete .. //depot/projects/arm/src/contrib/diff/sdiff.c#2 delete .. //depot/projects/arm/src/contrib/diff/side.c#2 delete .. //depot/projects/arm/src/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/arm/src/contrib/diff/src/analyze.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/cmp.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/context.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/diff.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/diff.h#1 branch .. //depot/projects/arm/src/contrib/diff/src/diff3.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/dir.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/ed.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/io.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/normal.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/side.c#1 branch .. //depot/projects/arm/src/contrib/diff/src/system.h#1 branch .. //depot/projects/arm/src/contrib/diff/src/util.c#1 branch .. //depot/projects/arm/src/contrib/diff/stamp-h.in#2 delete .. //depot/projects/arm/src/contrib/diff/system.h#2 delete .. //depot/projects/arm/src/contrib/diff/util.c#2 delete .. //depot/projects/arm/src/contrib/diff/version.c#2 delete .. //depot/projects/arm/src/contrib/diff/xmalloc.c#2 delete .. //depot/projects/arm/src/contrib/less/main.c#4 integrate .. //depot/projects/arm/src/contrib/less/search.c#4 integrate .. //depot/projects/arm/src/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/arm/src/etc/Makefile#4 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#16 integrate .. //depot/projects/arm/src/etc/group#2 integrate .. //depot/projects/arm/src/etc/namedb/Makefile#2 integrate .. //depot/projects/arm/src/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/arm/src/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/arm/src/etc/namedb/make-localhost#2 delete .. //depot/projects/arm/src/etc/namedb/master/Makefile#1 branch .. //depot/projects/arm/src/etc/namedb/master/empty.db#1 branch .. //depot/projects/arm/src/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/arm/src/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/arm/src/etc/namedb/named.conf#2 integrate .. //depot/projects/arm/src/etc/pam.d/Makefile#2 integrate .. //depot/projects/arm/src/etc/pam.d/atrun#1 branch .. //depot/projects/arm/src/etc/pam.d/cron#1 branch .. //depot/projects/arm/src/etc/pam.d/ftpd#2 integrate .. //depot/projects/arm/src/etc/pam.d/gdm#2 integrate .. //depot/projects/arm/src/etc/pam.d/imap#2 integrate .. //depot/projects/arm/src/etc/pam.d/kde#2 integrate .. //depot/projects/arm/src/etc/pam.d/login#2 integrate .. //depot/projects/arm/src/etc/pam.d/other#2 integrate .. //depot/projects/arm/src/etc/pam.d/pop3#2 integrate .. //depot/projects/arm/src/etc/pam.d/rsh#2 integrate .. //depot/projects/arm/src/etc/pam.d/sshd#2 integrate .. //depot/projects/arm/src/etc/pam.d/telnetd#2 integrate .. //depot/projects/arm/src/etc/pam.d/xdm#2 integrate .. //depot/projects/arm/src/etc/rc.d/sendmail#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/arm/src/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/arm/src/gnu/lib/libreadline/Makefile.inc#3 integrate .. //depot/projects/arm/src/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/arm/src/gnu/usr.bin/diff/diff.1#2 delete .. //depot/projects/arm/src/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/arm/src/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/arm/src/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/arm/src/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/arm/src/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/arm/src/include/arpa/inet.h#3 integrate .. //depot/projects/arm/src/include/histedit.h#2 integrate .. //depot/projects/arm/src/include/paths.h#2 integrate .. //depot/projects/arm/src/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_ustar.c#10 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/main.c#4 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/arm/src/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/arm/src/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/arm/src/lib/libc/net/Makefile.inc#6 integrate .. //depot/projects/arm/src/lib/libc/net/Symbol.map#6 integrate .. //depot/projects/arm/src/lib/libc/net/inet.3#6 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/arm/src/lib/libc/net/sourcefilter.3#1 branch .. //depot/projects/arm/src/lib/libc/net/sourcefilter.c#1 branch .. //depot/projects/arm/src/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/arm/src/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/arm/src/lib/libc/regex/regerror.c#3 integrate .. //depot/projects/arm/src/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/arm/src/lib/libc/regex/regfree.c#3 integrate .. //depot/projects/arm/src/lib/libc/rpc/auth_unix.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/arm/src/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/timer_delete.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/arm/src/lib/libedit/editline.3#3 integrate .. //depot/projects/arm/src/lib/libedit/el.c#2 integrate .. //depot/projects/arm/src/lib/libedit/el.h#2 integrate .. //depot/projects/arm/src/lib/libedit/term.c#3 integrate .. //depot/projects/arm/src/lib/libedit/term.h#3 integrate .. //depot/projects/arm/src/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/arm/src/lib/libkvm/kvm.c#4 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_amd64.c#3 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_private.h#3 integrate .. //depot/projects/arm/src/lib/libpam/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/arm/src/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/arm/src/lib/libutil/login_cap.3#2 integrate .. //depot/projects/arm/src/lib/libutil/login_cap.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/e_log.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/arm/src/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/arm/src/libexec/atrun/Makefile#2 integrate .. //depot/projects/arm/src/libexec/atrun/atrun.c#2 integrate .. //depot/projects/arm/src/libexec/atrun/atrun.man#2 integrate .. //depot/projects/arm/src/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/arm/src/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/arm/src/sbin/Makefile#6 integrate .. //depot/projects/arm/src/sbin/ifconfig/af_ipx.c#4 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifbridge.c#6 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.h#3 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/arm/src/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/arm/src/sbin/ipf/libipf/Makefile#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#11 integrate .. //depot/projects/arm/src/sbin/mknod/mknod.c#2 integrate .. //depot/projects/arm/src/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/arm/src/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/arm/src/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#12 integrate .. //depot/projects/arm/src/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#14 integrate .. //depot/projects/arm/src/share/man/man4/altq.4#8 integrate .. //depot/projects/arm/src/share/man/man4/fwohci.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ip.4#3 integrate .. //depot/projects/arm/src/share/man/man4/miibus.4#4 integrate .. //depot/projects/arm/src/share/man/man4/nfe.4#4 integrate .. //depot/projects/arm/src/share/man/man4/rum.4#2 integrate .. //depot/projects/arm/src/share/man/man4/snd_hda.4#8 integrate .. //depot/projects/arm/src/share/man/man4/ural.4#5 integrate .. //depot/projects/arm/src/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/arm/src/share/man/man5/Makefile#4 integrate .. //depot/projects/arm/src/share/man/man5/make.conf.5#5 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#8 integrate .. //depot/projects/arm/src/share/man/man5/tmpfs.5#1 branch .. //depot/projects/arm/src/share/man/man5/xfs.5#1 branch .. //depot/projects/arm/src/share/man/man7/hier.7#9 integrate .. //depot/projects/arm/src/share/man/man9/selrecord.9#2 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#6 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#13 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#8 integrate .. //depot/projects/arm/src/sys/amd64/include/kdb.h#3 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#12 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#14 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#33 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#71 integrate .. //depot/projects/arm/src/sys/arm/include/intr.h#6 integrate .. //depot/projects/arm/src/sys/arm/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#15 integrate .. //depot/projects/arm/src/sys/arm/include/pte.h#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/arm/src/sys/cam/README.quirks#2 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#21 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/arm/src/sys/conf/NOTES#50 integrate .. //depot/projects/arm/src/sys/conf/files#74 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#24 integrate .. //depot/projects/arm/src/sys/conf/files.i386#26 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#17 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#12 integrate .. //depot/projects/arm/src/sys/conf/files.sun4v#7 integrate .. //depot/projects/arm/src/sys/conf/options#47 integrate .. //depot/projects/arm/src/sys/conf/options.arm#23 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/arm/src/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/arm/src/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#8 integrate .. //depot/projects/arm/src/sys/dev/aha/aha.c#6 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/aic/aic.c#5 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_pccard.c#5 integrate .. //depot/projects/arm/src/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#8 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#8 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#14 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#36 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#30 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/arm/src/sys/dev/awi/awi.c#5 integrate .. //depot/projects/arm/src/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#20 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#10 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt.c#7 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/arm/src/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#2 delete .. //depot/projects/arm/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/arm/src/sys/dev/fb/boot_font.c#5 integrate .. //depot/projects/arm/src/sys/dev/fb/creator.c#6 integrate .. //depot/projects/arm/src/sys/dev/fb/gallant12x22.c#3 integrate .. //depot/projects/arm/src/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/arm/src/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/arm/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#8 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.c#7 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.h#5 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipw.c#10 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_ioctl.h#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#27 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/mc146818/mc146818.c#3 integrate .. //depot/projects/arm/src/sys/dev/mc146818/mc146818var.h#3 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/arm/src/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/arm/src/sys/dev/mii/miidevs#18 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#8 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#40 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/arm/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#17 integrate .. //depot/projects/arm/src/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/arm/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/arm/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#11 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661.c#9 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#25 integrate .. //depot/projects/arm/src/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/clone.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/clone.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ess.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/mss.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/als4000.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#14 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx-pcm.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#20 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#14 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.h#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.h#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#15 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_volume.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#15 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/vchan.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/sbus/cs4231.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/version.h#2 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/arm/src/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/arm/src/sys/dev/trm/trm.c#9 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/arm/src/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/hid.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axereg.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cuereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#22 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralvar.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#8 integrate .. //depot/projects/arm/src/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ucycom.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ugen.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/uhcivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/umct.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#8 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#8 integrate .. //depot/projects/arm/src/sys/dev/wds/wd7000.c#6 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/arm/src/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_namei.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/arm/src/sys/i386/conf/PAE#8 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#15 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#16 integrate .. //depot/projects/arm/src/sys/i386/include/kdb.h#3 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#12 integrate .. //depot/projects/arm/src/sys/i386/xbox/xboxfb.c#5 integrate .. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/arm/src/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/arm/src/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/arm/src/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/arm/src/sys/ia64/include/vmparam.h#7 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#23 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#25 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_malloc.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#23 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#17 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#20 integrate .. //depot/projects/arm/src/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#11 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#12 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#20 integrate .. //depot/projects/arm/src/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/arm/src/sys/kern/sysv_msg.c#9 integrate .. //depot/projects/arm/src/sys/kern/tty.c#15 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/arm/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#30 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/arm/src/sys/libkern/mcount.c#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#44 integrate .. //depot/projects/arm/src/sys/modules/bge/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/mii/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/wlan_scan_ap/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/wlan_scan_sta/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/bpf.c#18 integrate .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/arm/src/sys/net/if.h#11 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#33 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#13 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/arm/src/sys/net/if_lagg.h#5 integrate .. //depot/projects/arm/src/sys/net/if_media.h#9 integrate .. //depot/projects/arm/src/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/arm/src/sys/net/if_types.h#5 integrate .. //depot/projects/arm/src/sys/net/pfil.h#3 integrate .. //depot/projects/arm/src/sys/net/route.c#7 integrate .. //depot/projects/arm/src/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_acl.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.h#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_none.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_ht.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#18 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#17 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#17 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_power.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_power.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#14 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_regdomain.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_regdomain.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_scan.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_scan.h#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_scan_ap.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_scan_sta.c#1 branch .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_car.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_vlan.c#4 integrate .. //depot/projects/arm/src/sys/netinet/igmp.h#2 integrate .. //depot/projects/arm/src/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/arm/src/sys/netinet/in.c#10 integrate .. //depot/projects/arm/src/sys/netinet/in.h#9 integrate .. //depot/projects/arm/src/sys/netinet/in_mcast.c#1 branch .. //depot/projects/arm/src/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/arm/src/sys/netinet/in_proto.c#7 integrate .. //depot/projects/arm/src/sys/netinet/in_var.h#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.h#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#32 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#23 integrate .. //depot/projects/arm/src/sys/netinet/ip_var.h#7 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_header.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#17 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#13 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#18 integrate .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#21 integrate .. //depot/projects/arm/src/sys/netinet/udp_var.h#3 integrate .. //depot/projects/arm/src/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/in6.h#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#14 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/arm/src/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/arm/src/sys/netipsec/key.c#5 integrate .. //depot/projects/arm/src/sys/netipx/ipx.c#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx.h#5 integrate .. //depot/projects/arm/src/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_ip.c#7 delete .. //depot/projects/arm/src/sys/netipx/ipx_ip.h#5 delete .. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#8 integrate .. //depot/projects/arm/src/sys/netsmb/smb_smb.c#3 integrate .. //depot/projects/arm/src/sys/netsmb/smb_trantcp.c#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/arm/src/sys/pci/if_ste.c#8 integrate .. //depot/projects/arm/src/sys/pci/ncr.c#9 integrate .. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/arm/src/sys/powerpc/include/cpu.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/busdma_machdep.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/uio_machdep.c#3 integrate .. //depot/projects/arm/src/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#18 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#13 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#14 integrate .. //depot/projects/arm/src/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#6 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/arm/src/sys/sparc64/include/kdb.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/smp.h#5 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pci.c#3 delete .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pci_if.m#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psychovar.h#4 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/eeprom.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#11 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/rtc.c#4 integrate .. //depot/projects/arm/src/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/arm/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/arm/src/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/pcpu.h#8 integrate .. //depot/projects/arm/src/sys/sun4v/include/trap.h#4 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#11 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#9 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#22 integrate .. //depot/projects/arm/src/sys/sys/param.h#32 integrate .. //depot/projects/arm/src/sys/sys/priv.h#6 integrate .. //depot/projects/arm/src/sys/sys/proc.h#28 integrate .. //depot/projects/arm/src/sys/sys/resourcevar.h#5 integrate .. //depot/projects/arm/src/sys/sys/sched.h#11 integrate .. //depot/projects/arm/src/sys/sys/socket.h#7 integrate .. //depot/projects/arm/src/sys/sys/systm.h#24 integrate .. //depot/projects/arm/src/sys/sys/tree.h#4 integrate .. //depot/projects/arm/src/sys/sys/vmmeter.h#5 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#17 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#15 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#20 integrate .. //depot/projects/arm/src/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#21 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#28 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#12 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_phys.c#1 branch .. //depot/projects/arm/src/sys/vm/vm_phys.h#1 branch .. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_KVM#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_KVM_SUPPORT#1 branch .. //depot/projects/arm/src/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/arm/src/tools/regression/netinet/ipmulticast/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/netinet/ipmulticast/ipmulticast.c#1 branch .. //depot/projects/arm/src/tools/regression/netinet/ipsockopt/ipsockopt.c#4 integrate .. //depot/projects/arm/src/tools/regression/tmpfs/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_create#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_dots#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_exec#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_link#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_mount#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_pipes#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_read_write#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_readdir#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_remove#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_rename#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_setattr#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_sizes#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_sockets#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_symlink#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_times#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_truncate#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_vnd#1 branch .. //depot/projects/arm/src/tools/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/calendar.calibrate#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.a2.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.a3.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.a4.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.b2.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.b3.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.b4.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.s1.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.s3.out#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-5.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-6.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.w0-7.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-1.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-2.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-3.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-4.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-5.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-6.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/calendar/regress.wn-7.out#1 branch .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/arm/src/tools/tools/net80211/wlandebug/wlandebug.c#4 integrate .. //depot/projects/arm/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate .. //depot/projects/arm/src/tools/tools/recoverdisk/Makefile#2 delete .. //depot/projects/arm/src/tools/tools/recoverdisk/recoverdisk.1#3 delete .. //depot/projects/arm/src/tools/tools/recoverdisk/recoverdisk.c#3 delete .. //depot/projects/arm/src/usr.bin/Makefile#5 integrate .. //depot/projects/arm/src/usr.bin/awk/lib.c.diff#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendar.h#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.all#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.dutch#1 branch .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/arm/src/usr.bin/calendar/day.c#4 integrate .. //depot/projects/arm/src/usr.bin/calendar/io.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/inet.c#7 integrate .. //depot/projects/arm/src/usr.bin/netstat/main.c#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/sctp.c#1 branch .. //depot/projects/arm/src/usr.bin/rpcgen/rpc_svcout.c#2 integrate .. //depot/projects/arm/src/usr.bin/sed/extern.h#3 integrate .. //depot/projects/arm/src/usr.bin/sed/main.c#3 integrate .. //depot/projects/arm/src/usr.bin/sed/process.c#4 integrate .. //depot/projects/arm/src/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/arm/src/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/arm/src/usr.bin/top/machine.c#4 integrate .. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/cron/cron.8#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/lib/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/cron/lib/entry.c#4 integrate .. //depot/projects/arm/src/usr.sbin/dconschat/dconschat.8#2 integrate .. //depot/projects/arm/src/usr.sbin/dconschat/dconschat.c#4 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwdv.c#3 integrate .. //depot/projects/arm/src/usr.sbin/ifmcstat/Makefile#4 integrate .. //depot/projects/arm/src/usr.sbin/moused/moused.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mtest/mtest.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/arm/src/usr.sbin/ntp/doc/ntpd.8#4 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/deps.c#2 integrate .. //depot/projects/arm/src/usr.sbin/powerd/powerd.c#2 integrate .. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#22 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 19 15:24: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 123CB16A46D; Tue, 19 Jun 2007 15:24: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 B5AF816A46B for ; Tue, 19 Jun 2007 15:24:35 +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 8FB2413C48A for ; Tue, 19 Jun 2007 15:24:35 +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 l5JFOZgM004657 for ; Tue, 19 Jun 2007 15:24:35 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JFOZhr004642 for perforce@freebsd.org; Tue, 19 Jun 2007 15:24:35 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 19 Jun 2007 15:24:35 GMT Message-Id: <200706191524.l5JFOZhr004642@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 121980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 15:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=121980 Change 121980 by zec@zec_tca51 on 2007/06/19 15:24:13 VIMAGE kernel doesn't yet compile with SCTP, and does not boot with AUDIT options compiled in, so disable those for now. Submitted by: Ana Kukec Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/VIMAGE#8 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/VIMAGE#8 (text+ko) ==== @@ -13,3 +13,5 @@ # Some kernel subsystems and functions don't yet compile with VIMAGE. Remove # from the configuration for now. # +nooptions SCTP +nooptions AUDIT From owner-p4-projects@FreeBSD.ORG Tue Jun 19 21:52: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 A6F7C16A468; Tue, 19 Jun 2007 21:52: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 753DD16A46B for ; Tue, 19 Jun 2007 21:52:33 +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 63F8213C46A for ; Tue, 19 Jun 2007 21:52:33 +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 l5JLqX23034951 for ; Tue, 19 Jun 2007 21:52:33 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5JLqXPu034939 for perforce@freebsd.org; Tue, 19 Jun 2007 21:52:33 GMT (envelope-from andrew@freebsd.org) Date: Tue, 19 Jun 2007 21:52:33 GMT Message-Id: <200706192152.l5JLqXPu034939@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 121993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Jun 2007 21:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121993 Change 121993 by andrew@andrew_hermies on 2007/06/19 21:52:10 Use INT32_{MIN,MAX} and UINT32_MAX rather than magic numbers Replace snprintf with a const char * Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#2 (text+ko) ==== @@ -324,7 +324,7 @@ int32_t data; const char *errstr; - data = strtonum(value, (-0x7fffffff - 1), 0x7fffffff, &errstr); + data = strtonum(value, INT32_MIN, INT32_MAX, &errstr); if (errstr != NULL) { /* TODO: Error handeling */ return -1; @@ -335,7 +335,7 @@ uint32_t data; const char *errstr; - data = strtonum(value, 0, 0xffffffffU, &errstr); + data = strtonum(value, 0, UINT32_MAX, &errstr); if (errstr != NULL) { /* TODO: Error handeling */ return -1; ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#6 (text+ko) ==== @@ -202,7 +202,6 @@ facund_server_end_tag(void *data, const XML_Char *name) { struct facund_conn *conn; - char str[1024]; printf("< %s\n", name); conn = data; @@ -223,8 +222,8 @@ conn->call_arg = conn->call_arg->obj_parent; } } else if (strcmp(name, "facund-client") == 0) { - snprintf(str, 1024, ""); - facund_send(conn, str, strlen(str)); + const char *msg = ""; + facund_send(conn, msg, strlen(msg)); conn->close = 1; } } From owner-p4-projects@FreeBSD.ORG Wed Jun 20 00:56: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 A8D1B16A475; Wed, 20 Jun 2007 00:56: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 485BE16A46C for ; Wed, 20 Jun 2007 00:56:20 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 37DED13C45D for ; Wed, 20 Jun 2007 00:56:20 +0000 (UTC) (envelope-from csjp@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 l5K0uKEA033392 for ; Wed, 20 Jun 2007 00:56:20 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K0uKZ3033379 for perforce@freebsd.org; Wed, 20 Jun 2007 00:56:20 GMT (envelope-from csjp@freebsd.org) Date: Wed, 20 Jun 2007 00:56:20 GMT Message-Id: <200706200056.l5K0uKZ3033379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 122000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 00:56:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=122000 Change 122000 by csjp@push on 2007/06/20 00:55:23 - Fix bug in in_addr_ex tokens where the incorrect amount of data was being copied for ip6 addresses. - Fix printing bug which resulted in the strings associated with arg32 tokens were not being processed. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#49 $ */ #include @@ -1306,6 +1306,7 @@ print_delim(fp, del); print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); + print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 (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. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#62 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#63 $ */ #include @@ -411,7 +411,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); + ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t)); return (t); } From owner-p4-projects@FreeBSD.ORG Wed Jun 20 01: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 C4D4316A469; Wed, 20 Jun 2007 01: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 968C816A421 for ; Wed, 20 Jun 2007 01:11:39 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 87E7513C448 for ; Wed, 20 Jun 2007 01:11:39 +0000 (UTC) (envelope-from csjp@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 l5K1BdM5048251 for ; Wed, 20 Jun 2007 01:11:39 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K1BdjG048242 for perforce@freebsd.org; Wed, 20 Jun 2007 01:11:39 GMT (envelope-from csjp@freebsd.org) Date: Wed, 20 Jun 2007 01:11:39 GMT Message-Id: <200706200111.l5K1BdjG048242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 122001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 01:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122001 Change 122001 by csjp@push on 2007/06/20 01:11:05 Add History items for the recent bug fixes Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#51 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#51 (text+ko) ==== @@ -5,6 +5,9 @@ - gcc41 warnings clean. - Teach audit_submit(3) about getaudit_addr(2). - Add support for zonename tokens. +- Fix bug when processing in_addr_ex tokens. +- Restore the behavior of printing the string/text specified while + auditing arg32 tokens. OpenBSM 1.0 alpha 13 @@ -284,4 +287,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#50 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#51 $ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 01:15: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 54D8916A46B; Wed, 20 Jun 2007 01:15: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 1DD0716A41F for ; Wed, 20 Jun 2007 01:15:45 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0E01713C46C for ; Wed, 20 Jun 2007 01:15:45 +0000 (UTC) (envelope-from csjp@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 l5K1Fi64052040 for ; Wed, 20 Jun 2007 01:15:44 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K1Fiqx052030 for perforce@freebsd.org; Wed, 20 Jun 2007 01:15:44 GMT (envelope-from csjp@freebsd.org) Date: Wed, 20 Jun 2007 01:15:44 GMT Message-Id: <200706200115.l5K1Fiqx052030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 122002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 01:15:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=122002 Change 122002 by csjp@push on 2007/06/20 01:15:41 - Add audit_arg_audinfo_addr() for auditing the arguments for setaudit_addr(2) - In audit_bsm.c, make sure all the arguments: ARG_AUID, ARG_ASID, ARG_AMASK, and ARG_TERMID{_ADDR} are valid before auditing their arguments. (This is done for both setaudit and setaudit_addr. - Audit the arguments passed to setaudit_addr(2) - AF_INET6 does not equate to AU_IPv6. Change this in au_to_in_addr_ex() so the audit token is created with the correct type. This fixes the processing of the in_addr_ex token in userspace. - Change the size of the token (as generated by the kernel) from 5*4 bytes to 4*4 bytes (the correct size of an ip6 address) - Correct regression from ucred work which resulted in getaudit() not returning E2BIG if the subject had an ip6 termid - Correct slight regression in getaudit(2) which resulted in the size of a pointer being passed instead of the size of the structure. (This resulted in invalid auditinfo data being returned via getaudit(2)) Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#27 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#33 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#29 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#35 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#44 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#27 (text+ko) ==== @@ -158,6 +158,7 @@ void audit_arg_sockaddr(struct thread *td, struct sockaddr *sa); void audit_arg_auid(uid_t auid); void audit_arg_auditinfo(struct auditinfo *au_info); +void audit_arg_auditinfo_addr(struct auditinfo_addr *au_info); void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags); void audit_arg_vnode(struct vnode *vp, u_int64_t flags); void audit_arg_text(char *text); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#33 (text+ko) ==== @@ -467,6 +467,28 @@ } void +audit_arg_auditinfo_addr(struct auditinfo_addr *au_info) +{ + struct kaudit_record *ar; + + ar = currecord(); + if (ar == NULL) + return; + + ar->k_ar.ar_arg_auid = au_info->ai_auid; + ar->k_ar.ar_arg_asid = au_info->ai_asid; + ar->k_ar.ar_arg_amask.am_success = au_info->ai_mask.am_success; + ar->k_ar.ar_arg_amask.am_failure = au_info->ai_mask.am_failure; + ar->k_ar.ar_arg_termid_addr.at_type = au_info->ai_termid.at_type; + ar->k_ar.ar_arg_termid_addr.at_port = au_info->ai_termid.at_port; + ar->k_ar.ar_arg_termid_addr.at_addr[0] = au_info->ai_termid.at_addr[0]; + ar->k_ar.ar_arg_termid_addr.at_addr[1] = au_info->ai_termid.at_addr[1]; + ar->k_ar.ar_arg_termid_addr.at_addr[2] = au_info->ai_termid.at_addr[2]; + ar->k_ar.ar_arg_termid_addr.at_addr[3] = au_info->ai_termid.at_addr[3]; + ARG_SET_VALID(ar, ARG_AUID | ARG_ASID | ARG_AMASK | ARG_TERMID_ADDR); +} + +void audit_arg_text(char *text) { struct kaudit_record *ar; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#29 (text+ko) ==== @@ -512,7 +512,10 @@ break; case AUE_SETAUDIT: - if (ARG_IS_VALID(kar, ARG_AUID)) { + if (ARG_IS_VALID(kar, ARG_AUID) && + ARG_IS_VALID(kar, ARG_ASID) && + ARG_IS_VALID(kar, ARG_AMASK) && + ARG_IS_VALID(kar, ARG_TERMID)) { tok = au_to_arg32(1, "setaudit:auid", ar->ar_arg_auid); kau_write(rec, tok); @@ -535,7 +538,37 @@ break; case AUE_SETAUDIT_ADDR: - break; /* XXX need to add arguments */ + if (ARG_IS_VALID(kar, ARG_AUID) && + ARG_IS_VALID(kar, ARG_ASID) && + ARG_IS_VALID(kar, ARG_AMASK) && + ARG_IS_VALID(kar, ARG_TERMID_ADDR)) { + tok = au_to_arg32(1, "setaudit_addr:auid", + ar->ar_arg_auid); + kau_write(rec, tok); + tok = au_to_arg32(1, "setaudit_addr:as_success", + ar->ar_arg_amask.am_success); + kau_write(rec, tok); + tok = au_to_arg32(1, "setaudit_addr:as_failure", + ar->ar_arg_amask.am_failure); + kau_write(rec, tok); + tok = au_to_arg32(1, "setaudit_addr:asid", + ar->ar_arg_asid); + kau_write(rec, tok); + tok = au_to_arg32(1, "setaudit_addr:type", + ar->ar_arg_termid_addr.at_type); + kau_write(rec, tok); + tok = au_to_arg32(1, "setaudit_addr:port", + ar->ar_arg_termid_addr.at_port); + kau_write(rec, tok); + if (ar->ar_arg_termid_addr.at_type == AU_IPv6) + tok = au_to_in_addr_ex((struct in6_addr *) + &ar->ar_arg_termid_addr.at_addr[0]); + if (ar->ar_arg_termid_addr.at_type == AU_IPv4) + tok = au_to_in_addr((struct in_addr *) + &ar->ar_arg_termid_addr.at_addr[0]); + kau_write(rec, tok); + } + break; case AUE_AUDITON: /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#35 (text+ko) ==== @@ -358,13 +358,13 @@ { token_t *t; u_char *dptr = NULL; - u_int32_t type = AF_INET6; + u_int32_t type = AU_IPv6; GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 5 * sizeof(uint32_t)); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_MEM(dptr, internet_addr, 5 * sizeof(uint32_t)); + ADD_MEM(dptr, internet_addr, 4 * sizeof(uint32_t)); return (t); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#44 (text+ko) ==== @@ -514,13 +514,15 @@ error = priv_check(td, PRIV_AUDIT_GETAUDIT); if (error) return (error); + if (td->td_ucred->cr_audit.ai_termid.at_type == AU_IPv6) + return (E2BIG); bzero(&ai, 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))); + return (copyout(&ai, uap->auditinfo, sizeof(ai))); } /* ARGSUSED */ @@ -596,7 +598,10 @@ error = copyin(uap->auditinfo_addr, &aia, sizeof(aia)); if (error) return (error); - /* XXXRW: Audit argument. */ + audit_arg_auditinfo_addr(&aia); + if (aia.ai_termid.at_type != AU_IPv6 && + aia.ai_termid.at_type != AU_IPv4) + return (EINVAL); newcred = crget(); PROC_LOCK(td->td_proc); oldcred = td->td_proc->p_ucred; From owner-p4-projects@FreeBSD.ORG Wed Jun 20 04:04:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35C8216A468; Wed, 20 Jun 2007 04:04:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E641516A41F for ; Wed, 20 Jun 2007 04:04:10 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D817A13C448 for ; Wed, 20 Jun 2007 04:04:10 +0000 (UTC) (envelope-from csjp@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 l5K44Act004917 for ; Wed, 20 Jun 2007 04:04:10 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K44AAG004908 for perforce@freebsd.org; Wed, 20 Jun 2007 04:04:10 GMT (envelope-from csjp@freebsd.org) Date: Wed, 20 Jun 2007 04:04:10 GMT Message-Id: <200706200404.l5K44AAG004908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 122005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 04:04:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=122005 Change 122005 by csjp@push on 2007/06/20 04:03:21 Teach id(1) about extended auditinfo data. This un-breaks id -A for subjects who have ip6 addresses associated with them. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/id/id.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/id/id.c#7 (text+ko) ==== @@ -313,14 +313,42 @@ auditid(void) { auditinfo_t auditinfo; + auditinfo_addr_t ainfo_addr; + int ret, extended; - if (getaudit(&auditinfo) < 0) + extended = 0; + ret = getaudit(&auditinfo); + if (ret < 0 && errno == E2BIG) { + if (getaudit_addr(&ainfo_addr, sizeof(ainfo_addr)) < 0) + err(1, "getaudit_addr"); + extended = 1; + } else if (ret < 0) err(1, "getaudit"); - printf("auid=%d\n", auditinfo.ai_auid); - printf("mask.success=0x%08x\n", auditinfo.ai_mask.am_success); - printf("mask.failure=0x%08x\n", auditinfo.ai_mask.am_failure); - printf("termid.port=0x%08x\n", auditinfo.ai_termid.port); - printf("asid=%d\n", auditinfo.ai_asid); + if (extended != 0) { + printf("auid=%d\n", ainfo_addr.ai_auid); + printf("mask.success=0x%08x\n", ainfo_addr.ai_mask.am_success); + printf("mask.failure=0x%08x\n", ainfo_addr.ai_mask.am_failure); + printf("asid=%d\n", ainfo_addr.ai_asid); + printf("termid_addr.port=0x%08x\n", + ainfo_addr.ai_termid.at_port); + printf("termid_addr.addr[0]=0x%08x\n" + "termid_addr.addr[1]=0x%08x\n" + "termid_addr.addr[2]=0x%08x\n" + "termid_addr.addr[3]=0x%08x\n", + ainfo_addr.ai_termid.at_addr[0], + ainfo_addr.ai_termid.at_addr[1], + ainfo_addr.ai_termid.at_addr[2], + ainfo_addr.ai_termid.at_addr[3]); + } else { + printf("auid=%d\n", auditinfo.ai_auid); + printf("mask.success=0x%08x\n", auditinfo.ai_mask.am_success); + printf("mask.failure=0x%08x\n", auditinfo.ai_mask.am_failure); + printf("asid=%d\n", auditinfo.ai_asid); + printf("termid.port=0x%08x\n", + auditinfo.ai_termid.port); + printf("termid.machine=0x%08x\n", + auditinfo.ai_termid.machine); + } } #endif From owner-p4-projects@FreeBSD.ORG Wed Jun 20 04:27: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 D044A16A46B; Wed, 20 Jun 2007 04:27: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 9DF5216A469 for ; Wed, 20 Jun 2007 04:27:40 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9037213C45B for ; Wed, 20 Jun 2007 04:27:40 +0000 (UTC) (envelope-from csjp@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 l5K4ReUZ027444 for ; Wed, 20 Jun 2007 04:27:40 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K4ReoX027435 for perforce@freebsd.org; Wed, 20 Jun 2007 04:27:40 GMT (envelope-from csjp@freebsd.org) Date: Wed, 20 Jun 2007 04:27:40 GMT Message-Id: <200706200427.l5K4ReoX027435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 122007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 04:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=122007 Change 122007 by csjp@push on 2007/06/20 04:26:59 Hook setaudit_addr(2)/getaudit_addr(2) into MLINKs now that they are viable syscalls. It should be noted that they will reference the setaudit/getaudit(2) man pages. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#23 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#23 (text+ko) ==== @@ -151,6 +151,8 @@ au_user.3 getauusernam.3 \ au_user.3 getauusernam_R.3 \ au_user.3 au_user_mask.3 \ - au_user.3 getfauditflags.3 + au_user.3 getfauditflags.3 \ + getaudit.2 getaudit_addr.2 \ + setaudit.2 setaudit_addr.2 .include From owner-p4-projects@FreeBSD.ORG Wed Jun 20 09:41: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 9A74C16A469; Wed, 20 Jun 2007 09:41: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 56E9D16A421 for ; Wed, 20 Jun 2007 09:41:18 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46E9213C45E for ; Wed, 20 Jun 2007 09:41:18 +0000 (UTC) (envelope-from gabor@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 l5K9fIL5037547 for ; Wed, 20 Jun 2007 09:41:18 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5K9fIoR037537 for perforce@freebsd.org; Wed, 20 Jun 2007 09:41:18 GMT (envelope-from gabor@freebsd.org) Date: Wed, 20 Jun 2007 09:41:18 GMT Message-Id: <200706200941.l5K9fIoR037537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 09:41:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=122014 Change 122014 by gabor@gabor_server on 2007/06/20 09:40:52 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#7 integrate .. //depot/projects/soc2006/gabor_destdir/GIDs#7 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#8 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#17 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#8 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/tindex#3 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#7 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#8 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#7 (text+ko) ==== @@ -82,7 +82,7 @@ AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: - * The remainging vestiges of FreeBSD 4.X support were removed. Any + * The remaining vestiges of FreeBSD 4.X support were removed. Any remaining users of 4.X should have stayed with the RELEASE_4_EOL tag. * It is now possible to include USE_PHP after bsd.port.pre.mk. @@ -96,7 +96,7 @@ * DEPENDS variable was removed, please use other *_DEPENDS variables instead. * A new pkg-plist keyword is available, @stopdaemon. It will call forcestop - on all rc.subr scripts installed by the port on deinstall, efectively + on all rc.subr scripts installed by the port on deinstall, effectively stopping services on deinstall/upgrade. * rc.subr script suffix is now available in Makefile as RC_SUBR_SUFFIX. @@ -214,7 +214,7 @@ 20060804: AUTHOR: gabor@FreeBSD.org -The following functional changes were made to bsd.*.mk and to +The following functional changes were made to bsd.*.mk and to Tools/scripts/security-check.awk: * Add DESTDIR support to let one install ports into a jail from outside. @@ -294,7 +294,7 @@ * Update default linux_base from '8' (Redhat 8) to 'fc4' (Fedora Core 4) [5] - * Switch default Linux X implementation from XFree86 to xorg to track the + * Switch default Linux X implementation from XFree86 to X.org to track the above [5] * Deprecate INSTALLS_SHLIB and replace it by USE_LDCONFIG. If set to "yes", @@ -452,7 +452,7 @@ instead upon the native FreeBSD libraries. - The variable LINUX_BASE_PORT contains a string which is suitable as an item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the - default (or overridden) Linux base, ${LINUX_BASE_PORT} should be used+ + default (or overridden) Linux base, ${LINUX_BASE_PORT} should be used instead of a hardcoded reference. - If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base port and if USE_LINUX isn't set to "yes" (case insensitive), the port will @@ -1351,4 +1351,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.71 2007/06/03 01:01:35 linimon Exp $ +$FreeBSD: ports/CHANGES,v 1.72 2007/06/19 05:56:21 danfe Exp $ ==== //depot/projects/soc2006/gabor_destdir/GIDs#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.41 2007/05/30 06:11:56 miwi Exp $ +$FreeBSD: ports/GIDs,v 1.42 2007/06/10 13:33:05 dinoex Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -78,11 +78,11 @@ _tor:*:256: _dns-proxy-tor:*:257: _trans-proxy-tor:*:258: -smxs:*:260: -smxq:*:261: -smxc:*:262: -smxm:*:263: -smx:*:264: +meta1s:*:260: +meta1q:*:261: +meta1c:*:262: +meta1m:*:263: +meta1:*:264: haclient:*:275: mrtg:*:279: prelude:*:281: ==== //depot/projects/soc2006/gabor_destdir/MOVED#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1386 2007/06/06 14:13:51 naddy Exp $ +# $FreeBSD: ports/MOVED,v 1.1397 2007/06/19 14:24:00 ahze Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2241,12 +2241,9 @@ graphics/gstreamer-plugins-libmng|graphics/gstreamer-plugins-libmng80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-mikmod|audio/gstreamer-plugins-mikmod80|2006-04-29|Not part of gstreamer 0.10 yet multimedia/gstreamer-plugins-mplex|multimedia/gstreamer-plugins-mplex80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-nas|audio/gstreamer-plugins-nas80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-polypaudio|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed audio/gstreamer-plugins-shout|audio/gstreamer-plugins-shout2|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-smoothwave|audio/gstreamer-plugins-smoothwave80|2006-04-29|Not part of gstreamer 0.10 yet -audio/gstreamer-plugins-sndfile|audio/gstreamer-plugins-sndfile80|2006-04-29|Not part of gstreamer 0.10 yet -multimedia/gstreamer-plugins-x264|multimedia/gstreamer-plugins-x26480|2006-04-29|Not part of gstreamer 0.10 yet graphics/gstreamer-plugins-jpeg-mmx|graphics/gstreamer-plugins-jpeg-mmx80|2006-04-29|Not part of gstreamer 0.10 yet audio/gstreamer-plugins-polyp|audio/gstreamer-plugins-pulse|2006-04-29|Project renamed www/evolution-caldav||2006-04-29|Now included in evolution-data-server and evolution @@ -2987,14 +2984,14 @@ audio/gstreamer-plugins-mikmod80||2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-musepack80|audio/gstreamer-plugins-musepack|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-musicbrainz80|audio/gstreamer-plugins-musicbrainz|2007-06-01|Gstreamer 0.8 has been removed -audio/gstreamer-plugins-nas80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-nas80|audio/gstreamer-plugins-nas|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-ogg80|audio/gstreamer-plugins-ogg|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-polyp80||2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-shout280|audio/gstreamer-plugins-shout2|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-shout80||2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-sidplay80|audio/gstreamer-plugins-sidplay|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-smoothwave80||2007-06-01|Gstreamer 0.8 has been removed -audio/gstreamer-plugins-sndfile80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-sndfile80|audio/gstreamer-plugins-sndfile|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-speex80|audio/gstreamer-plugins-speex|2007-06-01|Gstreamer 0.8 has been removed audio/gstreamer-plugins-vorbis80|audio/gstreamer-plugins-vorbis|2007-06-01|Gstreamer 0.8 has been removed devel/gstreamer-plugins-gconf80|devel/gstreamer-plugins-gconf|2007-06-01|Gstreamer 0.8 has been removed @@ -3019,7 +3016,7 @@ multimedia/gstreamer-plugins-mpeg2dec80|multimedia/gstreamer-plugins-mpeg2dec|2007-06-01|Gstreamer 0.8 has been removed multimedia/gstreamer-plugins-mplex80||2007-06-01|Gstreamer 0.8 has been removed multimedia/gstreamer-plugins-theora80|multimedia/gstreamer-plugins-theora|2007-06-01|Gstreamer 0.8 has been removed -multimedia/gstreamer-plugins-x26480||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-x26480|multimedia/gstreamer-plugins-x264|2007-06-01|Gstreamer 0.8 has been removed multimedia/gstreamer-plugins-xvid80|multimedia/gstreamer-plugins-xvid|2007-06-01|Gstreamer 0.8 has been removed multimedia/gstreamer-plugins80|multimedia/gstreamer-plugins|2007-06-01|Gstreamer 0.8 has been removed multimedia/gstreamer80|multimedia/gstreamer|2007-06-01|Gstreamer 0.8 has been removed @@ -3064,3 +3061,15 @@ multimedia/snd-music-duplicates||2007-06-05|Has expired: Development has been ceased, successor is shareware. audio/freebirth||2007-06-05|Has expired: Doesn't work on FreeBSD 5.0 and higher net/sixxs-heartbeatd||2007-06-05|obsolete, use net/sixxs-aiccu instead +graphics/tgif-nls|graphics/tgif|2007-06-09|graphics/tgif now supports NLS by default +x11-wm/ion-3ds|x11-wm/ion-3|2007-06-10|Upstream project became -rc, soon to become release +mail/smx|mail/meta1|2007-06-10|Project renamed +devel/py-clientcookie||2007-06-10|Module rolled into www/py-mechanize by author +lang/ghc5||2007-07-11|Outdated software, removed on upstream's request +lang/ghc5-doc||2007-07-11|Outdated software, removed on upstream's request +devel/hs-popenhs||2007-07-11|Remove software depending on outdated lang/ghc5 +databases/p5-DBD-Pg-13||2007-06-14|Has expired: Use databases/p5-DBD-Pg instead +multimedia/audacious-docklet|multimedia/audacious-plugins|2007-06-15|Functionality folded into plugins package +net/cacti|net-mgmt/cacti|2007-06-18|Move to net-mgmt category +net/zabbix-agent|net-mgmt/zabbix-agent|2007-06-18|Move to net-mgmt category +graphics/gpdf|graphics/evince|2007-06-19|Obsolete port ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.28 2007/03/27 01:23:56 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.29 2007/06/16 19:03:50 pav Exp $ # # Please view me with 4 column tabs! # @@ -260,6 +260,8 @@ # the order of autotools running. .if !target(run-autotools) +.ORDER: run-autotools run-autotools-aclocal patch-autotools run-autotools-autoheader run-autotools-autoconf run-autotools-automake + run-autotools:: run-autotools-aclocal patch-autotools run-autotools-autoheader \ run-autotools-autoconf run-autotools-automake .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#5 (text+ko) ==== @@ -6,7 +6,7 @@ # Created by: Michael Johnson # Date: 4 Oct 2004 # -# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.38 2007/06/07 16:21:34 ahze Exp $ +# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.39 2007/06/19 14:39:37 ahze Exp $ # $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -57,8 +57,8 @@ dv dvd esound faac faad ffmpeg flac gconf gnomevfs \ gnonlin good gsm hal ivorbis jack jpeg ladspa lame \ libcaca libmms libpng libvisual mp3 mpeg2enc mpeg2dec \ - musepack neon ogg pango pulse python sdl shout2 sidplay \ - spc speex swfdec theora ugly vorbis wavpack xvid + musepack nas neon ogg pango pulse python sdl shout2 sidplay \ + sndfile spc speex swfdec theora ugly vorbis wavpack x264 xvid # other plugins OTHER_GSTREAMER_PLUGINS+= core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#17 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.568 2007/05/25 00:09:37 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.569 2007/06/16 19:07:42 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -704,8 +704,16 @@ # - Show all directories which are build-dependencies # for this port. # package-depends-list -# - Show all directories which are -# package-dependencies for this port. +# - Show all directories which are package-dependencies +# for this port. This is based upon the dependency +# tree as recorded in the Makefiles of the ports +# collection, not as recorded in the currently +# installed ports. +# actual-package-depends-list +# - Like package-depends-list but with the difference +# that the dependencies of the currently installed +# ports are used instead of the dependencies as +# recorded in the ports collection. # run-depends-list # - Show all directories which are run-dependencies # for this port. @@ -2307,7 +2315,7 @@ DISABLE_CONFLICTS= YES .endif .if !defined(PKG_ARGS) -PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} +PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} .if !defined(NO_MTREE) PKG_ARGS+= -m ${MTREE_FILE} .endif @@ -5080,11 +5088,43 @@ fi; \ done +ACTUAL-PACKAGE-DEPENDS?= \ + if [ "${_LIB_RUN_DEPENDS}" != " " ]; then \ + for pkgname in ${PKG_DBDIR}/*; do \ + if [ -e $$pkgname/+CONTENTS ]; then \ + a=$${pkgname\#\#*/}; \ + b=`${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS`; \ + if [ ! -z $$b ]; then \ + origins="$$origins $$a $$b"; \ + fi; \ + fi; \ + done; \ + for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ + tmp=$${dir%/*}; \ + dir=$${tmp\#\#*/}/$${dir\#\#*/}; \ + set -- $$origins; \ + while [ $$\# != 0 ]; do \ + if [ $$dir = $$2 ]; then \ + ${ECHO_CMD} $$1:$$dir; \ + if [ -e ${PKG_DBDIR}/$$1/+CONTENTS ]; then \ + packagelist="$$packagelist ${PKG_DBDIR}/$$1/+CONTENTS"; \ + fi; \ + break; \ + fi; \ + shift 2; \ + done; \ + done; \ + [ -z "$$packagelist" ] || ${AWK} -F '( |:)' 'BEGIN { pkgname="broken_contents" } /@pkgdep / { pkgname=$$2 } /@comment DEPORIGIN:/ { printf "%s:%s\n", pkgname, $$3; pkgname="broken_contents" }' $$packagelist; \ + fi + # Print out package names. package-depends: @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}' +actual-package-depends: + @${ACTUAL-PACKAGE-DEPENDS} + # Build packages for port and dependencies package-recursive: package ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#8 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.419 2007/04/28 00:11:47 shaun Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.421 2007/06/19 10:28:40 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -240,11 +240,6 @@ ftp://mirrors.kernel.org/fedora/core/%SUBDIR%/ \ http://mirror.web-ster.com/fedora/core/%SUBDIR%/ \ ftp://mirror.web-ster.com/fedora/core/%SUBDIR%/ \ - ftp://fedora.cs.utah.edu/pub/fedora/linux/core/%SUBDIR%/ \ - http://fedora.cat.pdx.edu/linux/core/%SUBDIR%/ \ - ftp://fedora.cat.pdx.edu/linux/core/%SUBDIR%/ \ - http://mirror.linux.duke.edu/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.linux.duke.edu/pub/fedora/linux/core/%SUBDIR%/ \ http://rpmfind.net/linux/fedora/core/%SUBDIR%/ \ ftp://rpmfind.net/linux/fedora/core/%SUBDIR%/ \ ftp://ftp.gtlib.cc.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ @@ -253,18 +248,10 @@ ftp://ftp.ale.org/mirrors/fedora/linux/core/%SUBDIR%/ \ http://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \ ftp://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \ - http://fedora.server4you.net/fedora/core/%SUBDIR%/ \ - ftp://fedora.server4you.net/fedora/core/%SUBDIR%/ \ - http://fedora.mirrored.ca/fedora/%SUBDIR%/ \ - ftp://fedora.mirrored.ca/fedora/%SUBDIR%/ \ - ftp://ftp.scarlet.be/pub/fedora/%SUBDIR%/ \ - http://ftp.belnet.be/linux/fedora/linux/core/%SUBDIR%/ \ ftp://ftp.belnet.be/linux/fedora/linux/core/%SUBDIR%/ \ http://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \ ftp://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \ ftp://ultra.linux.cz/pub/fedora/%SUBDIR%/ \ - ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.ipv6.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/linux/core/%SUBDIR%/ \ http://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ ftp://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ http://wftp.tu-chemnitz.de/pub/linux/fedora-core/%SUBDIR%/ \ @@ -274,36 +261,143 @@ http://ftp.esat.net/pub/linux/fedora/%SUBDIR%/ \ ftp://ftp.esat.net/pub/linux/fedora/%SUBDIR%/ \ ftp://alviss.et.tudelft.nl/pub/fedora/core/%SUBDIR%/ \ - http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora/%SUBDIR%/ \ - ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora/%SUBDIR%/ \ - http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora/%SUBDIR%/ \ - ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora/%SUBDIR%/ \ + http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ + http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ ftp://ftp.uninett.no/pub/linux/Fedora/core/%SUBDIR%/ \ - http://ftp.man.poznan.pl/pub/linux/fedora/%SUBDIR%/ \ + http://ftp.man.poznan.pl/pub/linux/fedora/core/%SUBDIR%/ \ ftp://ftp.man.poznan.pl/pub/linux/fedora/%SUBDIR%/ \ http://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \ ftp://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \ - http://ftp.idilis.ro/mirrors/fedora/core/%SUBDIR%/ \ - ftp://ftp.idilis.ro/mirrors/fedora/core/%SUBDIR%/ \ ftp://ftp.kappa.ro/pub/Linux/Distributions/fedora/%SUBDIR%/ \ - http://mirror.etf.bg.ac.yu/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.etf.bg.ac.yu/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.chl.chalmers.se/pub/fedora/linux/core/%SUBDIR%/ \ + http://mirror.etf.bg.ac.yu/fedora/%SUBDIR%/ \ + ftp://mirror.etf.bg.ac.yu/fedora/%SUBDIR%/ \ http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/core/%SUBDIR%/ \ ftp://ftp.hostrino.com/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora/%SUBDIR%/ \ + ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ http://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \ ftp://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \ ftp://ftp.riken.go.jp/pub/Linux/fedora/core/%SUBDIR%/ \ http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \ ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.planetmirror.com/pub/fedora/linux/core/%SUBDIR%/ \ http://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \ ftp://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \ ftp://mirror.netglobalis.net/pub/fedora/%SUBDIR%/ \ http://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \ - ftp://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ + ftp://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \ + http://download.fedora.redhat.com/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.univie.ac.at/systems/linux/fedora/core/%SUBDIR%/ \ + http://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \ + http://fedora.mirror.iweb.ca/core/%SUBDIR%/ \ + ftp://fedora.mirror.iweb.ca/core/%SUBDIR%/ \ + ftp://ftp.telus.net/pub/fedora/linux/core/%SUBDIR%/ \ + http://fedora.arcticnetwork.ca/linux/core/%SUBDIR%/ \ + http://www.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.solnet.ch/mirror/fedora/linux/core/%SUBDIR%/ \ + http://mirror.karneval.cz/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.telmexchile.cl/Unix/fedora/linux/core/%SUBDIR%/ \ + http://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \ + ftp://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \ + http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \ + ftp://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \ + http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \ + http://www.jur-linux.org/download/fedora/core/%SUBDIR%/ \ + http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core/%SUBDIR%/ \ + ftp://ftp.uni-muenster.de/pub/linux/distributions/fedora/linux/core/%SUBDIR%/ \ + http://ftp.uni-bayreuth.de/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.fu-berlin.de/linux/fedora/core/%SUBDIR%/ \ + http://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core/%SUBDIR%/ \ + http://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \ + http://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.univ-pau.fr/pub/mirrors/fedora/%SUBDIR%/ \ + ftp://ftp.lip6.fr/pub/linux/distributions/fedora/%SUBDIR%/ \ + http://fr.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ + http://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core/%SUBDIR%/ \ + ftp://zeniiia.linux.org.uk/pub/distributions/fedora/linux/core/%SUBDIR%/ \ + http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ + http://download.stmc.edu.hk/fedora/linux/core/%SUBDIR%/ \ + ftp://download.stmc.edu.hk/fedora/linux/core/%SUBDIR%/ \ + http://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \ + ftp://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \ + http://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \ + ftp://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \ + http://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ + ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ + http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/%SUBDIR%/ \ + http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \ + http://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ + ftp://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ + http://ftp.riken.jp/Linux/fedora/core/%SUBDIR%/ \ + http://ftp.kaist.ac.kr/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.kaist.ac.kr/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core/%SUBDIR%/ \ + ftp://mirror.hostway.co.kr/pub/fedora/%SUBDIR%/ \ + http://fedora.ifc.unam.mx/fedora/core/%SUBDIR%/ \ + ftp://fedora.ifc.unam.mx/linux/fedora/core/%SUBDIR%/ \ + ftp://ftp.easynet.nl/mirror/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/core/%SUBDIR%/ \ + ftp://ftp.uib.no/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.tpnet.pl/d17/fedora/%SUBDIR%/ \ + http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ + ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/%SUBDIR%/ \ + http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.iasi.roedu.net/mirrors/fedora.redhat.com/core/%SUBDIR%/ \ + ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora/%SUBDIR%/ \ + http://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \ + http://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \ + http://ftp.port80.se/fedora/core/%SUBDIR%/ \ + ftp://ftp.port80.se/fedora/core/%SUBDIR%/ \ + http://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \ + http://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.tlk-l.net/pub/mirrors/fedora.redhat.com/linux/core/%SUBDIR%/ \ + http://limestone.uoregon.edu/ftp/fedora/%SUBDIR%/ \ + ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \ + http://mirrors.tiatera.com/fedora/core/%SUBDIR%/ \ + ftp://mirrors.tiatera.com/fedora/core/%SUBDIR%/ \ + ftp://fedora.bu.edu/core/%SUBDIR%/ \ + http://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \ + ftp://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \ + ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core/%SUBDIR%/ \ + http://coblitz.planet-lab.org/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://ftp.software.umn.edu/linux/fedora/core/%SUBDIR%/ \ + http://fedora.omnispring.com/core/%SUBDIR%/ \ + ftp://fedora.omnispring.com/core/%SUBDIR%/ \ + ftp://ftp.applios.net/pub/fedora/linux/core/%SUBDIR%/ \ + http://fedora.mirror.facebook.com/linux/core/%SUBDIR%/ \ + http://mirror.steadfast.net/fedora/core/%SUBDIR%/ \ + http://mirror.eas.muohio.edu/fedora/linux/core/%SUBDIR%/ \ + http://mirror.engr.sjsu.edu/pub/fedora/linux/core/%SUBDIR%/ \ + ftp://wuarchive.wustl.edu/pub/linux/distributions/fedora/%SUBDIR%/ \ + http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ + ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ + http://mirror.cogentco.com/pub/linux/fedora/linux/core/%SUBDIR%/ \ + http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ + ftp://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_FESTIVAL) @@ -924,6 +1018,13 @@ ftp://ftp.trolltech.com/qt/source/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_RAR) +.for mirror in 2 3 4 5 6 7 8 9 +MASTER_SITE_RAR+= \ + http://files${mirror}.rarlab.com/rar/%SUBDIR%/ +.endfor +.endif + .if !defined(IGNORE_MASTER_SITE_REDHAT_LINUX) MASTER_SITE_REDHAT_LINUX+= \ http://mirrors.usc.edu/pub/linux/distributions/redhat/redhat/linux/%SUBDIR%/ \ ==== //depot/projects/soc2006/gabor_destdir/Tools/scripts/tindex#3 (text+ko) ==== @@ -33,6 +33,11 @@ export SRCDIR6=${BASEDIR}/src.6 export SRCDIR7=${BASEDIR}/src.7 +# Target architecture if not set in the environment +if [ "${ARCH}" = "" ]; then + export ARCH=i386 +fi + # SSH key to use for copying INDEXes to www host (if non-default) export SSHKEY="-i /home/kris/.ssh/id_dsa-index" ==== //depot/projects/soc2006/gabor_destdir/UIDs#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.45 2007/05/30 06:11:56 miwi Exp $ +$FreeBSD: ports/UIDs,v 1.46 2007/06/10 13:33:05 dinoex Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/sbin/nologin @@ -88,11 +88,11 @@ _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh _dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin _trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/sbin/nologin -smxs:*:260:260:Sendmail X SMTPS:/nonexistent:/usr/sbin/nologin -smxq:*:261:261:Sendmail X QMGR:/nonexistent:/usr/sbin/nologin -smxc:*:262:262:Sendmail X SMTPC:/nonexistent:/usr/sbin/nologin -smxm:*:263:263:Sendmail X misc:/nonexistent:/usr/sbin/nologin -smx:*:264:264:Sendmail X other:/nonexistent:/usr/sbin/nologin +meta1s:*:260:260:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin +meta1q:*:261:261:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin +meta1c:*:262:262:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin +meta1m:*:263:263:MeTA1 misc:/nonexistent:/usr/sbin/nologin +meta1:*:264:264: X other:/nonexistent:/usr/sbin/nologin hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/sbin/nologin mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin prelude:*:281:281:Prelude user:/nonexistent:/sbin/nologin ==== //depot/projects/soc2006/gabor_destdir/UPDATING#8 (text+ko) ==== @@ -6,6 +6,45 @@ time you update your ports collection, before attempting any port upgrades. +20070614: + AFFECTS: users of www/oscommerce + AUTHOR: vlad@vlad.uz.ua + + osCommerce now installs into /usr/local/www/oscommerce instead of + /usr/local/www/data/oscommerce. + +20070614: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + www/mediawiki version is 1.10 now. 1.9 version was preserved on + www/mediawiki19 port. + +20070614: + AFFECTS: users of www/xshttpd-devel and web apps porters + AUTHOR: johans@FreeBSD.org + + www/xshttpd-devel now uses ${PREFIX}/www/xshttpd/ as a root + directory for its data files. The xshttpd configuration files have + been moved to ${PREFIX}/www/xshttpd/conf/. Move the appropriate + local files manually if you are upgrading from versions <= 3.5.b07 + +20070613: + AFFECTS: users of net-mgmt/zabbix + AUTHOR: infofarmer@FreeBSD.org + + The agent part has been moved out into net/zabbix-agent. If you + need both the server and the agent, install both ports. + +20070612: + AFFECTS: users of security/sshguard + AUTHOR: itetcu@FreeBSD.org + + The port has been split in 3, if you use it with ipfw please: + # portupgrade -o security/sshguard-ipfw sshguard\* + or if you use it with pf: + # portupgrade -o security/sshguard-pf sshguard\* + 20070526: AFFECTS: users of devel/perforce AUTHOR: lth@FreeBSD.org @@ -5344,4 +5383,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.511 2007/06/06 21:53:07 sem Exp $ +$FreeBSD: ports/UPDATING,v 1.519 2007/06/14 21:56:23 pav Exp $ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:00: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 8601F16A421; Wed, 20 Jun 2007 10:00: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 4667B16A46C for ; Wed, 20 Jun 2007 10:00:42 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1F97C13C44B for ; Wed, 20 Jun 2007 10:00:42 +0000 (UTC) (envelope-from zhouzhouyi@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 l5KA0gVX052957 for ; Wed, 20 Jun 2007 10:00:42 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KA0fas052953 for perforce@freebsd.org; Wed, 20 Jun 2007 10:00:41 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 20 Jun 2007 10:00:41 GMT Message-Id: <200706201000.l5KA0fas052953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:00:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=122015 Change 122015 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/20 10:00:33 parser program to parse the result from /dev/mactestpipe. use bison to convert mactestparser.y to .c file enjoy :-) Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tools/regression/mactest/mactestparser.y#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:12: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 2C5CB16A46C; Wed, 20 Jun 2007 10:12: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 EA00A16A46B for ; Wed, 20 Jun 2007 10:12:57 +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 DAB4F13C4C1 for ; Wed, 20 Jun 2007 10:12:57 +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 l5KACvTV066345 for ; Wed, 20 Jun 2007 10:12:57 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KACvNt066336 for perforce@freebsd.org; Wed, 20 Jun 2007 10:12:57 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:12:57 GMT Message-Id: <200706201012.l5KACvNt066336@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 122016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122016 Change 122016 by fli@fli_genesis on 2007/06/20 10:12:04 - Avoid shadowing of function names - const'ify key argument - Add opaque callback argument to hashtbl_walk() - Attempt to detect changes to a hash bucket after callback routine in hashtbl_walk() Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#5 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#5 (text+ko) ==== @@ -308,13 +308,13 @@ * len - table entries, should be a power of 2 */ int -hashtbl_init(struct hashtbl *ht, size_t len, size_t grow, size_t col) +hashtbl_init(struct hashtbl *ht, size_t len, size_t growsz, size_t col) { size_t i; ht->ht_buckets = malloc(sizeof(struct hashbkt) * len); ht->ht_tblsz = len; - ht->ht_grow = grow; + ht->ht_grow = growsz; ht->ht_col = col; ht->ht_mask = len - 1; ht->ht_alloc_size = 0; @@ -342,7 +342,7 @@ for (i = 0; i < ht->ht_tblsz; i++) { TAILQ_FOREACH(he, &ht->ht_buckets[i].hb_table, he_next) { if (he->he_flags & HASHTBL_KEYDUP) - free(he->he_key); + free(he->he_key.vol); } } SLIST_FOREACH_SAFE(hep, &ht->ht_new, hep_next, hep2) { @@ -359,13 +359,13 @@ * keylen - Key length */ static inline struct hashentry * -find(struct hashtbl *ht, uint32_t hval, void *key, size_t keylen) +find(struct hashtbl *ht, uint32_t hval, const void *key, size_t keylen) { struct hashentry *he; TAILQ_FOREACH(he, &ht->ht_buckets[hval].hb_table, he_next) { if (keylen == he->he_keylen) { - if (memcmp(key, he->he_key, keylen) == 0) + if (memcmp(key, he->he_key.con, keylen) == 0) break; } } @@ -382,7 +382,8 @@ * Returns 0 on success, on failure -1 is returned */ int -hashtbl_add(struct hashtbl *ht, void *key, size_t keylen, void *data, int flags) +hashtbl_add(struct hashtbl *ht, const void *key, size_t keylen, void *data, + int flags) { uint32_t hval; struct hashentry *he; @@ -399,11 +400,11 @@ he->he_flags = flags; if (flags & HASHTBL_KEYDUP) { - he->he_key = malloc(keylen); - memcpy(he->he_key, key, keylen); + he->he_key.vol = malloc(keylen); + memcpy(he->he_key.vol, key, keylen); } else { - he->he_key = key; + he->he_key.con = key; } he->he_keylen = keylen; he->he_data = data; @@ -427,7 +428,7 @@ * Returns 0 on success, -1 on failure (non-existing key) */ int -hashtbl_del(struct hashtbl *ht, void *key, size_t keylen) +hashtbl_del(struct hashtbl *ht, const void *key, size_t keylen) { uint32_t hval; struct hashentry *he; @@ -439,7 +440,7 @@ if (he != NULL) { TAILQ_REMOVE(&ht->ht_buckets[hval].hb_table, he, he_next); if (he->he_flags & HASHTBL_KEYDUP) - free(he->he_key); + free(he->he_key.vol); free_he(ht, he); return (0); } @@ -456,7 +457,7 @@ * NULL is returned. */ void * -hashtbl_find(struct hashtbl *ht, void *key, size_t keylen) +hashtbl_find(struct hashtbl *ht, const void *key, size_t keylen) { uint32_t hval; struct hashentry *he; @@ -474,14 +475,31 @@ * cb - Callback function */ void -hashtbl_walk(struct hashtbl *ht, hashtbl_cb cb) +hashtbl_walk(struct hashtbl *ht, hashtbl_cb cb, void *arg) { - struct hashentry *he, *he2; + struct hashentry *he, *he_tmp; + struct hashentry *he_head, *he_next, *he_prev; 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); + he = he_head = TAILQ_FIRST(&ht->ht_buckets[i].hb_table); + while (he != NULL) { + he_next = TAILQ_NEXT(he, he_next); + he_prev = TAILQ_PREV(he, hashbkt_head, he_next); + + cb(ht, he->he_key.con, he->he_keylen, he->he_data, arg); + + if (he_head != TAILQ_FIRST(&ht->ht_buckets[i].hb_table)) { + he = he_head = TAILQ_FIRST(&ht->ht_buckets[i].hb_table); + } + else { + he = he_next; + if (he_prev != NULL) { + he_tmp = TAILQ_NEXT(TAILQ_NEXT(he_prev, he_next), he_next); + if (he_tmp != NULL && he_tmp != he_next) + he = he_tmp; + } + } } } } ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#5 (text+ko) ==== @@ -36,7 +36,10 @@ TAILQ_ENTRY(hashentry) he_next; /* Next entry */ uint32_t he_hash; /* Computed hash */ int he_flags; - void *he_key; /* Byte key */ + union { + void *vol; + const void *con; + } he_key; size_t he_keylen; /* Byte Key length */ void *he_data; /* Data object pointer */ }; @@ -45,7 +48,7 @@ * Hash bucket */ struct hashbkt { - TAILQ_HEAD(, hashentry) hb_table; + TAILQ_HEAD(hashbkt_head, hashentry) hb_table; uint8_t hb_len; }; @@ -75,12 +78,13 @@ #define HASHTBL_KEYDUP 0x01 -typedef void (hashtbl_cb)(struct hashtbl *, void *, size_t, void *); +typedef void (hashtbl_cb)(struct hashtbl *, const void *, size_t, + void *, 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); -int hashtbl_del(struct hashtbl *, void *, size_t); -void * hashtbl_find(struct hashtbl *, void *, size_t); -void hashtbl_walk(struct hashtbl *, hashtbl_cb); +int hashtbl_add(struct hashtbl *, const void *, size_t, void *, int); +int hashtbl_del(struct hashtbl *, const void *, size_t); +void * hashtbl_find(struct hashtbl *, const void *, size_t); +void hashtbl_walk(struct hashtbl *, hashtbl_cb, void *); #endif /* _HASH_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:19: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 BEFBE16A473; Wed, 20 Jun 2007 10:19: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 6C90216A46C for ; Wed, 20 Jun 2007 10:19:08 +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 5D61513C4BF for ; Wed, 20 Jun 2007 10:19:08 +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 l5KAJ6uK072062 for ; Wed, 20 Jun 2007 10:19:06 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAJ6vY072047 for perforce@freebsd.org; Wed, 20 Jun 2007 10:19:06 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:19:06 GMT Message-Id: <200706201019.l5KAJ6vY072047@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 122017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=122017 Change 122017 by fli@fli_genesis on 2007/06/20 10:18:28 - Revisit the buffer management code. We now keep two different sized chunks, one huge (9000 bytes, maximum mdns packet length) and one "MTU-sized". - Add some debugging printouts. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#7 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.c#7 (text+ko) ==== @@ -29,7 +29,9 @@ #include #include +#include "stack_mdns.h" #include "stack_buf.h" +#include "log.h" #include "debug.h" struct mdns_bufpool * mdns_bufpool_init(size_t, int, @@ -48,6 +50,8 @@ assert((lock == NULL && unlock == NULL) || (lock != unlock)); bp = malloc(sizeof(struct mdns_bufpool)); + if (bp == NULL) + return (NULL); bzero(bp, sizeof(struct mdns_bufpool)); bp->bp_defsz = defsz; bp->bp_lim = lim; @@ -55,34 +59,41 @@ bp->bp_unlock = unlock; bp->bp_lockarg = arg; TAILQ_INIT(&bp->bp_list); + TAILQ_INIT(&bp->bp_huge); MDNS_INIT_SET(bp, bp_magic); + dprintf(DEBUG_BUF, "Bufferpool initialized defsz=%d, bp=%x", defsz, bp); return (bp); } int mdns_bufpool_destroy(struct mdns_bufpool *bp) { - struct mdns_buf *buf; - int ret; + struct mdns_buf *buf, *buf2; MDNS_INIT_ASSERT(bp, bp_magic); MDNS_BP_LOCK(bp); - while (!TAILQ_EMPTY(&bp->bp_list)) { - buf = TAILQ_FIRST(&bp->bp_list); - TAILQ_REMOVE(&bp->bp_list, buf, b_list); + TAILQ_FOREACH_SAFE(buf, &bp->bp_list, b_next, buf2) { + MDNS_INIT_ASSERT(buf, b_magic); + MDNS_INIT_UNSET(buf, b_magic); + TAILQ_REMOVE(&bp->bp_list, buf, b_next); + free(buf->b_buf); + free(buf); + } + TAILQ_FOREACH_SAFE(buf, &bp->bp_huge, b_next, buf2) { + MDNS_INIT_ASSERT(buf, b_magic); + MDNS_INIT_UNSET(buf, b_magic); + TAILQ_REMOVE(&bp->bp_huge, buf, b_next); free(buf->b_buf); free(buf); } - ret = TAILQ_EMPTY(&bp->bp_list); + MDNS_INIT_UNSET(bp, bp_magic); MDNS_BP_UNLOCK(bp); + free(bp); - if (ret == 1) { - MDNS_INIT_UNSET(bp, bp_magic); - free(bp); - } - return (ret); + dprintf(DEBUG_BUF, "Bufferpool destroyed bp=%x", bp); + return (0); } void @@ -93,6 +104,7 @@ MDNS_BP_LOCK(bp); bp->bp_defsz = len; MDNS_BP_UNLOCK(bp); + dprintf(DEBUG_BUF, "Bufferpool size set to %d bytes, bp=%x", len, bp); } size_t @@ -109,53 +121,73 @@ } struct mdns_buf * -mdns_buf_alloc(struct mdns_bufpool *bp, struct mdns_bufhead *bh, - size_t len, int locked) +mdns_buf_alloc(struct mdns_bufpool *bp, struct mdns_bufhead *bh, size_t len, + int flags) { struct mdns_buf *buf; MDNS_INIT_ASSERT(bp, bp_magic); - if (!locked) + if (!(flags & MDNS_BP_LOCKED)) MDNS_BP_LOCK(bp); buf = NULL; - do { + if (flags & MDNS_BP_HUGE) { + if (!TAILQ_EMPTY(&bp->bp_huge)) { + buf = TAILQ_FIRST(&bp->bp_huge); + TAILQ_REMOVE(&bp->bp_huge, buf, b_next); + bp->bp_buffree[1]--; + } + } + else { if (!TAILQ_EMPTY(&bp->bp_list)) { buf = TAILQ_FIRST(&bp->bp_list); - TAILQ_REMOVE(&bp->bp_list, buf, b_list); - bp->bp_buffree--; - if (buf->b_sz < bp->bp_defsz) { - mdns_buf_free(bp, bh, buf, 1); - buf = NULL; - } - else if (buf->b_sz > bp->bp_defsz) { - buf->b_flags |= MDNS_BUF_TEMP; - } + TAILQ_REMOVE(&bp->bp_list, buf, b_next); + bp->bp_buffree[0]--; + } + } + + if (buf == NULL) { + buf = malloc(sizeof(struct mdns_buf)); + if (buf == NULL) + goto out; + + buf->b_flags = 0; + buf->b_sz = (len == 0) ? + ((flags & MDNS_BP_HUGE) ? MDNS_PKG_MAX_LEN : bp->bp_defsz) : len; + buf->b_buf = malloc(buf->b_sz); + if (buf->b_buf == NULL) { + free(buf); + buf = NULL; + goto out; + } + + if (flags & MDNS_BP_HUGE) { + buf->b_flags |= MDNS_BUF_HUGE; + bp->bp_buftotal[1]++; + } + else if (buf->b_sz > bp->bp_defsz) { + buf->b_flags |= MDNS_BUF_TEMP; + bp->bp_buftotal[0]++; } else { - buf = malloc(sizeof(struct mdns_buf)); - buf->b_flags = 0; - if (len > 0) { - buf->b_sz = len; - buf->b_flags |= MDNS_BUF_TEMP; - } - else { - buf->b_sz = bp->bp_defsz; - } - buf->b_buf = malloc(buf->b_sz); - bp->bp_buftotal++; + bp->bp_buftotal[0]++; } - } while (buf == NULL); + } + MDNS_INIT_SET(buf, b_magic); + bp->bp_allocs++; buf->b_len = 0; if (bh->bh_size == 0) TAILQ_INIT(&bh->bh_list); - TAILQ_INSERT_TAIL(&bh->bh_list, buf, b_list); + TAILQ_INSERT_TAIL(&bh->bh_list, buf, b_next); bh->bh_size++; - MDNS_INIT_SET(buf, b_magic); + + dprintf(DEBUG_BUF, "Blocks in use %d, free normal=%d, huge=%d", + bp->bp_allocs, bp->bp_buffree[0], bp->bp_buffree[1]); - if (!locked) +out: + if (!(flags & MDNS_BP_LOCKED)) MDNS_BP_UNLOCK(bp); return (buf); } @@ -171,31 +203,53 @@ if (!locked) MDNS_BP_LOCK(bp); - MDNS_INIT_UNSET(buf, b_magic); - TAILQ_REMOVE(&bh->bh_list, buf, b_list); + TAILQ_REMOVE(&bh->bh_list, buf, b_next); bh->bh_size--; - if (!(buf->b_flags & MDNS_BUF_TEMP)) { - TAILQ_INSERT_TAIL(&bp->bp_list, buf, b_list); - bp->bp_buffree++; + bp->bp_allocs--; + + dprintf(DEBUG_BUF, "Free buf=%x, size=%d, flags=%x", buf, + buf->b_sz, buf->b_flags); + if (!(buf->b_flags & MDNS_BUF_TEMP) || buf->b_sz >= bp->bp_defsz) { + if (buf->b_flags & MDNS_BUF_HUGE) { + TAILQ_INSERT_TAIL(&bp->bp_huge, buf, b_next); + bp->bp_buffree[1]++; + } + else { + TAILQ_INSERT_TAIL(&bp->bp_list, buf, b_next); + bp->bp_buffree[0]++; + } } else { + MDNS_INIT_UNSET(buf, b_magic); free(buf->b_buf); free(buf); goto out; } - i = (bp->bp_buffree - 1) / 4; - for (; i > 0; i--) { + i = ((bp->bp_allocs + 1) * 1.5); + while (bp->bp_buffree[0] > i) { + bp->bp_buffree[0]--; buf = TAILQ_FIRST(&bp->bp_list); if (buf == NULL) break; - TAILQ_REMOVE(&bp->bp_list, buf, b_list); + TAILQ_REMOVE(&bp->bp_list, buf, b_next); + free(buf->b_buf); + free(buf); + } + + while (bp->bp_buffree[1] > i) { + bp->bp_buffree[1]--; + buf = TAILQ_FIRST(&bp->bp_huge); + if (buf == NULL) + break; + TAILQ_REMOVE(&bp->bp_huge, buf, b_next); free(buf->b_buf); free(buf); - bp->bp_buftotal--; - bp->bp_buffree--; } + dprintf(DEBUG_BUF, "Blocks in use %d, free normal=%d, huge=%d", + bp->bp_allocs, bp->bp_buffree[0], bp->bp_buffree[1]); + out: if (!locked) MDNS_BP_UNLOCK(bp); @@ -241,7 +295,7 @@ MDNS_BP_LOCK(bp); len = 0; - TAILQ_FOREACH(buf, &bh->bh_list, b_list) { + TAILQ_FOREACH(buf, &bh->bh_list, b_next) { len += MDNS_BUFLEN(buf); } @@ -252,7 +306,7 @@ while (!TAILQ_EMPTY(&bh->bh_list)) { buf2 = TAILQ_FIRST(&bh->bh_list); - TAILQ_REMOVE(&bh->bh_list, buf2, b_list); + TAILQ_REMOVE(&bh->bh_list, buf2, b_next); memcpy(MDNS_BUFPOS(buf), MDNS_BUF(buf2), MDNS_BUFLEN(buf2)); MDNS_BUFLEN(buf) += MDNS_BUFLEN(buf2); mdns_buf_free(bp, bh, buf2, 1); ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_buf.h#5 (text+ko) ==== @@ -37,12 +37,13 @@ */ struct mdns_buf { MAGIC(b_magic); - TAILQ_ENTRY(mdns_buf) b_list; + TAILQ_ENTRY(mdns_buf) b_next; char *b_buf; /* raw byte buffer */ size_t b_sz; /* buffer size */ size_t b_len; int b_flags; #define MDNS_BUF_TEMP 0x01 /* do not put back on free list after use */ +#define MDNS_BUF_HUGE 0x02 }; /* @@ -72,15 +73,20 @@ struct mdns_bufpool { MAGIC(bp_magic); TAILQ_HEAD(, mdns_buf) bp_list; /* free list */ + TAILQ_HEAD(, mdns_buf) bp_huge; /* huge free list */ size_t bp_defsz; /* default segment size */ int bp_lim; /* max number of segments */ bp_lock bp_lock; /* external lock function */ bp_unlock bp_unlock; /* external lock function */ void *bp_lockarg; /* lock argument */ - int bp_buffree; - int bp_buftotal; + int bp_buffree[2]; + int bp_buftotal[2]; + uint32_t bp_allocs; }; +#define MDNS_BP_LOCKED 0x01 +#define MDNS_BP_HUGE 0x02 + /* * Buffer consumer */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:24: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 B1AB616A46B; Wed, 20 Jun 2007 10:24: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 7186B16A421 for ; Wed, 20 Jun 2007 10:24:13 +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 61FCD13C4DA for ; Wed, 20 Jun 2007 10:24:13 +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 l5KAOD3a076951 for ; Wed, 20 Jun 2007 10:24:13 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAODiu076942 for perforce@freebsd.org; Wed, 20 Jun 2007 10:24:13 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:24:13 GMT Message-Id: <200706201024.l5KAODiu076942@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 122018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:24:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=122018 Change 122018 by fli@fli_genesis on 2007/06/20 10:23:35 - Several setsockopt() IPv6 related fixes. - Fix MTU retrieval code. - Follow buffer changes. - Make sockets non-blocking. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#5 (text+ko) ==== @@ -48,6 +48,7 @@ #include "mdns.h" #include "stack_mdns.h" #include "debug.h" +#include "log.h" static int mdns_udp_open(struct mdns *, int); static int mdns_udp_close(struct mdns *, int); @@ -103,8 +104,9 @@ md->md_ifindex = idx; md->md_bp = bp; + bzero(&req, sizeof(struct ifreq)); strlcpy(req.ifr_name, md->md_ifnam, IFNAMSIZ); - sock = socket(IPPROTO_IP, SOCK_DGRAM, 0); + sock = socket(PF_INET, SOCK_DGRAM, 0); error = ioctl(sock, SIOCGIFMTU, &req); close(sock); /* @@ -119,13 +121,15 @@ md->md_maxpkgsz = MDNS_PKG_MAX_LEN; } #undef _HDR_OVERHEAD + dprintf(DEBUG_STACK, "Max packet size %d bytes on %s\n", + md->md_maxpkgsz, md->md_ifnam); /* * Adjust the global buffer pool segment size upwards if needed */ len = mdns_bufpool_getsize(bp); if (md->md_maxpkgsz > len) - mdns_bufpool_setsize(bp, len); + mdns_bufpool_setsize(bp, md->md_maxpkgsz); TAILQ_INIT(&md->md_pkglist); @@ -219,10 +223,10 @@ static int mdns_udp_open(struct mdns *md, int family) { - int sock, so, error, level; + int sock, so, error; struct sockaddr_in sin, *sinptr; #ifdef INET6 - struct sockaddr_in6 sin6, *sin6ptr; + struct sockaddr_in6 sin6; #endif struct ifreq ifreq; @@ -242,46 +246,45 @@ sock = socket(family, SOCK_DGRAM, 0); if (sock < 0) return (-1); - - if (family == PF_INET) - level = IPPROTO_IP; -#ifdef INET6 - else if (family == PF_INET6) - level = IPPROTO_IPV6; -#endif - else { + error = fcntl(sock, F_SETFL, O_NONBLOCK); + if (error != 0) goto out; - } so = 1; setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &so, sizeof(so)); - error = setsockopt(sock, level, IP_RECVIF, &so, sizeof(so)); - if (error != 0) - goto out; - so = 0; - /* Ignore our own multicast packets */ - error = setsockopt(sock, level, IP_MULTICAST_LOOP, &so, sizeof(so)); - if (error != 0) - goto out; + switch (family) { + case PF_INET: + /* + * Set IP TTL to 255, this is to be comaptible with older + * MDNS responders that discard packets with ttl != 255 + * We do not care if it fails. + */ + so = 255; + setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, &so, sizeof(so)); + setsockopt(sock, IPPROTO_IP, IP_TTL, &so, sizeof(so)); - /* - * Set IP TTL to 255, this is to be comaptible with older - * MDNS responders that discard packets with ttl != 255 - * We do not care if it fails. - */ - so = 255; - setsockopt(sock, level, IP_MULTICAST_TTL, &so, sizeof(so)); - setsockopt(sock, level, IP_TTL, &so, sizeof(so)); + so = 1; + error = setsockopt(sock, IPPROTO_IP, IP_RECVIF, &so, sizeof(so)); + if (error != 0) + goto out; + /* Ignore our own multicast packets */ + so = 0; + error = setsockopt(sock, IPPROTO_IP, IP_MULTICAST_LOOP, &so, + sizeof(so)); + if (error != 0) + goto out; - if_indextoname(md->md_ifindex, ifreq.ifr_name); - switch (family) { - case PF_INET: /* Make sure we transmit on the correct interface */ + if_indextoname(md->md_ifindex, ifreq.ifr_name); error = ioctl(sock, SIOCGIFADDR, &ifreq); + if (error != 0) + goto out; sinptr = (struct sockaddr_in *)&ifreq.ifr_addr; setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, &sinptr->sin_addr.s_addr, sizeof(sinptr->sin_addr.s_addr)); + if (error != 0) + goto out; /* Bind udp socket */ bzero(&sin, sizeof(struct sockaddr_in)); @@ -302,11 +305,18 @@ break; #ifdef INET6 case PF_INET6: + /* Receive interface information */ + so = 1; + error = setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &so, + sizeof(so)); + if (error != 0) + goto out; /* Make sure we transmit on the correct interface */ - error = ioctl(sock, SIOCGIFADDR, &ifreq); - sin6ptr = (struct sockaddr_in6 *)&ifreq.ifr_addr; - setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, - &sin6ptr->sin6_addr, sizeof(sin6ptr->sin6_addr)); + so = md->md_ifindex; + error = setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, &so, + sizeof(so)); + if (error != 0) + goto out; /* Bind udp socket */ bzero(&sin6, sizeof(struct sockaddr_in6)); @@ -605,7 +615,7 @@ TAILQ_FOREACH(pkg, &pc->pc_head, p_list) { iov = malloc(sizeof(struct iovec) * MDNS_BUFHSZ(&pkg->p_buflist)); i = 0; - TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_list) { + TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_next) { iov[i].iov_base = MDNS_BUF(buf); iov[i].iov_len = MDNS_BUFLEN(buf); i++; @@ -703,7 +713,8 @@ mdns_recv(struct mdns *md, struct mdns_pkgchain *pc, int family, struct sockaddr *from, socklen_t *fromlen) { - int sock, ret; + int sock; + ssize_t ret; struct mdns_packet *pkg; struct mdns_buf *buf; struct msghdr msg; @@ -714,6 +725,13 @@ struct cmsghdr cmsg; struct sockaddr_dl sdl; } control; +#ifdef INET6 + struct { + struct cmsghdr cmsg; + struct in6_pktinfo pkt; + } control6; + struct in6_pktinfo *ipi6; +#endif MDNS_INIT_ASSERT(md, md_magic); MDNS_INIT_ASSERT(pc, pc_magic); @@ -721,10 +739,14 @@ switch (family) { case PF_INET: sock = md->md_udp4; + msg.msg_control = &control; + msg.msg_controllen = sizeof(control); break; #ifdef INET6 case PF_INET6: sock = md->md_udp6; + msg.msg_control = &control6; + msg.msg_controllen = sizeof(control6); break; #endif default: @@ -737,7 +759,7 @@ return (-1); buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : - mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); + mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, MDNS_BP_HUGE); if (buf == NULL) return (-1); @@ -746,21 +768,35 @@ msg.msg_name = from; msg.msg_namelen = *fromlen; - msg.msg_control = &control; - msg.msg_controllen = sizeof(control); msg.msg_iov = iov; msg.msg_iovlen = 1; ret = recvmsg(sock, &msg, 0); + if (ret < 0) + goto error; + pkg->p_len = MDNS_BUFLEN(buf) = ret; + dprintf(DEBUG_STACK, "Buffer filled %d bytes (size %d)", + MDNS_BUFLEN(buf), MDNS_BUFSZ(buf)); cmptr = CMSG_FIRSTHDR(&msg); - if (cmptr->cmsg_type == IP_RECVIF && cmptr->cmsg_level == IPPROTO_IP) { - sdl = (struct sockaddr_dl *) CMSG_DATA(cmptr); - if (sdl->sdl_index != md->md_ifindex) - return (-1); + if (cmptr->cmsg_level == IPPROTO_IP) { + if (cmptr->cmsg_type == IP_RECVIF) { + sdl = (struct sockaddr_dl *) CMSG_DATA(cmptr); + if (sdl->sdl_index != md->md_ifindex) + goto error; + } + } +#ifdef INET6 + else if (cmptr->cmsg_level == IPPROTO_IPV6) { + ipi6 = (struct in6_pktinfo *) CMSG_DATA(cmptr); + if (ipi6->ipi6_ifindex != (unsigned int)md->md_ifindex) + goto error; } +#endif - pkg->p_len = MDNS_BUFLEN(buf) = ret; - return (ret); + return (pkg->p_len); +error: + mdns_buf_free(md->md_bp, &pkg->p_buflist, buf, 0); + return (-1); } /* @@ -772,7 +808,7 @@ * fromlen - Socket address length */ int -mdns_tcp_client(struct mdns *md, int sock, +mdns_tcp_client(__unused struct mdns *md, int sock, struct sockaddr *from, socklen_t *fromlen) { int nsock; @@ -830,7 +866,7 @@ TAILQ_FOREACH(pkg, &pc->pc_head, p_list) { iov = malloc(sizeof(struct iovec) * MDNS_BUFHSZ(&pkg->p_buflist)); i = 0; - TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_list) { + TAILQ_FOREACH(buf, &MDNS_BUFHEAD(&pkg->p_buflist), b_next) { iov[i].iov_base = MDNS_BUF(buf); iov[i].iov_len = MDNS_BUFLEN(buf); i++; @@ -864,17 +900,17 @@ return (-1); buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : - mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); + mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, MDNS_BP_HUGE); if (buf == NULL) return (-1); for (;;) { n = read(sock, MDNS_BUF(buf), MDNS_BUFSZ(buf)); - if (n > 0) { - pkg->p_len += n; - MDNS_BUFLEN(buf) = n; - } - if ((unsigned int)n < MDNS_BUFSZ(buf) || pkg->p_len >= MDNS_PKG_MAX_LEN) + if (n < 0) + break; + pkg->p_len += n; + MDNS_BUFLEN(buf) = n; + if ((size_t)n < MDNS_BUFSZ(buf) || pkg->p_len >= MDNS_PKG_MAX_LEN) break; buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); @@ -888,7 +924,7 @@ * very rare. TCP operations are only present to provide compability * with legacy clients. */ - buf = mdns_buf_merge(md->md_bp, &pkg->p_buflist, 1); + buf = mdns_buf_merge(md->md_bp, &pkg->p_buflist, 0); if (buf == NULL) return (-1); From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:28: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 27CDD16A477; Wed, 20 Jun 2007 10:28: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 EF34E16A46F for ; Wed, 20 Jun 2007 10:28:18 +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 E043B13C45A for ; Wed, 20 Jun 2007 10:28:18 +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 l5KASI3H080862 for ; Wed, 20 Jun 2007 10:28:18 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KASIdn080853 for perforce@freebsd.org; Wed, 20 Jun 2007 10:28:18 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:28:18 GMT Message-Id: <200706201028.l5KASIdn080853@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 122019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:28:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=122019 Change 122019 by fli@fli_genesis on 2007/06/20 10:27:30 - __packed instead of __attribute__((packed)) - Whitespace fixes. - Add a neccessary struct forward declaration. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#4 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#4 (text+ko) ==== @@ -86,11 +86,11 @@ unsigned int h_cd:1; /* Checking disabled, q/r=0 ignore on recv */ unsigned int h_rcode:4; /* Resp. code, q/r=0 ignore on recv */ #endif - unsigned int h_qcount:16; /* number of question entries */ - unsigned int h_acount:16; /* number of answer entries */ + unsigned int h_qcount:16; /* number of question entries */ + unsigned int h_acount:16; /* number of answer entries */ unsigned int h_nscount:16; /* number of authority entries */ - unsigned int h_rcount:16; /* number of resource entries */ -} __attribute__((packed)); + unsigned int h_rcount:16; /* number of resource entries */ +} __packed; /* * Question section "header", starts at the end @@ -100,7 +100,7 @@ /* Qname ..//.. */ uint16_t qs_type; uint16_t qs_class; -} __attribute__((packed)); +} __packed; /* * Resource record "header", starts at the end of the @@ -113,8 +113,9 @@ uint32_t rs_ttl; uint16_t rs_rdlen; /* Rdata ..//.. */ -} __attribute__((packed)); +} __packed; +struct mdns_pkgchain; struct mdns_packet * pkg_alloc(struct mdns_pkgchain *); #endif /* _STACK_MDNS_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:32: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 0959E16A46C; Wed, 20 Jun 2007 10:32: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 BA0D316A421 for ; Wed, 20 Jun 2007 10:32:24 +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 AAB1413C45E for ; Wed, 20 Jun 2007 10:32:24 +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 l5KAWOBP085464 for ; Wed, 20 Jun 2007 10:32:24 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAWOqq085458 for perforce@freebsd.org; Wed, 20 Jun 2007 10:32:24 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:32:24 GMT Message-Id: <200706201032.l5KAWOqq085458@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 122020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=122020 Change 122020 by fli@fli_genesis on 2007/06/20 10:32:06 - Remove utf8_{encode,decode} from this file. - mdns_t_* => mdns_in_* - Follow buffer changes. - Add resource encoding and decoding on IN types that needs it. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#6 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#6 (text+ko) ==== @@ -40,13 +40,13 @@ #include "stack_mdns.h" #include "hash.h" -static ssize_t utf8_encode(wchar_t *, char *, size_t); -static ssize_t utf8_decode(char *, size_t, wchar_t *, size_t); static inline char * skipname(char *, char *); 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 res_encode(struct hashtbl *, char *, uint16_t, char *, + size_t *, int); static inline void free_pkg(struct mdns_packet *, struct mdns_bufpool *); @@ -88,15 +88,15 @@ md->md_pkgtotal++; } - if (pc->pc_unlock != NULL) - pc->pc_unlock(pc->pc_lockarg); + bzero(pkg, sizeof(struct mdns_packet)); + pkg->p_pc = pc; + pc->pc_pkg = pkg; - bzero(pkg, sizeof(struct mdns_packet)); - mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0); TAILQ_INSERT_TAIL(&pc->pc_head, pkg, p_list); - pc->pc_pkg = pkg; pc->pc_list_len++; - pkg->p_pc = pc; + + if (pc->pc_unlock != NULL) + pc->pc_unlock(pc->pc_lockarg); return (pkg); error: @@ -148,7 +148,6 @@ /* Return buffers allocated to this packet */ while (!TAILQ_EMPTY(&pkg->p_buflist.bh_list)) { buf = TAILQ_FIRST(&pkg->p_buflist.bh_list); - TAILQ_REMOVE(&pkg->p_buflist.bh_list, buf, b_list); mdns_buf_free(bp, &pkg->p_buflist, buf, 1); } @@ -208,126 +207,6 @@ } /* - * utf8_encode - * Encodes a wide character string into an UTF-8 byte sequence - * Arguments - * src - Pointer to start of wide character string - * slen - Logical (not bytes) length of character string. - * dst - Destination where the encoded string should be placed. - * dlen - Length of ``dst'' - * Return values - * The length of the encoded string is returned on success. - * On failure a number less than zero is returned, this absoute value of - * this number can be used as a hint if ``dst'' is too small. - * - * This function is partially based on code from libarchive by Tim Kientzle - */ -static ssize_t -utf8_encode(wchar_t *src, char *dst, size_t dlen) -{ - char *p; - wchar_t *wp, wc; - size_t len; - - len = 0; - for (wp = src; *wp != L'\0'; wp++) { - wc = *wp; - if (wc <= 0x7f) - len++; - else if (wc <= 0x7ff) - len += 2; - else if (wc <= 0xffff) - len += 3; - else if (wc <= 0x10ffff) - len += 4; - } - - if (len > dlen) - return (-len); - - for (wp = src, p = dst; *wp != L'\0'; wp++) { - wc = *wp; - if (wc <= 0x7f) { - *p++ = (char)wc; - } else if (wc <= 0x7ff) { - p[0] = 0xc0 | ((wc >> 6) & 0x1f); - p[1] = 0x80 | (wc & 0x3f); - p += 2; - } else if (wc <= 0xffff) { - p[0] = 0xe0 | ((wc >> 12) & 0x0f); - p[1] = 0x80 | ((wc >> 6) & 0x3f); - p[2] = 0x80 | (wc & 0x3f); - p += 3; - } else if (wc <= 0x10ffff) { - p[0] = 0xf0 | ((wc >> 18) & 0x07); - p[1] = 0x80 | ((wc >> 12) & 0x3f); - p[2] = 0x80 | ((wc >> 6) & 0x3f); - p[3] = 0x80 | (wc & 0x3f); - p += 4; - } - } - - *p = '\0'; - return (len); -} - -/* - * utf8_decode - * Decodes an UTF-8 byte sequence into a wide character string - * Arguments - * src - Pointer to start of UTF-8 string - * slen - Length of UTF-8 byte sequence - * dst - Destination where the decoded string should be placed - * dlen - Size of ``dst'' (logical length, not byte length) - * Return values - * Returns logical length of decoded string or -1 on failure - */ -static ssize_t -utf8_decode(char *src, size_t slen, wchar_t *dst, size_t dlen) -{ - size_t len; - char c, *p; - wchar_t *wp; - - if (dlen < slen) - return (-1); - - len = 0; - for (p = src, wp = dst; *p != '\0'; wp++) { - c = *p; - if ((c & 0xf8) == 0xf0) { - *wp = (p[0] & 0x7) << 18; - *wp |= (p[1] & 0x3f) << 12; - *wp |= (p[2] & 0x3f) << 6; - *wp |= (p[3] & 0x3f); - p += 4; - } - else if ((c & 0xf0) == 0xe0) { - *wp = (p[0] & 0xf) << 12; - *wp |= (p[1] & 0x3f) << 6; - *wp |= (p[2] & 0x3f); - p += 3; - } - else if ((c & 0xe0) == 0xc0) { - *wp = (p[0] & 0x1f) << 6; - *wp |= (p[1] & 0x3f); - p += 2; - } - else if ((c & 0x80) == 0) { - *wp = c & 0x7f; - p++; - } - else { - return (-1); - } - len++; - } - *wp = L'\0'; - - return (len); -} - -/* * Returns a pointer to the last byte in a dns name * str - Start of dns name * end - End of buffer @@ -485,7 +364,7 @@ return (NULL); switch (type) { - case mdns_t_srv: + case mdns_in_srv: p = malloc(MDNS_RECORD_LEN + 6); if (p == NULL) return (NULL); @@ -497,8 +376,8 @@ } *reslen = strlen(p + 6) + 6; break; - case mdns_t_ptr: - case mdns_t_cname: + case mdns_in_ptr: + case mdns_in_cname: p = malloc(MDNS_RECORD_LEN); if (p == NULL) return (NULL); @@ -519,6 +398,25 @@ } /* + * Labelize (and name compress) resource data that needs it + */ +static inline void +res_encode(struct hashtbl *ht, char *buf, uint16_t type, char *res, + size_t *rlen, int plen) +{ + + switch (type) { + case mdns_in_ptr: + case mdns_in_cname: + name_compress(ht, res, *rlen, buf, rlen, plen); + break; + default: + memcpy(buf, res, *rlen); + break; + } +} + +/* * Set DNS header on the current chain * pc - Package chain * id - Transaction id (only non-zero with legacy unicast clients) @@ -538,7 +436,7 @@ buf = MDNS_BUFH(&pkg->p_buflist); if (buf == NULL) - buf = mdns_buf_alloc(pc->pc_md->md_bp, &pkg->p_buflist, 0, 1); + buf = mdns_buf_alloc(pc->pc_md->md_bp, &pkg->p_buflist, 0, 0); bzero(MDNS_BUF(buf), MDNS_HEADER_LEN); @@ -756,7 +654,7 @@ struct mdns_buf *buf; struct mdns_header *h; size_t namlen, namclen; - int i, error, flags; + int i, error, flags, baflag = 0; uint16_t class; struct mdns_rsec rsec; @@ -796,6 +694,15 @@ flags |= MDNS_HEAD_AA; mdns_pkg_sethdr(pc, 0, flags); buf = NULL; + /* + * If the rrset does fit a "MTU sized" packet, make sure that + * the next rrset will get a new packet as super-sized packets + * only are allowed to carry one rrset. + */ + if (i > pc->pc_md->md_maxpkgsz) { + baflag = MDNS_BUF_HUGE; + pkg_alloc(pc); + } } else if (buf != NULL && (i + MDNS_BUFLEN(buf)) > MDNS_BUFSZ(buf)) { error = mdns_buf_expand(buf, 0); @@ -813,7 +720,7 @@ switch (section) { case SEC_QUESTIONS: if (pkg->p_bufseg(p_questions) == NULL) { - buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0); + buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, baflag); pkg->p_bufseg(p_questions) = buf; pkg->p_buf(p_questions) = MDNS_BUF(buf); if (section == SEC_QUESTIONS) @@ -821,7 +728,7 @@ } case SEC_ANSWERS: if (pkg->p_bufseg(p_answers) == NULL) { - buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0); + buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, baflag); pkg->p_bufseg(p_answers) = buf; pkg->p_buf(p_answers) = MDNS_BUF(buf); if (section == SEC_ANSWERS) @@ -829,7 +736,7 @@ } case SEC_AUTHORITY: if (pkg->p_bufseg(p_auths) == NULL) { - buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0); + buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, baflag); pkg->p_bufseg(p_auths) = buf; pkg->p_buf(p_auths) = MDNS_BUF(buf); if (section == SEC_AUTHORITY) @@ -869,8 +776,10 @@ memcpy(MDNS_BUFPOS(buf), &rsec, MDNS_RRSET_HLEN); MDNS_BUFLEN(buf) += MDNS_RRSET_HLEN; - memcpy(MDNS_BUFPOS(buf), rs->r_data, rs->r_datalen); - MDNS_BUFLEN(buf) += rs->r_datalen; + namclen = rs->r_datalen; + res_encode(pkg->p_nc_tbl, MDNS_BUFPOS(buf), rs->r_type, + rs->r_data, &namclen, pkg->p_len); + MDNS_BUFLEN(buf) += namclen; pkg->p_len += namlen + MDNS_RRSET_HLEN + rs->r_datalen; @@ -1084,11 +993,22 @@ rs->r_datalen = ntohs(rsec.rs_rdlen); 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; + + if (rs->r_class == mdns_c_in) { + 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; + } + } + else { + if (p + rs->r_datalen > (MDNS_BUF(buf) + MDNS_BUFLEN(buf))) { + rs->r_datalen = 0; + goto invalidpkg; + } + rs->r_data = malloc(rs->r_datalen); + memcpy(rs->r_data, p, rs->r_datalen); } } else { From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:35: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 88EA616A46B; Wed, 20 Jun 2007 10:35: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 5794516A400 for ; Wed, 20 Jun 2007 10:35: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 309B113C43E for ; Wed, 20 Jun 2007 10:35: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 l5KAZTYC088482 for ; Wed, 20 Jun 2007 10:35:29 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAZThL088473 for perforce@freebsd.org; Wed, 20 Jun 2007 10:35:29 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:35:29 GMT Message-Id: <200706201035.l5KAZThL088473@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 122021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=122021 Change 122021 by fli@fli_genesis on 2007/06/20 10:35:27 Add a file with some handy functions such as, convertion between ascii IN types to integer IN type and resource and name encoding routines. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_util.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:37:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABD116A46B; Wed, 20 Jun 2007 10: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 2595C16A468 for ; Wed, 20 Jun 2007 10: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 F310E13C45D for ; Wed, 20 Jun 2007 10:37:46 +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 l5KAbkS2090459 for ; Wed, 20 Jun 2007 10:37:46 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAbkJY090456 for perforce@freebsd.org; Wed, 20 Jun 2007 10:37:46 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:37:46 GMT Message-Id: <200706201037.l5KAbkJY090456@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 122022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:37:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=122022 Change 122022 by fli@fli_genesis on 2007/06/20 10:36:57 Move the utf8 encoding/decoding routines to its own file, they really don't belong anywhere else. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:41: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 E758F16A46C; Wed, 20 Jun 2007 10:41: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 B4E8E16A421 for ; Wed, 20 Jun 2007 10:41:05 +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 A574E13C45A for ; Wed, 20 Jun 2007 10:41:05 +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 l5KAf5SY093660 for ; Wed, 20 Jun 2007 10:41:05 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAf5JW093603 for perforce@freebsd.org; Wed, 20 Jun 2007 10:41:05 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:41:05 GMT Message-Id: <200706201041.l5KAf5JW093603@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 122023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=122023 Change 122023 by fli@fli_genesis on 2007/06/20 10:40:18 - Allow the same event engine to execute the handler again for serialized events. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#3 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.c#3 (text+ko) ==== @@ -137,6 +137,7 @@ ev = (struct event *)arg.ptr; MDNS_INIT_ASSERT(ev, ev_magic); +again: switch (ev->ev_type) { case EVENT_TYPE_IO: ret = ev->ev_cb.ev_handler.io(&ev->ev_data.io, ev->ev_handler_arg); @@ -150,10 +151,18 @@ } EV_WLOCK(ev); + if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_redo > 0) { + ev->ev_redo--; + EV_UNLOCK(ev); + dprintf(DEBUG_EVENT, "Executing event again ev=%x", ev); + goto again; + } ev->ev_refcnt--; if (ev->ev_flags & EVENT_FLAG_DYING) { evl = ev->ev_evl; - remove_event(evl, ev, NULL); + if (remove_event(evl, ev, NULL) == 1) { + EV_UNLOCK(ev); + } } else { EV_UNLOCK(ev); @@ -226,7 +235,8 @@ /* Exclusive event already in progress */ if ((ev->ev_flags & EVENT_FLAG_EX) && ev->ev_refcnt > 0) { dprintf(DEBUG_EVENT, - "Exclusive event already in progress ev=%x", ev); + "Exclusive event already in progress ev=%x", ev); + ev->ev_redo++; EV_UNLOCK(ev); continue; } ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/event.h#3 (text+ko) ==== @@ -123,6 +123,7 @@ int ev_flags; #define EVENT_FLAG_EX 0x1 /* exclusive event (refcnt=1) */ #define EVENT_FLAG_DYING 0x2 /* event is dying */ + int ev_redo; int ev_type; /* event type */ #define EVENT_TYPE_IO 0x1 #define EVENT_TYPE_TMR 0x2 From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:52: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 48BEB16A46B; Wed, 20 Jun 2007 10:52: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 01F3D16A400 for ; Wed, 20 Jun 2007 10:52: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 E614513C44C for ; Wed, 20 Jun 2007 10:52:19 +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 l5KAqJSN006670 for ; Wed, 20 Jun 2007 10:52:19 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAqJTu006661 for perforce@freebsd.org; Wed, 20 Jun 2007 10:52:19 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:52:19 GMT Message-Id: <200706201052.l5KAqJTu006661@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 122024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=122024 Change 122024 by fli@fli_genesis on 2007/06/20 10:52:02 - Do reference counting on records and record types so they can be released when no longer needed. - Make record_type_*() functions non-static. - Add a function to manipulate the name of a record in-place. - Add a function to manipulate resource data in-place. - Add functions to traverse records, record types and resources. - Reverse the logic of the memory allocation flag. - Add macros to set the parent (owner). - Add a NOINIT flag, allows *_get() to be used as search functions. - Follow hash table changes. - Add debugging printouts. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#2 edit .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#2 (text+ko) ==== @@ -29,10 +29,10 @@ #include #include "record.h" +#include "log.h" -static int record_type_get(struct record *, struct record_type **, - int, uint16_t); -static void record_type_release(struct record_type *); +#define record_aquire(r) (r)->r_refcnt++; +#define record_type_aquire(rt) (rt)->rt_refcnt++; /* * Initialize a record set for `class' @@ -47,7 +47,8 @@ } static void -rec_free(struct hashtbl *ht, void *key, size_t keylen, void *data) +rec_free(__unused struct hashtbl *ht, __unused const void *key, + __unused size_t keylen, void *data, __unused void *arg) { struct record *r = (struct record *)data; struct record_type *rt, *rt2; @@ -73,7 +74,7 @@ records_destroy(struct records *recs) { - hashtbl_walk(&recs->r_recs, rec_free); + hashtbl_walk(&recs->r_recs, rec_free, NULL); hashtbl_destroy(&recs->r_recs); MDNS_INIT_UNSET(recs, r_magic); } @@ -83,10 +84,10 @@ * recs - Record set * r - Pointer to record * name - Resource name - * flags - RECORD_ALLOC will cause it to allocate memory if needed + * flags - RECORD_NOALLOC will supress memory allocation */ int -record_get(struct records *recs, struct record **r, char *name, int flags) +record_get(struct records *recs, struct record **r, int flags, char *name) { size_t len; struct record *rec; @@ -95,8 +96,19 @@ len = strlen(name); rec = hashtbl_find(&recs->r_recs, name, len); + + if (rec == NULL && (flags & RECORD_NOINIT)) { + *r = NULL; + return (0); + } + + if (len > MDNS_RECORD_LEN) { + *r = NULL; + return (-1); + } + if (rec == NULL) { - if (flags & RECORD_ALLOC) + if (!(flags & RECORD_NOALLOC)) *r = malloc(sizeof(struct record)); MDNS_INIT_SET((*r), r_magic); (*r)->r_recs = recs; @@ -110,7 +122,8 @@ else { *r = rec; } - (*r)->r_refcnt++; + record_aquire(*r); + dprintf(DEBUG_REC, "Record aquired r=%x, refcnt=%d", *r, (*r)->r_refcnt); return (0); } @@ -129,23 +142,66 @@ recs = r->r_recs; MDNS_INIT_ASSERT(recs, r_magic); - if (TAILQ_EMPTY(&r->r_list)) { + if (--r->r_refcnt == 0) { + assert(TAILQ_EMPTY(&r->r_list) == 1); len = strlen(r->r_name); hashtbl_del(&recs->r_recs, r->r_name, len); MDNS_INIT_UNSET(r, r_magic); - if (r->r_flags & RECORD_ALLOC) + if (!(r->r_flags & RECORD_NOALLOC)) free(r); + dprintf(DEBUG_REC, "References cleared on r=%x, removed", r); } + else { + dprintf(DEBUG_REC, "Record released r=%x, refs=%d", r, r->r_refcnt); + } } /* + * Modify the name of a record in-place without releasing + * types and resources. + */ +void +record_setname(struct record *r, char *name) +{ + struct records *recs; + size_t len; + + MDNS_INIT_ASSERT(r, r_magic); + recs = r->r_recs; + MDNS_INIT_ASSERT(recs, r_magic); + + len = strlen(r->r_name); + hashtbl_del(&recs->r_recs, r->r_name, len); + len = strlen(name); + memcpy(r->r_name, name, len+1); + hashtbl_add(&recs->r_recs, r->r_name, len, r, 0); + dprintf(DEBUG_REC, "Record name set to %s on r=%x", r->r_name, r); +} + +/* + * Lookup if a record exists + */ +struct record * +record_find(struct records *recs, char *name) +{ + struct record *r; + size_t len; + + MDNS_INIT_ASSERT(recs, r_magic); + + len = strlen(name); + r = hashtbl_find(&recs->r_recs, name, len); + return (r); +} + +/* * Get a record type for a record, will be intialized if needed * r - Record * rt - Pointer to the new record type - * flags - RECORD_ALLOC will cause it to allocated memory if needed + * flags - RECORD_NOALLOC will supress memory allocation * type - DNS type */ -static int +int record_type_get(struct record *r, struct record_type **rt, int flags, uint16_t type) { @@ -157,9 +213,13 @@ if (type == rt2->rt_type) break; } + if (rt2 == NULL && (flags & RECORD_NOINIT)) { + *rt = NULL; + return (0); + } if (rt2 == NULL) { - if (flags & RECORD_ALLOC) + if (!(flags & RECORD_NOALLOC)) *rt = malloc(sizeof(struct record_type)); MDNS_INIT_SET((*rt), rt_magic); (*rt)->rt_parent = NULL; @@ -167,6 +227,7 @@ (*rt)->rt_flags = flags; (*rt)->rt_record = r; (*rt)->rt_refcnt = 0; + record_aquire(r); TAILQ_INIT(&((*rt)->rt_list)); TAILQ_FOREACH(rt2, &r->r_list, rt_next) { if (type > rt2->rt_type) @@ -180,7 +241,9 @@ else { *rt = rt2; } - (*rt)->rt_refcnt++; + record_type_aquire(*rt); + dprintf(DEBUG_REC, "Record type aquired rt=%x, refcnt=%d", *rt, + (*rt)->rt_refcnt); return (0); } @@ -189,7 +252,7 @@ * was the last reference. * rt - Record type to release */ -static void +void record_type_release(struct record_type *rt) { struct record *r; @@ -199,13 +262,17 @@ r = rt->rt_record; TAILQ_REMOVE(&r->r_list, rt, rt_next); MDNS_INIT_UNSET(rt, rt_magic); - if (rt->rt_flags & RECORD_ALLOC) + if (!(rt->rt_flags & RECORD_NOALLOC)) free(rt); + dprintf(DEBUG_REC, "References cleared on rt=%x, removed", rt); record_release(r); } + else { + dprintf(DEBUG_REC, "Record type released rt=%x, refcnt=%d", + rt, rt->rt_refcnt); + } } - /* * Add a resource record to a resource type * r - Parent record @@ -223,17 +290,17 @@ MDNS_INIT_ASSERT(r, r_magic); - record_type_get(r, &rt, RECORD_ALLOC, type); - if (flags & RECORD_ALLOC) + record_type_get(r, &rt, 0, type); + if (!(flags & RECORD_NOALLOC)) *rr = malloc(sizeof(struct record_res)); MDNS_INIT_SET((*rr), rr_magic); (*rr)->rr_parent = NULL; (*rr)->rr_flags = flags; - (*rr)->rr_data = data; + (*rr)->rr_data = data; /* FIXME: assumption, new flag */ (*rr)->rr_len = dlen; (*rr)->rr_type = rt; TAILQ_INSERT_TAIL(&rt->rt_list, *rr, rr_next); - + dprintf(DEBUG_REC, "Resource rr=%x added on r=%x, rt=%x", *rr, r, rt); return (0); } @@ -252,13 +319,27 @@ MDNS_INIT_ASSERT(rt, rt_magic); flags = rr->rr_flags; TAILQ_REMOVE(&rt->rt_list, rr, rr_next); - free(rr->rr_data); /* XXX asumption */ + free(rr->rr_data); /* FIXME assumption */ record_type_release(rt); MDNS_INIT_UNSET(rr, rr_magic); - if (flags & RECORD_ALLOC) + if (!(flags & RECORD_NOALLOC)) free(rr); + dprintf(DEBUG_REC, "Resource rr=%x removed, rt=%x", rr, rt); +} + +void +record_res_setdata(struct record_res *rr, void *data, size_t dlen) +{ + + MDNS_INIT_ASSERT(rr, rr_magic); + free(rr->rr_data); /* FIXME: assumption */ + rr->rr_data = data; + rr->rr_len = dlen; + dprintf(DEBUG_REC, "Resource data set on rr=%x, data=%x, dlen=%d", + rr, data, dlen); } + /* * Returns a pointer to the first resource record identified by (name, type) * recs - Record set @@ -290,3 +371,67 @@ rr = TAILQ_FIRST(&rt->rt_list); return (rr); } + +static void +rec_walk(__unused struct hashtbl *ht, __unused const void *key, + __unused size_t keylen, void *data, void *arg) +{ + void **args = (void **)arg; + record_foreach cb = args[0]; + void *cbarg = args[1]; + struct record *r = data; + + cb(r, cbarg); +} + +void +records_foreach(struct records *recs, record_foreach cb, void *arg) +{ + void *args[]= {cb, arg}; + + MDNS_INIT_ASSERT(recs, r_magic); + hashtbl_walk(&recs->r_recs, rec_walk, (void *)args); +} + +void +record_foreach_type(struct record *r, record_type_foreach cb, void *arg) +{ + struct record_type *rt, *rt2; + + MDNS_INIT_ASSERT(r, r_magic); + TAILQ_FOREACH_SAFE(rt, &r->r_list, rt_next, rt2) { + MDNS_INIT_ASSERT(rt, rt_magic); + cb(rt, arg); + } +} + +void +record_type_foreach_res(struct record_type *rt, record_res_foreach cb, + void *arg) +{ + struct record_res *rr, *rr_tmp; + struct record_res *rr_head, *rr_next, *rr_prev; + + MDNS_INIT_ASSERT(rt, rt_magic); + + rr = rr_head = TAILQ_FIRST(&rt->rt_list); + while (rr != NULL) { + MDNS_INIT_ASSERT(rr, rr_magic); + rr_next = TAILQ_NEXT(rr, rr_next); + rr_prev = TAILQ_PREV(rr, record_res_head, rr_next); + + cb(rr, arg); + + if (rr_head != TAILQ_FIRST(&rt->rt_list)) { + rr = rr_head = TAILQ_FIRST(&rt->rt_list); + } + else { + rr_tmp = TAILQ_NEXT(TAILQ_NEXT(rr_prev, rr_next), rr_next); + if (rr_tmp != NULL && rr_tmp != rr_next) + rr = rr_tmp; + else + rr = rr_next; + } + } + +} ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#2 (text+ko) ==== @@ -74,7 +74,7 @@ int rt_type; int rt_flags; size_t rt_refcnt; - TAILQ_HEAD(, record_res) rt_list; + TAILQ_HEAD(record_res_head, record_res) rt_list; }; /* @@ -92,19 +92,44 @@ char r_name[MDNS_RECORD_LEN]; }; -#define RECORD_ALLOC 0x01 +/* + * Flags used with record_* functions + */ +#define RECORD_NOINIT 0x01 /* Do not initialize, assumes valid ptr */ +#define RECORD_NOALLOC 0x02 /* Do not allocate memory */ void records_init(struct records *, int); void records_destroy(struct records *); -int record_get(struct records *, struct record **, char *, int); +void record_setname(struct record *, char *); +int record_get(struct records *, struct record **, int, char *); void record_release(struct record *); +struct record * record_find(struct records *, char *); + +int record_type_get(struct record *, struct record_type **, int, uint16_t); +void record_type_release(struct record_type *); + int record_res_add(struct record *, struct record_res **, int, uint16_t, void *, size_t); void record_res_del(struct record_res *); struct record_res * record_res_find(struct records *, char *, uint16_t); +void record_res_setdata(struct record_res *, void *, size_t); -#define record_setparent(x, y) (x)->r_parent = y -#define record_res_setparent(x, y) (x)->rr_parent = y -#define record_res_getparent(x) (x)->rr_parent +typedef void (*record_foreach)(struct record *, void *); +typedef void (*record_type_foreach)(struct record_type *, void *); +typedef void (*record_res_foreach)(struct record_res *, void *); + +void records_foreach(struct records *, record_foreach, void *); +void record_foreach_type(struct record *, record_type_foreach, void *); +void record_type_foreach_res(struct record_type *, record_res_foreach, void *); + +#define __getparent(x, f) (x)->f +#define record_setparent(x, y) __getparent(x, r_parent) = y +#define record_getparent(x) __getparent(x, r_parent) +#define record_refcnt(x) (x)->r_refcnt +#define record_type_setparent(x, y) __getparent(x, rt_parent) = y +#define record_type_getparent(x) __getparent(x, rt_parent) +#define record_type_refcnt(x) (x)->rt_refcnt +#define record_res_setparent(x, y) __getparent(x, rr_parent) = y +#define record_res_getparent(x) __getparent(x, rr_parent) #endif /* _RECORD_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 10:54: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 739E416A46C; Wed, 20 Jun 2007 10:54: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 2B31816A400 for ; Wed, 20 Jun 2007 10:54:23 +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 0D2DD13C43E for ; Wed, 20 Jun 2007 10:54:23 +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 l5KAsMsr008699 for ; Wed, 20 Jun 2007 10:54:22 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAsMZQ008693 for perforce@freebsd.org; Wed, 20 Jun 2007 10:54:22 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 10:54:22 GMT Message-Id: <200706201054.l5KAsMZQ008693@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 122025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 10:54:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=122025 Change 122025 by fli@fli_genesis on 2007/06/20 10:54:09 - Follow record changes. - If a ttl of 0 was given in cache_set_ttl() bump it up to 1. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#2 (text+ko) ==== @@ -113,9 +113,8 @@ if (cr == NULL) return; MDNS_INIT_ASSERT(cr, cr_magic); - if (--cr->cr_ttl_rel > 0) { + if (--cr->cr_ttl_rel > 0) return; - } /* Remove entries with the same ttl */ do { @@ -164,10 +163,10 @@ *new = rr; } else if (rrset->r_ttl > 0) { - record_get(&c->c_recs, &r, rrset->r_name, RECORD_ALLOC); + record_get(&c->c_recs, &r, 0, rrset->r_name); cr = malloc(sizeof(struct cache_res)); rr = &cr->cr_res; - record_res_add(r, &rr, 0, rrset->r_type, rrset->r_data, + record_res_add(r, &rr, RECORD_NOALLOC, rrset->r_type, rrset->r_data, rrset->r_datalen); record_res_setparent(&cr->cr_res, cr); cr->cr_ttl_abs = rrset->r_ttl; @@ -283,6 +282,8 @@ { struct cache_res *cr; + if (ttl == 0) + ttl++; cr = record_res_getparent(rr); dequeue_ttl(c, cr); cr->cr_ttl_rel = ttl; From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11: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 BAF3716A469; Wed, 20 Jun 2007 11:10: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 53FB316A400 for ; Wed, 20 Jun 2007 11:10: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 4586A13C447 for ; Wed, 20 Jun 2007 11:10: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 l5KBAhZX025249 for ; Wed, 20 Jun 2007 11:10:43 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBAggd025240 for perforce@freebsd.org; Wed, 20 Jun 2007 11:10:42 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:10:42 GMT Message-Id: <200706201110.l5KBAggd025240@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 122026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=122026 Change 122026 by fli@fli_genesis on 2007/06/20 11:09:46 Add a record database (for self-claimed records), a configuration file parser and a variable substitution system. The variable system allows the use of variables in the configuration file, such as $(hostname) or $(ifaddrs4). These variables are updated when the system changes state, and changes are propagated out among variable consumers. The currently supported variables are hostname, ifname, ifaddr4, ifaddrs4, ifaddr6 and ifaddrs6, where ifaddrs{4,6} expands into all currently configured addresses on an interface while ifaddr{4,6} only expands into the first. The record database uses the variable system to create real records which can be used as responses to queries from other peers. Some variables expand into several data lines, the database record is aware of this and clones records and resources when needed. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/parse.y#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/token.l#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#1 add .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:32: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 E5EB516A46C; Wed, 20 Jun 2007 11:32: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 9BF1216A46B for ; Wed, 20 Jun 2007 11:32: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 8D44313C480 for ; Wed, 20 Jun 2007 11:32: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 l5KBW9Sr046990 for ; Wed, 20 Jun 2007 11:32:09 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBW9NC046982 for perforce@freebsd.org; Wed, 20 Jun 2007 11:32:09 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:32:09 GMT Message-Id: <200706201132.l5KBW9NC046982@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 122027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=122027 Change 122027 by fli@fli_genesis on 2007/06/20 11:31:19 - Change mdns_t_* to mdns_in_* - Add some flags used by the name/resource encoding routines. - Prototypes to name/resource encoding routines. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#5 (text+ko) ==== @@ -136,21 +136,21 @@ * SOA or NS (ie. no peer should EVER respond to them). */ enum mdns_type { - mdns_t_invalid = 0, - mdns_t_a = 1, - mdns_t_cname = 5, - mdns_t_null = 10, - mdns_t_wks = 11, - mdns_t_ptr = 12, - mdns_t_hinfo = 13, - mdns_t_minfo = 14, - mdns_t_mx = 16, - mdns_t_txt = 16, - mdns_t_rp = 17, - mdns_t_aaaa = 28, - mdns_t_loc = 29, - mdns_t_srv = 33, - mdns_t_any = 255 + mdns_in_invalid = 0, + mdns_in_a = 1, + mdns_in_cname = 5, + mdns_in_null = 10, + mdns_in_wks = 11, + mdns_in_ptr = 12, + mdns_in_hinfo = 13, + mdns_in_minfo = 14, + mdns_in_mx = 16, + mdns_in_txt = 16, + mdns_in_rp = 17, + mdns_in_aaaa = 28, + mdns_in_loc = 29, + mdns_in_srv = 33, + mdns_in_any = 255 }; /* @@ -202,6 +202,18 @@ int q_unicast; /* unicast desired */ }; +/* + * Name/Resource encoding flags + */ +#define MDNS_ENC_CHAR 0x01 +#define MDNS_ENC_WCHAR 0x02 +#define MDNS_ENC_BINARY 0x04 +#define MDNS_ENC_AUTO 0x08 +#define MDNS_ENC_ADDR 0x10 +#define MDNS_ENC_NAME 0x20 +#define MDNS_ENC_INET4 0x40 +#define MDNS_ENC_INET6 0x80 + int mdns_init(struct mdns *, struct mdns_bufpool *, const char *); void mdns_destroy(struct mdns *); int mdns_open(struct mdns *, int, int); @@ -236,4 +248,8 @@ int mdns_pkg_getanswer(struct mdns_packet *, int, struct mdns_rrset *); int mdns_pkg_getauth(struct mdns_packet *, int, struct mdns_rrset *); +int mdns_type_atoi(const char *); +void * mdns_res_encode(uint16_t, uint16_t, void *, int, size_t, size_t *); +char * mdns_name_encode(wchar_t *, size_t, int); + #endif /* _MDNS_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:37: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 C3A4516A46C; Wed, 20 Jun 2007 11:37: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 8123B16A469 for ; Wed, 20 Jun 2007 11:37:16 +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 70FFA13C43E for ; Wed, 20 Jun 2007 11:37:16 +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 l5KBbGs1051412 for ; Wed, 20 Jun 2007 11:37:16 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBbGo8051406 for perforce@freebsd.org; Wed, 20 Jun 2007 11:37:16 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:37:16 GMT Message-Id: <200706201137.l5KBbGo8051406@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 122028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=122028 Change 122028 by fli@fli_genesis on 2007/06/20 11:36:30 - Use one global cache cleaner instead of one per interface. - Add some __unused to silence compiler. - Some variable renaming to avoid function shadowing. - Remove unnecessary error logging. - Add record database init/destroy calls. - Make the routing socket event read until there is no data left. - Revisit how interface address changes are handled. - Insert a just-to-be-sure setlocale() call. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#3 (text+ko) ==== @@ -34,7 +34,9 @@ #include #include +#include #include +#include #include #include #include @@ -115,14 +117,19 @@ * Periodic cache cleaner, removes expired cache entries */ static int -evh_cacheclean(const struct event_tmr *ev, const ev_arg arg) +evh_cacheclean(const struct event_tmr *ev __unused, const ev_arg arg) { - struct md_if *mif = arg.ptr; + struct md_glob *g = arg.ptr; + struct md_if *mif; - if (if_aquire(mif, 1) != 0) - return (0); - cache_clean(&mif->mif_cache); - if_release(mif, 1); + RW_RLOCK(g, g_lock); + TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { + if (if_aquire(mif, 1) != 0) + continue; + cache_clean(&mif->mif_cache); + if_release(mif, 1); + } + RW_UNLOCK(g, g_lock); return (0); } @@ -132,7 +139,7 @@ * occured, this is to catch and ignore sporadic link changes. */ static int -evh_linkchg(const struct event_tmr *ev, const ev_arg arg) +evh_linkchg(const struct event_tmr *ev __unused, const ev_arg arg) { struct md_if *mif = arg.ptr; @@ -159,7 +166,7 @@ * Signal handler to SIG{INT,HUP} */ int -sig(struct event_sig *ev, ev_arg arg) +sig(struct event_sig *ev, ev_arg arg __unused) { dprintf(DEBUG_MISC, "Signal %d caught\n", ev->evsig_signo); @@ -171,7 +178,7 @@ * Signal handler initializer for SIG{INT,HUP} */ int -sig_init(int what, struct event_sig *ev, ev_arg arg) +sig_init(int what __unused, struct event_sig *ev, ev_arg arg __unused) { ev->evsig_signo = arg.int32; @@ -488,7 +495,7 @@ } static inline int -if_aquire(struct md_if *mif, int write) +if_aquire(struct md_if *mif, int w) { RW_WLOCK(mif, mif_lock); @@ -497,7 +504,7 @@ return (-1);; } mif->mif_refcnt++; - if (!write) { + if (!w) { RW_UNLOCK(mif, mif_lock); RW_RLOCK(mif, mif_lock); } @@ -505,10 +512,10 @@ } static inline void -if_release(struct md_if *mif, int write) +if_release(struct md_if *mif, int w) { - if (!write) { + if (!w) { RW_UNLOCK(mif, mif_lock); RW_WLOCK(mif, mif_lock); } @@ -544,11 +551,11 @@ 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)"); + if (error == 0) + mif->mif_flags |= MIF_UDP4; error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET); - if (error != 0) - logger(LOG_ERR, "Failed to setup TCP sockets (INET)"); + if (error == 0) + mif->mif_flags |= MIF_TCP4; /* Install read-ready event to UDP INET socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET, &socklen); @@ -583,11 +590,11 @@ #ifdef INET6 /* Open up UDP and TCP INET6 sockets */ error = mdns_open(&mif->mif_handle, MDNS_UDP, PF_INET6); - if (error != 0) - logger(LOG_ERR, "Failed to setup multicast UDP sockets (INET6)"); + if (error == 0) + mif->mif_flags |= MIF_UDP6; error = mdns_open(&mif->mif_handle, MDNS_TCP, PF_INET6); - if (error != 0) - logger(LOG_ERR, "Failed to setup TCP sockets (INET6)"); + if (error == 0) + mif->mif_flags |= MIF_TCP6; /* Install read-ready event to UDP INET6 socket */ socks = mdns_get_sock(&mif->mif_handle, MDNS_UDP, PF_INET6, &socklen); @@ -681,17 +688,22 @@ 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); + dbr_init(&mif->mif_dbr, mif); + cfg_read(&mif->mif_dbr, ifnam, "mdnsd.conf"); 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); return (mif); @@ -722,10 +734,10 @@ 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); + dbr_destroy(&mif->mif_dbr); logger(LOG_NOTICE, "Removed interface %s", mif->mif_ifnam); if_release(mif, 1); @@ -733,12 +745,12 @@ } static struct md_if * -if_indextodata(struct md_glob *g, int index) +if_indextodata(struct md_glob *g, int idx) { struct md_if *mif; TAILQ_FOREACH(mif, &g->g_ifs, mif_next) { - if (index == mif->mif_index) + if (idx == mif->mif_index) return (mif); } return (NULL); @@ -748,15 +760,16 @@ * Routing socket event handler initialization */ int -evh_routesock_init(int what, struct event_io *ev, ev_arg arg) +evh_routesock_init(int what, struct event_io *ev, ev_arg arg __unused) { int sock; switch (what) { case EVENT_INIT_OPEN: - sock = socket(AF_ROUTE, SOCK_RAW, 0); + sock = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); if (sock < 0) return (-1); + fcntl(sock, F_SETFL, O_NONBLOCK); ev->evio_fd = sock; ev->evio_dir = EVENT_IO_READ; break; @@ -786,70 +799,73 @@ sock = ev->evio_fd; - len = read(sock, buf, RS_BUFLEN); - if (len <= 0) - return (0); + for (;;) { + len = read(sock, buf, RS_BUFLEN); + if (len <= 0) + break; + lim = buf + len; + for (next = buf; next < lim; next += ifm->ifm_msglen) { + ifm = (struct if_msghdr *) next; + if (ifm->ifm_flags & IFF_LOOPBACK) + continue; - 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); - 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 (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); + 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 (!(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); + if (mif == NULL) { + continue; } - } - 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); + if (ifm->ifm_type == RTM_DELADDR) { + TAILQ_FOREACH_SAFE(ifev, &mif->mif_evlist, ifev_next, ifev2) { + event_del(g->g_evl, ifev->ifev_id, NULL); + TAILQ_REMOVE(&mif->mif_evlist, ifev, ifev_next); + 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); + mdns_close(&mif->mif_handle, MDNS_UDP, PF_INET6); + mdns_close(&mif->mif_handle, MDNS_TCP, PF_INET6); #endif - setup_socks(mif); + mif->mif_flags &= ~(MIF_UDP4 | MIF_TCP4 | MIF_UDP6 | MIF_TCP6); + } + else if (ifm->ifm_type == RTM_NEWADDR) { + setup_socks(mif); + } if_release(mif, 1); } } @@ -915,6 +931,8 @@ if (glob.g_bp == NULL) err(EXIT_FAILURE, "Failed to initialize buffer pool"); + setlocale(LC_CTYPE, getenv("LC_CTYPE")); + /* Daemonize */ #ifndef DEBUG if (!nodaemon) { @@ -951,6 +969,8 @@ event_add(glob.g_evl, EVENT_TYPE_IO, evh_routesock, &eva, evh_routesock_init, NULL); + tmr_start(&glob, 1000, evh_cacheclean, &glob); + /* Launch the event dispatcher */ error = event_dispatch(glob.g_evl, glob.g_wq); From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11: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 357BC16A4DE; Wed, 20 Jun 2007 11: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 BE75816A469 for ; Wed, 20 Jun 2007 11:39:19 +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 AECD513C468 for ; Wed, 20 Jun 2007 11:39:19 +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 l5KBdJ1Z053069 for ; Wed, 20 Jun 2007 11:39:19 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBdJkK053060 for perforce@freebsd.org; Wed, 20 Jun 2007 11:39:19 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:39:19 GMT Message-Id: <200706201139.l5KBdJkK053060@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 122029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=122029 Change 122029 by fli@fli_genesis on 2007/06/20 11:38:49 - Add/change record database structures - Add record database prototypes - Add configuration prototypes - Removed a (now) unused member of struct cache {} Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include "event.h" #include "mdns.h" #include "record.h" +#include "var.h" #include "debug.h" #ifdef HAVE_PTHREAD @@ -90,10 +91,21 @@ */ struct cache { struct records c_recs; - int c_timer; TAILQ_HEAD(, cache_res) c_list; /* time delta list */ }; +/* + * Database record set + */ +struct dbr_rec; +struct dbr { + MAGIC(dbr_magic); + void *dbr_ctx; + TAILQ_HEAD(, dbr_rec) dbr_reclist; + struct records dbr_recs; + struct vars dbr_vars; +}; + /* Event identifier */ struct md_if_ev { TAILQ_ENTRY(md_if_ev) ifev_next; @@ -116,46 +128,92 @@ #define MIF_DYING 0x0001 /* Interface is going away */ #define MIF_LINKUP 0x0002 /* Link is up (carrier) */ #define MIF_LINKCHG 0x0004 /* Link state change pending */ +#define MIF_UDP4 0x0008 +#define MIF_TCP4 0x0010 +#define MIF_UDP6 0x0020 +#define MIF_TCP6 0x0040 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; + struct dbr mif_dbr; char mif_ifnam[IFNAMSIZ]; }; /* - * Self-claimed record state + * Database record resource name */ +struct dbr_rec { + struct record dr_rec; + MAGIC(dr_magic); + struct dbr *dr_dbr; + int dr_type; + int dr_state; + wchar_t **dr_names; /* unexpanded source strings */ + int dr_cur; /* current alternative */ + int dr_flags; +#define DR_CLONE 0x01 /* record is a clone */ + size_t dr_clones; /* number of clones */ + union { + TAILQ_HEAD(recclone_head, dbr_rec) head; + TAILQ_ENTRY(dbr_rec) next; + } dr_clone; + struct dbr_rec *dr_chead; /* clone head */ +}; + 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 */ + DR_UNIQUE, + DR_SHARED }; -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 */ +/* + * Record state to unique self-slaimed records + * We always claim name uniquness on the record level + */ +enum { + DR_TENTATIVE, /* Probe step not done */ + DR_INVALID, /* Invalid name */ + DR_PROBING, /* Probing for uniqness */ + DR_ANNOUNCING, /* Annonucing a uniqe name */ + DR_OK, /* Record is OK */ + DR_CONFLICT, /* Conflict with other peer */ }; -struct db_rec { - struct record dc_rec; - /* vartag name */ +/* + * Database record type + */ +struct dbr_type { + struct record_type dt_type; + MAGIC(dt_magic); + struct dbr_rec *dt_rec; + int dt_state; +#define DT_SHARED 0x01 +#define DT_UNIQUE 0x02 + int dt_flags; }; -struct db { - struct records db_recs; +/* + * Database record resource data + */ +struct dbr_res { + struct record_res ds_res; + MAGIC(ds_magic); + struct dbr_type *ds_type; + uint32_t ds_ttl; /* resource ttl */ + wchar_t *ds_vdata; /* unexpanded source string */ + wchar_t *ds_data; /* expanded source string */ +#define DS_CLONE 0x01 /* resource is a clone */ +#define DS_INVALID 0x02 /* unable to expand vdata */ + int ds_flags; + size_t ds_clones; /* number of clones */ + union { + TAILQ_HEAD(clone_head, dbr_res) head; + TAILQ_ENTRY(dbr_res) next; + } ds_clone; + struct dbr_res *ds_chead; /* clone head */ }; - /* cache.c */ void cache_init(struct cache *); void cache_destroy(struct cache *); @@ -167,4 +225,15 @@ void cache_clean(struct cache *); void cache_set_ttl(struct cache *, struct record_res *, uint32_t); +/* dbrec.c */ +void dbr_init(struct dbr *, void *); +void dbr_destroy(struct dbr *); +struct dbr_rec * dbr_add(struct dbr *, wchar_t **, int); +void dbr_del(struct dbr_rec *); +struct dbr_res * dbr_res_add(struct dbr_rec *, uint16_t, uint32_t, wchar_t *); +void dbr_res_del(struct dbr_res *); + +/* parse.y */ +int cfg_read(struct dbr *r, const char *, const char *); + #endif /* _MDNSD_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:41: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 D785916A46D; Wed, 20 Jun 2007 11:41: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 A478516A468 for ; Wed, 20 Jun 2007 11:41:36 +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 948E513C4AE for ; Wed, 20 Jun 2007 11:41:36 +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 l5KBfaWw055700 for ; Wed, 20 Jun 2007 11:41:36 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBfaTi055694 for perforce@freebsd.org; Wed, 20 Jun 2007 11:41:36 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:41:36 GMT Message-Id: <200706201141.l5KBfaTi055694@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 122030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=122030 Change 122030 by fli@fli_genesis on 2007/06/20 11:40:44 Remove the totally useless iov-dance (what was I thinking?) and replace it with ONE fprintf-call :) Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/log.c#3 (text+ko) ==== @@ -44,23 +44,14 @@ #endif static void -dolog(int priority, const char *message) +dolog(int priority, char *message) { - struct iovec iov[4]; if (_isdaemon) { syslog(priority, message); } else { - iov[0].iov_base = (char *)_pname; - iov[0].iov_len = strlen(_pname); - iov[1].iov_base = ": "; - iov[1].iov_len = 2; - iov[2].iov_base = (char *)message; - iov[2].iov_len = strlen(message); - iov[3].iov_base = "\n"; - iov[3].iov_len = 1; - writev(STDERR_FILENO, iov, 4); + fprintf(stderr, "%s: %s\n", _pname, message); } } From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:42: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 6512A16A468; Wed, 20 Jun 2007 11:42: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 439E816A400 for ; Wed, 20 Jun 2007 11:42: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 34D9513C468 for ; Wed, 20 Jun 2007 11:42: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 l5KBgc0f056526 for ; Wed, 20 Jun 2007 11:42:38 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBgboZ056520 for perforce@freebsd.org; Wed, 20 Jun 2007 11:42:37 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:42:37 GMT Message-Id: <200706201142.l5KBgboZ056520@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 122031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=122031 Change 122031 by fli@fli_genesis on 2007/06/20 11:42:27 - Add several new debugging printout controls. - Tweak the HEXDUMP-code a bit (ie. make it work)) Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#2 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#2 (text+ko) ==== @@ -34,10 +34,16 @@ #define DEBUG_WQUEUE 0x0001 #define DEBUG_EVENT 0x0002 #define DEBUG_STACK 0x0004 -#define DEBUG_CACHE 0x0008 +#define DEBUG_BUF 0x0008 #define DEBUG_RECV 0x0010 #define DEBUG_SEND 0x0020 -#define DEBUG_MISC 0x0040 +#define DEBUG_REC 0x0040 +#define DEBUG_CACHE 0x0080 +#define DEBUG_DBR 0x0100 +#define DEBUG_CFG 0x0200 +#define DEBUG_CFGPARSE 0x0400 +#define DEBUG_VAR 0x0800 +#define DEBUG_MISC 0x1000 /* * Structure initialization protection @@ -57,10 +63,10 @@ #endif #ifdef DEBUG -# define HEXDUMP(buf, _len) do { \ +# define HEXDUMP(__buf, _len) do { \ { \ size_t __tmp; \ - char *__buf = (char *)buf; \ + char *__buf = (char *)__buf; \ for (__tmp = 0; __tmp < _len; __tmp++) \ printf("%.2x ", *__buf++); \ printf("\n"); \ From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:44: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 E674516A474; Wed, 20 Jun 2007 11:44: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 B5A8C16A41F for ; Wed, 20 Jun 2007 11:44: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 29D0713C4BD for ; Wed, 20 Jun 2007 11:44:41 +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 l5KBifD2058218 for ; Wed, 20 Jun 2007 11:44:41 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBieG2058211 for perforce@freebsd.org; Wed, 20 Jun 2007 11:44:40 GMT (envelope-from fli@FreeBSD.org) Date: Wed, 20 Jun 2007 11:44:40 GMT Message-Id: <200706201144.l5KBieG2058211@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 122032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=122032 Change 122032 by fli@fli_genesis on 2007/06/20 11:43:54 - Hook up new files to the build - Bring WARNS up to 4 - Obligatory DEBUG_MASK tweak. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#3 (text+ko) ==== @@ -1,9 +1,10 @@ -SRCS= stack_mdns.c stack_packet.c stack_buf.c hash.c event.c \ - wqueue.c log.c mdnsd.c record.c cache.c +SRCS= stack_mdns.c stack_packet.c stack_buf.c stack_util.c hash.c \ + utf8.c event.c wqueue.c log.c mdnsd.c record.c cache.c dbrec.c var.c \ + token.l parse.y y.tab.h PROG= mdnsd -WARNS?= 3 +WARNS?= 4 -CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0xfc +CFLAGS+= -Wall -g -DDEBUG -DDEBUG_MASK=0x1fec .if !defined(WITHOUT_INET6) CFLAGS+= -DINET6 .endif From owner-p4-projects@FreeBSD.ORG Wed Jun 20 11:49: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 2281016A46B; Wed, 20 Jun 2007 11:49: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 E6F8C16A400 for ; Wed, 20 Jun 2007 11:49:47 +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 D7EE913C468 for ; Wed, 20 Jun 2007 11:49:47 +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 l5KBnlRr062574 for ; Wed, 20 Jun 2007 11:49:47 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KBnlUM062566 for perforce@freebsd.org; Wed, 20 Jun 2007 11:49:47 GMT (envelope-from andrew@freebsd.org) Date: Wed, 20 Jun 2007 11:49:47 GMT Message-Id: <200706201149.l5KBnlUM062566@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 122033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 11:49:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=122033 Change 122033 by andrew@andrew_hermies on 2007/06/20 11:49:02 Add facund_object_free to free memory used by objects Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_object.h#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#7 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#3 (text+ko) ==== @@ -292,6 +292,30 @@ return obj->obj_array[pos]; } +/* + * Free an object and it's children + */ +void +facund_object_free(struct facund_object *obj) +{ + if (obj == NULL) + return; + + if (obj->obj_string != NULL) + free(obj->obj_string); + + if (obj->obj_array != NULL) { + unsigned int i; + + for (i = 0; obj->obj_array[i] != NULL; i++) { + facund_object_free(obj->obj_array[i]); + } + free(obj->obj_array); + } + + free(obj); +} + struct facund_object * facund_object_new_from_typestr(const char *type) { ==== //depot/projects/soc2007/andrew-update/lib/facund_object.h#2 (text+ko) ==== @@ -72,6 +72,8 @@ const struct facund_object *facund_object_get_array_item(struct facund_object *, unsigned int); +void facund_object_free(struct facund_object *); + struct facund_object *facund_object_new_from_typestr(const char *); int facund_object_set_from_str(struct facund_object *, const char *); ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#7 (text+ko) ==== @@ -211,7 +211,7 @@ conn->call_arg); conn->current_call[0] = '\0'; conn->call_id[0] = '\0'; - /* TODO: Free the call_arg */ + facund_object_free(conn->call_arg); conn->call_arg = NULL; } else if (strcmp(name, "data") == 0) { /* From owner-p4-projects@FreeBSD.ORG Wed Jun 20 13:18: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 40B5F16A468; Wed, 20 Jun 2007 13:18: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 0ACC216A41F for ; Wed, 20 Jun 2007 13:18:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EDE0313C487 for ; Wed, 20 Jun 2007 13:18:39 +0000 (UTC) (envelope-from gabor@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 l5KDIdcd059674 for ; Wed, 20 Jun 2007 13:18:39 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KDIdhq059664 for perforce@freebsd.org; Wed, 20 Jun 2007 13:18:39 GMT (envelope-from gabor@freebsd.org) Date: Wed, 20 Jun 2007 13:18:39 GMT Message-Id: <200706201318.l5KDIdhq059664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Jun 2007 13:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122037 Change 122037 by gabor@gabor_server on 2007/06/20 13:18:15 Fix dependency handling by adding a missing semicolon. Spotted by: sat Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#18 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#18 (text+ko) ==== @@ -4745,7 +4745,7 @@ else \ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ fi; \ - ${ECHO_MSG} "===> Returning to build of ${PKGNAME}" + ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; .for deptype in EXTRACT PATCH FETCH BUILD RUN ${deptype:L}-depends: @@ -4820,7 +4820,6 @@ notfound=1; \ fi; \ fi; \ -### FIXME: somehow it breaks after the two fi statements? if [ $$notfound != 0 ]; then \ ${ECHO_MSG} "===> Verifying $$target for $$prog in $$dir"; \ if [ ! -d "$$dir" ]; then \ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 05:33: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 D3F7016A468; Thu, 21 Jun 2007 05:33: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 87D9816A41F for ; Thu, 21 Jun 2007 05:33:13 +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 76CFA13C4B8 for ; Thu, 21 Jun 2007 05:33:13 +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 l5L5XDKv005643 for ; Thu, 21 Jun 2007 05:33:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L5VCuw003152 for perforce@freebsd.org; Thu, 21 Jun 2007 05:31:12 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 21 Jun 2007 05:31:12 GMT Message-Id: <200706210531.l5L5VCuw003152@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 122063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 05:33:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=122063 Change 122063 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/21 05:29:43 IFC Affected files ... .. //depot/projects/opentoe/ObsoleteFiles.inc#8 integrate .. //depot/projects/opentoe/UPDATING#9 integrate .. //depot/projects/opentoe/bin/date/date.1#2 integrate .. //depot/projects/opentoe/cddl/lib/Makefile#2 integrate .. //depot/projects/opentoe/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/opentoe/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/opentoe/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/opentoe/contrib/bind9/CHANGES#2 integrate .. //depot/projects/opentoe/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/opentoe/contrib/bind9/FAQ#2 integrate .. //depot/projects/opentoe/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/opentoe/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/opentoe/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/README#2 integrate .. //depot/projects/opentoe/contrib/bind9/README.idnkit#1 branch .. //depot/projects/opentoe/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/aclconf.c#2 delete .. //depot/projects/opentoe/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/aclconf.h#2 delete .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/configure.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/opentoe/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/opentoe/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/opentoe/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:06: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 7E24116A46B; Thu, 21 Jun 2007 09:06: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 361A616A468 for ; Thu, 21 Jun 2007 09:06:45 +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 2786F13C457 for ; Thu, 21 Jun 2007 09:06:45 +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 l5L96jGm011201 for ; Thu, 21 Jun 2007 09:06:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L96iAN011198 for perforce@freebsd.org; Thu, 21 Jun 2007 09:06:44 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 09:06:44 GMT Message-Id: <200706210906.l5L96iAN011198@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 122068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122068 Change 122068 by rdivacky@rdivacky_witten on 2007/06/21 09:06:06 Introduce fcntl.h part of POSIX Extended API: o remove __BSD_VISIBLE around O_NOFOLLOW, its POSIX now o add AT_FDCWD, AT_SYMLINK_NOFOLLOW, AT_SYMLINK_FOLLOW, AT_REMOVEDIR o add AT_EACCESS but ifdefed out for the moment o add O_DIRECTORY o add openat() prototype this is a WIP and commits to other files will follow Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#4 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#4 (text+ko) ==== @@ -96,16 +96,24 @@ #define O_FSYNC 0x0080 /* synchronous writes */ #endif #define O_SYNC 0x0080 /* POSIX synonym for O_FSYNC */ -#if __BSD_VISIBLE #define O_NOFOLLOW 0x0100 /* don't follow symlinks */ -#endif #define O_CREAT 0x0200 /* create if nonexistent */ #define O_TRUNC 0x0400 /* truncate to zero length */ #define O_EXCL 0x0800 /* error if already exists */ #ifdef _KERNEL #define FHASLOCK 0x4000 /* descriptor holds advisory lock */ #endif -#define AT_FDCWD -100 /* CWD for *at syscals */ +/* Defined by POSIX Extended API ... TODO: number of the spec */ +#define AT_FDCWD -100 /* Use the current working directory + to determine the target of relative + file paths. + */ +#ifdef notyet +#define AT_EACCESS 0x100 /* Check access using effective user and group ID */ +#endif +#define AT_SYMLINK_NOFOLLOW 0x200 /* Do not follow symbolic links */ +#define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic link */ +#define AT_REMOVEDIR 0x800 /* Remove directory instead of file */ /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */ #define O_NOCTTY 0x8000 /* don't assign controlling terminal */ @@ -115,6 +123,9 @@ #define O_DIRECT 0x00010000 #endif +/* Defined by POSIX Extended API ... TODO: number of the spec */ +#define O_DIRECTORY 0x00020000 /* Fail if not directory */ + /* * XXX missing O_DSYNC, O_RSYNC. */ @@ -221,6 +232,7 @@ int open(const char *, int, ...); int creat(const char *, mode_t); int fcntl(int, int, ...); +int openat(int, const char *, int, ...); #if __BSD_VISIBLE int flock(int, int); #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:13: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 224C516A46D; Thu, 21 Jun 2007 09:13: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 EB9B316A41F for ; Thu, 21 Jun 2007 09:13:53 +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 DCC4113C45E for ; Thu, 21 Jun 2007 09:13:53 +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 l5L9Drtq012601 for ; Thu, 21 Jun 2007 09:13:53 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9DrQG012598 for perforce@freebsd.org; Thu, 21 Jun 2007 09:13:53 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 09:13:53 GMT Message-Id: <200706210913.l5L9DrQG012598@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 122070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=122070 Change 122070 by rdivacky@rdivacky_witten on 2007/06/21 09:13:21 Introduce stat.h part of the POSIX Extended API: o add fstatat, mkdirat, mknodat, mkfifoat prototypes Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/stat.h#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/stat.h#2 (text+ko) ==== @@ -338,6 +338,10 @@ #endif int stat(const char * __restrict, struct stat * __restrict); mode_t umask(mode_t); +int fstatat(int, const char *, struct stat *, int); +int mkdirat(int, const char *, mode_t); +int mkfifoat(int, const char *, mode_t); +int mknodat(int, const char *, mode_t, dev_t); __END_DECLS #endif /* !_KERNEL */ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:16:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5223316A46B; Thu, 21 Jun 2007 09:16: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 25D1716A400 for ; Thu, 21 Jun 2007 09:16:08 +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 1610B13C4AE for ; Thu, 21 Jun 2007 09:16:08 +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 l5L9G7nU013096 for ; Thu, 21 Jun 2007 09:16:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9G7iN013093 for perforce@freebsd.org; Thu, 21 Jun 2007 09:16:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 09:16:07 GMT Message-Id: <200706210916.l5L9G7iN013093@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 122071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122071 Change 122071 by rdivacky@rdivacky_witten on 2007/06/21 09:15:07 Introduce time.h part of the POSIX Extended API: o add futimesat prototype Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/time.h#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/time.h#2 (text+ko) ==== @@ -320,6 +320,7 @@ int setitimer(int, const struct itimerval *, struct itimerval *); int settimeofday(const struct timeval *, const struct timezone *); int utimes(const char *, const struct timeval *); +int futimesat(int, const char *, const struct timeval [2]); __END_DECLS #endif /* !_KERNEL */ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:27: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 B3B4816A46B; Thu, 21 Jun 2007 09:27:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 75E5216A400 for ; Thu, 21 Jun 2007 09:27:22 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5A75F13C43E for ; Thu, 21 Jun 2007 09:27:22 +0000 (UTC) (envelope-from zhouzhouyi@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 l5L9RMvn015045 for ; Thu, 21 Jun 2007 09:27:22 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9RMQ0015042 for perforce@freebsd.org; Thu, 21 Jun 2007 09:27:22 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 21 Jun 2007 09:27:22 GMT Message-Id: <200706210927.l5L9RMQ0015042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=122072 Change 122072 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/21 09:26:54 Correct the mactestpipe grammer for precise parsing it Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#10 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tools/regression/mactest/mactestparser.y#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#10 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -1765,7 +1766,7 @@ } sprintf(submitstring, "mac_test_check_sysv_semctl " - "with cmd and cr_label and semaklabel:%s:", + "with cmd and cr_label and semaklabel#%s:", cmdstring); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -1809,7 +1810,7 @@ bzero(submitstring, 256); if (submitstring){ sprintf(submitstring, "mac_test_check_sysv_semop " - "with access type and cr_label and semaklabel:%s:", + "with access type and cr_label and semaklabel#%s:", accesstype&SEM_R? (accesstype&SEM_A? "SEM_AR": "SEM_R"): (accesstype&SEM_A? "SEM_A": "NULL")); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, @@ -1835,7 +1836,7 @@ bzero(submitstring, 256); if (submitstring){ sprintf(submitstring, "mac_test_check_sysv_shmat " - "with shmflg and cr_label and shmseglabel:%s:", + "with shmflg and cr_label and shmseglabel#%s:", (shmflg & SHM_RDONLY)? "SHM_RDONLY" : "SHM_RND"); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -1883,7 +1884,7 @@ } sprintf(submitstring, "mac_test_check_sysv_shmctl " - "with cmd and cr_label and shmseglabel:%s:", + "with cmd and cr_label and shmseglabel#%s:", cmdstring); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -2806,7 +2807,7 @@ if (string == acc_string) strcpy(acc_string, "NULL"); sprintf(submitstring, "mac_test_check_vnode_access " - "with acc_mode and cr_label and vplabel:%s:", + "with acc_mode and cr_label and vplabel#%s:", acc_string); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -3112,7 +3113,7 @@ if (string == acc_string) strcpy(acc_string, "NULL"); sprintf(submitstring, "mac_test_check_vnode_open " - "with acc_mode and cr_label and vplabel:%s:", + "with acc_mode and cr_label and vplabel#%s:", acc_string); MACTEST_PIPE_SUBMIT_WITHPID(submitstring, strlen(submitstring)); @@ -3321,6 +3322,9 @@ strlen("mac_test_check_vnode_setextattr " "with cr_label and vplabel:")); MACTEST_PIPE_SUBMIT_LABEL2(cred, cred->cr_label, vnode, vplabel); + if (attrnamespace == EXTATTR_NAMESPACE_SYSTEM && !strcmp(name, "mac_test") + && uio->uio_iov->iov_len && !strncmp(uio->uio_iov->iov_base, "mac_test", 8)) + LABEL_INIT(vplabel, MAGIC_MACTESTPIPE); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(check_vnode_setextattr); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tools/regression/mactest/mactestparser.y#2 (text+ko) ==== @@ -45,6 +45,7 @@ static int line = 0; size_t strlen_allow_null(const char *s); + char * stringsave = 0; %} @@ -56,12 +57,15 @@ %token PID %token IDENTIFIER %token NUM +%token MAC_TEST %type identifier +%type mac_test %type mactestpipe_records %type mactestpipe_record -%type hook_elements +%type hook_elements %type label_elements %type modflag_elements +%type modflag_and_label_elements %type pid %% /* Grammar rules and actions follow. */ @@ -79,29 +83,32 @@ ; mactestpipe_record: - PID '=' pid identifier '\n' {$$ = new_mactestpipe_record(strdup($4), $3);} - |PID '=' pid identifier hook_elements ':' label_elements '\n' { - $$ = new_mactestpipe_record(strdup($4), $3);} - |PID '=' pid identifier hook_elements ':' modflag_elements ':' label_elements '\n' { - $$ = new_mactestpipe_record(strdup($4), $3);} + PID '=' pid hook_elements '\n' {$$ = new_mactestpipe_record(strdup($4), $3);} + |PID '=' pid hook_elements label_elements '\n' { + $$ = new_mactestpipe_record(stringsave, $3);stringsave = 0;} + |PID '=' pid hook_elements modflag_and_label_elements '\n' { + $$ = new_mactestpipe_record(stringsave, $3);stringsave = 0;} |'\n' {$$ = 0;} ; hook_elements: - identifier {} + mac_test {stringsave = strdup($1);} |hook_elements identifier {} |hook_elements error ; label_elements: - identifier { new_labelstrings(strdup($1));} + ':' identifier { new_labelstrings(strdup($2));} |label_elements identifier { new_labelstrings(strdup($2));} |label_elements error ; +modflag_and_label_elements: + modflag_elements label_elements + ; modflag_elements: - identifier { new_modes_or_flags(strdup($1));} + '#' identifier { new_modes_or_flags(strdup($2));} |modflag_elements identifier { new_modes_or_flags(strdup($2));} |modflag_elements error ; @@ -109,7 +116,9 @@ identifier: IDENTIFIER {} ; - +mac_test: + MAC_TEST {} + ; pid: NUM {} ; @@ -163,11 +172,16 @@ if (c == ':') return ':'; + + if (c == '#') + return '#'; i = 0; buf[i] = c; - while ((c = getchar()) != ' ' && c != '\t' && c != '\n' && c!= EOF && c !=':'){ + while ((c = getchar()) != ' ' && c != '\t' && c != '\n' && c!= EOF && c !=':' + && c != '#') + { i ++; buf[i] = c; @@ -192,6 +206,10 @@ ungetc (c,stdin); } + if (c == '#'){ + ungetc (c,stdin); + } + yylval.namestring = buf; if (!strcmp(buf, "pid")) @@ -199,8 +217,10 @@ if (!strcmp(buf, "=")) - return '='; - + return '='; + + if (!strncmp(buf, "mac_test", 8)) + return MAC_TEST; return IDENTIFIER; } From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:35: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 3919816A473; Thu, 21 Jun 2007 09:35: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 0B9E016A46E for ; Thu, 21 Jun 2007 09:35:34 +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 F05BB13C4D0 for ; Thu, 21 Jun 2007 09:35:33 +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 l5L9ZXoj016960 for ; Thu, 21 Jun 2007 09:35:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9ZX2a016957 for perforce@freebsd.org; Thu, 21 Jun 2007 09:35:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 09:35:33 GMT Message-Id: <200706210935.l5L9ZX2a016957@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 122074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122074 Change 122074 by rdivacky@rdivacky_witten on 2007/06/21 09:35:23 Add faccessat() syscall. We ignore the mode argument. We implement the AT_EACCESS flag. Untested. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#19 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.228 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -504,4 +504,5 @@ { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0 }, /* 472 = sctp_generic_sendmsg */ { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */ + { AS(faccessat_args), (sy_call_t *)faccessat, AUE_ACCESS, NULL, 0, 0 }, /* 475 = faccessat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.212 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -482,4 +482,5 @@ "sctp_generic_sendmsg", /* 472 = sctp_generic_sendmsg */ "sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */ "sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */ + "faccessat", /* 475 = faccessat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#2 (text+ko) ==== @@ -835,5 +835,6 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_ACCESS STD { int faccessat(int dirfd, char *path, int mode, int flags); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.12 2006/11/11 22:01:25 ru Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -2805,6 +2805,16 @@ *n_args = 7; break; } + /* faccessat */ + case 475: { + struct faccessat_args *p = params; + iarg[0] = p->dirfd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->mode; /* int */ + iarg[3] = p->flags; /* int */ + *n_args = 4; + break; + } default: *n_args = 0; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#19 (text+ko) ==== @@ -1999,6 +1999,20 @@ return (kern_access(td, uap->path, UIO_USERSPACE, uap->flags)); } +#ifndef _SYS_SYSPROTO_H_ +struct faccessat_args { + int dirfd; + char *path; + int mode; + int flags; +} +#endif +int faccessat(struct thread *td, struct faccessat_args *args) +{ + /* XXX: what about mode? */ + return kern_accessat(td, args->path, UIO_USERSPACE, args->flags, args->dirfd); +} + int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { @@ -2029,8 +2043,13 @@ */ cred = td->td_ucred; tmpcred = crdup(cred); - tmpcred->cr_uid = cred->cr_ruid; - tmpcred->cr_groups[0] = cred->cr_rgid; + if (flags & AT_EACCESS) { + tmpcred->cr_uid = cred->cr_uid; + tmpcred->cr_groups[0] = cred->cr_groups[0]; + } else { + tmpcred->cr_uid = cred->cr_ruid; + tmpcred->cr_groups[0] = cred->cr_rgid; + } td->td_ucred = tmpcred; if ((error = namei(&nd)) != 0) goto out; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#5 (text+ko) ==== @@ -108,9 +108,7 @@ to determine the target of relative file paths. */ -#ifdef notyet #define AT_EACCESS 0x100 /* Check access using effective user and group ID */ -#endif #define AT_SYMLINK_NOFOLLOW 0x200 /* Do not follow symbolic links */ #define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic link */ #define AT_REMOVEDIR 0x800 /* Remove directory instead of file */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.209 2006/11/11 22:01:24 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -394,4 +394,5 @@ #define SYS_sctp_generic_sendmsg 472 #define SYS_sctp_generic_sendmsg_iov 473 #define SYS_sctp_generic_recvmsg 474 -#define SYS_MAXSYSCALL 475 +#define SYS_faccessat 475 +#define SYS_MAXSYSCALL 476 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.164 2006/11/11 22:01:24 ru Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp MIASM = \ syscall.o \ @@ -335,4 +335,5 @@ sctp_peeloff.o \ sctp_generic_sendmsg.o \ sctp_generic_sendmsg_iov.o \ - sctp_generic_recvmsg.o + sctp_generic_recvmsg.o \ + faccessat.o ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.213 2006/11/11 22:01:24 ru Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.231 2006/11/03 15:23:14 rrs Exp */ @@ -1482,6 +1482,12 @@ char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; char msg_flags_l_[PADL_(int *)]; int * msg_flags; char msg_flags_r_[PADR_(int *)]; }; +struct faccessat_args { + char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1814,6 +1820,7 @@ int sctp_generic_sendmsg(struct thread *, struct sctp_generic_sendmsg_args *); int sctp_generic_sendmsg_iov(struct thread *, struct sctp_generic_sendmsg_iov_args *); int sctp_generic_recvmsg(struct thread *, struct sctp_generic_recvmsg_args *); +int faccessat(struct thread *, struct faccessat_args *); #ifdef COMPAT_43 @@ -2365,6 +2372,7 @@ #define SYS_AUE_sctp_generic_sendmsg AUE_NULL #define SYS_AUE_sctp_generic_sendmsg_iov AUE_NULL #define SYS_AUE_sctp_generic_recvmsg AUE_NULL +#define SYS_AUE_faccessat AUE_ACCESS #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:41: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 0256916A46D; Thu, 21 Jun 2007 09:41: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 B110A16A469 for ; Thu, 21 Jun 2007 09:41:41 +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 8A06913C4AD for ; Thu, 21 Jun 2007 09:41:41 +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 l5L9ffxS017917 for ; Thu, 21 Jun 2007 09:41:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9ff9e017914 for perforce@freebsd.org; Thu, 21 Jun 2007 09:41:41 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 09:41:41 GMT Message-Id: <200706210941.l5L9ff9e017914@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 122075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:41:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=122075 Change 122075 by rdivacky@rdivacky_witten on 2007/06/21 09:41:33 Check for valid flags in faccessat. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#20 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#20 (text+ko) ==== @@ -2009,6 +2009,8 @@ #endif int faccessat(struct thread *td, struct faccessat_args *args) { + if (args->flags & ~AT_EACCESS) + return (EINVAL); /* XXX: what about mode? */ return kern_accessat(td, args->path, UIO_USERSPACE, args->flags, args->dirfd); } From owner-p4-projects@FreeBSD.ORG Thu Jun 21 09:45: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 D2A7D16A468; Thu, 21 Jun 2007 09:45: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 4532D16A421 for ; Thu, 21 Jun 2007 09:45:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1E6CB13C448 for ; Thu, 21 Jun 2007 09:45:47 +0000 (UTC) (envelope-from zhouzhouyi@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 l5L9jk2V018804 for ; Thu, 21 Jun 2007 09:45:47 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5L9jkBa018800 for perforce@freebsd.org; Thu, 21 Jun 2007 09:45:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 21 Jun 2007 09:45:46 GMT Message-Id: <200706210945.l5L9jkBa018800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 09:45:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=122076 Change 122076 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/21 09:45:33 add a README file for anyone interested in my code Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/README#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:01:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94A9916A468; Thu, 21 Jun 2007 10:01: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 4985B16A41F for ; Thu, 21 Jun 2007 10:01:08 +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 3A4B413C489 for ; Thu, 21 Jun 2007 10:01:08 +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 l5LA16Gx021225 for ; Thu, 21 Jun 2007 10:01:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LA16H4021185 for perforce@freebsd.org; Thu, 21 Jun 2007 10:01:06 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 10:01:06 GMT Message-Id: <200706211001.l5LA16H4021185@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 122077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122077 Change 122077 by rdivacky@rdivacky_witten on 2007/06/21 10:00:59 Introduce kern_absolute_path which checks whether a given path is absolute or not by checking first char for being '/'. Use this function to implement BADF semantic of *at syscalls. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#21 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#21 (text+ko) ==== @@ -88,6 +88,7 @@ static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); +static int kern_absolute_path(char *path, enum uio_seg pathseg); /* * The module initialization routine for POSIX asynchronous I/O will @@ -981,6 +982,22 @@ return (0); } +/* Check whether a path is an absolute path. */ +static int kern_absolute_path(char *path, enum uio_seg pathseg) +{ + int error, len; + char buf[PATH_MAX]; + + if (pathseg == UIO_SYSSPACE) { + return (path[0] == '/'); + } else { + error = copyinstr(path, buf, PATH_MAX, &len); + if (error) + return 1; /* we want to fail */ + return (buf[0] == '/'); + } +} + int kern_openat(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode, int dirfd) @@ -1004,7 +1021,7 @@ /* XXX: audit dirfd */ error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); @@ -1221,7 +1238,7 @@ if (dir_vn) vrele(dir_vn); error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1348,7 +1365,7 @@ if (dir_vn) vrele(dir_vn); error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1490,13 +1507,13 @@ int lvfslocked; error = kern_get_at(td, olddirfd, &pdir_vn); - if (error) + if (error && !kern_absolute_path(path, segflg)) return (error); NDINIT_AT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); - if (error) + if (error && !kern_absolute_path(link, segflg)) return (error); NDINIT_AT(&ndl, CREATE, LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, @@ -1609,7 +1626,7 @@ if (dir_vn) vrele(dir_vn); error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -1758,7 +1775,7 @@ if (dir_vn) vrele(dir_vn); error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, @@ -2032,7 +2049,7 @@ int vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, @@ -2242,7 +2259,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | @@ -2311,7 +2328,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | @@ -2504,7 +2521,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, @@ -2751,7 +2768,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); @@ -2911,7 +2928,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); @@ -2968,7 +2985,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); @@ -3142,7 +3159,7 @@ int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); @@ -3524,10 +3541,10 @@ int error; error = kern_get_at(td, fdirfd, &fdir_vn); - if (error) + if (error && !kern_absolute_path(from, pathseg)) return (error); error = kern_get_at(td, tdirfd, &tdir_vn); - if (error) + if (error && !kern_absolute_path(to, pathseg)) return (error); #ifdef MAC @@ -3683,7 +3700,7 @@ if (dir_vn) vrele(dir_vn); error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, @@ -3787,7 +3804,7 @@ restart: error = kern_get_at(td, dirfd, &dir_vn); - if (error) + if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:39: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 E520616A469; Thu, 21 Jun 2007 10:39:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 990F616A41F for ; Thu, 21 Jun 2007 10:39:11 +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 528A913C448 for ; Thu, 21 Jun 2007 10:39:10 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id C2EAD8BE295 for ; Thu, 21 Jun 2007 12:39:09 +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 W7B-OjResOsT for ; Thu, 21 Jun 2007 12:39:08 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id A627B8BE21B for ; Thu, 21 Jun 2007 12:39:08 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l5LAd8SK093957 for perforce@FreeBSD.org; Thu, 21 Jun 2007 12:39:08 +0200 (CEST) (envelope-from rdivacky) Date: Thu, 21 Jun 2007 12:39:08 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20070621103908.GA93922@freebsd.org> References: <200706211001.l5LA16H4021185@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706211001.l5LA16H4021185@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: PERFORCE change 122077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:39:12 -0000 On Thu, Jun 21, 2007 at 10:01:06AM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122077 > > Change 122077 by rdivacky@rdivacky_witten on 2007/06/21 10:00:59 > > Introduce kern_absolute_path which checks whether a given path is absolute or > not by checking first char for being '/'. > > Use this function to implement BADF semantic of *at syscalls. there is a race condition pointed out by kib@, the path string can change between calling the kern_absolute_path and the actual use in namei. I'll work on it From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:42: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 0F59216A469; Thu, 21 Jun 2007 10:42:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6A8F16A421 for ; Thu, 21 Jun 2007 10:42:27 +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 B5FEF13C45A for ; Thu, 21 Jun 2007 10:42:27 +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 l5LAgRAq032786 for ; Thu, 21 Jun 2007 10:42:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LAg2vp032741 for perforce@freebsd.org; Thu, 21 Jun 2007 10:42:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 10:42:02 GMT Message-Id: <200706211042.l5LAg2vp032741@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 122081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:42:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=122081 Change 122081 by rdivacky@rdivacky_witten on 2007/06/21 10:41:48 IFC to get include/* files. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/include/stdio.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/include/unistd.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/intr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.sun4v#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aha/aha.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aic.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/amd/amd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/asr/asr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/creator.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iir/iir.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iir/iir.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mly/mly.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/clone.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/clone.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/als4000.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/atiixp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/version.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/trm/trm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/hid.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ohcivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uark.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhcivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umass.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umct.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ums.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/urio.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_mem.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdi_util.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wds/wd7000.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_priv.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_resource.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/Makefile#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bpf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/igmp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/key.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_ste.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/ncr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pci.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/priv.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/tree.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_contig.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_fault.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.82 2007/06/11 17:57:24 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $"); #include #include @@ -841,7 +841,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - bus_addr_t lastaddr; + bus_addr_t lastaddr = 0; int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.587 2007/05/31 22:52:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.588 2007/06/17 04:27:45 mjacob Exp $"); /* * Manages physical address maps. @@ -1645,6 +1645,9 @@ continue; pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_collect"); + } tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, ("pmap_collect: wired pte %#lx", tpte)); @@ -2060,6 +2063,9 @@ PMAP_LOCK(pmap); pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_remove_all"); + } tpte = pte_load_clear(pte); if (tpte & PG_W) pmap->pm_stats.wired_count--; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.481 2007/06/12 02:24:30 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.482 2007/06/14 17:14:25 delphij Exp $ cpu HAMMER ident GENERIC @@ -30,6 +30,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options SCTP # Stream Transmission Control Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.231 2007/06/04 18:25:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $"); /* * Routines to handle clock hardware. @@ -53,12 +53,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -931,4 +934,100 @@ DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0); DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0); + +/* + * Linux-style /dev/nvram driver + * + * cmos ram starts at bytes 14 through 128, for a total of 114 bytes. + * bytes 16 through 31 are checksummed at byte 32. + * Unlike Linux, you have to take care of the checksums yourself. + * The driver exposes byte 14 as file offset 0. + */ + +#define NVRAM_FIRST RTC_DIAG /* 14 */ +#define NVRAM_LAST 128 + +static d_open_t nvram_open; +static d_read_t nvram_read; +static d_write_t nvram_write; + +static struct cdev *nvram_dev; + +static struct cdevsw nvram_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, + .d_open = nvram_open, + .d_read = nvram_read, + .d_write = nvram_write, + .d_name = "nvram", +}; + +static int +nvram_open(struct cdev *dev __unused, int flags, int fmt __unused, + struct thread *td) +{ + int error = 0; + + if (flags & FWRITE) + error = securelevel_gt(td->td_ucred, 0); + + return (error); +} + +static int +nvram_read(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + v = rtcin(nv_off); + error = uiomove(&v, 1, uio); + } + return (error); + +} + +static int +nvram_write(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + error = uiomove(&v, 1, uio); + writertc(nv_off, v); + } + return (error); +} + +static int +nvram_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch (type) { + case MOD_LOAD: + nvram_dev = make_dev(&nvram_cdevsw, 0, + UID_ROOT, GID_KMEM, 0640, "nvram"); + break; + case MOD_UNLOAD: + case MOD_SHUTDOWN: + destroy_dev(nvram_dev); + break; + default: + return (EOPNOTSUPP); + } + return (0); +} +DEV_MODULE(nvram, nvram_modevent, NULL); + #endif /* DEV_ISA */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/intr.h#2 (text+ko) ==== @@ -32,14 +32,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $ * */ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ -#ifdef CPU_ARM9 +#ifdef CPU_XSCALE_81342 +#define NIRQ 128 +#elif defined(CPU_ARM9) #define NIRQ 64 #else #define NIRQ 32 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/common/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.8 2006/11/02 00:26:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.9 2007/06/17 00:17:15 marius Exp $"); #include #include "openfirm.h" @@ -41,7 +41,6 @@ extern char bootprog_date[]; extern char bootprog_maker[]; -phandle_t chosen; u_int32_t acells; static char bootargs[128]; @@ -64,24 +63,22 @@ uint64_t memsize(void) { - ihandle_t meminstance; - phandle_t memory; + phandle_t memoryp; struct ofw_reg reg[4]; struct ofw_reg2 reg2[8]; int i; u_int64_t sz, memsz; - OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance)); - memory = OF_instance_to_package(meminstance); + memoryp = OF_instance_to_package(memory); if (acells == 1) { - sz = OF_getprop(memory, "reg", ®, sizeof(reg)); + sz = OF_getprop(memoryp, "reg", ®, sizeof(reg)); sz /= sizeof(struct ofw_reg); for (i = 0, memsz = 0; i < sz; i++) memsz += reg[i].size; } else if (acells == 2) { - sz = OF_getprop(memory, "reg", ®2, sizeof(reg2)); + sz = OF_getprop(memoryp, "reg", ®2, sizeof(reg2)); sz /= sizeof(struct ofw_reg2); for (i = 0, memsz = 0; i < sz; i++) @@ -107,7 +104,6 @@ OF_init(openfirm); root = OF_finddevice("/"); - chosen = OF_finddevice("/chosen"); acells = 1; OF_getprop(root, "#address-cells", &acells, sizeof(acells)); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.10 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ LIB= ofw INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ - ofw_time.c openfirm.c openfirm_mmu.c + ofw_time.c openfirm.c CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_console.c#2 (text+ko) ==== @@ -27,15 +27,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.11 2005/10/20 10:39:09 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.12 2007/06/17 00:17:15 marius Exp $"); #include #include "bootstrap.h" #include "openfirm.h" -int console; - static void ofw_cons_probe(struct console *cp); static int ofw_cons_init(int); void ofw_cons_putchar(int); @@ -59,10 +57,7 @@ static void ofw_cons_probe(struct console *cp) { - phandle_t chosen; - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)); OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)); cp->c_flags |= C_PRESENTIN|C_PRESENTOUT; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/ofw_net.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.10 2005/03/02 20:12:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.11 2007/06/17 00:17:15 marius Exp $"); #include #include @@ -179,12 +179,11 @@ static void ofwn_init(struct iodesc *desc, void *machdep_hint) { - phandle_t chosen, netdev; + phandle_t netdev; char path[64]; char *ch; int pathlen; - chosen = OF_finddevice("/chosen"); pathlen = OF_getprop(chosen, "bootpath", path, 64); if ((ch = index(path, ':')) != NULL) *ch = '\0'; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ofw/libofw/openfirm.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.13 2006/10/09 04:43:07 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.15 2007/06/17 00:17:15 marius Exp $"); #include @@ -66,39 +66,24 @@ int (*openfirmware)(void *); +phandle_t chosen; ihandle_t mmu; ihandle_t memory; -/* Initialiaser */ +/* Initialiser */ void OF_init(int (*openfirm)(void *)) { - phandle_t chosen; openfirmware = openfirm; - chosen = OF_finddevice("/chosen"); - OF_getprop(chosen, "memory", &memory, sizeof(memory)); - if (memory == 0) - panic("failed to get memory ihandle"); - OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)); - if (mmu == 0) - panic("failed to get mmu ihandle"); -} - -phandle_t -OF_chosennode(void) -{ - static phandle_t chosen; - - if (chosen) - return (chosen); - - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); - - return (chosen); + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + if (OF_getprop(chosen, "memory", &memory, sizeof(memory)) == -1) + OF_exit(); + if (OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)) == -1) + OF_exit(); } /* @@ -110,23 +95,21 @@ OF_test(char *name) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t service; - cell_t missing; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t service; + cell_t missing; } args = { (cell_t)"test", 1, 1, - 0, - 0 }; args.service = (cell_t)name; if (openfirmware(&args) == -1) - return -1; - return (int)args.missing; + return (-1); + return (args.missing); } /* Return firmware millisecond count. */ @@ -134,19 +117,18 @@ OF_milliseconds() { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t ms; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t ms; } args = { (cell_t)"milliseconds", 0, 1, - 0 }; - + openfirmware(&args); - return (int)args.ms; + return (args.ms); } /* @@ -158,23 +140,21 @@ OF_peer(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t next; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t next; } args = { (cell_t)"peer", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.next; + return (-1); + return (args.next); } /* Return the first child of this node or 0. */ @@ -182,23 +162,21 @@ OF_child(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t child; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t child; } args = { (cell_t)"child", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.child; + return (-1); + return (args.child); } /* Return the parent of this node or 0. */ @@ -206,23 +184,21 @@ OF_parent(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t parent; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t parent; } args = { (cell_t)"parent", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.parent; + return (-1); + return (args.parent); } /* Return the package handle that corresponds to an instance handle. */ @@ -230,23 +206,21 @@ OF_instance_to_package(ihandle_t instance) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t package; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t instance; + cell_t package; } args = { (cell_t)"instance-to-package", 1, 1, - 0, - 0 }; - - args.instance = (u_int)instance; + + args.instance = instance; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.package; + return (-1); + return (args.package); } /* Get the length of a property of a package. */ @@ -254,26 +228,23 @@ OF_getproplen(phandle_t package, char *propname) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t proplen; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t proplen; } args = { (cell_t)"getproplen", 2, 1, - 0, - 0, - 0 }; - args.package = (u_int)package; + args.package = package; args.propname = (cell_t)propname; if (openfirmware(&args) == -1) - return -1; - return (int)args.proplen; + return (-1); + return (args.proplen); } /* Get the value of a property of a package. */ @@ -281,32 +252,27 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t buflen; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t buf; + cell_t buflen; + cell_t size; } args = { (cell_t)"getprop", 4, 1, - 0, - 0, - 0, - 0, - 0 }; - - args.package = (u_int)package; + + args.package = package; args.propname = (cell_t)propname; args.buf = (cell_t)buf; - args.buflen = (u_int)buflen; + args.buflen = buflen; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:51: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 15A6816A478; Thu, 21 Jun 2007 10:51: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 CC47916A476 for ; Thu, 21 Jun 2007 10:51:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BC55613C4C5 for ; Thu, 21 Jun 2007 10:51:40 +0000 (UTC) (envelope-from lulf@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 l5LApejR034627 for ; Thu, 21 Jun 2007 10:51:40 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LApdue034623 for perforce@freebsd.org; Thu, 21 Jun 2007 10:51:39 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 21 Jun 2007 10:51:39 GMT Message-Id: <200706211051.l5LApdue034623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=122083 Change 122083 by lulf@lulf_carrot on 2007/06/21 10:51:31 - integrate Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#8 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#10 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sun4v#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#7 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_fork.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_priv.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_resource.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sched_ule.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_witness.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/Makefile#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/priv.h#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/tree.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_contig.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_fault.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1432 2007/06/13 14:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -125,10 +125,6 @@ options MAXPHYS=(128*1024) -# Options for the VM subsystem -# Deprecated options supported for backwards compatibility -#options PQ_NOOPT # No coloring - # This allows you to actually store this configuration file into # the kernel binary itself, where it may be later read by saying: # strings -n 3 /boot/kernel/kernel | sed -n 's/^___//p' > MYKERNEL @@ -584,17 +580,7 @@ # for in a captured lab environment :-) options SCTP_WITH_NO_CSUM # -# Logging, this is another debug tool thats way -# cool.. but does take resources so its off -# by default. To do any logging you must first -# enable SCTP_STAT_LOGGING. This gets the utilities -# into the code base that actually do the logging and -# alocates a hugh fixed circular buffer that logging -# uses (about 80,000 entires that are probably 8 long -# words or so long.. so it does take a LOT of memory). -# Its cool for real-time debugging though. -# -options SCTP_STAT_LOGGING + # # All that options after that turn on specific types of # logging. You can monitor CWND growth, flight size @@ -605,25 +591,19 @@ # I have not yet commited the tools to get and print # the logs, I will do that eventually .. before then # if you want them send me an email rrs@freebsd.org +# You basically must have KTR enabled for these +# and you then set the sysctl to turn on/off various +# logging bits. Use ktrdump to pull the log and run +# it through a dispaly program.. and graphs and other +# things too. # -options SCTP_LOG_MAXBURST -options SCTP_LOG_RWND -options SCTP_CWND_LOGGING -options SCTP_CWND_MONITOR -options SCTP_BLK_LOGGING -options SCTP_STR_LOGGING -options SCTP_FR_LOGGING -options SCTP_MAP_LOGGING -options SCTP_SACK_LOGGING -options SCTP_LOCK_LOGGING -options SCTP_RTTVAR_LOGGING -options SCTP_SB_LOGGING -options SCTP_EARLYFR_LOGGING -options SCTP_NAGLE_LOGGING -options SCTP_WAKE_LOGGING -options SCTP_RECV_RWND_LOGGING -options SCTP_SACK_RWND_LOGGING -options SCTP_MBUF_LOGGING +options SCTP_LOCK_LOGGING +options SCTP_MBUF_LOGGING +options SCTP_MBCNT_LOGGING +options SCTP_PACKET_LOGGING +options SCTP_LTRACE_CHUNKS +options SCTP_LTRACE_ERRORS + # altq(9). Enable the base part of the hooks with the ALTQ option. # Individual disciplines must be built into the base system and can not be ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1220 2007/06/13 14:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1205,6 +1205,11 @@ fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs +fs/tmpfs/tmpfs_vnops.c optional tmpfs +fs/tmpfs/tmpfs_fifoops.c optional tmpfs +fs/tmpfs/tmpfs_vfsops.c optional tmpfs +fs/tmpfs/tmpfs_subr.c optional tmpfs +fs/tmpfs/tmpfs_uma.c optional tmpfs gdb/gdb_cons.c optional gdb gdb/gdb_main.c optional gdb gdb/gdb_packet.c optional gdb @@ -2073,6 +2078,7 @@ vm/vm_pageout.c standard vm/vm_pageq.c standard vm/vm_pager.c standard +vm/vm_phys.c standard vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sparc64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.89 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.91 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -46,6 +46,7 @@ dev/esp/esp_sbus.c optional esp sbus dev/fb/creator.c optional creator sc dev/fb/fb.c optional sc +dev/fb/gallant12x22.c optional sc dev/fb/machfb.c optional machfb sc dev/hwpmc/hwpmc_sparc64.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd @@ -80,7 +81,6 @@ sparc64/isa/isa_dma.c optional isa sparc64/isa/ofw_isa.c optional ebus | isa sparc64/pci/apb.c optional pci -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sun4v#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.9 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.10 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -47,7 +47,6 @@ sparc64/sparc64/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci sun4v/sun4v/trap_trace.S optional trap_tracing -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.593 2007/06/13 14:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ # # On the handling of kernel options # @@ -196,6 +196,7 @@ PSEUDOFS opt_dontuse.h REISERFS opt_dontuse.h SMBFS opt_dontuse.h +TMPFS opt_dontuse.h UDF opt_dontuse.h UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h @@ -397,30 +398,18 @@ # SCTP # SCTP opt_sctp.h -SCTP_DEBUG opt_sctp.h -SCTP_HIGH_SPEED opt_sctp.h -SCTP_LOG_MAXBURST opt_sctp.h -SCTP_LOG_RWND opt_sctp.h -SCTP_STAT_LOGGING opt_sctp.h -SCTP_CWND_LOGGING opt_sctp.h -SCTP_CWND_MONITOR opt_sctp.h -SCTP_BLK_LOGGING opt_sctp.h -SCTP_STR_LOGGING opt_sctp.h -SCTP_FR_LOGGING opt_sctp.h -SCTP_MAP_LOGGING opt_sctp.h -SCTP_SACK_LOGGING opt_sctp.h -SCTP_LOCK_LOGGING opt_sctp.h -SCTP_RTTVAR_LOGGING opt_sctp.h -SCTP_SB_LOGGING opt_sctp.h -SCTP_WITH_NO_CSUM opt_sctp.h -SCTP_EARLYFR_LOGGING opt_sctp.h -SCTP_NAGLE_LOGGING opt_sctp.h -SCTP_WAKE_LOGGING opt_sctp.h -SCTP_RECV_RWND_LOGGING opt_sctp.h -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 +SCTP_DEBUG opt_sctp.h # Enable debug printfs +SCTP_HIGH_SPEED opt_sctp.h # Enable Sally Floyds HS TCP CC +SCTP_WITH_NO_CSUM opt_sctp.h # Use this at your peril +SCTP_LOCK_LOGGING opt_sctp.h # Log to KTR lock activity +SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free +SCTP_MBCNT_LOGGING opt_sctp.h # Log to KTR mbcnt activity +SCTP_PACKET_LOGGING opt_sctp.h # Log to a packet buffer last N packets +SCTP_LTRACE_CHUNKS opt_sctp.h # Log to KTR chunks processed +SCTP_LTRACE_ERRORS opt_sctp.h # Log to KTR error returns. +# +# +# # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. # Each netgraph node type can be either be compiled into the kernel @@ -566,7 +555,6 @@ NO_SWAPPING opt_vm.h MALLOC_MAKE_FAILURES opt_vm.h MALLOC_PROFILE opt_vm.h -PQ_NOOPT opt_vmpage.h # The MemGuard replacement allocator used for tamper-after-free detection DEBUG_MEMGUARD opt_vm.h ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.8 2007/06/06 05:01:41 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.9 2007/06/17 22:19:19 marcel Exp $"); #include #include @@ -136,6 +136,81 @@ return (NULL); } +void +g_part_geometry_heads(off_t blocks, u_int sectors, off_t *bestchs, + u_int *bestheads) +{ + static u_int candidate_heads[] = { 1, 2, 16, 32, 64, 128, 255, 0 }; + off_t chs, cylinders; + u_int heads; + int idx; + + *bestchs = 0; + *bestheads = 0; + for (idx = 0; candidate_heads[idx] != 0; idx++) { + heads = candidate_heads[idx]; + cylinders = blocks / heads / sectors; + if (cylinders < heads || cylinders < sectors) + break; + if (cylinders > 1023) + continue; + chs = cylinders * heads * sectors; + if (chs > *bestchs || (chs == *bestchs && *bestheads == 1)) { + *bestchs = chs; + *bestheads = heads; + } + } +} + +static void +g_part_geometry(struct g_part_table *table, struct g_consumer *cp, + off_t blocks) +{ + static u_int candidate_sectors[] = { 1, 9, 17, 33, 63, 0 }; + off_t chs, bestchs; + u_int heads, sectors; + int idx; + + if (g_getattr("GEOM::fwsectors", cp, §ors) != 0 || + sectors < 1 || sectors > 63 || + g_getattr("GEOM::fwheads", cp, &heads) != 0 || + heads < 1 || heads > 255) { + table->gpt_fixgeom = 0; + table->gpt_heads = 0; + table->gpt_sectors = 0; + bestchs = 0; + for (idx = 0; candidate_sectors[idx] != 0; idx++) { + sectors = candidate_sectors[idx]; + g_part_geometry_heads(blocks, sectors, &chs, &heads); + if (chs == 0) + continue; + /* + * Prefer a geometry with sectors > 1, but only if + * it doesn't bump down the numbver of heads to 1. + */ + if (chs > bestchs || (chs == bestchs && heads > 1 && + table->gpt_sectors == 1)) { + bestchs = chs; + table->gpt_heads = heads; + table->gpt_sectors = sectors; + } + } + /* + * If we didn't find a geometry at all, then the disk is + * too big. This means we can use the maximum number of + * heads and sectors. + */ + if (bestchs == 0) { + table->gpt_heads = 255; + table->gpt_sectors = 63; + } + } else { + table->gpt_fixgeom = 1; + table->gpt_heads = heads; + table->gpt_sectors = sectors; + } +} + struct g_part_entry * g_part_new_entry(struct g_part_table *table, int index, quad_t start, quad_t end) @@ -574,6 +649,12 @@ g_topology_unlock(); + /* Make sure the provider has media. */ + if (pp->mediasize == 0 || pp->sectorsize == 0) { + error = ENODEV; + goto fail; + } + /* Make sure we can nest and if so, determine our depth. */ error = g_getattr("PART::isleaf", cp, &attr); if (!error && attr) { @@ -583,6 +664,14 @@ error = g_getattr("PART::depth", cp, &attr); table->gpt_depth = (!error) ? attr + 1 : 0; + /* + * Synthesize a disk geometry. Some partitioning schemes + * depend on it and since some file systems need it even + * when the partitition scheme doesn't, we do it here in + * scheme-independent code. + */ + g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); + error = G_PART_CREATE(table, gpp); if (error) goto fail; @@ -1217,6 +1306,15 @@ g_topology_unlock(); + /* + * Short-circuit the whole probing galore when there's no + * media present. + */ + if (pp->mediasize == 0 || pp->sectorsize == 0) { + error = ENODEV; + goto fail; + } + /* Make sure we can nest and if so, determine our depth. */ error = g_getattr("PART::isleaf", cp, &attr); if (!error && attr) { @@ -1231,6 +1329,15 @@ goto fail; table = gp->softc; + + /* + * Synthesize a disk geometry. Some partitioning schemes + * depend on it and since some file systems need it even + * when the partitition scheme doesn't, we do it here in + * scheme-independent code. + */ + g_part_geometry(table, cp, pp->mediasize / pp->sectorsize); + error = G_PART_READ(table, cp); if (error) goto fail; @@ -1311,6 +1418,10 @@ (uintmax_t)table->gpt_first); sbuf_printf(sb, "%s%ju\n", indent, (uintmax_t)table->gpt_last); + sbuf_printf(sb, "%s%u\n", indent, + table->gpt_sectors); + sbuf_printf(sb, "%s%u\n", indent, + table->gpt_heads); G_PART_DUMPCONF(table, NULL, sb, indent); } } @@ -1349,7 +1460,6 @@ struct g_part_table *table; struct g_kerneldump *gkd; struct g_provider *pp; - int attr; pp = bp->bio_to; gp = pp->geom; @@ -1387,6 +1497,14 @@ case BIO_FLUSH: break; case BIO_GETATTR: + if (g_handleattr_int(bp, "GEOM::fwheads", table->gpt_heads)) + return; + if (g_handleattr_int(bp, "GEOM::fwsectors", table->gpt_sectors)) + return; + if (g_handleattr_int(bp, "PART::isleaf", table->gpt_isleaf)) + return; + if (g_handleattr_int(bp, "PART::depth", table->gpt_depth)) + return; if (!strcmp("GEOM::kerneldump", bp->bio_attribute)) { /* * Check that the partition is suitable for kernel @@ -1405,25 +1523,6 @@ if (gkd->offset + gkd->length > pp->mediasize) gkd->length = pp->mediasize - gkd->offset; gkd->offset += entry->gpe_offset; - } else if (!strcmp("PART::isleaf", bp->bio_attribute)) { - if (bp->bio_length != sizeof(int)) { - g_io_deliver(bp, EFAULT); - return; - } - attr = table->gpt_isleaf ? 1 : 0; - bcopy(&attr, bp->bio_data, sizeof(int)); - bp->bio_completed = sizeof(int); - g_io_deliver(bp, 0); - return; - } else if (!strcmp("PART::depth", bp->bio_attribute)) { - if (bp->bio_length != sizeof(int)) { - g_io_deliver(bp, EFAULT); - return; - } - bcopy(&table->gpt_depth, bp->bio_data, sizeof(int)); - bp->bio_completed = sizeof(int); - g_io_deliver(bp, 0); - return; } break; default: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.2 2007/05/08 20:18:17 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.3 2007/06/17 22:19:19 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -87,12 +87,25 @@ */ uint32_t gpt_smhead; uint32_t gpt_smtail; + /* + * gpt_sectors and gpt_heads are the fixed or synchesized number + * of sectors per track and heads (resp) that make up a disks + * geometry. This is to support partitioning schemes as well as + * file systems that work on a geometry. The MBR scheme and the + * MS-DOS (FAT) file system come to mind. + * We keep track of whether the geometry is fixed or synchesized + * so that a partitioning scheme can correct the synthesized + * geometry, based on the on-disk metadata. + */ + uint32_t gpt_sectors; + uint32_t gpt_heads; int gpt_depth; /* Sub-partitioning level. */ int gpt_isleaf:1; /* Cannot be sub-partitioned. */ int gpt_created:1; /* Newly created. */ int gpt_modified:1; /* Table changes have been made. */ int gpt_opened:1; /* Permissions obtained. */ + int gpt_fixgeom:1; /* Geometry is fixed. */ }; struct g_part_entry *g_part_new_entry(struct g_part_table *, int, quad_t, @@ -127,4 +140,6 @@ unsigned int gpp_version; }; +void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); + #endif /* !_GEOM_PART_H_ */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/part/g_part_mbr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.1 2007/06/13 04:27:36 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.2 2007/06/17 22:19:19 marcel Exp $"); #include #include @@ -50,7 +50,6 @@ struct g_part_mbr_table { struct g_part_table base; u_char mbr[MBRSIZE]; - int spt; /* Sectors/track. */ }; struct g_part_mbr_entry { @@ -119,31 +118,52 @@ return (EINVAL); } +static void +mbr_set_chs(struct g_part_table *table, uint32_t lba, u_char *cylp, u_char *hdp, + u_char *secp) +{ + uint32_t cyl, hd, sec; + + sec = lba % table->gpt_sectors + 1; + lba /= table->gpt_sectors; + hd = lba % table->gpt_heads; + lba /= table->gpt_heads; + cyl = lba; + if (cyl > 1023) + sec = hd = cyl = ~0; + + *cylp = cyl & 0xff; + *hdp = hd & 0xff; + *secp = (sec & 0x3f) | ((cyl >> 2) & 0xc0); +} + static int g_part_mbr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, struct g_part_parms *gpp) { struct g_part_mbr_entry *entry; struct g_part_mbr_table *table; - uint32_t start, size; + uint32_t start, size, sectors; if (gpp->gpp_parms & G_PART_PARM_LABEL) return (EINVAL); + sectors = basetable->gpt_sectors; + entry = (struct g_part_mbr_entry *)baseentry; table = (struct g_part_mbr_table *)basetable; start = gpp->gpp_start; size = gpp->gpp_size; - if (size < table->spt) + if (size < sectors) return (EINVAL); - if (start % table->spt) { - size = size - table->spt + (start % table->spt); - start = start - (start % table->spt) + table->spt; + if (start % sectors) { + size = size - sectors + (start % sectors); + start = start - (start % sectors) + sectors; } - if (size % table->spt) - size = size - (size % table->spt); - if (size < table->spt) + if (size % sectors) + size = size - (size % sectors); + if (size < sectors) return (EINVAL); if (baseentry->gpe_deleted) @@ -155,6 +175,10 @@ baseentry->gpe_end = start + size - 1; entry->ent.dp_start = start; entry->ent.dp_size = size; + mbr_set_chs(basetable, baseentry->gpe_start, &entry->ent.dp_scyl, + &entry->ent.dp_shd, &entry->ent.dp_ssect); + mbr_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl, + &entry->ent.dp_ehd, &entry->ent.dp_esect); return (mbr_parse_type(gpp->gpp_type, &entry->ent.dp_typ)); } @@ -165,27 +189,19 @@ struct g_provider *pp; struct g_part_mbr_table *table; uint64_t msize; - int error, spt; pp = gpp->gpp_provider; cp = LIST_FIRST(&pp->consumers); - error = g_getattr("GEOM::fwsectors", cp, &spt); - if (error) - spt = 17; - else if (spt == 0) - spt = 1; - - if (pp->sectorsize < MBRSIZE || pp->mediasize < spt * pp->sectorsize) + if (pp->sectorsize < MBRSIZE) return (ENOSPC); msize = pp->mediasize / pp->sectorsize; - basetable->gpt_first = spt; - basetable->gpt_last = msize - (msize % spt) - 1; + basetable->gpt_first = basetable->gpt_sectors; + basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1; table = (struct g_part_mbr_table *)basetable; le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); - table->spt = spt; return (0); } @@ -262,23 +278,13 @@ struct g_part_mbr_table *table; struct g_part_mbr_entry *entry; u_char *buf, *p; - uint64_t msize; - int error, index, spt; - - error = g_getattr("GEOM::fwsectors", cp, &spt); - if (error) - spt = 17; - else if (spt == 0) - spt = 1; + off_t chs, msize; + u_int sectors, heads; + int error, index; pp = cp->provider; table = (struct g_part_mbr_table *)basetable; - table->spt = spt; - msize = pp->mediasize / pp->sectorsize; - basetable->gpt_first = spt; - basetable->gpt_last = msize - (msize % spt) - 1; - basetable->gpt_entries = NDOSPART; buf = g_read_data(cp, 0L, pp->sectorsize, &error); if (buf == NULL) @@ -303,10 +309,19 @@ continue; if (ent.dp_start == 0 || ent.dp_size == 0) continue; - if ((ent.dp_start % spt) != 0) + sectors = ent.dp_esect & 0x3f; + if (sectors > basetable->gpt_sectors && + !basetable->gpt_fixgeom) { + g_part_geometry_heads(msize, sectors, &chs, &heads); + if (chs != 0) { + basetable->gpt_sectors = sectors; + basetable->gpt_heads = heads; + } + } + if ((ent.dp_start % basetable->gpt_sectors) != 0) printf("GEOM: %s: partition %d does not start on a " "track boundary.\n", pp->name, index + 1); - if ((ent.dp_size % spt) != 0) + if ((ent.dp_size % basetable->gpt_sectors) != 0) printf("GEOM: %s: partition %d does not end on a " "track boundary.\n", pp->name, index + 1); @@ -314,6 +329,11 @@ index + 1, ent.dp_start, ent.dp_start + ent.dp_size - 1); entry->ent = ent; } + + basetable->gpt_entries = NDOSPART; + basetable->gpt_first = basetable->gpt_sectors; + basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1; + return (0); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/cpufreq/smist.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/cpufreq/smist.c,v 1.1 2005/04/19 16:38:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/cpufreq/smist.c,v 1.2 2007/06/17 07:18:23 njl Exp $"); #include #include @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -71,6 +72,8 @@ struct cf_setting sets[2]; /* Only two settings. */ }; +static char smist_magic[] = "Copyright (c) 1999 Intel Corporation"; + static void smist_identify(driver_t *driver, device_t parent); static int smist_probe(device_t dev); static int smist_attach(device_t dev); @@ -147,34 +150,84 @@ return (0); } -static int -set_ownership(device_t dev) +/* Temporary structure to hold mapped page and status. */ +struct set_ownership_data { + int smi_cmd; + int command; + int result; + void *buf; +}; + +/* Perform actual SMI call to enable SpeedStep. */ +static void +set_ownership_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { - int result; - struct smist_softc *sc; - vm_paddr_t pmagic; - static char magic[] = "Copyright (c) 1999 Intel Corporation"; + struct set_ownership_data *data; - sc = device_get_softc(dev); - if (!sc) - return (ENXIO); + data = arg; + if (error) { + data->result = error; + return; + } - pmagic = vtophys(magic); - + /* Copy in the magic string and send it by writing to the SMI port. */ + strlcpy(data->buf, smist_magic, PAGE_SIZE); __asm __volatile( "movl $-1, %%edi\n\t" "out %%al, (%%dx)\n" - : "=D" (result) - : "a" (sc->command), + : "=D" (data->result) + : "a" (data->command), "b" (0), "c" (0), - "d" (sc->smi_cmd), - "S" (pmagic) + "d" (data->smi_cmd), + "S" ((uint32_t)segs[0].ds_addr) ); +} - DPRINT(dev, "taking ownership over BIOS return %d\n", result); +static int +set_ownership(device_t dev) +{ + struct smist_softc *sc; + struct set_ownership_data cb_data; + bus_dma_tag_t tag; + bus_dmamap_t map; + + /* + * Specify the region to store the magic string. Since its address is + * passed to the BIOS in a 32-bit register, we have to make sure it is + * located in a physical page below 4 GB (i.e., for PAE.) + */ + sc = device_get_softc(dev); + if (bus_dma_tag_create(/*parent*/ NULL, + /*alignment*/ PAGE_SIZE, /*no boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, /*highaddr*/ BUS_SPACE_MAXADDR, + NULL, NULL, /*maxsize*/ PAGE_SIZE, /*segments*/ 1, + /*maxsegsize*/ PAGE_SIZE, 0, busdma_lock_mutex, &Giant, + &tag) != 0) { + device_printf(dev, "can't create mem tag\n"); + return (ENXIO); + } + if (bus_dmamem_alloc(tag, &cb_data.buf, BUS_DMA_NOWAIT, &map) != 0) { + bus_dma_tag_destroy(tag); + device_printf(dev, "can't alloc mapped mem\n"); + return (ENXIO); + } - return (result ? ENXIO : 0); + /* Load the physical page map and take ownership in the callback. */ + cb_data.smi_cmd = sc->smi_cmd; + cb_data.command = sc->command; + if (bus_dmamap_load(tag, map, cb_data.buf, PAGE_SIZE, set_ownership_cb, + &cb_data, BUS_DMA_NOWAIT) != 0) { + bus_dmamem_free(tag, cb_data.buf, map); + bus_dma_tag_destroy(tag); + device_printf(dev, "can't load mem\n"); + return (ENXIO); + }; + DPRINT(dev, "taking ownership over BIOS return %d\n", cb_data.result); + bus_dmamap_unload(tag, map); + bus_dmamem_free(tag, cb_data.buf, map); + bus_dma_tag_destroy(tag); + return (cb_data.result ? ENXIO : 0); } static int ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.236 2007/06/04 18:25:07 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.237 2007/06/15 22:58:13 peter Exp $"); /* * Routines to handle clock hardware. @@ -56,12 +56,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -930,4 +933,100 @@ DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0); DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0); + +/* + * Linux-style /dev/nvram driver + * + * cmos ram starts at bytes 14 through 128, for a total of 114 bytes. + * bytes 16 through 31 are checksummed at byte 32. + * Unlike Linux, you have to take care of the checksums yourself. + * The driver exposes byte 14 as file offset 0. + */ + +#define NVRAM_FIRST RTC_DIAG /* 14 */ +#define NVRAM_LAST 128 + +static d_open_t nvram_open; +static d_read_t nvram_read; +static d_write_t nvram_write; + +static struct cdev *nvram_dev; + +static struct cdevsw nvram_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, + .d_open = nvram_open, + .d_read = nvram_read, + .d_write = nvram_write, + .d_name = "nvram", +}; + +static int +nvram_open(struct cdev *dev __unused, int flags, int fmt __unused, + struct thread *td) +{ + int error = 0; + + if (flags & FWRITE) + error = securelevel_gt(td->td_ucred, 0); + + return (error); +} + +static int +nvram_read(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + v = rtcin(nv_off); + error = uiomove(&v, 1, uio); + } + return (error); + +} + +static int +nvram_write(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + error = uiomove(&v, 1, uio); + writertc(nv_off, v); + } + return (error); +} + +static int +nvram_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch (type) { + case MOD_LOAD: + nvram_dev = make_dev(&nvram_cdevsw, 0, + UID_ROOT, GID_KMEM, 0640, "nvram"); + break; + case MOD_UNLOAD: + case MOD_SHUTDOWN: + destroy_dev(nvram_dev); + break; + default: + return (EOPNOTSUPP); + } + return (0); +} +DEV_MODULE(nvram, nvram_modevent, NULL); + #endif /* DEV_ISA */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/xbox/xboxfb.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/i386/xbox/xboxfb.c,v 1.4 2006/03/03 14:52:57 rink Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/i386/xbox/xboxfb.c,v 1.5 2007/06/16 21:31:53 marius Exp $"); + /* * This is the syscon(4)-ized version of the Xbox Frame Buffer driver. It * supports about all features required, such as mouse support. @@ -71,7 +72,7 @@ char* sc_framebuffer; /* pointer to the font used */ - struct gfb_font* sc_font; + const struct gfb_font* sc_font; }; #define SCREEN_WIDTH 640 @@ -79,7 +80,7 @@ #define XBOXFB_DRIVER_NAME "xboxsc" -extern struct gfb_font bold8x16; +extern const struct gfb_font bold8x16; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:52: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 D2F8416A421; Thu, 21 Jun 2007 10:52: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 98FE116A400 for ; Thu, 21 Jun 2007 10:52:42 +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 8AABB13C447 for ; Thu, 21 Jun 2007 10:52:42 +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 l5LAqgib034883 for ; Thu, 21 Jun 2007 10:52:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LAqg3x034879 for perforce@freebsd.org; Thu, 21 Jun 2007 10:52:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 10:52:42 GMT Message-Id: <200706211052.l5LAqg3x034879@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 122084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=122084 Change 122084 by rdivacky@rdivacky_witten on 2007/06/21 10:51:40 Introduce include/* part of POSIX Extended API o add prototypes for faccessat, fchmodat, fchownat, fexecve, linkat, readlinkat, symlinkat, unlinkat I changed return value of readlinkat at from ssizt_t to ssize_t because I think its a typo and I changed "int flag" to just "int" in linkat prototype. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/include/stdio.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/include/unistd.h#2 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/include/stdio.h#2 (text+ko) ==== @@ -447,5 +447,6 @@ #define putchar_unlocked(x) putc_unlocked(x, stdout) #endif +int renameat(int, const char *, int, const char *); __END_DECLS #endif /* !_STDIO_H_ */ ==== //depot/projects/soc2007/rdivacky/linux_at/include/unistd.h#2 (text+ko) ==== @@ -558,6 +558,15 @@ extern int optreset; /* getopt(3) external variable */ #endif #endif /* __BSD_VISIBLE */ + +int faccessat(int, const char *, int); +int fchmodat(int, const char *, mode_t, int); +int fchownat(int, const char *, uid_t, gid_t, int); +int fexecve(int, char *const [], char *const []); +int linkat(int, const char *, int, const char *, int); +ssize_t readlinkat(int, const char *, char *, size_t); +int symlinkat(const char *, int, const char *); +int unlinkat(int, const char *, int); __END_DECLS #endif /* !_UNISTD_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 10:56: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 D61EA16A421; Thu, 21 Jun 2007 10:56: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 9ED1A16A46B for ; Thu, 21 Jun 2007 10:56:48 +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 785E113C489 for ; Thu, 21 Jun 2007 10:56:48 +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 l5LAumY0035621 for ; Thu, 21 Jun 2007 10:56:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LAume2035616 for perforce@freebsd.org; Thu, 21 Jun 2007 10:56:48 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 10:56:48 GMT Message-Id: <200706211056.l5LAume2035616@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 122085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 10:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=122085 Change 122085 by rdivacky@rdivacky_witten on 2007/06/21 10:56:01 Nullify the dir_vn in a case of a failure. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#22 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#22 (text+ko) ==== @@ -971,10 +971,13 @@ *dir_vn = NULL; else { error = fgetvp(td, dirfd, dir_vn); - if (error) + if (error) { + *dir_vn = NULL; return (error); + } if ((*dir_vn)->v_type != VDIR) { vrele(*dir_vn); + *dir_vn = NULL; return (ENOTDIR); } } From owner-p4-projects@FreeBSD.ORG Thu Jun 21 11:13: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 B42DA16A469; Thu, 21 Jun 2007 11:13: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 6CFB216A421 for ; Thu, 21 Jun 2007 11:13:10 +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 5E78C13C45B for ; Thu, 21 Jun 2007 11:13:10 +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 l5LBDAUj040181 for ; Thu, 21 Jun 2007 11:13:10 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LBDA4Y040178 for perforce@freebsd.org; Thu, 21 Jun 2007 11:13:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 11:13:10 GMT Message-Id: <200706211113.l5LBDA4Y040178@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 122087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 11:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=122087 Change 122087 by rdivacky@rdivacky_witten on 2007/06/21 11:13:03 Dont copy whole path from userland when we need only the first char. Also we dont use len so dont care filling it. Pointed out by: netchild Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#23 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#23 (text+ko) ==== @@ -988,13 +988,13 @@ /* Check whether a path is an absolute path. */ static int kern_absolute_path(char *path, enum uio_seg pathseg) { - int error, len; - char buf[PATH_MAX]; + int error; + char buf[1]; if (pathseg == UIO_SYSSPACE) { return (path[0] == '/'); } else { - error = copyinstr(path, buf, PATH_MAX, &len); + error = copyinstr(path, buf, 1, NULL); if (error) return 1; /* we want to fail */ return (buf[0] == '/'); From owner-p4-projects@FreeBSD.ORG Thu Jun 21 11:28: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 E5F3916A421; Thu, 21 Jun 2007 11:28: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 B63E016A478 for ; Thu, 21 Jun 2007 11:28:29 +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 A585513C45E for ; Thu, 21 Jun 2007 11:28:29 +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 l5LBSTQB042590 for ; Thu, 21 Jun 2007 11:28:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LBSTgO042587 for perforce@freebsd.org; Thu, 21 Jun 2007 11:28:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 11:28:29 GMT Message-Id: <200706211128.l5LBSTgO042587@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 122088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 11:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=122088 Change 122088 by rdivacky@rdivacky_witten on 2007/06/21 11:27:47 Check for absolute path in namei() when startdir is NULL when called from *at context. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#24 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#6 (text+ko) ==== @@ -195,8 +195,12 @@ if (ndp->ni_startdir) dp = ndp->ni_startdir; - else + else { dp = fdp->fd_cdir; + /* we might have raced so check it */ + if ((cnp->cn_flags & AT) && (cnp->cn_pnbuf[0] != '/')) + return (EBADF); + } vfslocked = VFS_LOCK_GIANT(dp->v_mount); VREF(dp); FILEDESC_SUNLOCK(fdp); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#24 (text+ko) ==== @@ -1027,7 +1027,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1244,7 +1244,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -1371,7 +1371,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -1513,13 +1513,13 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); + NDINIT_AT(&ndp, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); if (error && !kern_absolute_path(link, segflg)) return (error); - NDINIT_AT(&ndl, CREATE, LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, + NDINIT_AT(&ndl, CREATE, AT | LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); bwillwrite(); @@ -1632,7 +1632,7 @@ if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -1781,7 +1781,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, DELETE, AT | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -2055,7 +2055,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); /* @@ -2265,7 +2265,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | + NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2334,7 +2334,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | + NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2527,7 +2527,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, + NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2774,7 +2774,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2934,7 +2934,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2991,7 +2991,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -3165,7 +3165,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, AT |FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3551,13 +3551,13 @@ return (error); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | + NDINIT_AT(&fromnd, DELETE, AT | LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #else - NDINIT_AT(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | + NDINIT_AT(&fromnd, DELETE, AT | WANTPARENT | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #endif - NDINIT_AT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | + NDINIT_AT(&tond, RENAME, AT | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); bwillwrite(); @@ -3706,7 +3706,7 @@ if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { @@ -3810,7 +3810,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, DELETE, AT | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) return (error); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#5 (text+ko) ==== @@ -109,8 +109,9 @@ #define NOCACHE 0x0020 /* name must not be left in cache */ #define FOLLOW 0x0040 /* follow symbolic links */ #define LOCKSHARED 0x0100 /* Shared lock leaf */ +#define AT 0x0200 /* called from *at context */ #define NOFOLLOW 0x0000 /* do not follow symbolic links (pseudo) */ -#define MODMASK 0x01fc /* mask of operational modifiers */ +#define MODMASK 0x03fc /* mask of operational modifiers */ /* * Namei parameter descriptors. * From owner-p4-projects@FreeBSD.ORG Thu Jun 21 11:32: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 0BB8816A469; Thu, 21 Jun 2007 11:32: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 82E2016A400 for ; Thu, 21 Jun 2007 11:32:28 +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 3CB5613C447 for ; Thu, 21 Jun 2007 11:32:27 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 31DDB8BE45C for ; Thu, 21 Jun 2007 13:32:27 +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 2PR1e3p45vsz for ; Thu, 21 Jun 2007 13:32:25 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id D73B48BE445 for ; Thu, 21 Jun 2007 13:32:25 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l5LBWPcB095834 for perforce@FreeBSD.org; Thu, 21 Jun 2007 13:32:25 +0200 (CEST) (envelope-from rdivacky) Date: Thu, 21 Jun 2007 13:32:25 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20070621113225.GA95778@freebsd.org> References: <200706211128.l5LBSTgO042587@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706211128.l5LBSTgO042587@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: PERFORCE change 122088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 11:32:29 -0000 On Thu, Jun 21, 2007 at 11:28:29AM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122088 > > Change 122088 by rdivacky@rdivacky_witten on 2007/06/21 11:27:47 > > Check for absolute path in namei() when startdir is NULL when > called from *at context. the kern_absolute_path etc. is now unecessary. I'll keep it for the moment and we'll see how it turns out... From owner-p4-projects@FreeBSD.ORG Thu Jun 21 12:14: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 2D46E16A46C; Thu, 21 Jun 2007 12:14: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 B3D7816A421 for ; Thu, 21 Jun 2007 12:14:29 +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 A4A0B13C44C for ; Thu, 21 Jun 2007 12:14:29 +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 l5LCETaY052463 for ; Thu, 21 Jun 2007 12:14:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LCETSf052457 for perforce@freebsd.org; Thu, 21 Jun 2007 12:14:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 12:14:29 GMT Message-Id: <200706211214.l5LCETSf052457@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 122090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 12:14:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=122090 Change 122090 by rdivacky@rdivacky_witten on 2007/06/21 12:13:32 Change AT to ATBADF meaning that we were passed an illegal dirfd but we carried on because we had absolute path. Check for this flag in namei(). Also note that the kern_absolute_path() is necessary (unlike the previous mail says) beacuse we want to distinguish various errors from just "bad file". Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#25 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#7 (text+ko) ==== @@ -198,7 +198,7 @@ else { dp = fdp->fd_cdir; /* we might have raced so check it */ - if ((cnp->cn_flags & AT) && (cnp->cn_pnbuf[0] != '/')) + if ((cnp->cn_flags & ATBADF) && (cnp->cn_pnbuf[0] != '/')) return (EBADF); } vfslocked = VFS_LOCK_GIANT(dp->v_mount); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#25 (text+ko) ==== @@ -78,6 +78,8 @@ #include #include +#define ATBAD ((error) ? ATBADF : 0) + static int chroot_refuse_vdir_fds(struct filedesc *fdp); static int getutimes(const struct timeval *, enum uio_seg, struct timespec *); static int setfown(struct thread *td, struct vnode *, uid_t, gid_t); @@ -1027,7 +1029,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1244,7 +1246,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -1371,7 +1373,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -1513,13 +1515,13 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); + NDINIT_AT(&ndp, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); if (error && !kern_absolute_path(link, segflg)) return (error); - NDINIT_AT(&ndl, CREATE, AT | LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, + NDINIT_AT(&ndl, CREATE, ATBAD | LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); bwillwrite(); @@ -1632,7 +1634,7 @@ if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -1781,7 +1783,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, AT | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -2055,7 +2057,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); /* @@ -2265,7 +2267,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | + NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2334,7 +2336,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | + NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2527,7 +2529,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, + NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) @@ -2774,7 +2776,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2934,7 +2936,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2991,7 +2993,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT | NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -3165,7 +3167,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, AT |FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ATBAD |FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3551,13 +3553,13 @@ return (error); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, AT | LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | + NDINIT_AT(&fromnd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #else - NDINIT_AT(&fromnd, DELETE, AT | WANTPARENT | SAVESTART | MPSAFE | + NDINIT_AT(&fromnd, DELETE, ATBAD | WANTPARENT | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #endif - NDINIT_AT(&tond, RENAME, AT | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | + NDINIT_AT(&tond, RENAME, ATBAD | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); bwillwrite(); @@ -3706,7 +3708,7 @@ if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, AT | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { @@ -3810,7 +3812,7 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, AT | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + NDINIT_AT(&nd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) return (error); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/namei.h#6 (text+ko) ==== @@ -109,7 +109,7 @@ #define NOCACHE 0x0020 /* name must not be left in cache */ #define FOLLOW 0x0040 /* follow symbolic links */ #define LOCKSHARED 0x0100 /* Shared lock leaf */ -#define AT 0x0200 /* called from *at context */ +#define ATBADF 0x0200 /* called from *at context with invalid dirfd */ #define NOFOLLOW 0x0000 /* do not follow symbolic links (pseudo) */ #define MODMASK 0x03fc /* mask of operational modifiers */ /* From owner-p4-projects@FreeBSD.ORG Thu Jun 21 12:21: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 8CB2216A46B; Thu, 21 Jun 2007 12:21: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 49A7A16A468 for ; Thu, 21 Jun 2007 12:21:39 +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 3A28813C43E for ; Thu, 21 Jun 2007 12:21:39 +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 l5LCLdGu053835 for ; Thu, 21 Jun 2007 12:21:39 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LCLdPw053829 for perforce@freebsd.org; Thu, 21 Jun 2007 12:21:39 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 12:21:39 GMT Message-Id: <200706211221.l5LCLdPw053829@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 122091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 12:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=122091 Change 122091 by rdivacky@rdivacky_witten on 2007/06/21 12:21:26 Grrrrr. p4 commited previous version ;( Expand the ATBAD macro and adjust lines wrapping accordingly. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#26 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -78,8 +78,6 @@ #include #include -#define ATBAD ((error) ? ATBADF : 0) - static int chroot_refuse_vdir_fds(struct filedesc *fdp); static int getutimes(const struct timeval *, enum uio_seg, struct timespec *); static int setfown(struct thread *td, struct vnode *, uid_t, gid_t); @@ -1029,7 +1027,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 + | MPSAFE, pathseg, path, td, dir_vn); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1246,8 +1245,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -1373,8 +1372,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -1515,14 +1514,15 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); + NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE + | AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); if (error && !kern_absolute_path(link, segflg)) return (error); - NDINIT_AT(&ndl, CREATE, ATBAD | LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, - link, td, ldir_vn); + NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME + | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); bwillwrite(); if ((error = namei(&ndp)) != 0) @@ -1634,8 +1634,8 @@ if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - segflg, link, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME + | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -1783,8 +1783,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td, dir_vn); + NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -2057,8 +2057,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); /* * Create and modify a temporary credential instead of one that @@ -2267,8 +2267,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED + | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2336,8 +2336,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF + | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2529,8 +2529,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, - path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2776,7 +2776,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE + | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2936,7 +2937,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE + | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2993,7 +2995,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE + | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -3167,7 +3170,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD |FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 + | MPSAFE, pathseg, path, td, dir_vn); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3553,14 +3557,14 @@ return (error); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, from, td, fdir_vn); + NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF + | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #else - NDINIT_AT(&fromnd, DELETE, ATBAD | WANTPARENT | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, from, td, fdir_vn); + NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | SAVESTART + | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #endif - NDINIT_AT(&tond, RENAME, ATBAD | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | - MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); + NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF + | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); bwillwrite(); if ((error = namei(&fromnd)) != 0) @@ -3708,8 +3712,8 @@ if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - segflg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME + | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -3812,8 +3816,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ATBAD | LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td, dir_vn); + NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF + | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); From owner-p4-projects@FreeBSD.ORG Thu Jun 21 13:07: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 EB50316A46C; Thu, 21 Jun 2007 13:07: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 ACD0D16A469 for ; Thu, 21 Jun 2007 13:07:36 +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 9DB0113C45D for ; Thu, 21 Jun 2007 13:07:36 +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 l5LD7axa075075 for ; Thu, 21 Jun 2007 13:07:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LD7a54075072 for perforce@freebsd.org; Thu, 21 Jun 2007 13:07:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 13:07:36 GMT Message-Id: <200706211307.l5LD7a54075072@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 122092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 13:07:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=122092 Change 122092 by rdivacky@rdivacky_witten on 2007/06/21 13:06:56 Introduce fchmodat, fchownat. Change "flags" arugment ot faccessat to "flag" to be consistent with the rest. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#27 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#11 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#3 (text+ko) ==== @@ -505,4 +505,6 @@ { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */ { AS(faccessat_args), (sy_call_t *)faccessat, AUE_ACCESS, NULL, 0, 0 }, /* 475 = faccessat */ + { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_CHMOD, NULL, 0, 0 }, /* 476 = fchmodat */ + { AS(fchownat_args), (sy_call_t *)fchownat, AUE_CHOWN, NULL, 0, 0 }, /* 477 = fchownat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#3 (text+ko) ==== @@ -483,4 +483,6 @@ "sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */ "sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */ "faccessat", /* 475 = faccessat */ + "fchmodat", /* 476 = fchmodat */ + "fchownat", /* 477 = fchownat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#3 (text+ko) ==== @@ -835,6 +835,8 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } -475 AUE_ACCESS STD { int faccessat(int dirfd, char *path, int mode, int flags); } +475 AUE_ACCESS STD { int faccessat(int dirfd, char *path, int mode, int flag); } +476 AUE_CHMOD STD { int fchmodat(int dirfd, char *path, mode_t mode, int flag); } +477 AUE_CHOWN STD { int fchownat(int dirfd, char *path, uid_t uid, gid_t gid, int flag); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#3 (text+ko) ==== @@ -2811,10 +2811,31 @@ iarg[0] = p->dirfd; /* int */ uarg[1] = (intptr_t) p->path; /* char * */ iarg[2] = p->mode; /* int */ - iarg[3] = p->flags; /* int */ + iarg[3] = p->flag; /* int */ + *n_args = 4; + break; + } + /* fchmodat */ + case 476: { + struct fchmodat_args *p = params; + iarg[0] = p->dirfd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->mode; /* mode_t */ + iarg[3] = p->flag; /* int */ *n_args = 4; break; } + /* fchownat */ + case 477: { + struct fchownat_args *p = params; + iarg[0] = p->dirfd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = p->uid; /* uid_t */ + iarg[3] = p->gid; /* gid_t */ + iarg[4] = p->flag; /* int */ + *n_args = 5; + break; + } default: *n_args = 0; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#27 (text+ko) ==== @@ -2026,15 +2026,15 @@ int dirfd; char *path; int mode; - int flags; + int flag; } #endif int faccessat(struct thread *td, struct faccessat_args *args) { - if (args->flags & ~AT_EACCESS) + if (args->flag & ~AT_EACCESS) return (EINVAL); /* XXX: what about mode? */ - return kern_accessat(td, args->path, UIO_USERSPACE, args->flags, args->dirfd); + return kern_accessat(td, args->path, UIO_USERSPACE, args->flag, args->dirfd); } int @@ -2759,6 +2759,26 @@ return (kern_chmod(td, uap->path, UIO_USERSPACE, uap->mode)); } +#ifndef _SYS_SYSPROTO_H_ +struct fchmodat_args { + int dirfd; + char *path; + mode_t mode; + int flag; +} +#endif +int +fchmodat(struct thread *td, struct fchmodat_args *args) +{ + if (args->flag & ~AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->flag & AT_SYMLINK_NOFOLLOW) + return kern_lchmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd); + else + return kern_chmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd); +} + int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { @@ -2809,18 +2829,30 @@ int mode; } */ *uap; { + return kern_lchmodat(td, uap->path, UIO_USERSPACE, uap->mode, AT_FDCWD); +} + + +int +kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, mode_t mode, int dirfd) +{ int error; struct nameidata nd; int vfslocked; + struct vnode *dir_vn; + + error = kern_get_at(td, dirfd, &dir_vn); + if (error && !kern_absolute_path(path, pathseg)) + return (error); - AUDIT_ARG(mode, (mode_t)uap->mode); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, UIO_USERSPACE, - uap->path, td); + AUDIT_ARG(mode, mode); + NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, + path, td, dir_vn); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); - error = setfmode(td, nd.ni_vp, uap->mode); + error = setfmode(td, nd.ni_vp, mode); vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); return (error); @@ -2918,6 +2950,23 @@ return (kern_chown(td, uap->path, UIO_USERSPACE, uap->uid, uap->gid)); } +#ifndef _SYS_SYSPROTO_H_ +#endif +int +fchownat(struct thread *td, struct fchownat_args *args) +{ + if (args->flag & ~AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->flag & AT_SYMLINK_NOFOLLOW) + return kern_lchownat(td, args->path, UIO_USERSPACE, args->uid, + args->gid, args->dirfd); + else + return kern_chownat(td, args->path, UIO_USERSPACE, args->uid, + args->gid, args->dirfd); +} + + int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#3 (text+ko) ==== @@ -395,4 +395,6 @@ #define SYS_sctp_generic_sendmsg_iov 473 #define SYS_sctp_generic_recvmsg 474 #define SYS_faccessat 475 -#define SYS_MAXSYSCALL 476 +#define SYS_fchmodat 476 +#define SYS_fchownat 477 +#define SYS_MAXSYSCALL 478 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#3 (text+ko) ==== @@ -336,4 +336,6 @@ sctp_generic_sendmsg.o \ sctp_generic_sendmsg_iov.o \ sctp_generic_recvmsg.o \ - faccessat.o + faccessat.o \ + fchmodat.o \ + fchownat.o ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#11 (text+ko) ==== @@ -70,6 +70,8 @@ int mode, int dirfd); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); +int kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, + mode_t mode, int dirfd); int kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid, int dirfd); int kern_clock_getres(struct thread *td, clockid_t clock_id, ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#3 (text+ko) ==== @@ -1486,7 +1486,20 @@ char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +struct fchmodat_args { + char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +struct fchownat_args { + char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)]; + char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); @@ -1821,6 +1834,8 @@ int sctp_generic_sendmsg_iov(struct thread *, struct sctp_generic_sendmsg_iov_args *); int sctp_generic_recvmsg(struct thread *, struct sctp_generic_recvmsg_args *); int faccessat(struct thread *, struct faccessat_args *); +int fchmodat(struct thread *, struct fchmodat_args *); +int fchownat(struct thread *, struct fchownat_args *); #ifdef COMPAT_43 @@ -2373,6 +2388,8 @@ #define SYS_AUE_sctp_generic_sendmsg_iov AUE_NULL #define SYS_AUE_sctp_generic_recvmsg AUE_NULL #define SYS_AUE_faccessat AUE_ACCESS +#define SYS_AUE_fchmodat AUE_CHMOD +#define SYS_AUE_fchownat AUE_CHOWN #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Thu Jun 21 14:10:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B390916A46B; Thu, 21 Jun 2007 14:10: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 5B8B516A421 for ; Thu, 21 Jun 2007 14:10:54 +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 4AE1713C46C for ; Thu, 21 Jun 2007 14:10:54 +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 l5LEAsM5087712 for ; Thu, 21 Jun 2007 14:10:54 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LEAreH087709 for perforce@freebsd.org; Thu, 21 Jun 2007 14:10:53 GMT (envelope-from taleks@FreeBSD.org) Date: Thu, 21 Jun 2007 14:10:53 GMT Message-Id: <200706211410.l5LEAreH087709@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 122093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 14:10:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=122093 Change 122093 by taleks@taleks_th on 2007/06/21 14:10:11 Updated pxe_socks module for connecting and closing to TCP sockets. pxe_tcp module seems do handshaking and breaking correctly in active closing/establishing connection. Need to implement passive closing (CLOSE_WAIT, LAST_ACK states) and resending of packets. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#9 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#4 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#9 (text+ko) ==== @@ -140,18 +140,28 @@ #endif return (0); } + + PXE_FILTER_ENTRY *filter = sock->filter; + + /* socket buffers seems not be used more */ + pxe_buffer_memfree(&sock->send_buffer); + pxe_buffer_memfree(&sock->recv_buffer); - if (sock->filter != NULL) - pxe_filter_remove(sock->filter); - else { + /* UDP socket closing is simple */ + if (filter->protocol == PXE_UDP_PROTOCOL) { + + if (filter != NULL) + pxe_filter_remove(sock->filter); + else { #ifdef PXE_DEBUG - printf("pxe_close(): filter for socket already NULL.\n"); + printf("pxe_close(): filter for socket already NULL.\n"); #endif + } + } else { + /* filter removing is done in check_time_to_die() in pxe_tcp.c */ + pxe_tcp_disconnect(sock); } - pxe_buffer_memfree(&sock->send_buffer); - pxe_buffer_memfree(&sock->recv_buffer); - return pxe_socket_free(socket); } @@ -332,7 +342,7 @@ } else { /* not binded, connect */ /* NOTE: if it's already connected, return error */ - if (!pxe_connect(socket, ip, port, PXE_UDP_PROTOCOL)) { + if (pxe_connect(socket, ip, port, PXE_UDP_PROTOCOL) == -1) { printf("pxe_sendto(): failed to connect.\n"); return (-1); } @@ -351,7 +361,6 @@ * for binded sockets pxe_connect() skipped, so we need manually call pxe_next_port() * to get local port (so, we don't use binded local port, it seems correct behaviour) */ -/* uint16_t lport = (sock->state == PXE_SOCKET_BINDED) ? pxe_next_port() : filter->dst_port; */ uint16_t lport = filter->dst_port; #ifdef PXE_DEBUG @@ -377,14 +386,14 @@ * proto - IP stack protocol * out: * -1 - failed - * nonnegative - new socket descriptor number + * 0 - success */ int pxe_connect(int socket, uint32_t ip, uint16_t port, uint8_t proto) { if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { - return (0); + return (-1); } PXE_SOCKET *sock = &pxe_sockets[socket]; @@ -405,7 +414,7 @@ if (port == 0) { printf("pxe_connect(): failed to allocate local port.\n"); - return (0); + return (-1); } PXE_FILTER_ENTRY *entry = @@ -414,7 +423,7 @@ if ( entry == NULL ) { printf("pxe_connect(): failed to add filter.\n"); - return (0); + return (-1); } sock->filter = entry; @@ -425,16 +434,15 @@ if (pxe_tcp_connect(sock)) { sock->state = PXE_SOCKET_ESTABLISHED; } else { /* failed, cleanup */ - pxe_filter_remove(entry); - return (0); + return (-1); } } #ifdef PXE_DEBUG - printf("pxe_connect(): socket %d connected, 0x%x:%d -> 0x%x:%d\n", socket, pxe_get_ip32(PXE_IP_MY), lport, ip, port); + printf("pxe_connect(): socket %d connected, 0x%x:%d -> 0x%x:%d\n", socket, pxe_get_ip32(PXE_IP_MY), lport, ip, port); #endif /* all is ok */ - return (1); + return (0); } /* NOTE: assuming socket is UDP, need to think about TCP/UDP functions calling ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#2 (text+ko) ==== @@ -8,25 +8,49 @@ #include "pxe_sock.h" #include "pxe_tcp.h" +/* state handle functions */ +static int tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_last_ack(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); + +/* connection structs storage */ static PXE_TCP_CONNECTION tcp_connections[PXE_MAX_TCP_CONNECTIONS]; +/* currently allocated connections */ static int all_connections = 0; +/* pointers to appropriate state handlers */ +static pxe_tcp_state_func state_functions[PXE_TCP_ALL_STATES] = { + NULL, /* PXE_TCP_CLOSED */ + tcp_syn_sent, /* PXE_TCP_SYN_SENT */ + NULL, /* PXE_TCP_SYN_RECEIVED */ + tcp_established,/* PXE_TCP_ESTABLISHED */ + tcp_close_wait, /* PXE_TCP_CLOSE_WAIT */ + tcp_last_ack, /* PXE_TCP_LAST_ACK */ + tcp_fin_wait1, /* PXE_TCP_FIN_WAIT1 */ + tcp_closing, /* PXE_TCP_CLOSING */ + tcp_fin_wait2, /* PXE_TCP_FIN_WAIT2 */ + tcp_time_wait, /* PXE_TCP_TIME_WAIT */ + }; - -/* sock_to_connection() - returns connections, associated with provided socket +/* filter_to_connection() - returns connections, associated with provided filter * in: - * sock - pointer to socket structure, for which connection is searched + * filter - pointer to filter entry structure, for which connection is searched * out: * NULL - failed to find * not NULL- searched connections */ static PXE_TCP_CONNECTION * -sock_to_connection(PXE_SOCKET *sock) +filter_to_connection(PXE_FILTER_ENTRY *filter) { int con_index = 0; for ( ; con_index < PXE_MAX_TCP_CONNECTIONS; ++con_index) { - if (tcp_connections[con_index].sock == sock) { + if (tcp_connections[con_index].filter == filter) { return (&tcp_connections[con_index]); } } @@ -34,6 +58,93 @@ return (NULL); } +/* alloc_connection() - returns pointer to free connection structure + * in: + * none + * out: + * NULL - failed to alloc + * non NULL- pointer to allocated structure + */ +PXE_TCP_CONNECTION * +alloc_connection() +{ + if (all_connections == PXE_MAX_TCP_CONNECTIONS) + return (NULL); + + uint16_t index = 0; + + for ( ; index < PXE_MAX_TCP_CONNECTIONS; ++index) { + + if (tcp_connections[index].state == PXE_TCP_CLOSED) { + /* if state is closed, it's free structure*/ + all_connections += 1; + return &tcp_connections[index]; + } + } + + /* NOTE: we must not ever get here */ + return (NULL); +} + +/* free_connection() - releases connections + * in: + * connection - pointer to connection to release (assuming it's valid connection) + * out: + * none + */ +void +free_connection(PXE_TCP_CONNECTION *connection) +{ + + connection->state = PXE_TCP_CLOSED; + all_connections -= 1; +} + +/* get_secs() - returns time in seconds + * in: + * none + * out: + * elapsed time in seconds + */ +static time_t +get_secs() +{ + time_t secs; + + time(&secs); + + return (secs); +} + +/* check_time_to_die() - moves to CLOSED state connections from state + * TIME_WAIT if last received packet (ACK for FIN in most cases) + * was more than 2*MSL time ago. + * in: + * connection - connection to check + * out: + * none + */ +static void +check_time_to_die(PXE_TCP_CONNECTION *connection) +{ + /* if connection in other states - do nothing */ + if (connection->state != PXE_TCP_TIME_WAIT) + return; + + time_t cur_time = get_secs(); + + if (cur_time - connection->last_recv > 2 * PXE_TCP_MSL) { + /* release filter */ + PXE_FILTER_ENTRY *filter = connection->filter; + + if (filter != NULL) /* it must always be non NULL */ + pxe_filter_remove(filter); + + /* release connection */ + free_connection(connection); + } +} + /* tcp_send_rst_for() - sends RST in reply to provided packet * in: * tcp_packet - packet which caused RST sending @@ -41,10 +152,9 @@ * 0 - failed * 1 - success */ -int +static int tcp_send_rst_for(PXE_TCP_PACKET *tcp_packet) { - PXE_TCP_CONNECTION connection; pxe_memset(&connection, 0, sizeof(PXE_TCP_CONNECTION)); @@ -52,30 +162,260 @@ connection.src_port = le2be16(tcp_packet->tcphdr.dst_port); connection.dst_ip = tcp_packet->iphdr.src_ip; connection.next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; + connection.next_send = le2be32(tcp_packet->tcphdr.ack_next); + + return pxe_tcp_send(&connection, 0, PXE_TCP_RST | PXE_TCP_ACK); +} + +/* tcp_syn_sent() - SYN_SENT state handler + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ + uint8_t flags = tcp_packet->tcphdr.flags; + + /* accepting only SYN+ACK */ + if ( (flags & (PXE_TCP_SYN | PXE_TCP_ACK)) + != (PXE_TCP_SYN | PXE_TCP_ACK)) + { + return (0); /* drop, may be better RST */ + } + + connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; + connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); + +#ifdef PXE_DEBUG_HELL + printf("tcp_syn_sent(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); +#endif + if (pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { + connection->state = PXE_TCP_ESTABLISHED; +#ifdef PXE_DEBUG_HELL + printf("tcp_syn_sent(): new state - ESTABLISHED\n"); +#endif + /* updating last recv time. Used in resending and TIME_WAIT state */ + connection->last_recv = get_secs(); + } else { + printf("tcp_syn_sent(): failed to ack syn reply packet.\n"); + } + + return (0); +} + +/* tcp_established() - ESTABLISHED state handler + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ + uint8_t flags = tcp_packet->tcphdr.flags; - return pxe_tcp_send(&connection, 0, PXE_TCP_RST);; + if (flags & PXE_TCP_FIN) { /* remote host requested connection break */ + + connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; + connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); + +#ifdef PXE_DEBUG_HELL + printf("tcp_established(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); +#endif + if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { + printf("tcp_established(): failed to ack FIN request.\n"); + return (0); + } + + connection->last_recv = get_secs(); + connection->state = PXE_TCP_CLOSE_WAIT; +#ifdef PXE_DEBUG_HELL + printf("tcp_established(): new state - CLOSE_WAIT\n"); +#endif + return (0); + } + + /* TODO: process data receiving */ + + + connection->last_recv = get_secs(); + return (0); +} + +/* tcp_fin_wait1() - FIN_WAIT_1 state handler + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ + uint8_t flags = tcp_packet->tcphdr.flags; + + if ( (flags & (PXE_TCP_ACK | PXE_TCP_FIN)) == ((PXE_TCP_ACK | PXE_TCP_FIN)) ) { + /* remote host acked our FIN and sent FIN */ + + connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; + connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); + +#ifdef PXE_DEBUG_HELL + printf("tcp_fin_wait1(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); +#endif + + if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { + printf("tcp_fin_wait2(): failed to ack FIN request.\n"); + return (0); + } + + connection->state = PXE_TCP_CLOSING; +#ifdef PXE_DEBUG_HELL + printf("tcp_fin_wait1(): new state - CLOSING\n"); +#endif + connection->last_recv = get_secs(); + return (0); + } + + if (flags & PXE_TCP_ACK) { /* remote host just acked our FIN */ + +/* connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; */ + connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); + connection->state = PXE_TCP_FIN_WAIT2; +#ifdef PXE_DEBUG_HELL + printf("tcp_fin_wait1(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); + printf("tcp_fin_wait1(): new state - FIN_WAIT_2\n"); +#endif + connection->last_recv = get_secs(); + } + + return (0); +} + +/* tcp_closing() - CLOSING state handler + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ + uint8_t flags = tcp_packet->tcphdr.flags; + + if (flags & PXE_TCP_ACK) { /* remote host acked FIN */ + connection->state = PXE_TCP_TIME_WAIT; +#ifdef PXE_DEBUG_HELL + printf("tcp_closing(): new state - TIME_WAIT\n"); +#endif + connection->last_recv = get_secs(); + } + + return (0); } -/* tcp_send_ack_for() - sends ACK in reply to provided packet +/* tcp_fin_wait2() - FIN_WAIT_2 state handler * in: - * tcp_packet - packet which caused RST sending + * tcp_packet - incoming packet data + * connection - current connection * out: - * 0 - failed - * 1 - success + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler */ -int -tcp_send_ack_for(PXE_TCP_PACKET *tcp_packet, uint32_t next_recv) +static int +tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) { + uint8_t flags = tcp_packet->tcphdr.flags; + + if (flags & PXE_TCP_FIN) { /* remote sent FIN */ + + connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; + connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); +#ifdef PXE_DEBUG_HELL + printf("tcp_fin_wait2(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); +#endif + if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { + printf("tcp_fin_wait2(): failed to ack FIN request.\n"); + return (0); + } + + connection->state = PXE_TCP_TIME_WAIT; +#ifdef PXE_DEBUG_HELL + printf("tcp_fin_wait2(): new state - TIME_WAIT\n"); +#endif + connection->last_recv = get_secs(); + } + + return (0); +} - PXE_TCP_CONNECTION connection; - pxe_memset(&connection, 0, sizeof(PXE_TCP_CONNECTION)); - - connection.dst_port = le2be16(tcp_packet->tcphdr.src_port); - connection.src_port = le2be16(tcp_packet->tcphdr.dst_port); - connection.dst_ip = tcp_packet->iphdr.src_ip; - connection.next_recv = le2be32(next_recv); +/* tcp_time_wait() - TIME_WAIT state handler + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ + /* this state grabs lost packets */ + + check_time_to_die(connection); - return pxe_tcp_send(&connection, 0, PXE_TCP_ACK);; + return (0); +} + +/* tcp_close_wait() - CLOSE_WAIT state handler. TODO: implement + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ +#ifdef PXE_DEBUG_HELL + printf("tcp_close_wait(): started.\n"); +#endif + return (0); +} + +/* tcp_last_ack() - LAST_ACK state handler. TODO: implement + * in: + * tcp_packet - incoming packet data + * connection - current connection + * out: + * 0 - don't interested more in this packet + * 1 - interested + * 2 - try next state handler + */ +static int +tcp_last_ack(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +{ +#ifdef PXE_DEBUG_HELL + printf("tcp_last_ack(): started.\n"); +#endif + return (0); } /* pxe_tcp_callback() - TCP protocol callback function, executed by pxe_core @@ -144,7 +484,7 @@ if (flags & PXE_TCP_SYN) { /* this was hopeless attempt to connect */ tcp_send_rst_for(tcp_packet); - } + } /* otherwise just ignore this packet */ return (0); } @@ -154,76 +494,60 @@ /* TODO: verify checksum */ - /* Here socket is not NULL, that means packet is for connected socket or - * connection is trying to be established + /* Here filter is not NULL, that means packet is for connected socket or + * connection is trying to be established/breaked correctly */ - PXE_TCP_CONNECTION *connection = sock_to_connection(sock); + PXE_TCP_CONNECTION *connection = filter_to_connection(sock->filter); if (connection == NULL) { - printf("pxe_tcp_callback(): there is no connection for socket 0x%x", sock); + printf("pxe_tcp_callback(): there is no connection for filter 0x%x\n", sock->filter); return (0); /* NOTE: this is internal error, if got here */ } - switch (connection->state) { - case PXE_TCP_CLOSED: /* connection is already closed */ - tcp_send_rst_for(tcp_packet); /* in fact, we must not ever reach this point */ - return (0); /* cause filter for connection is destroyed */ - /* so this checks for internal error */ - - case PXE_TCP_SYN_SENT: /* started client handshaking, waiting SYN ACK only */ - if (flags != (PXE_TCP_SYN | PXE_TCP_ACK)) { - return (0); /* drop, may be better RST */ - } - break; - - case PXE_TCP_ESTABLISHED: /* process receiving data to socket buffer */ - break; -/* - case PXE_TCP_CLOSE_WAIT: - case PXE_TCP_SYN_RECIEVED: - case PXE_TCP_LAST_ACK: - case PXE_TCP_FIN_WAIT1: - case PXE_TCP_CLOSING: - case PXE_TCP_FIN_WAIT2: - case PXE_TCP_TIME_WAIT: -*/ - default: /* never getting here */ - return (0); - break; - } - - /* connection is in established state */ - - /* checking sequence order (!SIMPLE STUB!) */ uint32_t seq = le2be32(tcp_packet->tcphdr.sequence); - if (seq != connection->next_recv) { /* not next in order, drop it, send ACK */ - tcp_send_ack_for(tcp_packet, connection->next_recv); /* with next needed sequence number */ + if (flags & PXE_TCP_RST) { /* connection aborted (hard error) by remote host */ + printf("pxe_tcp_callback(): connectuion refused.\n"); + connection->state = PXE_TCP_RESETED; return (0); } - - /* receiving data to buffer */ - uint16_t buf_free = sock->recv_buffer.bufleft; - - if (buf_free < data_size) { /* no space, by the way */ - /* send packet with buf_free window */ - tcp_send_ack_for(tcp_packet, connection->next_recv); - return (0); - } - PXE_BUFFER* recv_buffer = &sock->recv_buffer; + if (connection->state > PXE_TCP_SYN_SENT) { /* if we know sequence number, then check it */ - if (pxe_buffer_space(recv_buffer) < data_size) { - printf("pxe_udp_callback(): not enough space in recv buffer for socket %d\n", sock); + if (seq != connection->next_recv) { /* not next in order, drop it, send ACK */ +/* tcp_send_ack_for(tcp_packet, connection->next_recv, /* with next needed sequence number */ +/* connection->next_send, sock); */ +#ifdef PXE_DEBUG + printf("pxe_tcp_callback(): got %d != awaited %d\n", seq, connection->next_recv); +#endif + return (0); + } } else { - pxe_buffer_write(recv_buffer, tcp_packet + 1, data_size); + /* in case of SYN_SENT state we don't know sequence number yet */ + } + + /* calling appropriate state handler, if it's not NULL */ + if (connection->state < PXE_TCP_ALL_STATES) { + + int result = 0; + while (1) { + + if (state_functions[connection->state] != NULL) { + result = state_functions[connection->state](tcp_packet, connection); + + if (result == 2) + continue; + + return (result); + } + } } return (0); } -/* pxe_udp_init() - initialization of UDP module +/* pxe_tcp_init() - initialization of TCP module * in/out: * none */ @@ -251,7 +575,6 @@ int pxe_tcp_send(PXE_TCP_CONNECTION *connection, uint16_t size, uint8_t tcp_flags) { - PXE_TCP_PACKET dummy_packet; PXE_TCP_PACKET *tcp_packet = &dummy_packet; @@ -259,11 +582,15 @@ tcp_packet->tcphdr.src_port = le2be16(connection->src_port); tcp_packet->tcphdr.dst_port = le2be16(connection->dst_port); tcp_packet->tcphdr.checksum = 0; - tcp_packet->tcphdr.sequence = 0; + tcp_packet->tcphdr.sequence = le2be32(connection->next_send); tcp_packet->tcphdr.ack_next = le2be32(connection->next_recv); tcp_packet->tcphdr.data_off = (uint8_t)((sizeof(PXE_TCP_HDR)/4) << 4); tcp_packet->tcphdr.flags = tcp_flags; - tcp_packet->tcphdr.window_size = 0; + + PXE_BUFFER *recv_buffer = connection->recv; + + /* set window size to free buffer space size, or to zero if recv_buffer == NULL */ + tcp_packet->tcphdr.window_size = (recv_buffer != NULL) ? le2be16(recv_buffer->bufleft) : 0; tcp_packet->tcphdr.checksum = 0; tcp_packet->tcphdr.urgent = 0; @@ -274,16 +601,16 @@ pseudo_hdr.zero = 0; pseudo_hdr.proto = PXE_TCP_PROTOCOL; pseudo_hdr.length = le2be16(length); - /* adding pseudo header checksum to checksum of udp header with data + + /* adding pseudo header checksum to checksum of tcp header with data * and make it complimentary */ - uint16_t part1 = pxe_ip_checksum(&pseudo_hdr, sizeof(PXE_IP4_PSEUDO_HDR)); uint16_t part2 = pxe_ip_checksum(&tcp_packet->tcphdr, length); uint32_t tmp_sum = ((uint32_t)part1) + ((uint32_t)part2); - if (tmp_sum & 0xf0000) { /*need carry out */ + if (tmp_sum & 0xf0000) { /* need carry out */ tmp_sum -= 0xffff; } tcp_packet->tcphdr.checksum = ~((uint16_t)(tmp_sum & 0xffff)); @@ -298,60 +625,19 @@ if (!pxe_ip_send(tcp_packet, connection->dst_ip, PXE_TCP_PROTOCOL, length + sizeof(PXE_IP_HDR), 1)) { printf("pxe_tcp_send(): failed to send tcp packet to 0x%x\n", connection->dst_ip); + return (0); } - time_t secs; - time(&secs); - - connection->last_sent = secs; + connection->last_sent = get_secs(); - return (0); + return (1); } -/* alloc_connection() - returns pointer to free connection structure - * in: - * none - * out: - * NULL - failed to alloc - * non NULL- pointer to allocated structure - */ -PXE_TCP_CONNECTION * -alloc_connection() -{ - if (all_connections == PXE_MAX_TCP_CONNECTIONS) - return (NULL); - - uint16_t index = 0; - - for ( ; index < PXE_MAX_TCP_CONNECTIONS; ++index) { - - if (tcp_connections[index].state == PXE_TCP_CLOSED) { - /* if state is closed, it's free structure*/ - all_connections += 1; - return &tcp_connections[index]; - } - } - - /* NOTE: we must not ever get here */ - return (NULL); -} - -/* free_connection() - releases connections - * in: - * connection - pointer to connection to release (assuming it's valid connection) - * out: - * none - */ -void -free_connection(PXE_TCP_CONNECTION *connection) -{ - - connection->state = PXE_TCP_CLOSED; - all_connections -= 1; -} /* tcp_await() - await function for some TCP protocol functions (handshaking, - * breaking connection). Note, that much of work is done in pxe_tcp_callback() + * breaking connection). + * NOTE: + * main work is done in pxe_tcp_callback() */ int tcp_await(uint8_t function, uint16_t try_number, uint32_t timeout, void *data) @@ -359,11 +645,14 @@ PXE_TCP_WAIT_DATA *wait_data = (PXE_TCP_WAIT_DATA *)data; switch(function) { - case PXE_AWAIT_NEWPACKETS: + case PXE_AWAIT_NEWPACKETS: /* check current state with needed to wait for */ { PXE_TCP_CONNECTION *conn = wait_data->connection; if (wait_data->state == conn->state) return (PXE_AWAIT_COMPLETED); + + if (conn->state == PXE_TCP_RESETED) + return (PXE_AWAIT_BREAK); } break; @@ -396,18 +685,21 @@ PXE_FILTER_ENTRY *filter = sock->filter; PXE_TCP_CONNECTION *connection = alloc_connection(); - if (alloc_connection == NULL) { + if (connection == NULL) { return (0); } - pxe_memset(&connection, 0, sizeof(PXE_TCP_CONNECTION)); + pxe_memset(connection, 0, sizeof(PXE_TCP_CONNECTION)); connection->dst_port = filter->src_port; connection->src_port = filter->dst_port; connection->dst_ip = filter->src_ip; connection->next_recv = 0; - connection->next_send = 0; - connection->sock = sock; + + /* NOTE: need to make more correct initial number */ + connection->next_send = (uint32_t)get_secs(); + + connection->filter = filter; connection->recv = &sock->recv_buffer; connection->send = &sock->send_buffer; @@ -418,7 +710,9 @@ } connection->state = PXE_TCP_SYN_SENT; - +#ifdef PXE_DEBUG_HELL + printf("pxe_tcp_connect(): new state - SYN_SENT\n"); +#endif PXE_TCP_WAIT_DATA wait_data; wait_data.connection = connection; @@ -428,11 +722,14 @@ * connection will fell in this state in pxe_tcp_callback(), * after receiving SYN ACK and sending ACK to remote host */ - if (!pxe_await(tcp_await, 1, 20000, &wait_data)) { /* failed to get SYN/ACK */ + if (!pxe_await(tcp_await, 1, PXE_TCP_MSL, &wait_data)) { /* failed to get SYN/ACK */ free_connection(connection); return (0); } - + +#ifdef PXE_DEBUG + printf("pxe_tcp_connect(): connection established.\n"); +#endif return (1); } @@ -441,11 +738,50 @@ * socket - socket * out: * 0 - failed to disconnect (timeout) - * 1 - handshaking successful + * 1 - disconnect successful */ int pxe_tcp_disconnect(PXE_SOCKET *sock) { + PXE_FILTER_ENTRY *filter = sock->filter; + + if (filter == NULL) { + /* NULL filters means there are no connection for socket */ + return (1); + } + + PXE_TCP_CONNECTION *connection = filter_to_connection(filter); + + if (connection == NULL) { + return (0); + } + + if (!pxe_tcp_send(connection, 0, PXE_TCP_FIN | PXE_TCP_ACK)) { + printf("pxe_tcp_connect(): failed to send FIN.\n"); + free_connection(connection); + return (0); + } + + connection->state = PXE_TCP_FIN_WAIT1; +#ifdef PXE_DEBUG_HELL + printf("pxe_tcp_disconnect(): new state - FIN_WAIT_1\n"); +#endif + PXE_TCP_WAIT_DATA wait_data; + wait_data.connection = connection; + + wait_data.state = PXE_TCP_TIME_WAIT; + + /* await TIME_WITE state. + * connection will fell in this state in pxe_tcp_callback(), + * after receiving SYN ACK and sending ACK to remote host + */ + if (!pxe_await(tcp_await, 1, PXE_TCP_MSL, &wait_data)) { /* failed to get SYN/ACK */ + free_connection(connection); + return (0); + } - return (0); -}+#ifdef PXE_DEBUG + printf("pxe_tcp_connect(): connection closed.\n"); +#endif + return (1); +} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#4 (text+ko) ==== @@ -7,13 +7,18 @@ #include #include + +#include "pxe_buffer.h" #include "pxe_ip.h" -#include "pxe_sock.h" +#include "pxe_filter.h" +/* #include "pxe_sock.h" */ /* maximum existing connections at one time */ #define PXE_MAX_TCP_CONNECTIONS 4 /* TCP IP stack protocol number*/ #define PXE_TCP_PROTOCOL 6 +/* maximum segment life time in ms */ +#define PXE_TCP_MSL 60000 /* tcp packet flags */ #define PXE_TCP_FIN 0x01 @@ -27,9 +32,10 @@ #define PXE_TCP_STATE_MASK 0x0f #define PXE_TCP_CLOSED 0x00 /* closed */ +#define PXE_TCP_RESETED 0x0f /* received RST */ #define PXE_TCP_SYN_SENT 0x01 /* active */ -#define PXE_TCP_SYN_RECIEVED 0x02 /* sent & received SYN */ +#define PXE_TCP_SYN_RECEIVED 0x02 /* sent & received SYN */ #define PXE_TCP_ESTABLISHED 0x03 /* established connection */ #define PXE_TCP_CLOSE_WAIT 0x04 /* got FIN, waiting to close */ #define PXE_TCP_LAST_ACK 0x05 /* got FIN, closing and waiting FIN ACK */ @@ -38,6 +44,7 @@ #define PXE_TCP_CLOSING 0x07 /* got FIN, sent ACK, waiting FIN ACK */ #define PXE_TCP_FIN_WAIT2 0x08 /* got FIN ACK */ #define PXE_TCP_TIME_WAIT 0x09 /* closed, waiting 2MSL*/ +#define PXE_TCP_ALL_STATES 10 typedef struct pxe_tcp_hdr { @@ -61,6 +68,9 @@ typedef struct pxe_tcp_connecton { uint8_t state; +/* uint8_t state_in; + uint8_t state_out; + */ uint32_t next_recv; uint32_t next_send; uint16_t src_port; @@ -68,7 +78,7 @@ uint32_t dst_ip; PXE_BUFFER *recv; PXE_BUFFER *send; - PXE_SOCKET *sock; + PXE_FILTER_ENTRY* filter; time_t last_sent; time_t last_recv; } PXE_TCP_CONNECTION; @@ -79,6 +89,8 @@ PXE_TCP_CONNECTION *connection; /* which connection is monitored */ } __packed PXE_TCP_WAIT_DATA; +typedef int (*pxe_tcp_state_func)(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); + /* init tcp */ void pxe_tcp_init(); @@ -88,5 +100,8 @@ /* initates handshaking */ int pxe_tcp_connect(PXE_SOCKET* sock); +/* initates connection break */ +int pxe_tcp_disconnect(PXE_SOCKET* sock); + #endif // PXE_TCP_H_INCLUDED >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 21 16:21:07 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 26CEA16A48F; Thu, 21 Jun 2007 16:21:07 +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 C92F316A481 for ; Thu, 21 Jun 2007 16:21:06 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B9FEC13C44C for ; Thu, 21 Jun 2007 16:21:06 +0000 (UTC) (envelope-from gabor@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 l5LGL6Ol015402 for ; Thu, 21 Jun 2007 16:21:06 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LGL6vu015383 for perforce@freebsd.org; Thu, 21 Jun 2007 16:21:06 GMT (envelope-from gabor@freebsd.org) Date: Thu, 21 Jun 2007 16:21:06 GMT Message-Id: <200706211621.l5LGL6vu015383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 16:21:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=122099 Change 122099 by gabor@gabor_server on 2007/06/21 16:20:08 Add hooks for subsections. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#19 edit .. //depot/user/gabor/doc/linux-emulation/article.sgml#10 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#19 (text+ko) ==== @@ -1093,10 +1093,13 @@ # DESTDIR section to start a chrooted process if incoked with DESTDIR set # -.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) +DESTDIR_LOCKFILE?= /var/tmp/destdir.lock + +.if defined(DESTDIR) && !empty(DESTDIR) && !exists(${DESTDIR_LOCKFILE}) _TARGET:= ${.TARGET} .BEGIN: ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ + ${TOUCH} ${DESTDIR}${DESTDIR_LOCKFILE} ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} CHROOTED=YES ${_TARGET})" .else ==== //depot/user/gabor/doc/linux-emulation/article.sgml#10 (text+ko) ==== @@ -17,7 +17,7 @@ Divacky -
rdivacky@&os;.org
+
rdivacky@FreeBSD.org
 @@ -1155,7 +1155,7 @@ linuxulator. This part covers i386 and ELF handling only. A.out is obsolete and untested. - + Syscall handling @@ -1164,7 +1164,7 @@ the general syscall routine calls linux prepsyscall routine for the &linux; ABI. - + &linux; prepsyscall @@ -1178,7 +1178,7 @@ - + Syscall writing @@ -1248,7 +1248,7 @@ - + Dummy syscalls @@ -1264,7 +1264,7 @@ - + Signal handling @@ -1273,7 +1273,7 @@ for this purpose. - + &linux; sendsig @@ -1288,7 +1288,7 @@ - + &linux; rt sendsig @@ -1300,7 +1300,7 @@ - + &linux; sigreturn @@ -1312,7 +1312,7 @@ - + Ptrace @@ -1343,7 +1343,7 @@ - + Traps @@ -1376,7 +1376,7 @@ - + Stack fixup @@ -1389,7 +1389,7 @@ - + A.OUT support @@ -1416,7 +1416,7 @@ talk briefly about some syscalls. - + Description of NTPL @@ -1448,7 +1448,7 @@ - + &linux; 2.6 emulation infrastructure @@ -1456,7 +1456,7 @@ &os;. - + Runtime determining of 2.6 emulation @@ -1473,7 +1473,7 @@ - + &linux; process and thread identifiers @@ -1559,7 +1559,7 @@ - + PID mangling @@ -1578,7 +1578,7 @@ - + Clone syscall @@ -1631,7 +1631,7 @@ - + Locking @@ -1647,14 +1647,14 @@ - + TLS This section deals with TLS aka thread local storage. - + Introduction to threading @@ -1683,7 +1683,7 @@ - + Segments on i386 @@ -1708,7 +1708,7 @@ - + Implementation on &linux; i386 @@ -1724,10 +1724,10 @@ - + Emulation of &linux; TLS - + i386 @@ -1754,7 +1754,7 @@ - + amd64 @@ -1769,10 +1769,10 @@ - + Futexes - + Introduction to synchronization @@ -1799,7 +1799,7 @@ - + Futexes introduction @@ -1829,7 +1829,7 @@ - + Futex API @@ -1871,7 +1871,7 @@ - + FUTEX_WAIT @@ -1882,7 +1882,7 @@ - + FUTEX_WAKE @@ -1891,7 +1891,7 @@ - + FUTEX_FD @@ -1900,7 +1900,7 @@ - + FUTEX_REQUEUE @@ -1910,7 +1910,7 @@ - + FUTEX_CMP_REQUEUE @@ -1920,7 +1920,7 @@ - + FUTEX_WAKE_OP @@ -1960,7 +1960,7 @@ - + Futex emulation in &os; @@ -1990,7 +1990,7 @@ }; - + futex_get/put @@ -2002,7 +2002,7 @@ - + futex_sleep @@ -2017,7 +2017,7 @@ - + futex_wake @@ -2032,7 +2032,7 @@ - + futex_wake_op @@ -2044,7 +2044,7 @@ - + futex atomic operation @@ -2066,7 +2066,7 @@ - + Futex locking @@ -2078,7 +2078,7 @@ - + Various syscalls implementation @@ -2087,7 +2087,7 @@ point of view. - + *at family of syscalls @@ -2127,7 +2127,7 @@ routine and simple wrapping layer. - + Implementation @@ -2154,7 +2154,7 @@ - + Ioctl @@ -2175,7 +2175,7 @@ - + Debugging @@ -2192,7 +2192,7 @@ Conclusion - + Results @@ -2222,7 +2222,7 @@ - + Future work @@ -2253,7 +2253,7 @@ - + Team From owner-p4-projects@FreeBSD.ORG Thu Jun 21 17:23: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 C8B3216A474; Thu, 21 Jun 2007 17:23:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F50716A46E for ; Thu, 21 Jun 2007 17:23:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5584713C45E for ; Thu, 21 Jun 2007 17:23:28 +0000 (UTC) (envelope-from gabor@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 l5LHNR7t035657 for ; Thu, 21 Jun 2007 17:23:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LHNRfI035654 for perforce@freebsd.org; Thu, 21 Jun 2007 17:23:27 GMT (envelope-from gabor@freebsd.org) Date: Thu, 21 Jun 2007 17:23:27 GMT Message-Id: <200706211723.l5LHNRfI035654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jun 2007 17:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=122102 Change 122102 by gabor@gabor_server on 2007/06/21 17:22:52 - Revert an accidentally submitted change - Use .TARGETS to pass the needed targets to the DESTDIR environment Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 (text+ko) ==== @@ -1093,14 +1093,10 @@ # DESTDIR section to start a chrooted process if incoked with DESTDIR set # -DESTDIR_LOCKFILE?= /var/tmp/destdir.lock - -.if defined(DESTDIR) && !empty(DESTDIR) && !exists(${DESTDIR_LOCKFILE}) -_TARGET:= ${.TARGET} +.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) .BEGIN: ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${TOUCH} ${DESTDIR}${DESTDIR_LOCKFILE} - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} CHROOTED=YES ${_TARGET})" + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" .else # Look for ${WRKSRC}/.../*.orig files, and (re-)create From owner-p4-projects@FreeBSD.ORG Fri Jun 22 03:33: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 A4CB416A46C; Fri, 22 Jun 2007 03:33: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 2ECDE16A469 for ; Fri, 22 Jun 2007 03:33:27 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1CA4313C468 for ; Fri, 22 Jun 2007 03:33:27 +0000 (UTC) (envelope-from thioretic@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 l5M3XR7g006760 for ; Fri, 22 Jun 2007 03:33:27 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5M3XQph006747 for perforce@freebsd.org; Fri, 22 Jun 2007 03:33:26 GMT (envelope-from thioretic@FreeBSD.org) Date: Fri, 22 Jun 2007 03:33:26 GMT Message-Id: <200706220333.l5M3XQph006747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 122117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 03:33:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=122117 Change 122117 by thioretic@thioretic on 2007/06/22 03:33:03 Branch of //depot/vendor/freebsd_6/src/sys for GSoC 2007 'Generic input device layer' project Submitted by: thioretic Affected files ... .. //depot/projects/soc2007/thioretic_gidl/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/atomic.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/autoconf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/busspace.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/clock.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/clock_if.m#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/db_interface.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/db_trace.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/divrem.m4#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/exception.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/genassym.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/interrupt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/locore.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pal.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/pmap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/prom.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/promcons.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/sgmap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/support.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/swtch.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/trap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/compile/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/GENERIC#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/conf/NOTES#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/_bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/_inttypes.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/_limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/_stdint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/_types.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/asm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/atomic.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/bootinfo.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/bus_dma.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/bwx.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/chipset.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/clock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/clockvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/cpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/cpuconf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/cpufunc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/db_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/elf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/endian.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/exec.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/float.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/fpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/frame.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ieee.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ieeefp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/in_cksum.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/inst.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/intr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/intrcnt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/kdb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/md_var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/memdev.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/mutex.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pal.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/param.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pc/bios.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pc/display.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pc/vesa.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pcb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pcpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pmap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ppireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/proc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/profile.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/prom.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/pte.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ptrace.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/reloc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/resource.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/rpb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/runq.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/setjmp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/sf_buf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/sgmap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/sigframe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/signal.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/smp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/stdarg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/swiz.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/sysarch.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/timerreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/ucontext.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/varargs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/include/vmparam.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/isa/isavar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_locore.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_proto.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/syscalls.conf#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/linux/syscalls.master#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/osf1/syscalls.master#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecs.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecsreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/apecsvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/bwx.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/cia.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/cia_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/ciareg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/ciavar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/irongate.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/irongatereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/irongatevar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/lca.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/lca_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/lcareg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/lcavar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/pcibus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/swiz.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/t2.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/t2_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/t2reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/t2var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/tsunami.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/gbus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/SMP#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/float.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/param.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/support.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_spiio.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/_types.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/asm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/bus.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/clock.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/elf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/endian.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/exec.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/float.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/fp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/frame.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/intr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/limits.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/param.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/proc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/profile.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/psl.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/pte.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/resource.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/runq.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/signal.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/smp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/swi.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/trap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/README#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/cdboot/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/common/conf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/common/help.alpha#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/common/ldscript#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/common/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/loader/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/loader/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/alpha/netboot/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/include/arctypes.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/include/libarc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/abort.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/delay.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/prom.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/lib/time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/loader/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/loader/conf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/loader/help.alpha#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/loader/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arc/loader/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/boot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/commands.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/console.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/help.common#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/interp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/loader.8#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/ls.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/misc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/panic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/pnpdata#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/README#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/boot0.5/Makefile#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 22 05:01: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 E409B16A46B; Fri, 22 Jun 2007 05:01: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 9501516A468 for ; Fri, 22 Jun 2007 05:01:02 +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 82A3213C484 for ; Fri, 22 Jun 2007 05:01:02 +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 l5M51251032489 for ; Fri, 22 Jun 2007 05:01:02 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5M50Icj032393 for perforce@freebsd.org; Fri, 22 Jun 2007 05:00:19 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 22 Jun 2007 05:00:19 GMT Message-Id: <200706220500.l5M50Icj032393@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 122120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 05:01:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=122120 Change 122120 by mjacob@mjexp on 2007/06/22 05:00:04 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#18 integrate .. //depot/projects/mjexp/UPDATING#18 integrate .. //depot/projects/mjexp/cddl/lib/Makefile#4 integrate .. //depot/projects/mjexp/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/mjexp/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/mjexp/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/mjexp/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/mjexp/contrib/diff/AUTHORS#1 branch .. //depot/projects/mjexp/contrib/diff/COPYING#2 integrate .. //depot/projects/mjexp/contrib/diff/ChangeLog#2 integrate .. //depot/projects/mjexp/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/mjexp/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/contrib/diff/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/diff/Makefile.in#2 delete .. //depot/projects/mjexp/contrib/diff/NEWS#2 integrate .. //depot/projects/mjexp/contrib/diff/README#2 integrate .. //depot/projects/mjexp/contrib/diff/THANKS#1 branch .. //depot/projects/mjexp/contrib/diff/TODO#1 branch .. //depot/projects/mjexp/contrib/diff/analyze.c#2 delete .. //depot/projects/mjexp/contrib/diff/bootstrap#1 branch .. //depot/projects/mjexp/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/mjexp/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/mjexp/contrib/diff/config.h#2 integrate .. //depot/projects/mjexp/contrib/diff/config.hin#2 delete .. //depot/projects/mjexp/contrib/diff/configure#2 delete .. //depot/projects/mjexp/contrib/diff/configure.in#2 delete .. //depot/projects/mjexp/contrib/diff/context.c#2 delete .. //depot/projects/mjexp/contrib/diff/diagmeet.note#2 delete .. //depot/projects/mjexp/contrib/diff/diff.c#2 delete .. //depot/projects/mjexp/contrib/diff/diff.h#2 delete .. //depot/projects/mjexp/contrib/diff/diff.texi#2 delete .. //depot/projects/mjexp/contrib/diff/diff3.c#2 delete .. //depot/projects/mjexp/contrib/diff/dir.c#2 delete .. //depot/projects/mjexp/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/mjexp/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/mjexp/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/mjexp/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/mjexp/contrib/diff/doc/version.texi#1 branch .. //depot/projects/mjexp/contrib/diff/ed.c#2 delete .. //depot/projects/mjexp/contrib/diff/exgettext#1 branch .. //depot/projects/mjexp/contrib/diff/ifdef.c#2 delete .. //depot/projects/mjexp/contrib/diff/install-sh#2 delete .. //depot/projects/mjexp/contrib/diff/io.c#2 delete .. //depot/projects/mjexp/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/basename.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/error.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/error.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/exit.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/mjexp/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/regex.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/regex.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/mjexp/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/mjexp/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/diff/man/cmp.1#1 branch .. //depot/projects/mjexp/contrib/diff/man/diff.1#1 branch .. //depot/projects/mjexp/contrib/diff/man/diff3.1#1 branch .. //depot/projects/mjexp/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/mjexp/contrib/diff/normal.c#2 delete .. //depot/projects/mjexp/contrib/diff/prepend_args.c#2 delete .. //depot/projects/mjexp/contrib/diff/prepend_args.h#2 delete .. //depot/projects/mjexp/contrib/diff/sdiff.c#2 delete .. //depot/projects/mjexp/contrib/diff/side.c#2 delete .. //depot/projects/mjexp/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/diff/src/analyze.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/cmp.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/context.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/diff.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/diff.h#1 branch .. //depot/projects/mjexp/contrib/diff/src/diff3.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/dir.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/ed.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/io.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/normal.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/side.c#1 branch .. //depot/projects/mjexp/contrib/diff/src/system.h#1 branch .. //depot/projects/mjexp/contrib/diff/src/util.c#1 branch .. //depot/projects/mjexp/contrib/diff/stamp-h.in#2 delete .. //depot/projects/mjexp/contrib/diff/system.h#2 delete .. //depot/projects/mjexp/contrib/diff/util.c#2 delete .. //depot/projects/mjexp/contrib/diff/version.c#2 delete .. //depot/projects/mjexp/contrib/diff/xmalloc.c#2 delete .. //depot/projects/mjexp/contrib/less/NEWS#3 integrate .. //depot/projects/mjexp/contrib/less/README#3 integrate .. //depot/projects/mjexp/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/mjexp/contrib/less/command.c#3 integrate .. //depot/projects/mjexp/contrib/less/forwback.c#3 integrate .. //depot/projects/mjexp/contrib/less/less.man#3 integrate .. //depot/projects/mjexp/contrib/less/less.nro#3 integrate .. //depot/projects/mjexp/contrib/less/lessecho.man#3 integrate .. //depot/projects/mjexp/contrib/less/lessecho.nro#3 integrate .. //depot/projects/mjexp/contrib/less/lesskey.man#3 integrate .. //depot/projects/mjexp/contrib/less/lesskey.nro#3 integrate .. //depot/projects/mjexp/contrib/less/main.c#3 integrate .. //depot/projects/mjexp/contrib/less/optfunc.c#3 integrate .. //depot/projects/mjexp/contrib/less/screen.c#3 integrate .. //depot/projects/mjexp/contrib/less/search.c#3 integrate .. //depot/projects/mjexp/contrib/less/version.c#3 integrate .. //depot/projects/mjexp/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate .. //depot/projects/mjexp/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/mjexp/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/mjexp/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/mjexp/etc/Makefile#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#13 integrate .. //depot/projects/mjexp/etc/devd.conf#5 integrate .. //depot/projects/mjexp/etc/group#2 integrate .. //depot/projects/mjexp/etc/namedb/Makefile#2 integrate .. //depot/projects/mjexp/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/mjexp/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/mjexp/etc/namedb/make-localhost#2 delete .. //depot/projects/mjexp/etc/namedb/master/Makefile#1 branch .. //depot/projects/mjexp/etc/namedb/master/empty.db#1 branch .. //depot/projects/mjexp/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/mjexp/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/mjexp/etc/namedb/named.conf#2 integrate .. //depot/projects/mjexp/etc/pam.d/Makefile#2 integrate .. //depot/projects/mjexp/etc/pam.d/atrun#1 branch .. //depot/projects/mjexp/etc/pam.d/cron#1 branch .. //depot/projects/mjexp/etc/pam.d/ftpd#2 integrate .. //depot/projects/mjexp/etc/pam.d/gdm#2 integrate .. //depot/projects/mjexp/etc/pam.d/imap#2 integrate .. //depot/projects/mjexp/etc/pam.d/kde#2 integrate .. //depot/projects/mjexp/etc/pam.d/login#2 integrate .. //depot/projects/mjexp/etc/pam.d/other#2 integrate .. //depot/projects/mjexp/etc/pam.d/pop3#2 integrate .. //depot/projects/mjexp/etc/pam.d/rsh#2 integrate .. //depot/projects/mjexp/etc/pam.d/sshd#2 integrate .. //depot/projects/mjexp/etc/pam.d/telnetd#2 integrate .. //depot/projects/mjexp/etc/pam.d/xdm#2 integrate .. //depot/projects/mjexp/etc/rc.d/sendmail#2 integrate .. //depot/projects/mjexp/etc/rc.resume#2 integrate .. //depot/projects/mjexp/etc/rc.suspend#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/mjexp/gnu/lib/libdialog/Makefile#2 integrate .. //depot/projects/mjexp/gnu/lib/libreadline/Makefile.inc#3 integrate .. //depot/projects/mjexp/gnu/lib/libregex/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/mjexp/gnu/usr.bin/diff/diff.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/mjexp/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/mjexp/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/sdiff/sdiff.1#2 delete .. //depot/projects/mjexp/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/mjexp/include/arpa/inet.h#3 integrate .. //depot/projects/mjexp/include/histedit.h#2 integrate .. //depot/projects/mjexp/include/paths.h#2 integrate .. //depot/projects/mjexp/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_fd.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/mjexp/lib/libarchive/test/main.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/mjexp/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/mjexp/lib/libc/net/Makefile.inc#6 integrate .. //depot/projects/mjexp/lib/libc/net/Symbol.map#7 integrate .. //depot/projects/mjexp/lib/libc/net/inet.3#6 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_bindx.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_freepaddrs.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getaddrlen.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getassocid.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_getpaddrs.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/mjexp/lib/libc/net/sourcefilter.3#1 branch .. //depot/projects/mjexp/lib/libc/net/sourcefilter.c#1 branch .. //depot/projects/mjexp/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/mjexp/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/mjexp/lib/libc/regex/regerror.c#3 integrate .. //depot/projects/mjexp/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/mjexp/lib/libc/regex/regfree.c#3 integrate .. //depot/projects/mjexp/lib/libc/rpc/auth_unix.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/mjexp/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/mjexp/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/mjexp/lib/libedit/editline.3#3 integrate .. //depot/projects/mjexp/lib/libedit/el.c#2 integrate .. //depot/projects/mjexp/lib/libedit/el.h#2 integrate .. //depot/projects/mjexp/lib/libedit/term.c#3 integrate .. //depot/projects/mjexp/lib/libedit/term.h#3 integrate .. //depot/projects/mjexp/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/mjexp/lib/libkvm/kvm.c#3 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_amd64.c#3 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_private.h#3 integrate .. //depot/projects/mjexp/lib/libpam/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/mjexp/lib/libthr/Makefile#5 integrate .. //depot/projects/mjexp/lib/libutil/login_cap.3#2 integrate .. //depot/projects/mjexp/lib/libutil/login_cap.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/e_log.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#7 integrate .. //depot/projects/mjexp/libexec/atrun/Makefile#2 integrate .. //depot/projects/mjexp/libexec/atrun/atrun.c#2 integrate .. //depot/projects/mjexp/libexec/atrun/atrun.man#2 integrate .. //depot/projects/mjexp/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#19 integrate .. //depot/projects/mjexp/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/mjexp/sbin/Makefile#5 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_ipx.c#4 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifbridge.c#4 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.h#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/mjexp/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/mjexp/sbin/ipf/libipf/Makefile#3 integrate .. //depot/projects/mjexp/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/mjexp/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/mjexp/sbin/mknod/mknod.c#2 integrate .. //depot/projects/mjexp/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/mjexp/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/mjexp/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/mjexp/sbin/sysctl/sysctl.c#6 integrate .. //depot/projects/mjexp/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#17 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#9 integrate .. //depot/projects/mjexp/share/man/man4/fwohci.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ip.4#3 integrate .. //depot/projects/mjexp/share/man/man4/miibus.4#4 integrate .. //depot/projects/mjexp/share/man/man4/nfe.4#3 integrate .. //depot/projects/mjexp/share/man/man4/rum.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_hda.4#8 integrate .. //depot/projects/mjexp/share/man/man4/ural.4#5 integrate .. //depot/projects/mjexp/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/mjexp/share/man/man5/Makefile#3 integrate .. //depot/projects/mjexp/share/man/man5/make.conf.5#3 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/mjexp/share/man/man5/src.conf.5#5 integrate .. //depot/projects/mjexp/share/man/man5/tmpfs.5#1 branch .. //depot/projects/mjexp/share/man/man5/xfs.5#1 branch .. //depot/projects/mjexp/share/man/man7/hier.7#7 integrate .. //depot/projects/mjexp/share/man/man9/lock.9#4 integrate .. //depot/projects/mjexp/share/man/man9/locking.9#3 integrate .. //depot/projects/mjexp/share/man/man9/selrecord.9#2 integrate .. //depot/projects/mjexp/share/misc/committers-ports.dot#8 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/mjexp/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/mjexp/sys/arm/at91/if_ate.c#9 integrate .. //depot/projects/mjexp/sys/arm/include/intr.h#3 integrate .. //depot/projects/mjexp/sys/arm/include/pmap.h#5 integrate .. //depot/projects/mjexp/sys/arm/include/pte.h#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/mjexp/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/mjexp/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_uid16.c#4 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/mjexp/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/mjexp/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/mjexp/sys/conf/NOTES#25 integrate .. //depot/projects/mjexp/sys/conf/files#29 integrate .. //depot/projects/mjexp/sys/conf/files.sparc64#9 integrate .. //depot/projects/mjexp/sys/conf/files.sun4v#5 integrate .. //depot/projects/mjexp/sys/conf/options#22 integrate .. //depot/projects/mjexp/sys/conf/options.arm#5 integrate .. //depot/projects/mjexp/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/mjexp/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/mjexp/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/mjexp/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/mjexp/sys/dev/aha/aha.c#6 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic/aic.c#5 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/mjexp/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/mjexp/sys/dev/amd/amd.c#7 integrate .. //depot/projects/mjexp/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/mjexp/sys/dev/asr/asr.c#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/mjexp/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/mjexp/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#7 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/mjexp/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#2 delete .. //depot/projects/mjexp/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/mjexp/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_scsi.c#6 integrate .. //depot/projects/mjexp/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/mjexp/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/mjexp/sys/dev/fb/creator.c#4 integrate .. //depot/projects/mjexp/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/mjexp/sys/dev/fb/gallant12x22.h#2 delete .. //depot/projects/mjexp/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/mjexp/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#7 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/mjexp/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/mjexp/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/mjexp/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/mjexp/sys/dev/iir/iir.c#5 integrate .. //depot/projects/mjexp/sys/dev/iir/iir.h#2 integrate .. //depot/projects/mjexp/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/mjexp/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/mjexp/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/mjexp/sys/dev/mly/mly.c#7 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#24 integrate .. //depot/projects/mjexp/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#17 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/mjexp/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/mjexp/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/mjexp/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/mjexp/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/mjexp/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#12 integrate .. //depot/projects/mjexp/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/clone.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/clone.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.h#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder_volume.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/version.h#2 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/mjexp/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/mjexp/sys/dev/trm/trm.c#7 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/mjexp/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/hid.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cdce.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/mjexp/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uark.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ucycom.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#9 integrate .. //depot/projects/mjexp/sys/dev/usb/umct.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ums.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/urio.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/mjexp/sys/dev/wds/wd7000.c#5 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/mjexp/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.c#6 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.h#3 integrate .. //depot/projects/mjexp/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/mjexp/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/mjexp/sys/i386/conf/PAE#3 integrate .. //depot/projects/mjexp/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/trap.c#10 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#9 integrate .. //depot/projects/mjexp/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/mjexp/sys/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/mjexp/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/kern/kern_conf.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/mjexp/sys/kern/kern_exec.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_exit.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#15 integrate .. //depot/projects/mjexp/sys/kern/kern_kse.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_priv.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_prot.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#14 integrate .. //depot/projects/mjexp/sys/kern/kern_sig.c#16 integrate .. //depot/projects/mjexp/sys/kern/kern_switch.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#12 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#17 integrate .. //depot/projects/mjexp/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/mjexp/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_trap.c#10 integrate .. //depot/projects/mjexp/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_unit.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#15 integrate .. //depot/projects/mjexp/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/mjexp/sys/kern/sysv_msg.c#8 integrate .. //depot/projects/mjexp/sys/kern/tty.c#8 integrate .. //depot/projects/mjexp/sys/kern/uipc_mqueue.c#8 integrate .. //depot/projects/mjexp/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/mjexp/sys/libkern/mcount.c#2 integrate .. //depot/projects/mjexp/sys/modules/Makefile#14 integrate .. //depot/projects/mjexp/sys/modules/cxgb/Makefile#5 integrate .. //depot/projects/mjexp/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/mjexp/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/mjexp/sys/net/bpf.c#6 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#6 integrate .. //depot/projects/mjexp/sys/net/if.h#4 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#10 integrate .. //depot/projects/mjexp/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/mjexp/sys/net/if_lagg.c#6 integrate .. //depot/projects/mjexp/sys/net/if_lagg.h#4 integrate .. //depot/projects/mjexp/sys/net/if_types.h#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/mjexp/sys/netinet/igmp.h#2 integrate .. //depot/projects/mjexp/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet/in.c#7 integrate .. //depot/projects/mjexp/sys/netinet/in.h#5 integrate .. //depot/projects/mjexp/sys/netinet/in_mcast.c#1 branch .. //depot/projects/mjexp/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/mjexp/sys/netinet/in_proto.c#4 integrate .. //depot/projects/mjexp/sys/netinet/in_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/mjexp/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/mjexp/sys/netinet/ip_output.c#8 integrate .. //depot/projects/mjexp/sys/netinet/ip_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#16 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#11 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/mjexp/sys/netinet/udp_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/mjexp/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#13 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/mjexp/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec_osdep.h#4 integrate .. //depot/projects/mjexp/sys/netipsec/key.c#3 integrate .. //depot/projects/mjexp/sys/netipx/ipx.c#4 integrate .. //depot/projects/mjexp/sys/netipx/ipx.h#4 integrate .. //depot/projects/mjexp/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/mjexp/sys/netipx/ipx_ip.c#4 delete .. //depot/projects/mjexp/sys/netipx/ipx_ip.h#4 delete .. //depot/projects/mjexp/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/mjexp/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/mjexp/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/mjexp/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/mjexp/sys/pci/if_ste.c#4 integrate .. //depot/projects/mjexp/sys/pci/ncr.c#7 integrate .. //depot/projects/mjexp/sys/powerpc/conf/DEFAULTS#5 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/mjexp/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/mjexp/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#11 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/mjexp/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/mjexp/sys/sparc64/include/smp.h#4 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pci.c#2 delete .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pci_if.m#3 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/sun4v/include/pcpu.h#6 integrate .. //depot/projects/mjexp/sys/sun4v/include/trap.h#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#9 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/mjexp/sys/sys/param.h#21 integrate .. //depot/projects/mjexp/sys/sys/priv.h#8 integrate .. //depot/projects/mjexp/sys/sys/proc.h#19 integrate .. //depot/projects/mjexp/sys/sys/sched.h#7 integrate .. //depot/projects/mjexp/sys/sys/socket.h#4 integrate .. //depot/projects/mjexp/sys/sys/systm.h#15 integrate .. //depot/projects/mjexp/sys/sys/tree.h#2 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/mjexp/sys/vm/vm_contig.c#10 integrate .. //depot/projects/mjexp/sys/vm/vm_fault.c#11 integrate .. //depot/projects/mjexp/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#12 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#15 integrate .. //depot/projects/mjexp/sys/vm/vm_page.h#6 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/mjexp/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_phys.c#2 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#10 integrate .. //depot/projects/mjexp/tools/build/options/WITHOUT_KVM#1 branch .. //depot/projects/mjexp/tools/build/options/WITHOUT_KVM_SUPPORT#1 branch .. //depot/projects/mjexp/tools/regression/atm/RunTest.sh#2 integrate .. //depot/projects/mjexp/tools/regression/netinet/ipmulticast/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipmulticast/ipmulticast.c#1 branch .. //depot/projects/mjexp/tools/regression/netinet/ipsockopt/ipsockopt.c#4 integrate .. //depot/projects/mjexp/tools/regression/tmpfs/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_create#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_dots#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_exec#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_link#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_mount#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_pipes#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_read_write#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_readdir#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_remove#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_rename#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_setattr#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_sizes#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_sockets#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_symlink#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_times#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_truncate#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_vnd#1 branch .. //depot/projects/mjexp/tools/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/calendar.calibrate#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.a2.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.a3.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.a4.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.b2.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.b3.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.b4.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.s1.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.s3.out#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-5.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-6.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.w0-7.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-1.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-2.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-3.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-4.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-5.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-6.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/calendar/regress.wn-7.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.sh#5 integrate .. //depot/projects/mjexp/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/mjexp/tools/tools/net80211/wlandebug/wlandebug.c#4 integrate .. //depot/projects/mjexp/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/mjexp/tools/tools/recoverdisk/Makefile#2 delete .. //depot/projects/mjexp/tools/tools/recoverdisk/recoverdisk.1#2 delete .. //depot/projects/mjexp/tools/tools/recoverdisk/recoverdisk.c#3 delete .. //depot/projects/mjexp/usr.bin/Makefile#4 integrate .. //depot/projects/mjexp/usr.bin/awk/lib.c.diff#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendar.h#3 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.all#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.dutch#1 branch .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/mjexp/usr.bin/calendar/day.c#4 integrate .. //depot/projects/mjexp/usr.bin/calendar/io.c#3 integrate .. //depot/projects/mjexp/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/mjexp/usr.bin/netstat/main.c#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/netstat.1#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/mjexp/usr.bin/netstat/sctp.c#1 branch .. //depot/projects/mjexp/usr.bin/rpcgen/rpc_svcout.c#2 integrate .. //depot/projects/mjexp/usr.bin/sed/extern.h#3 integrate .. //depot/projects/mjexp/usr.bin/sed/main.c#3 integrate .. //depot/projects/mjexp/usr.bin/sed/process.c#4 integrate .. //depot/projects/mjexp/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/mjexp/usr.bin/systat/tcp.c#2 integrate .. //depot/projects/mjexp/usr.bin/top/machine.c#5 integrate .. //depot/projects/mjexp/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/cron/cron.8#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/lib/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/lib/entry.c#3 integrate .. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.8#2 integrate .. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.c#4 integrate .. //depot/projects/mjexp/usr.sbin/fwcontrol/fwdv.c#3 integrate .. //depot/projects/mjexp/usr.sbin/ifmcstat/Makefile#4 integrate .. //depot/projects/mjexp/usr.sbin/moused/moused.c#3 integrate .. //depot/projects/mjexp/usr.sbin/mtest/mtest.c#3 integrate .. //depot/projects/mjexp/usr.sbin/mtree/mtree.8#2 integrate .. //depot/projects/mjexp/usr.sbin/ntp/doc/ntpd.8#3 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/deps.c#2 integrate .. //depot/projects/mjexp/usr.sbin/powerd/powerd.c#2 integrate .. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/mjexp/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.94 2007/06/05 01:10:47 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,51 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070618: shared library version bump +OLD_LIBS+=lib/libalias.so.5 +OLD_LIBS+=lib/libbsnmp.so.3 +OLD_LIBS+=lib/libncurses.so.6 +OLD_LIBS+=lib/libncursesw.so.6 +OLD_LIBS+=lib/libreadline.so.6 +OLD_LIBS+=usr/lib/libdialog.so.5 +OLD_LIBS+=usr/lib/libgnuregex.so.3 +OLD_LIBS+=usr/lib/libhistory.so.6 +OLD_LIBS+=usr/lib/libpam.so.3 +OLD_LIBS+=usr/lib/libssh.so.3 +OLD_LIBS+=usr/lib/pam_chroot.so.3 +OLD_LIBS+=usr/lib/pam_deny.so.3 +OLD_LIBS+=usr/lib/pam_echo.so.3 +OLD_LIBS+=usr/lib/pam_exec.so.3 +OLD_LIBS+=usr/lib/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib/pam_group.so.3 +OLD_LIBS+=usr/lib/pam_guest.so.3 +OLD_LIBS+=usr/lib/pam_krb5.so.3 +OLD_LIBS+=usr/lib/pam_ksu.so.3 +OLD_LIBS+=usr/lib/pam_lastlog.so.3 +OLD_LIBS+=usr/lib/pam_login_access.so.3 +OLD_LIBS+=usr/lib/pam_nologin.so.3 +OLD_LIBS+=usr/lib/pam_opie.so.3 +OLD_LIBS+=usr/lib/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib/pam_permit.so.3 +OLD_LIBS+=usr/lib/pam_radius.so.3 +OLD_LIBS+=usr/lib/pam_rhosts.so.3 +OLD_LIBS+=usr/lib/pam_rootok.so.3 +OLD_LIBS+=usr/lib/pam_securetty.so.3 +OLD_LIBS+=usr/lib/pam_self.so.3 +OLD_LIBS+=usr/lib/pam_ssh.so.3 +OLD_LIBS+=usr/lib/pam_tacplus.so.3 +OLD_LIBS+=usr/lib/pam_unix.so.3 +OLD_LIBS+=usr/lib/snmp_atm.so.4 +OLD_LIBS+=usr/lib/snmp_bridge.so.4 +OLD_LIBS+=usr/lib/snmp_hostres.so.4 +OLD_LIBS+=usr/lib/snmp_mibII.so.4 +OLD_LIBS+=usr/lib/snmp_netgraph.so.4 +OLD_LIBS+=usr/lib/snmp_pf.so.4 # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz +# 20070603: BIND 9.4.1 import +OLD_LIBS+=lib/liblwres.so.10 # 20070521: shared library version bump OLD_LIBS+=lib/libatm.so.4 OLD_LIBS+=lib/libbegemot.so.2 @@ -74,6 +117,7 @@ OLD_LIBS+=usr/lib/libthread_db.so.2 OLD_LIBS+=usr/lib/libugidfw.so.2 OLD_LIBS+=usr/lib/libusbhid.so.2 +OLD_LIBS+=usr/lib/libvgl.so.4 OLD_LIBS+=usr/lib/libwrap.so.4 OLD_LIBS+=usr/lib/libypclnt.so.2 OLD_LIBS+=usr/lib/snmp_atm.so.3 ==== //depot/projects/mjexp/UPDATING#18 (text+ko) ==== @@ -21,6 +21,62 @@ developers choose to disable these features on build machines to maximize performance. +20070612: + By default, /etc/rc.d/sendmail no longer rebuilds the aliases + database if it is missing or older than the aliases file. If + desired, set the new rc.conf option sendmail_rebuild_aliases + to "YES" to restore that functionality. + +20070612: + The IPv4 multicast socket code has been considerably modified, and + moved to the file sys/netinet/in_mcast.c. Initial support for the + RFC 3678 Source-Specific Multicast Socket API has been added to + the IPv4 network stack. + + Strict multicast and broadcast reception is now the default for + UDP/IPv4 sockets; the net.inet.udp.strict_mcast_mship sysctl variable + has now been removed. + + The RFC 1724 hack for interface selection has been removed; the use + of the Linux-derived ip_mreqn structure with IP_MULTICAST_IF has + been added to replace it. Consumers such as routed will soon be + updated to reflect this. + + These changes affect users who are running routed(8) or rdisc(8) + from the FreeBSD base system on point-to-point or unnumbered + interfaces. + +20070610: + The net80211 layer has changed significantly and all wireless + drivers that depend on it need to be recompiled. Further these + changes require that any program that interacts with the wireless + support in the kernel be recompiled; this includes: ifconfig, + wpa_supplicant, hostapd, and wlanstats. Users must also, for + the moment, kldload the wlan_scan_sta and/or wlan_scan_ap modules + if they use modules for wireless support. These modules implement + scanning support for station and ap modes, respectively. Failure + to load the appropriate module before marking a wireless interface + up will result in a message to the console and the device not >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 22 06:20: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 C6DAA16A46B; Fri, 22 Jun 2007 06:20: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 8018216A400 for ; Fri, 22 Jun 2007 06:20:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E78013C465 for ; Fri, 22 Jun 2007 06:20:52 +0000 (UTC) (envelope-from imp@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 l5M6Kq9E051824 for ; Fri, 22 Jun 2007 06:20:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5M6KocJ051819 for perforce@freebsd.org; Fri, 22 Jun 2007 06:20:50 GMT (envelope-from imp@freebsd.org) Date: Fri, 22 Jun 2007 06:20:50 GMT Message-Id: <200706220620.l5M6KocJ051819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 122132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 06:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=122132 Change 122132 by imp@imp_paco-paco on 2007/06/22 06:20:45 IFC @122130 Affected files ... .. //depot/projects/arm/src/contrib/less/NEWS#4 integrate .. //depot/projects/arm/src/contrib/less/README#4 integrate .. //depot/projects/arm/src/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/arm/src/contrib/less/command.c#4 integrate .. //depot/projects/arm/src/contrib/less/forwback.c#4 integrate .. //depot/projects/arm/src/contrib/less/less.man#4 integrate .. //depot/projects/arm/src/contrib/less/less.nro#4 integrate .. //depot/projects/arm/src/contrib/less/lessecho.man#3 integrate .. //depot/projects/arm/src/contrib/less/lessecho.nro#3 integrate .. //depot/projects/arm/src/contrib/less/lesskey.man#4 integrate .. //depot/projects/arm/src/contrib/less/lesskey.nro#4 integrate .. //depot/projects/arm/src/contrib/less/main.c#5 integrate .. //depot/projects/arm/src/contrib/less/optfunc.c#4 integrate .. //depot/projects/arm/src/contrib/less/screen.c#4 integrate .. //depot/projects/arm/src/contrib/less/version.c#4 integrate .. //depot/projects/arm/src/etc/devd.conf#6 integrate .. //depot/projects/arm/src/etc/rc.resume#2 integrate .. //depot/projects/arm/src/etc/rc.suspend#2 integrate .. //depot/projects/arm/src/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/arm/src/share/man/man9/lock.9#5 integrate .. //depot/projects/arm/src/share/man/man9/locking.9#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/hid.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_aue.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#23 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hs.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uark.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/ubser.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uhub.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#17 integrate .. //depot/projects/arm/src/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#15 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#9 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#16 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi_util.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/uvisor.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#9 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#11 integrate .. //depot/projects/arm/src/sys/kern/subr_unit.c#4 integrate .. //depot/projects/arm/src/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/busdma_machdep.c#6 integrate .. //depot/projects/arm/src/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate Differences ... ==== //depot/projects/arm/src/contrib/less/NEWS#4 (text+ko) ==== @@ -13,7 +13,7 @@ ====================================================================== - Major changes between "less" versions 394 and 403 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/arm/src/contrib/less/README#4 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 403 + Less, version 406 - This is the distribution of less, version 403, released 25 May 2007. + This is the distribution of less, version 406, released 19 Jun 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/arm/src/contrib/less/cmdbuf.c#4 (text+ko) ==== @@ -1390,11 +1390,14 @@ } if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) ml = &mlist_search; + else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { #if SHELL_ESCAPE || PIPEC - else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) ml = &mlist_shell; +#else + ml = NULL; #endif - else if (*line == '"') + } else if (*line == '"') { if (ml != NULL) cmd_addhist(ml, line+1); @@ -1444,11 +1447,18 @@ #if CMD_HISTORY char *filename; FILE *f; + int modified = 0; filename = histfile_name(); if (filename == NULL) return; - if (!mlist_search.modified && !mlist_shell.modified) + if (mlist_search.modified) + modified = 1; +#if SHELL_ESCAPE || PIPEC + if (mlist_shell.modified) + modified = 1; +#endif + if (!modified) return; f = fopen(filename, "w"); free(filename); ==== //depot/projects/arm/src/contrib/less/command.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -87,7 +87,7 @@ cmd_exec() { clear_attn(); - line_left(); + clear_bot(); flush(); } ==== //depot/projects/arm/src/contrib/less/forwback.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/forwback.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/forwback.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,9 +142,6 @@ clear(); home(); } - } else - { - clear_bot(); } if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) ==== //depot/projects/arm/src/contrib/less/less.man#4 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 403: 25 May 2007 LESS(1) + Version 406: 19 Jun 2007 LESS(1) ==== //depot/projects/arm/src/contrib/less/less.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 403: 25 May 2007" +.TH LESS 1 "Version 406: 19 Jun 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/arm/src/contrib/less/lessecho.man#3 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 403: 25 May 2007 LESSECHO(1) + Version 406: 19 Jun 2007 LESSECHO(1) ==== //depot/projects/arm/src/contrib/less/lessecho.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 403: 25 May 2007" +.TH LESSECHO 1 "Version 406: 19 Jun 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/arm/src/contrib/less/lesskey.man#4 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 403: 25 May 2007 LESSKEY(1) + Version 406: 19 Jun 2007 LESSKEY(1) ==== //depot/projects/arm/src/contrib/less/lesskey.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 403: 25 May 2007" +.TH LESSKEY 1 "Version 406: 19 Jun 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/arm/src/contrib/less/main.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.7 2007/06/16 02:43:44 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,7 +142,8 @@ if (s != NULL) scan_option(save(s)); -#define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') +#define isoptstring(s) less_is_more ? (((s)[0] == '-') && (s)[1] != '\0') : \ + (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') while (argc > 0 && (isoptstring(*argv) || isoptpending())) { s = *argv++; ==== //depot/projects/arm/src/contrib/less/optfunc.c#4 (text+ko) ==== @@ -45,6 +45,9 @@ extern char *wproto; extern IFILE curr_ifile; extern char version[]; +extern int jump_sline; +extern int jump_sline_fraction; +extern int less_is_more; #if LOGFILE extern char *namelogfile; extern int force_logfile; @@ -53,9 +56,6 @@ #if TAGS public char *tagoption = NULL; extern char *tags; -extern int jump_sline; -extern int jump_sline_fraction; -extern int less_is_more; #endif #if MSDOS_COMPILER extern int nm_fg_color, nm_bg_color; ==== //depot/projects/arm/src/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -626,7 +626,25 @@ char *capname; { char name[16]; + char *s; + s = lgetenv("LESS_TERMCAP_DEBUG"); + if (s != NULL && *s != '\0') + { + struct env { struct env *next; char *name; char *value; }; + static struct env *envs = NULL; + struct env *p; + for (p = envs; p != NULL; p = p->next) + if (strcmp(p->name, capname) == 0) + return p->value; + p = (struct env *) ecalloc(1, sizeof(struct env)); + p->name = save(capname); + p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); + sprintf(p->value, "<%s>", capname); + p->next = envs; + envs = p; + return p->value; + } strcpy(name, "LESS_TERMCAP_"); strcat(name, capname); return (lgetenv(name)); ==== //depot/projects/arm/src/contrib/less/version.c#4 (text+ko) ==== @@ -690,6 +690,9 @@ v402 3/30/07 Fix autoconf bug when memcpy etc are inline; fix bug in terminating number following -j option. v403 5/25/07 Fix Windows build. +v404 6/5/07 Fix display bug with F command and long lines. +v405 6/17/07 Fix display bug when using -w option. +v406 6/17/07 Fix secure build. */ -char version[] = "403"; +char version[] = "406"; ==== //depot/projects/arm/src/etc/devd.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -258,6 +258,19 @@ action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; }; +# User requested suspend, so perform preparation steps and then execute +# the actual suspend process. +notify 10 { + match "system" "ACPI"; + match "subsystem" "Suspend"; + action "/etc/rc.suspend acpi $notify"; +}; +notify 10 { + match "system" "ACPI"; + match "subsystem" "Resume"; + action "/etc/rc.resume acpi $notify"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might @@ -296,6 +309,7 @@ # Button: Button pressed (0 for power, 1 for sleep) # CMBAT: ACPI battery events # Lid: Lid state (0 is closed, 1 is open) +# Suspend, Resume: Suspend and resume notification # Thermal: ACPI thermal zone events # # This example calls a script when the AC state changes, passing the ==== //depot/projects/arm/src/etc/rc.resume#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.8 2007/06/21 22:50:36 njl Exp $ # # sample run command file for APM Resume Event if [ $# -ne 2 ]; then - echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + echo "Usage: $0 [apm|acpi] [standby,suspend|1-4]" exit 1 fi @@ -48,9 +48,13 @@ # pccardq | awk -F '~' '$5 == "inactive" \ # { printf("pccardc power %d 1", $1); }' | sh -# UHCI has trouble resuming so we just load/unload it. You -# should add any other kernel modules you want reloaded here. -# kldload usb +# If a device driver has problems resuming, try unloading it before +# suspend and reloading it on resume. Example: +# kldunload usb + +# wpa_supplicant(8) doesn't seem to reassociate during resume. Uncomment +# the following to signal it to reassociate. +# /usr/sbin/wpa_cli reassociate logger -t $subsystem resumed at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync ==== //depot/projects/arm/src/etc/rc.suspend#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.suspend,v 1.6 2004/01/21 03:03:40 njl Exp $ +# $FreeBSD: src/etc/rc.suspend,v 1.7 2007/06/21 22:50:36 njl Exp $ # # sample run command file for APM Suspend Event if [ $# -ne 2 ]; then - echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + echo "Usage: $0 [apm|acpi] [standby,suspend|1-4]" exit 1 fi @@ -48,15 +48,20 @@ # pccardq | awk -F '~' '$5 == "filled" && $4 ~ /sio/ \ # { printf("pccardc power %d 0", $1); }' | sh -# UHCI has trouble resuming so we just load/unload it. You -# should add any other kernel modules you want unloaded here. +# If a device driver has problems suspending, try unloading it before +# suspend and reloading it on resume. Example: # kldunload usb logger -t $subsystem suspend at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync -[ $subsystem = "apm" ] && sleep 3 +sleep 3 rm -f /var/run/rc.suspend.pid -[ $subsystem = "apm" ] && zzz +if [ $subsystem = "apm" ]; then + /usr/sbin/zzz +else + # Notify the kernel to continue the suspend process + /usr/sbin/acpiconf -k 0 +fi exit 0 ==== //depot/projects/arm/src/lib/libc/net/sctp_connectx.3#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.5 2007/06/19 16:29:46 brueffer Exp $ .\" -.Dd December 15, 2006 +.Dd June 19, 2007 .Dt SCTP_CONNECTX 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .In sys/socket.h .In netinet/sctp.h .Ft int -.Fn sctp_connectx "int s" "struct sockaddr *" "int addrcnt" +.Fn sctp_connectx "int s" "struct sockaddr *" "int addrcnt" "sctp_assoc_t *" .Sh DESCRIPTION The .Fn sctp_connectx @@ -73,6 +73,12 @@ the extra addresses sent in the .Fn sctp_connectx call will be silently discarded from the association. +On +successful completion the provided +.Fa "sctp_assoc_t *" +will be +filled in with the association identification of the newly +forming association. .Sh RETURN VALUES The call returns 0 on success and -1 upon failure. .Sh ERRORS ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1041 2007/06/18 12:03:02 yar Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1045 2007/06/21 20:27:23 bmah Exp $ 2000 @@ -305,8 +305,9 @@ Security event auditing is now supported in the &os; kernel, and is enabled by the AUDIT kernel - configuration option. More information can be found in the - &man.audit.4; manual page. + configuration option. The option is enabled in the + GENERIC kernel. More information can be found + in the &man.audit.4; manual page. Support for the Camellia block cipher has been added to the &os; kernel. It can now be specified as a cipher in IPsec. More @@ -587,6 +588,8 @@ page. &merged; + The &man.firewire.4; code is now MPSAFE. + icee(4), a generic I2C EEPROM driver, has been added. A bug which prevented the &man.ichsmb.4; kernel module @@ -793,6 +796,8 @@ The IP over FireWire (&man.fwip.4;) driver is now enabled in the GENERIC kernel. + The &man.gem.4; driver now supports &man.altq.4;. + The firmware images needed by the &man.ipw.4; driver are now part of the &os; base system. For the loaded firmware to work the license at /usr/share/doc/legal/intel_ipw/LICENSE @@ -846,7 +851,7 @@ [&arch.amd64;, &arch.i386;] The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet adapters, has been added. For more details, see - &man.mxge.4;. + &man.mxge.4;. &merged; The &man.nfe.4; driver, an open-source driver for nForce Ethernet devices, has been added, originally from @@ -1134,8 +1139,10 @@ Support has been added for the Stream Control Transmission Protocol (SCTP). SCTP implements a reliable, message-oriented - transport protocol, and is defined in RFC 3268. It is enabled - in &os; with the SCTP kernel option. + transport protocol, and is defined in RFC 4960. It is enabled + in &os; with the SCTP kernel option and is + part of the GENERIC kernel. More + information can be found in the &man.sctp.4; manual page. The IPV6_V6ONLY socket option now works for UDP. @@ -1316,6 +1323,12 @@ The &man.mpt.4; driver is now MPSAFE. + [&arch.amd64;, &arch.i386;] Experimental support for the + TMPFS file system has been added. TMPFS is an efficient + memory file system originally developed for the NetBSD project + during the Google Summer of Code. More information can be + found in the &man.tmpfs.5; manual page. + The &man.twa.4; driver has been updated to the 3.70.03.007 release on the 3ware Web site. It now supports AMCC's 3ware 9650 series of SATA controllers. &merged; @@ -1492,6 +1505,9 @@ in the C language. Note that it currently supports checkout mode only. &merged; + The &man.dhclient.8; program now supports the Classless Static + Route option as described in RFC 3442. + The &man.dhclient.8; program now sends the host's name in DHCP requests if it is not specified in the configuration file. &merged; @@ -1696,7 +1712,14 @@ programs. Due to the use of different algorithms and data structures, jemalloc may expose some previously-unknown bugs in userland code, although most of the &os; base system and common - ports have been tested and/or fixed. + ports have been tested and/or fixed. Note that jemalloc uses + &man.mmap.2; to obtain memory and only uses &man.sbrk.2; under + limited circumstances (and then only for 32-bit architectures). + As a result, the datasize resource limit + has little practical effect for typical applications. The + vmemoryuse resource limit, however, can be + used to bound the total virtual memory used by a process, as + described in &man.limits.1;. The &man.mdconfig.8; utility now supports producing device listings formatted as XML. Currently, the @@ -1765,6 +1788,9 @@ differs depending on which stack is compiled into the kernel since they each keep different statistics. &merged; + The &man.netstat.1; utility now supports printing + &man.sctp.4; protocol statistics. + The /etc/nsswitch.conf file is now installed statically instead of being generated on every reboot. @@ -1931,7 +1957,7 @@ flag to display the &man.jail.8; ID for each process. &merged; The &man.touch.1; utility now supports a - flag that allows the access and modification times of a file be + flag that allows the access and modification times of a file to be adjusted by a specified value. &merged; The &man.traceroute.8; program now supports @@ -2117,7 +2143,7 @@ 1.0.3 to 1.0.4. GNU Diffutils has been updated - to 2.8.7. + from 2.7 to 2.8.7. DRM has been updated to a snapshot from DRI CVS as of 20060517. @@ -2135,7 +2161,7 @@ netcat has been updated from the version in a 4 February 2005 OpenBSD snapshot to the version - included in OpenBSD 4.1. + included in OpenBSD 4.1. &merged; GCC has been updated from 3.4.4 to 4.2.0. @@ -2151,7 +2177,7 @@ 4.1.8 to 4.1.23. less has been updated from v381 - to v403. + to v406. libpcap has been updated from 0.9.1 to 0.9.4. &merged; ==== //depot/projects/arm/src/share/man/man9/lock.9#5 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.16 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.17 2007/06/21 16:39:25 brueffer Exp $ .\" .Dd June 20, 2006 .Dt LOCK 9 @@ -273,7 +273,6 @@ will be the result of trying. .Sh SEE ALSO .Xr condvar 9 , -.Xr mutex 9 , .Xr locking 9 , .Xr mutex 9 , .Xr rwlock 9 , ==== //depot/projects/arm/src/share/man/man9/locking.9#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/locking.9,v 1.9 2007/06/01 03:11:47 delphij Exp $ +.\" $FreeBSD: src/share/man/man9/locking.9,v 1.10 2007/06/21 16:39:25 brueffer Exp $ .\" .Dd March 14, 2007 .Dt LOCKING 9 @@ -300,14 +300,14 @@ .El .Sh SEE ALSO .Xr condvar 9 , -.Xr lock 9 +.Xr lock 9 , .Xr mtx_pool 9 , .Xr rwlock 9 , .Xr sema 9 , .Xr sleep 9 , -.Xr sx 9 +.Xr sx 9 , .Xr LOCK_PROFILING 9 , -.Xr WITNESS 9 , +.Xr WITNESS 9 .Sh HISTORY These functions appeared in ==== //depot/projects/arm/src/sys/dev/acpica/acpi.c#23 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.239 2007/06/15 18:02:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); #include "opt_acpi.h" #include @@ -136,6 +136,7 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); @@ -412,6 +413,7 @@ sc = device_get_softc(dev); sc->acpi_dev = dev; + callout_init(&sc->susp_force_to, TRUE); error = ENXIO; @@ -594,7 +596,7 @@ /* Pick the first valid sleep state for the sleep button default. */ sc->acpi_sleep_button_sx = ACPI_S_STATES_MAX + 1; - for (state = ACPI_STATE_S1; state < ACPI_STATE_S5; state++) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) { sc->acpi_sleep_button_sx = state; break; @@ -2143,7 +2145,151 @@ return (acpi_SetInteger(ACPI_ROOT_OBJECT, "_PIC", model)); } +/* + * DEPRECATED. This interface has serious deficiencies and will be + * removed. + * + * Immediately enter the sleep state. In the old model, acpiconf(8) ran + * rc.suspend and rc.resume so we don't have to notify devd(8) to do this. + */ +ACPI_STATUS +acpi_SetSleepState(struct acpi_softc *sc, int state) +{ + static int once; + + if (!once) { + printf( +"warning: acpi_SetSleepState() deprecated, need to update your software\n"); + once = 1; + } + return (acpi_EnterSleepState(sc, state)); +} + static void +acpi_sleep_force(void *arg) +{ + struct acpi_softc *sc; + + printf("acpi: suspend request timed out, forcing sleep now\n"); + sc = arg; + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + printf("acpi: force sleep state S%d failed\n", sc->acpi_next_sstate); +} + +/* + * Request that the system enter the given suspend state. All /dev/apm + * devices and devd(8) will be notified. Userland then has a chance to + * save state and acknowledge the request. The system sleeps once all + * acks are in. + */ +int +acpi_ReqSleepState(struct acpi_softc *sc, int state) +{ + struct apm_clone_data *clone; + + if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5) + return (EINVAL); + + /* S5 (soft-off) should be entered directly with no waiting. */ + if (state == ACPI_STATE_S5) { + if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state))) + return (0); + else + return (ENXIO); + } + + /* If a suspend request is already in progress, just return. */ + ACPI_LOCK(acpi); + if (sc->acpi_next_sstate != 0) { + ACPI_UNLOCK(acpi); + return (0); + } + + /* Record the pending state and notify all apm devices. */ + sc->acpi_next_sstate = state; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + clone->notify_status = APM_EV_NONE; + if ((clone->flags & ACPI_EVF_DEVD) == 0) { + selwakeuppri(&clone->sel_read, PZERO); + KNOTE_UNLOCKED(&clone->sel_read.si_note, 0); + } + } + + /* Now notify devd(8) also. */ + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + + /* + * Set a timeout to fire if userland doesn't ack the suspend request + * in time. This way we still eventually go to sleep if we were + * overheating or running low on battery, even if userland is hung. + * We cancel this timeout once all userland acks are in or the + * suspend request is aborted. + */ + callout_reset(&sc->susp_force_to, 10 * hz, acpi_sleep_force, sc); + ACPI_UNLOCK(acpi); + return (0); +} + +/* + * Acknowledge (or reject) a pending sleep state. The caller has + * prepared for suspend and is now ready for it to proceed. If the + * error argument is non-zero, it indicates suspend should be cancelled + * and gives an errno value describing why. Once all votes are in, + * we suspend the system. + */ +int +acpi_AckSleepState(struct apm_clone_data *clone, int error) +{ + struct acpi_softc *sc; + int ret, sleeping; + + /* If no pending sleep state, return an error. */ + ACPI_LOCK(acpi); + sc = clone->acpi_sc; + if (sc->acpi_next_sstate == 0) { + ACPI_UNLOCK(acpi); + return (ENXIO); + } + + /* Caller wants to abort suspend process. */ + if (error) { + sc->acpi_next_sstate = 0; + callout_stop(&sc->susp_force_to); + printf("acpi: listener on %s cancelled the pending suspend\n", + devtoname(clone->cdev)); + ACPI_UNLOCK(acpi); + return (0); + } + + /* + * Mark this device as acking the suspend request. Then, walk through + * all devices, seeing if they agree yet. We only count devices that + * are writable since read-only devices couldn't ack the request. + */ + clone->notify_status = APM_EV_ACKED; + sleeping = TRUE; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + if ((clone->flags & ACPI_EVF_WRITE) != 0 && + clone->notify_status != APM_EV_ACKED) { + sleeping = FALSE; + break; + } + } + + /* If all devices have voted "yes", we will suspend now. */ + if (sleeping) + callout_stop(&sc->susp_force_to); + ACPI_UNLOCK(acpi); + ret = 0; + if (sleeping) { + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + ret = ENODEV; + } + + return (ret); +} + +static void acpi_sleep_enable(void *arg) { @@ -2159,12 +2305,12 @@ }; /* - * Set the system sleep state + * Enter the desired system sleep state. * * Currently we support S1-S5 but S4 is only S4BIOS */ -ACPI_STATUS -acpi_SetSleepState(struct acpi_softc *sc, int state) +static ACPI_STATUS +acpi_EnterSleepState(struct acpi_softc *sc, int state) { ACPI_STATUS status; UINT8 TypeA; @@ -2173,14 +2319,13 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + /* Re-entry once we're suspending is not allowed. */ status = AE_OK; ACPI_LOCK(acpi); if (sc->acpi_sleep_disabled) { - if (sc->acpi_sstate != ACPI_STATE_S0) - status = AE_ERROR; ACPI_UNLOCK(acpi); printf("acpi: suspend request ignored (not ready yet)\n"); - return (status); + return (AE_ERROR); } sc->acpi_sleep_disabled = 1; ACPI_UNLOCK(acpi); @@ -2276,6 +2421,7 @@ * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ + sc->acpi_next_sstate = 0; if (slp_state >= ACPI_SS_GPE_SET) { acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; @@ -2289,7 +2435,10 @@ /* Allow another sleep request after a while. */ if (state != ACPI_STATE_S5) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME); + + /* Run /etc/rc.resume after we are back. */ + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); mtx_unlock(&Giant); return_ACPI_STATUS (status); @@ -2599,11 +2748,15 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { + int ret; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) - acpi_SetSleepState((struct acpi_softc *)arg, state); + /* Request that the system prepare to enter the given suspend state. */ + ret = acpi_ReqSleepState((struct acpi_softc *)arg, state); + if (ret != 0) + printf("acpi: request to enter state S%d failed (err %d)\n", + state, ret); return_VOID; } @@ -2865,7 +3018,20 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_SETSLPSTATE: + case ACPIIO_REQSLPSTATE: + state = *(int *)addr; + if (state != ACPI_STATE_S5) + error = acpi_ReqSleepState(sc, state); + else { + printf("power off via acpi ioctl not supported\n"); + error = ENXIO; + } + break; + case ACPIIO_ACKSLPSTATE: + error = *(int *)addr; + error = acpi_AckSleepState(sc->acpi_clone, error); + break; + case ACPIIO_SETSLPSTATE: /* DEPRECATED */ error = EINVAL; state = *(int *)addr; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -3196,7 +3362,8 @@ goto out; } - acpi_SetSleepState(sc, acpi_state); + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + error = ENXIO; break; default: error = EINVAL; ==== //depot/projects/arm/src/sys/dev/acpica/acpiio.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.16 2005/10/23 00:16:41 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIIO_H_ @@ -33,7 +33,13 @@ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) +#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) /* DEPRECATED */ + +/* Request S1-5 sleep state. User is notified and then sleep proceeds. */ +#define ACPIIO_REQSLPSTATE _IOW('P', 4, int) + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 22 10:25: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 D907D16A468; Fri, 22 Jun 2007 10:25: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 95E3916A41F for ; Fri, 22 Jun 2007 10:25:05 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7D213C45D for ; Fri, 22 Jun 2007 10:25:05 +0000 (UTC) (envelope-from zhouzhouyi@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 l5MAP5Do016495 for ; Fri, 22 Jun 2007 10:25:05 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MAP5A7016487 for perforce@freebsd.org; Fri, 22 Jun 2007 10:25:05 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 22 Jun 2007 10:25:05 GMT Message-Id: <200706221025.l5MAP5A7016487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 10:25:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=122140 Change 122140 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/22 10:24:52 mactest.c is modified from tools/regression/fstest/fstest.c is support logging of mactestpipe records Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tools/regression/mactest/mactest.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 22 12:28: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 7A36516A474; Fri, 22 Jun 2007 12:28: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 23F7516A46B for ; Fri, 22 Jun 2007 12:28:26 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from ercist.iscas.ac.cn (ercist.iscas.ac.cn [124.16.138.3]) by mx1.freebsd.org (Postfix) with SMTP id 2D2F213C457 for ; Fri, 22 Jun 2007 12:28:23 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: (qmail 66912 invoked by uid 98); 22 Jun 2007 11:59:20 -0000 Received: from 124.16.138.62 by ercist.iscas.ac.cn (envelope-from , uid 89) with qmail-scanner-1.25 (spamassassin: 3.1.0. Clear:RC:1(124.16.138.62):SA:0(0.0/10.0):. Processed in 1.145813 secs); 22 Jun 2007 11:59:20 -0000 X-Spam-Status: No, hits=0.0 required=10.0 X-Qmail-Scanner-Mail-From: zhouzhouyi@FreeBSD.org via ercist.iscas.ac.cn X-Qmail-Scanner: 1.25 (Clear:RC:1(124.16.138.62):SA:0(0.0/10.0):. Processed in 1.145813 secs) Received: from unknown (HELO zzy.H.qngy.gscas) (zhouzhouyi@ercist.iscas.ac.cn@124.16.138.62) by 0 with SMTP; 22 Jun 2007 11:59:18 -0000 Date: Fri, 22 Jun 2007 19:54:38 +0800 From: zhouyi zhou To: rwatson@FreeBSD.org Message-Id: <20070622195438.0139156e.zhouzhouyi@FreeBSD.org> In-Reply-To: <200706221025.l5MAP5A7016487@repoman.freebsd.org> References: <200706221025.l5MAP5A7016487@repoman.freebsd.org> Organization: Institute of Software X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-portbld-freebsd5.4) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 122140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 12:28:26 -0000 Sorry for the wrong design, use pipe to direct the result into userspace is foolish, because the slow reader will soon make the queue on the pipe full I will redesign this mechanism follow the line of audit. Zhouyi Zhou From owner-p4-projects@FreeBSD.ORG Fri Jun 22 13:25: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 AC9FD16A46C; Fri, 22 Jun 2007 13:25: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 1F3E916A41F for ; Fri, 22 Jun 2007 13:25:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 11A0F13C4AE for ; Fri, 22 Jun 2007 13:25:56 +0000 (UTC) (envelope-from gabor@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 l5MDPtn5064404 for ; Fri, 22 Jun 2007 13:25:55 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MDPttK064400 for perforce@freebsd.org; Fri, 22 Jun 2007 13:25:55 GMT (envelope-from gabor@freebsd.org) Date: Fri, 22 Jun 2007 13:25:55 GMT Message-Id: <200706221325.l5MDPttK064400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 13:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=122144 Change 122144 by gabor@gabor_server on 2007/06/22 13:25:32 - Fix typo - Nullmount PORTSDIR if not available in the jail - Mount devfs if not available in the jail Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#21 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#21 (text+ko) ==== @@ -1090,11 +1090,18 @@ .include "${PORTSDIR}/Mk/bsd.commands.mk" # -# DESTDIR section to start a chrooted process if incoked with DESTDIR set +# DESTDIR section to start a chrooted process if invoked with DESTDIR set # .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) .BEGIN: + ${MKDIR} ${DESTDIR}${PORTSDIR} +.if !exists(${DESTDIR}${PORTSDIR}/Makefile) + ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR} +.endif +.if !exists (${DESTDIR}/dev/null) + ${MOUNT} -t devfs devfs ${DESTDIR}/dev +.endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" .else From owner-p4-projects@FreeBSD.ORG Fri Jun 22 13:53: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 7A67816A475; Fri, 22 Jun 2007 13:53: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 4A04416A473 for ; Fri, 22 Jun 2007 13:53:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2427413C483 for ; Fri, 22 Jun 2007 13:53:32 +0000 (UTC) (envelope-from gabor@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 l5MDrWY6069734 for ; Fri, 22 Jun 2007 13:53:32 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MDrVuX069730 for perforce@freebsd.org; Fri, 22 Jun 2007 13:53:31 GMT (envelope-from gabor@freebsd.org) Date: Fri, 22 Jun 2007 13:53:31 GMT Message-Id: <200706221353.l5MDrVuX069730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 13:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=122147 Change 122147 by gabor@gabor_server on 2007/06/22 13:53:07 - Add MOUNT here Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#2 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#2 (text+ko) ==== @@ -35,6 +35,7 @@ LS?= /bin/ls MKDIR?= /bin/mkdir -p MKTEMP?= /usr/bin/mktemp +MOUNT?= /sbin/mount MV?= /bin/mv OBJCOPY?= /usr/bin/objcopy OBJDUMP?= /usr/bin/objdump From owner-p4-projects@FreeBSD.ORG Fri Jun 22 13:58: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 1828716A421; Fri, 22 Jun 2007 13:58: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 9771016A476 for ; Fri, 22 Jun 2007 13:58:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4F2E113C45B for ; Fri, 22 Jun 2007 13:58:40 +0000 (UTC) (envelope-from gabor@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 l5MDwe8x070472 for ; Fri, 22 Jun 2007 13:58:40 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MDweMS070469 for perforce@freebsd.org; Fri, 22 Jun 2007 13:58:40 GMT (envelope-from gabor@freebsd.org) Date: Fri, 22 Jun 2007 13:58:40 GMT Message-Id: <200706221358.l5MDweMS070469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 13:58:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=122148 Change 122148 by gabor@gabor_server on 2007/06/22 13:58:32 - Add DESTDIR_ENV wo hook commonly overridden variable into the chrooted environment. In this way we can set PREFIX, LOCALBASE, etc. from outside. - Move some default variable assignments, this is needed for the former change. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#22 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#22 (text+ko) ==== @@ -1089,11 +1089,48 @@ .include "${PORTSDIR}/Mk/bsd.commands.mk" +# These need to be absolute since we don't know how deep in the ports +# tree we are and thus can't go relative. They can, of course, be overridden +# by individual Makefiles or local system make configuration. +PORTSDIR?= /usr/ports +LOCALBASE?= /usr/local +X11BASE?= ${LOCALBASE} +LINUXBASE?= /compat/linux +DISTDIR?= ${PORTSDIR}/distfiles +_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +INDEXDIR?= ${PORTSDIR} +INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} + +PACKAGES?= ${PORTSDIR}/packages +TEMPLATES?= ${PORTSDIR}/Templates + +.if defined(USE_X_PREFIX) +PREFIX?= ${X11BASE} +.elif defined(USE_LINUX_PREFIX) +PREFIX?= ${LINUXBASE} +NO_MTREE= yes +.else +PREFIX?= ${LOCALBASE} +.endif + +# where pkg_add records its dirty deeds. +PKG_DBDIR?= /var/db/pkg + +# where 'make config' records user configuration options +PORT_DBDIR?= /var/db/ports + # # DESTDIR section to start a chrooted process if invoked with DESTDIR set # .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) + +DESTDIR_ENV= LOCALBASE=${LOCALBASE} LINUXBASE=${LINUXBASE} \ + X11BASE=${X11BASE} PREFIX=${PREFIX} PORTSDIR=${PORTSDIR} \ + DISTDIR=${DISTDIR} PACKAGES=${PACKAGES} TEMPLATES=${TEMPLATES} \ + WRKDIRPREFIX=${WRKDIRPREFIX} PKG_DBDIR=${PKG_DBDIR} \ + PORT_DBDIR=${PORT_DBDIR} DESTDIR= CHROOTED=YES + .BEGIN: ${MKDIR} ${DESTDIR}${PORTSDIR} .if !exists(${DESTDIR}${PORTSDIR}/Makefile) @@ -1103,7 +1140,7 @@ ${MOUNT} -t devfs devfs ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})" .else # Look for ${WRKSRC}/.../*.orig files, and (re-)create @@ -1229,9 +1266,6 @@ USE_SUBMAKE= yes .endif -# where 'make config' records user configuration options -PORT_DBDIR?= /var/db/ports - LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 @@ -1321,18 +1355,6 @@ PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} -# These need to be absolute since we don't know how deep in the ports -# tree we are and thus can't go relative. They can, of course, be overridden -# by individual Makefiles or local system make configuration. -PORTSDIR?= /usr/ports -LOCALBASE?= /usr/local -X11BASE?= ${LOCALBASE} -LINUXBASE?= /compat/linux -DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} -INDEXDIR?= ${PORTSDIR} -INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} - DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME} @@ -1373,8 +1395,6 @@ .else EXTRACT_SUFX?= .tar.gz .endif -PACKAGES?= ${PORTSDIR}/packages -TEMPLATES?= ${PORTSDIR}/Templates PATCHDIR?= ${MASTERDIR}/files FILESDIR?= ${MASTERDIR}/files @@ -1390,14 +1410,6 @@ .if defined(USE_X_PREFIX) USE_XLIB= yes .endif -.if defined(USE_X_PREFIX) -PREFIX?= ${X11BASE} -.elif defined(USE_LINUX_PREFIX) -PREFIX?= ${LINUXBASE} -NO_MTREE= yes -.else -PREFIX?= ${LOCALBASE} -.endif .if defined(USE_LINUX_PREFIX) LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE} @@ -2337,8 +2349,6 @@ .else PKG_SUFX?= .tbz .endif -# where pkg_add records its dirty deeds. -PKG_DBDIR?= /var/db/pkg MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp From owner-p4-projects@FreeBSD.ORG Fri Jun 22 14:05: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 5D0A716A468; Fri, 22 Jun 2007 14:05: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 0F74016A400 for ; Fri, 22 Jun 2007 14:05:50 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 01DC013C483 for ; Fri, 22 Jun 2007 14:05:50 +0000 (UTC) (envelope-from gabor@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 l5ME5nTo073408 for ; Fri, 22 Jun 2007 14:05:49 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5ME5nXb073404 for perforce@freebsd.org; Fri, 22 Jun 2007 14:05:49 GMT (envelope-from gabor@freebsd.org) Date: Fri, 22 Jun 2007 14:05:49 GMT Message-Id: <200706221405.l5ME5nXb073404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 14:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=122149 Change 122149 by gabor@gabor_server on 2007/06/22 14:05:27 - Add two messages to note if we mount the ports tree / devfs into DESTDIR Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#23 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#23 (text+ko) ==== @@ -1134,9 +1134,11 @@ .BEGIN: ${MKDIR} ${DESTDIR}${PORTSDIR} .if !exists(${DESTDIR}${PORTSDIR}/Makefile) + ${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \ ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR} .endif .if !exists (${DESTDIR}/dev/null) + ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ ${MOUNT} -t devfs devfs ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ From owner-p4-projects@FreeBSD.ORG Fri Jun 22 15:21: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 EF06C16A46E; Fri, 22 Jun 2007 15:21: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 9CD1116A421 for ; Fri, 22 Jun 2007 15:21:25 +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 900A713C480 for ; Fri, 22 Jun 2007 15:21:25 +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 l5MFLPOX011484 for ; Fri, 22 Jun 2007 15:21:25 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MFLP57011468 for perforce@freebsd.org; Fri, 22 Jun 2007 15:21:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 22 Jun 2007 15:21:25 GMT Message-Id: <200706221521.l5MFLP57011468@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 122153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 15:21:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=122153 Change 122153 by rpaulo@rpaulo_epsilon on 2007/06/22 15:20:34 Add skeleton driver for the Apple Internal touchpad found on MacBooks. Don't hold your breath because nothing works yet. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#7 edit .. //depot/projects/soc2007/rpaulo-macbook/conf/files#14 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#1 add .. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#9 edit .. //depot/projects/soc2007/rpaulo-macbook/modules/atp/Makefile#1 add Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#7 (text+ko) ==== @@ -2410,6 +2410,8 @@ device umct # USB modem support device umodem +# USB Apple Internal Touchpad +device atp # USB mouse device ums # Diamond Rio 500 MP3 player ==== //depot/projects/soc2007/rpaulo-macbook/conf/files#14 (text+ko) ==== @@ -1069,6 +1069,7 @@ dev/ubsec/ubsec.c optional ubsec # # USB support +dev/usb/atp.c optional atp dev/usb/ehci.c optional ehci dev/usb/ehci_pci.c optional ehci pci dev/usb/hid.c optional usb ==== //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#9 (text+ko) ==== @@ -31,6 +31,7 @@ ath_rate_amrr \ ath_rate_onoe \ ${_ath_rate_sample} \ + atp \ aue \ ${_auxio} \ ${_awi} \ From owner-p4-projects@FreeBSD.ORG Fri Jun 22 15:54: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 0A84816A41F; Fri, 22 Jun 2007 15:54: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 B9A6E16A468 for ; Fri, 22 Jun 2007 15:54:08 +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 AB14613C465 for ; Fri, 22 Jun 2007 15:54:08 +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 l5MFs8ce019035 for ; Fri, 22 Jun 2007 15:54:08 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MFs6mQ019032 for perforce@freebsd.org; Fri, 22 Jun 2007 15:54:06 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 22 Jun 2007 15:54:06 GMT Message-Id: <200706221554.l5MFs6mQ019032@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 122156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 15:54:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=122156 Change 122156 by rpaulo@rpaulo_epsilon on 2007/06/22 15:53:07 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.sun4v#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpiio.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahb.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ehci.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/hid.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_aue.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axe.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rue.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rum.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_udav.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ohci.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uark.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ubsa.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ubser.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucycom.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/udbp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufm.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufoma.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uftdi.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhid.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhub.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uipaq.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ulpt.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umass.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umct.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uplcom.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/urio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_mem.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_port.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_subr.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdi_util.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uscanner.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uvisor.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uvscom.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_conf.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_cache.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/slhci/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/bpf.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pci.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/priv.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#6 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.90 2007/06/16 21:48:48 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.91 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -81,7 +81,6 @@ sparc64/isa/isa_dma.c optional isa sparc64/isa/ofw_isa.c optional ebus | isa sparc64/pci/apb.c optional pci -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/rpaulo-macbook/conf/files.sun4v#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.9 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.10 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -47,7 +47,6 @@ sparc64/sparc64/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci sun4v/sun4v/trap_trace.S optional trap_tracing -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.239 2007/06/15 18:02:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); #include "opt_acpi.h" #include @@ -136,6 +136,7 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); @@ -410,6 +411,7 @@ sc = device_get_softc(dev); sc->acpi_dev = dev; + callout_init(&sc->susp_force_to, TRUE); error = ENXIO; @@ -592,7 +594,7 @@ /* Pick the first valid sleep state for the sleep button default. */ sc->acpi_sleep_button_sx = ACPI_S_STATES_MAX + 1; - for (state = ACPI_STATE_S1; state < ACPI_STATE_S5; state++) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) { sc->acpi_sleep_button_sx = state; break; @@ -2118,7 +2120,151 @@ return (acpi_SetInteger(ACPI_ROOT_OBJECT, "_PIC", model)); } +/* + * DEPRECATED. This interface has serious deficiencies and will be + * removed. + * + * Immediately enter the sleep state. In the old model, acpiconf(8) ran + * rc.suspend and rc.resume so we don't have to notify devd(8) to do this. + */ +ACPI_STATUS +acpi_SetSleepState(struct acpi_softc *sc, int state) +{ + static int once; + + if (!once) { + printf( +"warning: acpi_SetSleepState() deprecated, need to update your software\n"); + once = 1; + } + return (acpi_EnterSleepState(sc, state)); +} + static void +acpi_sleep_force(void *arg) +{ + struct acpi_softc *sc; + + printf("acpi: suspend request timed out, forcing sleep now\n"); + sc = arg; + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + printf("acpi: force sleep state S%d failed\n", sc->acpi_next_sstate); +} + +/* + * Request that the system enter the given suspend state. All /dev/apm + * devices and devd(8) will be notified. Userland then has a chance to + * save state and acknowledge the request. The system sleeps once all + * acks are in. + */ +int +acpi_ReqSleepState(struct acpi_softc *sc, int state) +{ + struct apm_clone_data *clone; + + if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5) + return (EINVAL); + + /* S5 (soft-off) should be entered directly with no waiting. */ + if (state == ACPI_STATE_S5) { + if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state))) + return (0); + else + return (ENXIO); + } + + /* If a suspend request is already in progress, just return. */ + ACPI_LOCK(acpi); + if (sc->acpi_next_sstate != 0) { + ACPI_UNLOCK(acpi); + return (0); + } + + /* Record the pending state and notify all apm devices. */ + sc->acpi_next_sstate = state; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + clone->notify_status = APM_EV_NONE; + if ((clone->flags & ACPI_EVF_DEVD) == 0) { + selwakeuppri(&clone->sel_read, PZERO); + KNOTE_UNLOCKED(&clone->sel_read.si_note, 0); + } + } + + /* Now notify devd(8) also. */ + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + + /* + * Set a timeout to fire if userland doesn't ack the suspend request + * in time. This way we still eventually go to sleep if we were + * overheating or running low on battery, even if userland is hung. + * We cancel this timeout once all userland acks are in or the + * suspend request is aborted. + */ + callout_reset(&sc->susp_force_to, 10 * hz, acpi_sleep_force, sc); + ACPI_UNLOCK(acpi); + return (0); +} + +/* + * Acknowledge (or reject) a pending sleep state. The caller has + * prepared for suspend and is now ready for it to proceed. If the + * error argument is non-zero, it indicates suspend should be cancelled + * and gives an errno value describing why. Once all votes are in, + * we suspend the system. + */ +int +acpi_AckSleepState(struct apm_clone_data *clone, int error) +{ + struct acpi_softc *sc; + int ret, sleeping; + + /* If no pending sleep state, return an error. */ + ACPI_LOCK(acpi); + sc = clone->acpi_sc; + if (sc->acpi_next_sstate == 0) { + ACPI_UNLOCK(acpi); + return (ENXIO); + } + + /* Caller wants to abort suspend process. */ + if (error) { + sc->acpi_next_sstate = 0; + callout_stop(&sc->susp_force_to); + printf("acpi: listener on %s cancelled the pending suspend\n", + devtoname(clone->cdev)); + ACPI_UNLOCK(acpi); + return (0); + } + + /* + * Mark this device as acking the suspend request. Then, walk through + * all devices, seeing if they agree yet. We only count devices that + * are writable since read-only devices couldn't ack the request. + */ + clone->notify_status = APM_EV_ACKED; + sleeping = TRUE; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + if ((clone->flags & ACPI_EVF_WRITE) != 0 && + clone->notify_status != APM_EV_ACKED) { + sleeping = FALSE; + break; + } + } + + /* If all devices have voted "yes", we will suspend now. */ + if (sleeping) + callout_stop(&sc->susp_force_to); + ACPI_UNLOCK(acpi); + ret = 0; + if (sleeping) { + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + ret = ENODEV; + } + + return (ret); +} + +static void acpi_sleep_enable(void *arg) { @@ -2134,12 +2280,12 @@ }; /* - * Set the system sleep state + * Enter the desired system sleep state. * * Currently we support S1-S5 but S4 is only S4BIOS */ -ACPI_STATUS -acpi_SetSleepState(struct acpi_softc *sc, int state) +static ACPI_STATUS +acpi_EnterSleepState(struct acpi_softc *sc, int state) { ACPI_STATUS status; UINT8 TypeA; @@ -2148,14 +2294,13 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + /* Re-entry once we're suspending is not allowed. */ status = AE_OK; ACPI_LOCK(acpi); if (sc->acpi_sleep_disabled) { - if (sc->acpi_sstate != ACPI_STATE_S0) - status = AE_ERROR; ACPI_UNLOCK(acpi); printf("acpi: suspend request ignored (not ready yet)\n"); - return (status); + return (AE_ERROR); } sc->acpi_sleep_disabled = 1; ACPI_UNLOCK(acpi); @@ -2251,6 +2396,7 @@ * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ + sc->acpi_next_sstate = 0; if (slp_state >= ACPI_SS_GPE_SET) { acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; @@ -2264,7 +2410,10 @@ /* Allow another sleep request after a while. */ if (state != ACPI_STATE_S5) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME); + + /* Run /etc/rc.resume after we are back. */ + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); mtx_unlock(&Giant); return_ACPI_STATUS (status); @@ -2574,11 +2723,15 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { + int ret; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) - acpi_SetSleepState((struct acpi_softc *)arg, state); + /* Request that the system prepare to enter the given suspend state. */ + ret = acpi_ReqSleepState((struct acpi_softc *)arg, state); + if (ret != 0) + printf("acpi: request to enter state S%d failed (err %d)\n", + state, ret); return_VOID; } @@ -2840,7 +2993,20 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_SETSLPSTATE: + case ACPIIO_REQSLPSTATE: + state = *(int *)addr; + if (state != ACPI_STATE_S5) + error = acpi_ReqSleepState(sc, state); + else { + printf("power off via acpi ioctl not supported\n"); + error = ENXIO; + } + break; + case ACPIIO_ACKSLPSTATE: + error = *(int *)addr; + error = acpi_AckSleepState(sc->acpi_clone, error); + break; + case ACPIIO_SETSLPSTATE: /* DEPRECATED */ error = EINVAL; state = *(int *)addr; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -3171,7 +3337,8 @@ goto out; } - acpi_SetSleepState(sc, acpi_state); + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + error = ENXIO; break; default: error = EINVAL; ==== //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpiio.h#2 (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/acpica/acpiio.h,v 1.16 2005/10/23 00:16:41 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIIO_H_ @@ -33,7 +33,13 @@ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) +#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) /* DEPRECATED */ + +/* Request S1-5 sleep state. User is notified and then sleep proceeds. */ +#define ACPIIO_REQSLPSTATE _IOW('P', 4, int) + +/* Allow suspend to continue (0) or abort it (errno). */ +#define ACPIIO_ACKSLPSTATE _IOW('P', 5, int) struct acpi_battinfo { int cap; /* percent */ ==== //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpivar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.106 2007/06/15 18:02:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.107 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -39,12 +39,14 @@ #include #include #include +#include #include #include #include #include +struct apm_clone_data; struct acpi_softc { device_t acpi_dev; struct cdev *acpi_dev_t; @@ -76,6 +78,11 @@ bus_dmamap_t acpi_wakemap; vm_offset_t acpi_wakeaddr; vm_paddr_t acpi_wakephys; + + int acpi_next_sstate; /* Next suspend Sx state. */ + struct apm_clone_data *acpi_clone; /* Pseudo-dev for devd(8). */ + STAILQ_HEAD(,apm_clone_data) apm_cdevs; /* All apm/apmctl/acpi cdevs. */ + struct callout susp_force_to; /* Force suspend if no acks. */ }; struct acpi_device { @@ -89,6 +96,22 @@ struct resource_list ad_rl; }; +/* Track device (/dev/{apm,apmctl} and /dev/acpi) notification status. */ +struct apm_clone_data { + STAILQ_ENTRY(apm_clone_data) entries; + struct cdev *cdev; + int flags; +#define ACPI_EVF_NONE 0 /* /dev/apm semantics */ +#define ACPI_EVF_DEVD 1 /* /dev/acpi is handled via devd(8) */ +#define ACPI_EVF_WRITE 2 /* Device instance is opened writable. */ + int notify_status; +#define APM_EV_NONE 0 /* Device not yet aware of pending sleep. */ +#define APM_EV_NOTIFIED 1 /* Device saw next sleep state. */ +#define APM_EV_ACKED 2 /* Device agreed sleep can occur. */ + struct acpi_softc *acpi_sc; + struct selinfo sel_read; +}; + #define ACPI_PRW_MAX_POWERRES 8 struct acpi_prw_data { @@ -304,6 +327,8 @@ ACPI_RESOURCE *res); ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); ACPI_STATUS acpi_SetIntrModel(int model); +int acpi_ReqSleepState(struct acpi_softc *sc, int state); +int acpi_AckSleepState(struct apm_clone_data *clone, int error); ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); int acpi_wake_init(device_t dev, int type); int acpi_wake_set_enable(device_t dev, int enable); ==== //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahb.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: src/sys/dev/ahb/ahb.c,v 1.42 2007/06/17 05:55:46 scottl Exp $ + * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.43 2007/06/17 15:21:09 scottl Exp $ */ #include @@ -409,7 +409,7 @@ */ ahb = malloc(sizeof(struct ahb_softc), M_DEVBUF, M_NOWAIT | M_ZERO); if (!ahb) { - printf("ahb%ld: cannot malloc!\n", unit); + device_printf(dev, "cannot malloc!\n"); return (NULL); } SLIST_INIT(&ahb->free_ecbs); ==== //depot/projects/soc2007/rpaulo-macbook/dev/if_ndis/if_ndis_usb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.8 2007/06/12 15:37:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.9 2007/06/18 22:24:32 imp Exp $"); #include #include @@ -69,10 +69,9 @@ MODULE_DEPEND(ndis, usb, 1, 1, 1); -static int ndisusb_match (device_t); -static int ndisusb_attach (device_t); -static struct resource_list *ndis_get_resource_list - (device_t, device_t); +static device_probe_t ndisusb_match; +static device_attach_t ndisusb_attach; +static bus_get_resource_list_t ndis_get_resource_list; extern int ndisdrv_modevent (module_t, int, void *); extern int ndis_attach (device_t); @@ -108,22 +107,25 @@ DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); -USB_MATCH(ndisusb) +static int +ndisusb_match(device_t self) { - USB_MATCH_START(ndisusb, uaa); + struct usb_attach_arg *uaa = device_get_ivars(self); if (windrv_lookup(0, "USB Bus") == NULL) - return(UMATCH_NONE); + return (UMATCH_NONE); if (uaa->iface != NULL) - return(UMATCH_NONE); + return (UMATCH_NONE); - return(UMATCH_NONE); + return (UMATCH_NONE); } -USB_ATTACH(ndisusb) +static int +ndisusb_attach(device_t self) { - USB_ATTACH_START(ndisusb, dummy, uaa); + struct ndisusb_softc *dummy = device_get_softc(self); + struct usb_attach_arg *uaa = device_get_ivars(self); struct ndis_softc *sc; driver_object *drv; @@ -146,9 +148,7 @@ } static struct resource_list * -ndis_get_resource_list(dev, child) - device_t dev; - device_t child; +ndis_get_resource_list(device_t dev, device_t child) { struct ndis_softc *sc; ==== //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt_cam.c#5 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.59 2007/06/17 05:55:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.60 2007/06/18 18:28:43 scottl Exp $"); #include #include @@ -323,7 +323,7 @@ /* * Create the device queue for our SIM(s). */ - devq = cam_simq_alloc(1); + devq = cam_simq_alloc(maxq); if (devq == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIMQ!\n"); error = ENOMEM; @@ -334,7 +334,7 @@ * Construct our SIM entry. */ mpt->sim = - mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, 1, devq); + mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, maxq, devq); if (mpt->sim == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIM!\n"); cam_simq_free(devq); @@ -374,7 +374,7 @@ * Create a "bus" to export all hidden disks to CAM. */ mpt->phydisk_sim = - mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, 1, devq); + mpt_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, 1, maxq, devq); if (mpt->phydisk_sim == NULL) { mpt_prt(mpt, "Unable to allocate Physical Disk CAM SIM!\n"); error = ENOMEM; ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac.c#7 (text+ko) ==== @@ -80,10 +80,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20070611_0045" +#define HDA_DRV_TEST_REV "20070619_0045" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.41 2007/06/14 11:13:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.42 2007/06/18 22:39:27 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -257,6 +257,7 @@ /* Uniwill ? */ #define UNIWILL_VENDORID 0x1584 #define UNIWILL_9075_SUBVENDOR HDA_MODEL_CONSTRUCT(UNIWILL, 0x9075) +#define UNIWILL_9080_SUBVENDOR HDA_MODEL_CONSTRUCT(UNIWILL, 0x9080) /* Misc constants.. */ @@ -635,6 +636,8 @@ 0, 0, -1, 20, { 21, -1 }, -1 }, { ACER_3681WXM_SUBVENDOR, HDA_CODEC_ALC883, HDAC_HP_SWITCH_CTL, 0, 0, -1, 20, { 21, -1 }, -1 }, + { UNIWILL_9080_SUBVENDOR, HDA_CODEC_ALC883, HDAC_HP_SWITCH_CTL, + 0, 0, -1, 20, { 21, -1 }, -1 }, { MSI_MS1034_SUBVENDOR, HDA_CODEC_ALC883, HDAC_HP_SWITCH_CTL, 0, 0, -1, 20, { 27, -1 }, -1 }, /* ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.43 2007/06/16 03:37:28 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.44 2007/06/17 15:53:11 ariff Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -117,7 +117,7 @@ /* initialize unit numbering */ snd_unit_init(); if (snd_unit < 0 || snd_unit > PCMMAXUNIT) - snd_unit = 0; + snd_unit = -1; if (snd_maxautovchans < 0 || snd_maxautovchans > SND_MAXVCHANS) ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.c#4 (text+ko) ==== @@ -35,17 +35,22 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.116 2007/06/16 03:37:28 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.119 2007/06/17 19:02:05 ariff Exp $"); devclass_t pcm_devclass; int pcm_veto_load = 1; #ifdef USING_DEVFS -int snd_unit = 0; +int snd_unit = -1; TUNABLE_INT("hw.snd.default_unit", &snd_unit); #endif +static int snd_unit_auto = 0; +TUNABLE_INT("hw.snd.default_auto", &snd_unit_auto); +SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RW, + &snd_unit_auto, 0, "assign default unit to a newly attached device"); + int snd_maxautovchans = 16; /* XXX: a tunable implies that we may need more than one sound channel before the system can change a sysctl (/etc/sysctl.conf), do we really need @@ -801,6 +806,9 @@ pcm_unlock(d); + if (snd_unit < 0 || snd_unit_auto != 0) + snd_unit = device_get_unit(dev); + return (0); } @@ -1199,8 +1207,10 @@ if (snd_unit == device_get_unit(dev)) { /* - * Reassign default unit to the next available dev. + * Reassign default unit to the next available dev, but + * first, reset snd_unit to something ridiculous. */ + snd_unit = -1; for (i = 0; pcm_devclass != NULL && i < devclass_get_maxunit(pcm_devclass); i++) { if (device_get_unit(dev) == i) ==== //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.34 2007/06/16 03:37:28 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.36 2007/06/20 05:11:37 imp Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -98,6 +98,7 @@ #include "feeder_if.h" #endif +#include #include #include #include @@ -117,8 +118,8 @@ #endif /* #define UAUDIO_MULTIPLE_ENDPOINTS */ #ifdef USB_DEBUG -#define DPRINTF(x) do { if (uaudiodebug) logprintf x; } while (0) -#define DPRINTFN(n,x) do { if (uaudiodebug>(n)) logprintf x; } while (0) +#define DPRINTF(x) do { if (uaudiodebug) printf x; } while (0) +#define DPRINTFN(n,x) do { if (uaudiodebug>(n)) printf x; } while (0) int uaudiodebug = 0; #if defined(__FreeBSD__) SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); @@ -913,17 +914,17 @@ int cc, i, first; cc = UGETW(cl->wChannelConfig); - logprintf("cluster: bNrChannels=%u wChannelConfig=0x%.4x", + printf("cluster: bNrChannels=%u wChannelConfig=0x%.4x", cl->bNrChannels, cc); first = TRUE; for (i = 0; cc != 0; i++) { if (cc & 1) { - logprintf("%c%s", first ? '<' : ',', channel_names[i]); + printf("%c%s", first ? '<' : ',', channel_names[i]); first = FALSE; } cc = cc >> 1; } - logprintf("> iChannelNames=%u", cl->iChannelNames); + printf("> iChannelNames=%u", cl->iChannelNames); } #endif @@ -2353,79 +2354,79 @@ if (iot[i].d.desc == NULL) continue; - logprintf("id %d:\t", i); + printf("id %d:\t", i); switch (iot[i].d.desc->bDescriptorSubtype) { case UDESCSUB_AC_INPUT: - logprintf("AC_INPUT type=%s\n", uaudio_get_terminal_name + printf("AC_INPUT type=%s\n", uaudio_get_terminal_name (UGETW(iot[i].d.it->wTerminalType))); - logprintf("\t"); + printf("\t"); cluster = uaudio_get_cluster(i, iot); uaudio_dump_cluster(&cluster); - logprintf("\n"); + printf("\n"); break; case UDESCSUB_AC_OUTPUT: - logprintf("AC_OUTPUT type=%s ", uaudio_get_terminal_name + printf("AC_OUTPUT type=%s ", uaudio_get_terminal_name (UGETW(iot[i].d.ot->wTerminalType))); - logprintf("src=%d\n", iot[i].d.ot->bSourceId); + printf("src=%d\n", iot[i].d.ot->bSourceId); break; case UDESCSUB_AC_MIXER: - logprintf("AC_MIXER src="); + printf("AC_MIXER src="); for (j = 0; j < iot[i].d.mu->bNrInPins; j++) - logprintf("%d ", iot[i].d.mu->baSourceId[j]); - logprintf("\n\t"); + printf("%d ", iot[i].d.mu->baSourceId[j]); + printf("\n\t"); cluster = uaudio_get_cluster(i, iot); uaudio_dump_cluster(&cluster); - logprintf("\n"); + printf("\n"); break; case UDESCSUB_AC_SELECTOR: - logprintf("AC_SELECTOR src="); + printf("AC_SELECTOR src="); for (j = 0; j < iot[i].d.su->bNrInPins; j++) - logprintf("%d ", iot[i].d.su->baSourceId[j]); - logprintf("\n"); + printf("%d ", iot[i].d.su->baSourceId[j]); + printf("\n"); break; case UDESCSUB_AC_FEATURE: - logprintf("AC_FEATURE src=%d\n", iot[i].d.fu->bSourceId); + printf("AC_FEATURE src=%d\n", iot[i].d.fu->bSourceId); break; case UDESCSUB_AC_PROCESSING: - logprintf("AC_PROCESSING src="); + printf("AC_PROCESSING src="); for (j = 0; j < iot[i].d.pu->bNrInPins; j++) - logprintf("%d ", iot[i].d.pu->baSourceId[j]); - logprintf("\n\t"); + printf("%d ", iot[i].d.pu->baSourceId[j]); + printf("\n\t"); cluster = uaudio_get_cluster(i, iot); uaudio_dump_cluster(&cluster); - logprintf("\n"); + printf("\n"); break; case UDESCSUB_AC_EXTENSION: - logprintf("AC_EXTENSION src="); + printf("AC_EXTENSION src="); for (j = 0; j < iot[i].d.eu->bNrInPins; j++) - logprintf("%d ", iot[i].d.eu->baSourceId[j]); - logprintf("\n\t"); + printf("%d ", iot[i].d.eu->baSourceId[j]); + printf("\n\t"); cluster = uaudio_get_cluster(i, iot); uaudio_dump_cluster(&cluster); - logprintf("\n"); + printf("\n"); break; default: - logprintf("unknown audio control (subtype=%d)\n", + printf("unknown audio control (subtype=%d)\n", iot[i].d.desc->bDescriptorSubtype); } for (j = 0; j < iot[i].inputs_size; j++) { int k; - logprintf("\tinput%d: ", j); + printf("\tinput%d: ", j); tml = iot[i].inputs[j]; if (tml == NULL) { - logprintf("NULL\n"); + printf("NULL\n"); continue; } for (k = 0; k < tml->size; k++) - logprintf("%s ", uaudio_get_terminal_name + printf("%s ", uaudio_get_terminal_name (tml->terminals[k])); - logprintf("\n"); + printf("\n"); } - logprintf("\toutput: "); + printf("\toutput: "); tml = iot[i].output; for (j = 0; j < tml->size; j++) - logprintf("%s ", uaudio_get_terminal_name(tml->terminals[j])); - logprintf("\n"); + printf("%s ", uaudio_get_terminal_name(tml->terminals[j])); + printf("\n"); } #endif ==== //depot/projects/soc2007/rpaulo-macbook/dev/syscons/scgfbrndr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.23 2005/09/28 14:54:07 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.24 2007/06/18 22:15:17 marius Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" @@ -105,12 +105,38 @@ #endif /* SC_NO_MODE_CHANGE */ #ifndef SC_NO_CUTPASTE - +#ifdef __sparc64__ +static u_char mouse_pointer[22 * 2] = { + 0x00, 0x00, /* ............ */ + 0x80, 0x00, /* *........... */ + 0xc0, 0x00, /* **.......... */ + 0xe0, 0x00, /* ***......... */ + 0xf0, 0x00, /* ****........ */ + 0xf8, 0x00, /* *****....... */ + 0xfc, 0x00, /* ******...... */ + 0xfe, 0x00, /* *******..... */ + 0xff, 0x00, /* ********.... */ + 0xff, 0x80, /* *********... */ + 0xfc, 0xc0, /* ******..**.. */ + 0xdc, 0x00, /* **.***...... */ + 0x8e, 0x00, /* *...***..... */ + 0x0e, 0x00, /* ....***..... */ + 0x07, 0x00, /* .....***.... */ + 0x04, 0x00, /* .....*...... */ + 0x00, 0x00, /* ............ */ + 0x00, 0x00, /* ............ */ + 0x00, 0x00, /* ............ */ + 0x00, 0x00, /* ............ */ + 0x00, 0x00, /* ............ */ + 0x00, 0x00 /* ............ */ +}; +#else static u_char mouse_pointer[16] = { 0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x68, 0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00 }; #endif +#endif static void gfb_nop(scr_stat *scp) @@ -317,6 +343,10 @@ static void gfb_mouse(scr_stat *scp, int x, int y, int on) { +#ifdef __sparc64__ + (*vidsw[scp->sc->adapter]->putm)(scp->sc->adp, x, y, + mouse_pointer, on ? 0xffffffff : 0x0, 22, 12); +#else int i, pos; if (on) { @@ -337,6 +367,7 @@ if (x < scp->ysize - 1) (*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 22 16:05: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 7A09016A46C; Fri, 22 Jun 2007 16:05: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 4AD8716A41F for ; Fri, 22 Jun 2007 16:05:23 +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 3D3BA13C44B for ; Fri, 22 Jun 2007 16:05:23 +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 l5MG5Nk9022628 for ; Fri, 22 Jun 2007 16:05:23 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MG5NOk022625 for perforce@freebsd.org; Fri, 22 Jun 2007 16:05:23 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 22 Jun 2007 16:05:23 GMT Message-Id: <200706221605.l5MG5NOk022625@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 122157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 16:05:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=122157 Change 122157 by rpaulo@rpaulo_epsilon on 2007/06/22 16:05:19 Adapt to bsdimp@ changes to the USB stack. This driver does not depend on usb_port.h. Add some comments. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#2 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#1 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#2 $ */ #include @@ -51,8 +51,8 @@ #include "usbdevs.h" #ifdef USB_DEBUG -#define DPRINTF(x) if (atpdebug) logprintf x -#define DPRINTFN(n,x) if (atpdebug>(n)) logprintf x +#define DPRINTF(x) if (atpdebug) printf x +#define DPRINTFN(n,x) if (atpdebug>(n)) printf x int atpdebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, atp, CTLFLAG_RW, 0, "USB atp"); SYSCTL_INT(_hw_usb_atp, OID_AUTO, debug, CTLFLAG_RW, @@ -64,12 +64,16 @@ +/* + * Device interface. + */ +static int atp_match(device_t); +static int atp_attach(device_t); +static int atp_detach(device_t); -struct atp_softc { - device_t sc_dev; - -}; - +/* + * char device interface. + */ static d_open_t atp_open; static d_close_t atp_close; static d_read_t atp_read; @@ -87,6 +91,33 @@ .d_name = "atp", }; +struct atp_softc { + device_t sc_dev; + +}; + +static device_method_t atp_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, atp_match), + DEVMETHOD(device_attach, atp_attach), + DEVMETHOD(device_detach, atp_detach), + + { 0, 0 } +}; + +static driver_t atp_driver = { + "atp", + atp_methods, + sizeof(struct atp_softc) +}; + +static devclass_t atp_devclass; + +DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, usbd_driver_load, 0); + +/* + * Products supported by this driver. + */ static struct atp_product { uint16_t vendor; uint16_t product; @@ -97,13 +128,10 @@ }; -USB_DECLARE_DRIVER(atp); - - static int atp_match(device_t self) { - USB_MATCH_START(atp, uaa); + struct usb_attach_arg *uaa = device_get_ivars(self); usb_interface_descriptor_t *id; int size, i; usbd_status err; @@ -189,4 +217,4 @@ return -1; } -DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, usbd_driver_load, 0); + From owner-p4-projects@FreeBSD.ORG Fri Jun 22 16:40:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 191D916A469; Fri, 22 Jun 2007 16:40: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 A903516A41F for ; Fri, 22 Jun 2007 16:40:07 +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 9B2B013C448 for ; Fri, 22 Jun 2007 16:40:07 +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 l5MGe7Dp032263 for ; Fri, 22 Jun 2007 16:40:07 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MGe7R0032260 for perforce@freebsd.org; Fri, 22 Jun 2007 16:40:07 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 22 Jun 2007 16:40:07 GMT Message-Id: <200706221640.l5MGe7R0032260@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 122160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 16:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122160 Change 122160 by zec@zec_tca51 on 2007/06/22 16:39:47 Fix a few bugs introduced by recent integrations from HEAD, i.e. remove a few variables from global namespace that have already been virtualized. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in.c#9 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#2 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#12 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#18 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#16 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in.c#9 (text+ko) ==== @@ -67,19 +67,20 @@ struct in_ifaddr *, struct sockaddr_in *, int); static void in_purgemaddrs(struct ifnet *); -static int subnetsarelocal = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, - &subnetsarelocal, 0, "Treat all subnets as directly connected"); -static int sameprefixcarponly = 0; -SYSCTL_INT(_net_inet_ip, OID_AUTO, same_prefix_carp_only, CTLFLAG_RW, - &sameprefixcarponly, 0, - "Refuse to create same prefixes on different interfaces"); - #ifndef VIMAGE +static int subnetsarelocal; +static int sameprefixcarponly; extern struct inpcbinfo ripcbinfo; extern struct inpcbinfo udbinfo; #endif +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local, + CTLFLAG_RW, subnetsarelocal, 0, + "Treat all subnets as directly connected"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, same_prefix_carp_only, + CTLFLAG_RW, sameprefixcarponly, 0, + "Refuse to create same prefixes on different interfaces"); + /* * Return 1 if an internet address is for a ``local'' host * (one to which we have a connection). If subnetsarelocal @@ -93,7 +94,7 @@ register u_long i = ntohl(in.s_addr); register struct in_ifaddr *ia; - if (subnetsarelocal) { + if (V_subnetsarelocal) { TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) if ((i & ia->ia_netmask) == ia->ia_net) return (1); @@ -843,7 +844,7 @@ * interface address, we are done here. */ if (ia->ia_flags & IFA_ROUTE) { - if (sameprefixcarponly && + if (V_sameprefixcarponly && target->ia_ifp->if_type != IFT_CARP && ia->ia_ifp->if_type != IFT_CARP) return (EEXIST); ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#2 (text+ko) ==== @@ -89,7 +89,9 @@ * ip_output() to send IGMP packets while holding the lock; this probably is * not quite desirable. */ +#ifndef VIMAGE struct in_multihead in_multihead; /* XXX BSS initialization */ +#endif struct mtx in_multi_mtx; MTX_SYSINIT(in_multi_mtx, &in_multi_mtx, "in_multi_mtx", MTX_DEF | MTX_RECURSE); @@ -314,6 +316,7 @@ struct in_multi * in_addmulti(struct in_addr *ap, struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct in_multi *inm; inm = NULL; @@ -375,7 +378,7 @@ ninm->inm_ifma = ifma; ninm->inm_refcount = 1; ifma->ifma_protospec = ninm; - LIST_INSERT_HEAD(&in_multihead, ninm, inm_link); + LIST_INSERT_HEAD(&V_in_multihead, ninm, inm_link); igmp_joingroup(ninm); ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#12 (text+ko) ==== @@ -103,7 +103,9 @@ #define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ #define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ +#ifndef VIMAGE static struct tcp_hostcache tcp_hostcache; +#endif static struct callout tcp_hc_callout; @@ -135,8 +137,8 @@ CTLFLAG_RW, tcp_hostcache.expire, 0, "Expire time of TCP hostcache entries"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, prune, CTLFLAG_RW, - &tcp_hostcache.prune, 0, "Time between purge runs"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, prune, + CTLFLAG_RW, tcp_hostcache.prune, 0, "Time between purge runs"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_hostcache, OID_AUTO, purge, CTLFLAG_RW, tcp_hostcache.purgeall, 0, @@ -179,7 +181,7 @@ V_tcp_hostcache.cache_limit = V_tcp_hostcache.hashsize * V_tcp_hostcache.bucket_limit; V_tcp_hostcache.expire = TCP_HOSTCACHE_EXPIRE; - tcp_hostcache.prune = TCP_HOSTCACHE_PRUNE; + V_tcp_hostcache.prune = TCP_HOSTCACHE_PRUNE; TUNABLE_INT_FETCH("net.inet.tcp.hostcache.hashsize", &V_tcp_hostcache.hashsize); @@ -227,7 +229,7 @@ if (curvnet == &vnet_0) { #endif callout_init(&tcp_hc_callout, CALLOUT_MPSAFE); - callout_reset(&tcp_hc_callout, tcp_hostcache.prune * hz, tcp_hc_purge, 0); + callout_reset(&tcp_hc_callout, V_tcp_hostcache.prune * hz, tcp_hc_purge, 0); #ifdef VIMAGE } #endif @@ -660,10 +662,15 @@ V_tcp_hostcache.hashbase[i].hch_length--; V_tcp_hostcache.cache_count--; } else - hc_entry->rmx_expire -= tcp_hostcache.prune; + hc_entry->rmx_expire -= V_tcp_hostcache.prune; } THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); } VNET_ITERLOOP_END(); - callout_reset(&tcp_hc_callout, tcp_hostcache.prune * hz, tcp_hc_purge, 0); + + /* XXX Marko - FIXME! */ + CURVNET_SET(&vnet_0); + INIT_VNET_INET(&vnet_0); + callout_reset(&tcp_hc_callout, V_tcp_hostcache.prune * hz, tcp_hc_purge, 0); + CURVNET_RESTORE(); } ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#18 (text+ko) ==== @@ -875,10 +875,9 @@ void tcp_drain(void) { - VNET_ITERLOOP_BEGIN(); - INIT_VNET_INET(vnet_iter); - if (do_tcpdrain) { + VNET_ITERLOOP_BEGIN(); + INIT_VNET_INET(vnet_iter); struct inpcb *inpb; struct tcpcb *tcpb; struct tseg_qent *te; @@ -910,9 +909,8 @@ INP_UNLOCK(inpb); } INP_INFO_RUNLOCK(&V_tcbinfo); + VNET_ITERLOOP_END(); } - - VNET_ITERLOOP_END(); } /* @@ -1453,10 +1451,12 @@ #define ISN_STATIC_INCREMENT 4096 #define ISN_RANDOM_INCREMENT (4096 - 1) +#ifndef VIMAGE static u_char isn_secret[32]; static int isn_last_reseed; static u_int32_t isn_offset, isn_offset_old; static MD5_CTX isn_ctx; +#endif tcp_seq tcp_new_isn(struct tcpcb *tp) @@ -1469,37 +1469,37 @@ ISN_LOCK(); /* Seed if this is the first use, reseed if requested. */ - if ((isn_last_reseed == 0) || ((V_tcp_isn_reseed_interval > 0) && - (((u_int)isn_last_reseed + (u_int)V_tcp_isn_reseed_interval*hz) + if ((V_isn_last_reseed == 0) || ((V_tcp_isn_reseed_interval > 0) && + (((u_int)V_isn_last_reseed + (u_int)V_tcp_isn_reseed_interval*hz) < (u_int)ticks))) { - read_random(&isn_secret, sizeof(isn_secret)); - isn_last_reseed = ticks; + read_random(&V_isn_secret, sizeof(V_isn_secret)); + V_isn_last_reseed = ticks; } /* Compute the md5 hash and return the ISN. */ - MD5Init(&isn_ctx); - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_fport, sizeof(u_short)); - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_lport, sizeof(u_short)); + MD5Init(&V_isn_ctx); + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_fport, sizeof(u_short)); + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_lport, sizeof(u_short)); #ifdef INET6 if ((tp->t_inpcb->inp_vflag & INP_IPV6) != 0) { - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->in6p_faddr, + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->in6p_faddr, sizeof(struct in6_addr)); - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->in6p_laddr, + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->in6p_laddr, sizeof(struct in6_addr)); } else #endif { - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_faddr, + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_faddr, sizeof(struct in_addr)); - MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_laddr, + MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_laddr, sizeof(struct in_addr)); } - MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); - MD5Final((u_char *) &md5_buffer, &isn_ctx); + MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret)); + MD5Final((u_char *) &md5_buffer, &V_isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - isn_offset += ISN_STATIC_INCREMENT + + V_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += isn_offset; + new_isn += V_isn_offset; ISN_UNLOCK(); return (new_isn); } @@ -1515,12 +1515,15 @@ u_int32_t projected_offset; ISN_LOCK(); - projected_offset = isn_offset_old + ISN_BYTES_PER_SECOND / 100; + VNET_ITERLOOP_BEGIN(); + INIT_VNET_INET(curvnet); + projected_offset = V_isn_offset_old + ISN_BYTES_PER_SECOND / 100; - if (projected_offset > isn_offset) - isn_offset = projected_offset; + if (projected_offset > V_isn_offset) + V_isn_offset = projected_offset; - isn_offset_old = isn_offset; + V_isn_offset_old = V_isn_offset; + VNET_ITERLOOP_END(); callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); ISN_UNLOCK(); } ==== //depot/projects/vimage/src/sys/netinet/vinet.h#16 (text+ko) ==== @@ -36,6 +36,7 @@ #ifdef VIMAGE #include #include +#include #include #include @@ -65,6 +66,8 @@ int _arp_maxtries; int _useloopback; int _arp_proxyall; + int _subnetsarelocal; + int _sameprefixcarponly; int _ipforwarding; int _ipfastforward_active; @@ -128,6 +131,12 @@ int _tcp_reass_maxqlen; int _tcp_reass_overflows; + u_char _isn_secret[32]; + int _isn_last_reseed; + u_int32_t _isn_offset; + u_int32_t _isn_offset_old; + MD5_CTX _isn_ctx; + struct inpcbhead _udb; struct inpcbinfo _udbinfo; struct udpstat _udpstat; @@ -191,6 +200,8 @@ #define V_arp_maxtries VNET_INET(arp_maxtries) #define V_useloopback VNET_INET(useloopback) #define V_arp_proxyall VNET_INET(arp_proxyall) +#define V_subnetsarelocal VNET_INET(subnetsarelocal) +#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) #define V_ipforwarding VNET_INET(ipforwarding) #define V_ipfastforward_active VNET_INET(ipfastforward_active) @@ -254,6 +265,12 @@ #define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) +#define V_isn_secret VNET_INET(isn_secret) +#define V_isn_last_reseed VNET_INET(isn_last_reseed) +#define V_isn_offset VNET_INET(isn_offset) +#define V_isn_offset_old VNET_INET(isn_offset_old) +#define V_isn_ctx VNET_INET(isn_ctx) + #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) #define V_udpstat VNET_INET(udpstat) From owner-p4-projects@FreeBSD.ORG Fri Jun 22 16:40:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C5F416A4E1; Fri, 22 Jun 2007 16:40: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 E2DD516A421 for ; Fri, 22 Jun 2007 16:40:07 +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 D69F613C465 for ; Fri, 22 Jun 2007 16:40:07 +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 l5MGe7A0032271 for ; Fri, 22 Jun 2007 16:40:07 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MGe7DT032266 for perforce@freebsd.org; Fri, 22 Jun 2007 16:40:07 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 22 Jun 2007 16:40:07 GMT Message-Id: <200706221640.l5MGe7DT032266@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 122161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 16:40:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122161 Change 122161 by rpaulo@rpaulo_epsilon on 2007/06/22 16:40:05 Add MODULE_DEPEND() on usb. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#3 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#2 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/usb/atp.c#3 $ */ #include @@ -113,6 +113,7 @@ static devclass_t atp_devclass; +MODULE_DEPEND(atp, usb, 1, 1, 1); DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, usbd_driver_load, 0); /* From owner-p4-projects@FreeBSD.ORG Fri Jun 22 18:57: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 E972216A469; Fri, 22 Jun 2007 18:57:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EAB216A41F for ; Fri, 22 Jun 2007 18:57:22 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7051513C48C for ; Fri, 22 Jun 2007 18:57:22 +0000 (UTC) (envelope-from peter@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 l5MIvMPq070660 for ; Fri, 22 Jun 2007 18:57:22 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MIv0W2070596 for perforce@freebsd.org; Fri, 22 Jun 2007 18:57:00 GMT (envelope-from peter@freebsd.org) Date: Fri, 22 Jun 2007 18:57:00 GMT Message-Id: <200706221857.l5MIv0W2070596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 18:57:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=122163 Change 122163 by peter@peter_daintree on 2007/06/22 18:56:00 IFC @122155 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#27 integrate .. //depot/projects/hammer/UPDATING#102 integrate .. //depot/projects/hammer/cddl/lib/Makefile#3 integrate .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/hammer/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/hammer/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/hammer/contrib/diff/ABOUT-NLS#1 branch .. //depot/projects/hammer/contrib/diff/AUTHORS#1 branch .. //depot/projects/hammer/contrib/diff/COPYING#2 integrate .. //depot/projects/hammer/contrib/diff/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/diff/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/diff/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/diff/Makefile.am#1 branch .. //depot/projects/hammer/contrib/diff/Makefile.in#2 delete .. //depot/projects/hammer/contrib/diff/NEWS#2 integrate .. //depot/projects/hammer/contrib/diff/README#2 integrate .. //depot/projects/hammer/contrib/diff/THANKS#1 branch .. //depot/projects/hammer/contrib/diff/TODO#1 branch .. //depot/projects/hammer/contrib/diff/analyze.c#2 delete .. //depot/projects/hammer/contrib/diff/bootstrap#1 branch .. //depot/projects/hammer/contrib/diff/cmpbuf.c#2 delete .. //depot/projects/hammer/contrib/diff/cmpbuf.h#2 delete .. //depot/projects/hammer/contrib/diff/config.h#2 integrate .. //depot/projects/hammer/contrib/diff/config.hin#2 delete .. //depot/projects/hammer/contrib/diff/configure#2 delete .. //depot/projects/hammer/contrib/diff/configure.in#2 delete .. //depot/projects/hammer/contrib/diff/context.c#2 delete .. //depot/projects/hammer/contrib/diff/diagmeet.note#2 delete .. //depot/projects/hammer/contrib/diff/diff.c#3 delete .. //depot/projects/hammer/contrib/diff/diff.h#5 delete .. //depot/projects/hammer/contrib/diff/diff.texi#2 delete .. //depot/projects/hammer/contrib/diff/diff3.c#2 delete .. //depot/projects/hammer/contrib/diff/dir.c#2 delete .. //depot/projects/hammer/contrib/diff/doc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/diff/doc/diagmeet.note#1 branch .. //depot/projects/hammer/contrib/diff/doc/diff.texi#1 branch .. //depot/projects/hammer/contrib/diff/doc/fdl.texi#1 branch .. //depot/projects/hammer/contrib/diff/doc/stamp-vti#1 branch .. //depot/projects/hammer/contrib/diff/doc/version.texi#1 branch .. //depot/projects/hammer/contrib/diff/ed.c#2 delete .. //depot/projects/hammer/contrib/diff/exgettext#1 branch .. //depot/projects/hammer/contrib/diff/ifdef.c#2 delete .. //depot/projects/hammer/contrib/diff/install-sh#2 delete .. //depot/projects/hammer/contrib/diff/io.c#2 delete .. //depot/projects/hammer/contrib/diff/lib/Makefile.am#1 branch .. //depot/projects/hammer/contrib/diff/lib/alloca.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/alloca_.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/basename.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/c-stack.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/c-stack.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/cmpbuf.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/cmpbuf.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/dirname.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/dirname.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/error.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/error.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/exclude.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/exclude.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/exit.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/exitfail.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/exitfail.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/file-type.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/file-type.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/fnmatch.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/fnmatch_.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/fnmatch_loop.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/getopt.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/getopt.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/getopt1.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/getopt_int.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/gettext.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/gettimeofday.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/gnulib.mk#1 branch .. //depot/projects/hammer/contrib/diff/lib/hard-locale.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/hard-locale.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/imaxtostr.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/inttostr.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/inttostr.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/malloc.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/mkstemp.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/offtostr.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/posixver.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/posixver.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/prepargs.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/prepargs.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/quotesys.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/quotesys.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/realloc.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/regex.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/regex.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/setmode.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/setmode.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/stdbool_.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/strcase.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/strcasecmp.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strftime.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/stripslash.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strncasecmp.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtoimax.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtol.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtoll.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtoul.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtoull.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/strtoumax.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/tempname.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/time_r.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/time_r.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/umaxtostr.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/unlocked-io.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/version-etc.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/version-etc.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/waitpid.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/xalloc.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/xmalloc.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/xstrdup.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/xstrtol.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/xstrtol.h#1 branch .. //depot/projects/hammer/contrib/diff/lib/xstrtoul.c#1 branch .. //depot/projects/hammer/contrib/diff/lib/xstrtoumax.c#1 branch .. //depot/projects/hammer/contrib/diff/man/Makefile.am#1 branch .. //depot/projects/hammer/contrib/diff/man/cmp.1#1 branch .. //depot/projects/hammer/contrib/diff/man/diff.1#1 branch .. //depot/projects/hammer/contrib/diff/man/diff3.1#1 branch .. //depot/projects/hammer/contrib/diff/man/sdiff.1#1 branch .. //depot/projects/hammer/contrib/diff/normal.c#2 delete .. //depot/projects/hammer/contrib/diff/prepend_args.c#3 delete .. //depot/projects/hammer/contrib/diff/prepend_args.h#2 delete .. //depot/projects/hammer/contrib/diff/sdiff.c#2 delete .. //depot/projects/hammer/contrib/diff/side.c#2 delete .. //depot/projects/hammer/contrib/diff/src/Makefile.am#1 branch .. //depot/projects/hammer/contrib/diff/src/analyze.c#1 branch .. //depot/projects/hammer/contrib/diff/src/cmp.c#1 branch .. //depot/projects/hammer/contrib/diff/src/context.c#1 branch .. //depot/projects/hammer/contrib/diff/src/diff.c#1 branch .. //depot/projects/hammer/contrib/diff/src/diff.h#1 branch .. //depot/projects/hammer/contrib/diff/src/diff3.c#1 branch .. //depot/projects/hammer/contrib/diff/src/dir.c#1 branch .. //depot/projects/hammer/contrib/diff/src/ed.c#1 branch .. //depot/projects/hammer/contrib/diff/src/ifdef.c#1 branch .. //depot/projects/hammer/contrib/diff/src/io.c#1 branch .. //depot/projects/hammer/contrib/diff/src/normal.c#1 branch .. //depot/projects/hammer/contrib/diff/src/sdiff.c#1 branch .. //depot/projects/hammer/contrib/diff/src/side.c#1 branch .. //depot/projects/hammer/contrib/diff/src/system.h#1 branch .. //depot/projects/hammer/contrib/diff/src/util.c#1 branch .. //depot/projects/hammer/contrib/diff/stamp-h.in#2 delete .. //depot/projects/hammer/contrib/diff/system.h#2 delete .. //depot/projects/hammer/contrib/diff/util.c#4 delete .. //depot/projects/hammer/contrib/diff/version.c#2 delete .. //depot/projects/hammer/contrib/diff/xmalloc.c#2 delete .. //depot/projects/hammer/contrib/less/NEWS#5 integrate .. //depot/projects/hammer/contrib/less/README#5 integrate .. //depot/projects/hammer/contrib/less/cmdbuf.c#5 integrate .. //depot/projects/hammer/contrib/less/command.c#5 integrate .. //depot/projects/hammer/contrib/less/forwback.c#5 integrate .. //depot/projects/hammer/contrib/less/less.man#5 integrate .. //depot/projects/hammer/contrib/less/less.nro#5 integrate .. //depot/projects/hammer/contrib/less/lessecho.man#3 integrate .. //depot/projects/hammer/contrib/less/lessecho.nro#3 integrate .. //depot/projects/hammer/contrib/less/lesskey.man#5 integrate .. //depot/projects/hammer/contrib/less/lesskey.nro#5 integrate .. //depot/projects/hammer/contrib/less/main.c#5 integrate .. //depot/projects/hammer/contrib/less/optfunc.c#5 integrate .. //depot/projects/hammer/contrib/less/screen.c#5 integrate .. //depot/projects/hammer/contrib/less/search.c#5 integrate .. //depot/projects/hammer/contrib/less/version.c#5 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#6 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#7 integrate .. //depot/projects/hammer/etc/Makefile#53 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#77 integrate .. //depot/projects/hammer/etc/devd.conf#30 integrate .. //depot/projects/hammer/etc/group#8 integrate .. //depot/projects/hammer/etc/namedb/Makefile#4 integrate .. //depot/projects/hammer/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/hammer/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/hammer/etc/namedb/make-localhost#3 delete .. //depot/projects/hammer/etc/namedb/master/Makefile#1 branch .. //depot/projects/hammer/etc/namedb/master/empty.db#1 branch .. //depot/projects/hammer/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/hammer/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/hammer/etc/namedb/named.conf#10 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#8 integrate .. //depot/projects/hammer/etc/pam.d/atrun#1 branch .. //depot/projects/hammer/etc/pam.d/cron#1 branch .. //depot/projects/hammer/etc/pam.d/ftpd#4 integrate .. //depot/projects/hammer/etc/pam.d/gdm#4 integrate .. //depot/projects/hammer/etc/pam.d/imap#3 integrate .. //depot/projects/hammer/etc/pam.d/kde#4 integrate .. //depot/projects/hammer/etc/pam.d/login#5 integrate .. //depot/projects/hammer/etc/pam.d/other#4 integrate .. //depot/projects/hammer/etc/pam.d/pop3#3 integrate .. //depot/projects/hammer/etc/pam.d/rsh#3 integrate .. //depot/projects/hammer/etc/pam.d/sshd#4 integrate .. //depot/projects/hammer/etc/pam.d/telnetd#4 integrate .. //depot/projects/hammer/etc/pam.d/xdm#6 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#13 integrate .. //depot/projects/hammer/etc/rc.resume#3 integrate .. //depot/projects/hammer/etc/rc.suspend#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#68 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#11 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#12 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/context.c.diff#1 branch .. //depot/projects/hammer/gnu/usr.bin/diff/diff.1#5 delete .. //depot/projects/hammer/gnu/usr.bin/diff/diff.c.diff#1 branch .. //depot/projects/hammer/gnu/usr.bin/diff/doc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/diff3/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/diff3/diff3.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/diff3/diff3.c.diff#1 branch .. //depot/projects/hammer/gnu/usr.bin/sdiff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/sdiff/sdiff.1#3 delete .. //depot/projects/hammer/gnu/usr.bin/sdiff/sdiff.c.diff#1 branch .. //depot/projects/hammer/include/arpa/inet.h#5 integrate .. //depot/projects/hammer/include/histedit.h#4 integrate .. //depot/projects/hammer/include/paths.h#8 integrate .. //depot/projects/hammer/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#42 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#34 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#18 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/inet/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/inet/inet_ntoa.c#4 integrate .. //depot/projects/hammer/lib/libc/net/Makefile.inc#19 integrate .. //depot/projects/hammer/lib/libc/net/Symbol.map#9 integrate .. //depot/projects/hammer/lib/libc/net/inet.3#10 integrate .. //depot/projects/hammer/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/hammer/lib/libc/net/sourcefilter.3#1 branch .. //depot/projects/hammer/lib/libc/net/sourcefilter.c#1 branch .. //depot/projects/hammer/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/hammer/lib/libc/regex/regcomp.c#9 integrate .. //depot/projects/hammer/lib/libc/regex/regerror.c#5 integrate .. //depot/projects/hammer/lib/libc/regex/regexec.c#6 integrate .. //depot/projects/hammer/lib/libc/regex/regfree.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#15 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#36 integrate .. //depot/projects/hammer/lib/libc/sys/modstat.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/timer_create.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/timer_delete.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#6 integrate .. //depot/projects/hammer/lib/libedit/editline.3#11 integrate .. //depot/projects/hammer/lib/libedit/el.c#4 integrate .. //depot/projects/hammer/lib/libedit/el.h#3 integrate .. //depot/projects/hammer/lib/libedit/term.c#4 integrate .. //depot/projects/hammer/lib/libedit/term.h#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.c#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#11 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#22 integrate .. //depot/projects/hammer/lib/libkvm/kvm_i386.c#15 integrate .. //depot/projects/hammer/lib/libkvm/kvm_private.h#7 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_nologin/pam_nologin.8#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_nologin/pam_nologin.c#3 integrate .. //depot/projects/hammer/lib/libthr/Makefile#22 integrate .. //depot/projects/hammer/lib/libutil/login_cap.3#8 integrate .. //depot/projects/hammer/lib/libutil/login_cap.c#7 integrate .. //depot/projects/hammer/lib/msun/src/e_log.c#5 integrate .. //depot/projects/hammer/lib/msun/src/s_frexpf.c#2 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/hammer/libexec/atrun/Makefile#2 integrate .. //depot/projects/hammer/libexec/atrun/atrun.c#4 integrate .. //depot/projects/hammer/libexec/atrun/atrun.man#4 integrate .. //depot/projects/hammer/libexec/atrun/gloadavg.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#8 integrate .. //depot/projects/hammer/sbin/Makefile#44 integrate .. //depot/projects/hammer/sbin/ifconfig/af_ipx.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#43 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#34 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#13 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#30 integrate .. //depot/projects/hammer/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#12 integrate .. //depot/projects/hammer/sbin/ipf/libipf/Makefile#5 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#58 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#56 integrate .. //depot/projects/hammer/sbin/mknod/mknod.c#3 integrate .. //depot/projects/hammer/sbin/recoverdisk/Makefile#1 branch .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.1#1 branch .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.c#1 branch .. //depot/projects/hammer/sbin/sysctl/sysctl.c#22 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#20 integrate .. //depot/projects/hammer/share/man/man4/Makefile#91 integrate .. //depot/projects/hammer/share/man/man4/altq.4#17 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#12 integrate .. //depot/projects/hammer/share/man/man4/ip.4#21 integrate .. //depot/projects/hammer/share/man/man4/miibus.4#14 integrate .. //depot/projects/hammer/share/man/man4/nfe.4#4 integrate .. //depot/projects/hammer/share/man/man4/rum.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/hammer/share/man/man4/ural.4#11 integrate .. //depot/projects/hammer/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/hammer/share/man/man5/Makefile#21 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#48 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#80 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#9 integrate .. //depot/projects/hammer/share/man/man5/tmpfs.5#1 branch .. //depot/projects/hammer/share/man/man5/xfs.5#1 branch .. //depot/projects/hammer/share/man/man7/hier.7#33 integrate .. //depot/projects/hammer/share/man/man9/lock.9#8 integrate .. //depot/projects/hammer/share/man/man9/locking.9#3 integrate .. //depot/projects/hammer/share/man/man9/selrecord.9#3 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#3 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#158 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#97 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#95 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#16 integrate .. //depot/projects/hammer/sys/amd64/include/kdb.h#4 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#62 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#23 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#39 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#7 integrate .. //depot/projects/hammer/sys/arm/include/kdb.h#4 integrate .. //depot/projects/hammer/sys/arm/include/pcpu.h#6 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#21 integrate .. //depot/projects/hammer/sys/arm/include/pte.h#4 integrate .. //depot/projects/hammer/sys/boot/ofw/common/main.c#8 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#8 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.h#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#15 integrate .. //depot/projects/hammer/sys/cam/README.quirks#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#32 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#41 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#21 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#48 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#47 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#21 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#13 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#41 integrate .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/hammer/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#11 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#28 integrate .. //depot/projects/hammer/sys/conf/NOTES#119 integrate .. //depot/projects/hammer/sys/conf/files#151 integrate .. //depot/projects/hammer/sys/conf/files.amd64#91 integrate .. //depot/projects/hammer/sys/conf/files.i386#77 integrate .. //depot/projects/hammer/sys/conf/files.pc98#60 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#40 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#2 integrate .. //depot/projects/hammer/sys/conf/options#106 integrate .. //depot/projects/hammer/sys/conf/options.arm#11 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#16 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#18 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#76 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#39 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#54 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/hammer/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#16 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#16 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#17 integrate .. //depot/projects/hammer/sys/dev/ahb/ahbreg.h#3 integrate .. //depot/projects/hammer/sys/dev/aic/aic.c#8 integrate .. //depot/projects/hammer/sys/dev/aic/aic_cbus.c#6 integrate .. //depot/projects/hammer/sys/dev/aic/aic_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#21 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#21 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#17 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#17 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#34 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#77 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#28 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#11 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#13 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#52 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#15 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#28 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#20 integrate .. //depot/projects/hammer/sys/dev/awi/awivar.h#7 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#15 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#21 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#44 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc7323.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#1 branch .. //depot/projects/hammer/sys/dev/dcons/dcons.h#6 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#8 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#12 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.h#3 integrate .. //depot/projects/hammer/sys/dev/de/if_de.c#5 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt.h#6 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#11 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#18 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#12 integrate .. //depot/projects/hammer/sys/dev/fb/boot_font.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#13 integrate .. //depot/projects/hammer/sys/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/hammer/sys/dev/fb/gallant12x22.h#4 delete .. //depot/projects/hammer/sys/dev/fb/gfb.h#5 integrate .. //depot/projects/hammer/sys/dev/fb/machfb.c#5 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#37 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#23 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#32 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#40 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#12 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#28 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#12 integrate .. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#14 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#51 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#16 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#14 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#17 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#30 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#23 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#12 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#11 integrate .. //depot/projects/hammer/sys/dev/mc146818/mc146818.c#5 integrate .. //depot/projects/hammer/sys/dev/mc146818/mc146818var.h#4 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#31 integrate .. //depot/projects/hammer/sys/dev/mii/brgphyreg.h#5 integrate .. //depot/projects/hammer/sys/dev/mii/icsphy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/icsphyreg.h#1 branch .. //depot/projects/hammer/sys/dev/mii/miidevs#18 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#18 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#16 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/hammer/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#20 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#10 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#7 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#34 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#12 integrate .. //depot/projects/hammer/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#29 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560reg.h#2 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661reg.h#2 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#47 integrate .. //depot/projects/hammer/sys/dev/rr232x/osm_bsd.c#5 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/clone.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/clone.h#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#37 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/neomagic.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#27 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.h#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.h#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#32 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.h#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_volume.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.h#6 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#24 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/version.h#2 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#24 integrate .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#9 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#23 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#10 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/dsbr100io.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#12 integrate .. //depot/projects/hammer/sys/dev/usb/hid.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#34 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#33 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_cdce.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_cdcereg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/if_cuereg.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_kuereg.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_rumreg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_rumvar.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/ohcivar.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/rio500_usb.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/sl811hs.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/slhci_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/uark.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/uhcivar.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#43 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/urio.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb_mem.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usb_mem.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#19 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#79 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi_util.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#10 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#18 integrate .. //depot/projects/hammer/sys/dev/wds/wd7000.c#11 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#50 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#17 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#15 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#37 integrate .. //depot/projects/hammer/sys/gdb/gdb_packet.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#5 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_stree.c#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#28 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#53 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#22 integrate .. //depot/projects/hammer/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#34 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#54 integrate .. //depot/projects/hammer/sys/i386/include/kdb.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#37 integrate .. //depot/projects/hammer/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#29 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#61 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#59 integrate .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#11 integrate .. //depot/projects/hammer/sys/ia64/include/kdb.h#5 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#12 integrate .. //depot/projects/hammer/sys/kern/init_main.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#68 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#69 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#61 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#47 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_priv.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#79 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#95 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#29 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#48 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#77 integrate .. //depot/projects/hammer/sys/kern/subr_acl_posix1e.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#38 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#25 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#63 integrate .. //depot/projects/hammer/sys/kern/sysv_ipc.c#9 integrate .. //depot/projects/hammer/sys/kern/sysv_msg.c#18 integrate .. //depot/projects/hammer/sys/kern/tty.c#52 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#76 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#77 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#113 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#69 integrate .. //depot/projects/hammer/sys/libkern/mcount.c#5 integrate .. //depot/projects/hammer/sys/modules/Makefile#108 integrate .. //depot/projects/hammer/sys/modules/bge/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ip_mroute_mod/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/mii/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/tmpfs/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/wlan_scan_ap/Makefile#1 branch .. //depot/projects/hammer/sys/modules/wlan_scan_sta/Makefile#1 branch .. //depot/projects/hammer/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/hammer/sys/net/bpf.c#48 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/hammer/sys/net/if.h#28 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#32 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#10 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#63 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#3 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#3 integrate .. //depot/projects/hammer/sys/net/if_media.h#19 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#26 integrate .. //depot/projects/hammer/sys/net/if_types.h#10 integrate .. //depot/projects/hammer/sys/net/pfil.h#7 integrate .. //depot/projects/hammer/sys/net/route.c#26 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_none.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#37 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#33 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#40 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_power.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_regdomain.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_regdomain.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_scan.h#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_scan_ap.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#29 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#21 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#11 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_vlan.c#5 integrate .. //depot/projects/hammer/sys/netinet/igmp.h#5 integrate .. //depot/projects/hammer/sys/netinet/igmp_var.h#4 integrate .. //depot/projects/hammer/sys/netinet/in.c#27 integrate .. //depot/projects/hammer/sys/netinet/in.h#26 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#1 branch .. //depot/projects/hammer/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#22 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#14 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#24 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#40 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#82 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#63 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#29 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#47 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#9 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#13 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#72 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#42 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#64 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#27 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#46 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#47 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/ah_output.c#8 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#16 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#29 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#22 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#42 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#29 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#16 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#26 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#11 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_osdep.h#6 integrate .. //depot/projects/hammer/sys/netipsec/key.c#16 integrate .. //depot/projects/hammer/sys/netipx/ipx.c#8 integrate .. //depot/projects/hammer/sys/netipx/ipx.h#7 integrate .. //depot/projects/hammer/sys/netipx/ipx_if.h#6 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#15 delete .. //depot/projects/hammer/sys/netipx/ipx_ip.h#6 delete .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#14 integrate .. //depot/projects/hammer/sys/netsmb/smb_smb.c#8 integrate .. //depot/projects/hammer/sys/netsmb/smb_trantcp.c#11 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#35 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#6 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#44 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#47 integrate .. //depot/projects/hammer/sys/pci/ncr.c#21 integrate .. //depot/projects/hammer/sys/powerpc/conf/DEFAULTS#5 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/powerpc/include/cpu.h#11 integrate .. //depot/projects/hammer/sys/powerpc/include/kdb.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/vmparam.h#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_interface.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/syncicache.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/uio_machdep.c#6 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#15 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#7 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#7 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#24 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#12 integrate .. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 integrate .. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#53 integrate .. //depot/projects/hammer/sys/sparc64/include/kdb.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/smp.h#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#11 delete .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#7 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#14 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#32 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#12 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#26 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#50 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#21 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#6 integrate .. //depot/projects/hammer/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/hammer/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/hammer/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#59 integrate .. //depot/projects/hammer/sys/sys/param.h#86 integrate .. //depot/projects/hammer/sys/sys/priv.h#5 integrate .. //depot/projects/hammer/sys/sys/proc.h#105 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#18 integrate .. //depot/projects/hammer/sys/sys/sched.h#23 integrate .. //depot/projects/hammer/sys/sys/socket.h#22 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#28 integrate .. //depot/projects/hammer/sys/sys/systm.h#46 integrate .. //depot/projects/hammer/sys/sys/thr.h#9 integrate .. //depot/projects/hammer/sys/sys/tree.h#8 integrate .. //depot/projects/hammer/sys/sys/ucred.h#11 integrate .. //depot/projects/hammer/sys/sys/vmmeter.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#30 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#44 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#43 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_inode.c#21 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#48 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#35 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#45 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#42 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#67 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#58 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#28 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#42 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_phys.c#1 branch .. //depot/projects/hammer/sys/vm/vm_phys.h#1 branch .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#27 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_KVM#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_KVM_SUPPORT#1 branch .. //depot/projects/hammer/tools/regression/atm/RunTest.sh#4 integrate .. //depot/projects/hammer/tools/regression/netinet/ipmulticast/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipmulticast/ipmulticast.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#6 integrate .. //depot/projects/hammer/tools/regression/tmpfs/Makefile#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_create#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_dots#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_exec#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_link#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_mount#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_pipes#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_read_write#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_readdir#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_remove#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_rename#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_setattr#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_sizes#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_sockets#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_symlink#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_times#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_truncate#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_vnd#1 branch .. //depot/projects/hammer/tools/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/calendar/calendar.calibrate#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.a2.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.a3.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.a4.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.b2.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.b3.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.b4.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.s1.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.s3.out#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/calendar/regress.w0-5.out#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 22 19:03: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 DBB1016A46D; Fri, 22 Jun 2007 19:03: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 5011F16A421 for ; Fri, 22 Jun 2007 19:03:32 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 43A0313C4BA for ; Fri, 22 Jun 2007 19:03:32 +0000 (UTC) (envelope-from peter@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 l5MJ3Wlu073080 for ; Fri, 22 Jun 2007 19:03:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MJ3WU7073077 for perforce@freebsd.org; Fri, 22 Jun 2007 19:03:32 GMT (envelope-from peter@freebsd.org) Date: Fri, 22 Jun 2007 19:03:32 GMT Message-Id: <200706221903.l5MJ3WU7073077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 19:03:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=122165 Change 122165 by peter@peter_daintree on 2007/06/22 19:03:15 Attempt to recover from makefile reordering Affected files ... .. //depot/projects/hammer/etc/Makefile#54 edit Differences ... ==== //depot/projects/hammer/etc/Makefile#54 (text+ko) ==== @@ -130,6 +130,23 @@ .if ${MK_I4B} != "no" cd ${.CURDIR}/isdn; ${MAKE} install .endif +.if ${MK_BIND_ETC} != "no" +.if defined(NO_BIND_CHROOT) + cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${NAMEDB} ${DESTDIR}/etc/namedb +.else + cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${NAMEDB} ${DESTDIR}/var/named/etc/namedb +.endif +.endif +.if !defined(NO_BIND_CHROOT) +.if ${MK_BIND_MTREE} != "no" + @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ + set -x; \ + ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ + fi +.endif +.endif .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif @@ -158,23 +175,6 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if ${MK_BIND_ETC} != "no" -.if defined(NO_BIND_CHROOT) - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/etc/namedb -.else - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/var/named/etc/namedb -.endif -.endif -.if !defined(NO_BIND_CHROOT) -.if ${MK_BIND_MTREE} != "no" - @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ - set -x; \ - ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ - fi -.endif -.endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ From owner-p4-projects@FreeBSD.ORG Fri Jun 22 19:08: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 D60F316A468; Fri, 22 Jun 2007 19:08: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 85ED716A41F for ; Fri, 22 Jun 2007 19:08:39 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 79DD713C4AE for ; Fri, 22 Jun 2007 19:08:39 +0000 (UTC) (envelope-from peter@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 l5MJ8dRO073883 for ; Fri, 22 Jun 2007 19:08:39 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MJ8dHt073880 for perforce@freebsd.org; Fri, 22 Jun 2007 19:08:39 GMT (envelope-from peter@freebsd.org) Date: Fri, 22 Jun 2007 19:08:39 GMT Message-Id: <200706221908.l5MJ8dHt073880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 19:08:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122166 Change 122166 by peter@peter_daintree on 2007/06/22 19:07:58 More diff reduction Affected files ... .. //depot/projects/hammer/etc/Makefile#55 edit Differences ... ==== //depot/projects/hammer/etc/Makefile#55 (text+ko) ==== @@ -130,15 +130,6 @@ .if ${MK_I4B} != "no" cd ${.CURDIR}/isdn; ${MAKE} install .endif -.if ${MK_BIND_ETC} != "no" -.if defined(NO_BIND_CHROOT) - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/etc/namedb -.else - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/var/named/etc/namedb -.endif -.endif .if !defined(NO_BIND_CHROOT) .if ${MK_BIND_MTREE} != "no" @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ @@ -147,6 +138,9 @@ fi .endif .endif +.if ${MK_BIND_ETC} != "no" + cd ${.CURDIR}/namedb; ${MAKE} install +.endif .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif From owner-p4-projects@FreeBSD.ORG Fri Jun 22 21:38: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 6095116A421; Fri, 22 Jun 2007 21:38: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 1932716A469 for ; Fri, 22 Jun 2007 21:38:46 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0DB1C13C455 for ; Fri, 22 Jun 2007 21:38:46 +0000 (UTC) (envelope-from peter@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 l5MLcjOL021197 for ; Fri, 22 Jun 2007 21:38:45 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5MLcjxa021194 for perforce@freebsd.org; Fri, 22 Jun 2007 21:38:45 GMT (envelope-from peter@freebsd.org) Date: Fri, 22 Jun 2007 21:38:45 GMT Message-Id: <200706222138.l5MLcjxa021194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jun 2007 21:38:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122167 Change 122167 by peter@peter_daintree on 2007/06/22 21:38:41 Add kern.do_sigsys to control whether an enosys() also causes SIGSYS. This would have been very useful to probe for presence of syscalls. Avoids the need to install a sigsys handler. If only this was present for the last 10 years.... Affected files ... .. //depot/projects/hammer/sys/kern/kern_sig.c#80 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_sig.c#80 (text+ko) ==== @@ -111,6 +111,10 @@ SYSCTL_INT(_kern, OID_AUTO, forcesigexit, CTLFLAG_RW, &kern_forcesigexit, 0, "Force trap signal to be handled"); +static int kern_do_sigsys = 1; +SYSCTL_INT(_kern, OID_AUTO, do_sigsys, CTLFLAG_RW, + &kern_do_sigsys, 0, "Have the kernel send SIGSYS on a bad syscall"); + SYSCTL_NODE(_kern, OID_AUTO, sigqueue, CTLFLAG_RW, 0, "POSIX real time signal"); static int max_pending_per_proc = 128; @@ -3168,9 +3172,11 @@ { struct proc *p = td->td_proc; - PROC_LOCK(p); - psignal(p, SIGSYS); - PROC_UNLOCK(p); + if (kern_do_sigsys) { + PROC_LOCK(p); + psignal(p, SIGSYS); + PROC_UNLOCK(p); + } return (ENOSYS); } From owner-p4-projects@FreeBSD.ORG Sat Jun 23 00:00: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 A24D516A421; Sat, 23 Jun 2007 00:00: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 5AB9616A469 for ; Sat, 23 Jun 2007 00:00: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 4AF2913C469 for ; Sat, 23 Jun 2007 00:00: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 l5N00wV1052535 for ; Sat, 23 Jun 2007 00:00:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N00sqT052527 for perforce@freebsd.org; Sat, 23 Jun 2007 00:00:54 GMT (envelope-from sam@freebsd.org) Date: Sat, 23 Jun 2007 00:00:54 GMT Message-Id: <200706230000.l5N00sqT052527@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 122170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 00:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=122170 Change 122170 by sam@sam_aku on 2007/06/23 00:00:23 IFC @ 122169 Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#18 integrate .. //depot/projects/wifi/contrib/less/NEWS#4 integrate .. //depot/projects/wifi/contrib/less/README#4 integrate .. //depot/projects/wifi/contrib/less/cmdbuf.c#4 integrate .. //depot/projects/wifi/contrib/less/command.c#4 integrate .. //depot/projects/wifi/contrib/less/forwback.c#4 integrate .. //depot/projects/wifi/contrib/less/less.man#4 integrate .. //depot/projects/wifi/contrib/less/less.nro#4 integrate .. //depot/projects/wifi/contrib/less/lessecho.man#3 integrate .. //depot/projects/wifi/contrib/less/lessecho.nro#3 integrate .. //depot/projects/wifi/contrib/less/lesskey.man#4 integrate .. //depot/projects/wifi/contrib/less/lesskey.nro#4 integrate .. //depot/projects/wifi/contrib/less/main.c#5 integrate .. //depot/projects/wifi/contrib/less/optfunc.c#4 integrate .. //depot/projects/wifi/contrib/less/screen.c#4 integrate .. //depot/projects/wifi/contrib/less/search.c#4 integrate .. //depot/projects/wifi/contrib/less/version.c#4 integrate .. //depot/projects/wifi/etc/Makefile#14 integrate .. //depot/projects/wifi/etc/devd.conf#17 integrate .. //depot/projects/wifi/etc/namedb/Makefile#4 integrate .. //depot/projects/wifi/etc/namedb/PROTO.localhost-v6.rev#2 delete .. //depot/projects/wifi/etc/namedb/PROTO.localhost.rev#2 delete .. //depot/projects/wifi/etc/namedb/make-localhost#2 delete .. //depot/projects/wifi/etc/namedb/master/Makefile#1 branch .. //depot/projects/wifi/etc/namedb/master/empty.db#1 branch .. //depot/projects/wifi/etc/namedb/master/localhost-forward.db#1 branch .. //depot/projects/wifi/etc/namedb/master/localhost-reverse.db#1 branch .. //depot/projects/wifi/etc/namedb/named.conf#5 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#6 integrate .. //depot/projects/wifi/etc/pam.d/cron#1 branch .. //depot/projects/wifi/etc/rc.resume#2 integrate .. //depot/projects/wifi/etc/rc.suspend#2 integrate .. //depot/projects/wifi/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/wifi/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/wifi/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/wifi/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#26 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#18 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/wifi/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/wifi/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/wifi/lib/libbsnmp/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/libc/net/sctp_bindx.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_connectx.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_freepaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getaddrlen.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getassocid.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_getpaddrs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_opt_info.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_recvmsg.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#6 integrate .. //depot/projects/wifi/lib/libc/stdio/fseek.3#3 integrate .. //depot/projects/wifi/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/timer_create.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/timer_delete.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/timer_settime.2#4 integrate .. //depot/projects/wifi/lib/libpam/Makefile.inc#4 integrate .. //depot/projects/wifi/libexec/atrun/atrun.man#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#22 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#20 integrate .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.1#2 integrate .. //depot/projects/wifi/sbin/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/wifi/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#7 integrate .. //depot/projects/wifi/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/wifi/share/man/man9/lock.9#6 integrate .. //depot/projects/wifi/share/man/man9/locking.9#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/wifi/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low.c#7 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#18 integrate .. //depot/projects/wifi/sys/conf/files.sun4v#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_panasonic.c#7 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/wifi/sys/dev/acpica/acpiio.h#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#20 integrate .. //depot/projects/wifi/sys/dev/advansys/advansys.c#7 integrate .. //depot/projects/wifi/sys/dev/advansys/advlib.h#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/wifi/sys/dev/aha/aha.c#6 integrate .. //depot/projects/wifi/sys/dev/ahb/ahb.c#9 integrate .. //depot/projects/wifi/sys/dev/ahb/ahbreg.h#3 integrate .. //depot/projects/wifi/sys/dev/aic/aic.c#5 integrate .. //depot/projects/wifi/sys/dev/aic/aic_cbus.c#4 integrate .. //depot/projects/wifi/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/aic/aic_pccard.c#6 integrate .. //depot/projects/wifi/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/wifi/sys/dev/amd/amd.c#8 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#11 integrate .. //depot/projects/wifi/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/wifi/sys/dev/asr/asr.c#11 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-cam.c#13 integrate .. //depot/projects/wifi/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/wifi/sys/dev/buslogic/bt.c#7 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#20 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9x.c#10 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp_targ.c#8 integrate .. //depot/projects/wifi/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/wifi/sys/dev/hptmv/entry.c#13 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/wifi/sys/dev/iir/iir.c#7 integrate .. //depot/projects/wifi/sys/dev/iir/iir.h#7 integrate .. //depot/projects/wifi/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/wifi/sys/dev/mly/mly.c#8 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#14 integrate .. //depot/projects/wifi/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/wifi/sys/dev/rr232x/osm_bsd.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ess.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#15 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/isa/sb8.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cs4281.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10k1.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10kx-pcm.c#7 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#17 integrate .. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/pci/neomagic.c#5 integrate .. //depot/projects/wifi/sys/dev/sound/pci/solo.c#11 integrate .. //depot/projects/wifi/sys/dev/sound/pci/t4dwave.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/wifi/sys/dev/sound/pci/vibes.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/feeder.c#12 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.c#14 integrate .. //depot/projects/wifi/sys/dev/sound/sbus/cs4231.c#9 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#19 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#14 integrate .. //depot/projects/wifi/sys/dev/sym/sym_hipd.c#12 integrate .. //depot/projects/wifi/sys/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/wifi/sys/dev/trm/trm.c#9 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/hid.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#22 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/if_udav.c#17 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#31 integrate .. //depot/projects/wifi/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/sl811hs.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/slhci_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/uark.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ufm.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/ufoma.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uhub.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/umct.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/umodem.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/uplcom.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/urio.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/usb.h#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb_mem.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#12 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.h#6 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#28 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.c#9 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi_util.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/uvisor.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/wifi/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part.c#6 integrate .. //depot/projects/wifi/sys/geom/part/g_part.h#3 integrate .. //depot/projects/wifi/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/wifi/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#20 integrate .. //depot/projects/wifi/sys/kern/subr_unit.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/wifi/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#24 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#11 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#9 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#16 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/wifi/sys/netinet6/ah_output.c#4 integrate .. //depot/projects/wifi/sys/pci/ncr.c#9 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci.c#4 delete .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pci_if.m#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/wifi/sys/sparc64/pci/ofw_pcibus.c#9 integrate .. //depot/projects/wifi/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/wifi/sys/sys/priv.h#7 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#21 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_inode.c#9 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#20 integrate .. //depot/projects/wifi/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#23 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/wifi/usr.bin/netstat/sctp.c#3 integrate .. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate .. //depot/projects/wifi/usr.sbin/bsnmpd/modules/Makefile.inc#6 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/cron.8#3 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/database.c#2 integrate .. //depot/projects/wifi/usr.sbin/cron/cron/do_command.c#4 integrate .. //depot/projects/wifi/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/cron/lib/entry.c#5 integrate .. //depot/projects/wifi/usr.sbin/fwcontrol/fwdv.c#3 integrate .. //depot/projects/wifi/usr.sbin/moused/moused.c#10 integrate .. //depot/projects/wifi/usr.sbin/periodic/periodic.8#3 integrate .. //depot/projects/wifi/usr.sbin/periodic/periodic.sh#2 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/lib/deps.c#2 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.94 2007/06/05 01:10:47 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,51 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070618: shared library version bump +OLD_LIBS+=lib/libalias.so.5 +OLD_LIBS+=lib/libbsnmp.so.3 +OLD_LIBS+=lib/libncurses.so.6 +OLD_LIBS+=lib/libncursesw.so.6 +OLD_LIBS+=lib/libreadline.so.6 +OLD_LIBS+=usr/lib/libdialog.so.5 +OLD_LIBS+=usr/lib/libgnuregex.so.3 +OLD_LIBS+=usr/lib/libhistory.so.6 +OLD_LIBS+=usr/lib/libpam.so.3 +OLD_LIBS+=usr/lib/libssh.so.3 +OLD_LIBS+=usr/lib/pam_chroot.so.3 +OLD_LIBS+=usr/lib/pam_deny.so.3 +OLD_LIBS+=usr/lib/pam_echo.so.3 +OLD_LIBS+=usr/lib/pam_exec.so.3 +OLD_LIBS+=usr/lib/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib/pam_group.so.3 +OLD_LIBS+=usr/lib/pam_guest.so.3 +OLD_LIBS+=usr/lib/pam_krb5.so.3 +OLD_LIBS+=usr/lib/pam_ksu.so.3 +OLD_LIBS+=usr/lib/pam_lastlog.so.3 +OLD_LIBS+=usr/lib/pam_login_access.so.3 +OLD_LIBS+=usr/lib/pam_nologin.so.3 +OLD_LIBS+=usr/lib/pam_opie.so.3 +OLD_LIBS+=usr/lib/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib/pam_permit.so.3 +OLD_LIBS+=usr/lib/pam_radius.so.3 +OLD_LIBS+=usr/lib/pam_rhosts.so.3 +OLD_LIBS+=usr/lib/pam_rootok.so.3 +OLD_LIBS+=usr/lib/pam_securetty.so.3 +OLD_LIBS+=usr/lib/pam_self.so.3 +OLD_LIBS+=usr/lib/pam_ssh.so.3 +OLD_LIBS+=usr/lib/pam_tacplus.so.3 +OLD_LIBS+=usr/lib/pam_unix.so.3 +OLD_LIBS+=usr/lib/snmp_atm.so.4 +OLD_LIBS+=usr/lib/snmp_bridge.so.4 +OLD_LIBS+=usr/lib/snmp_hostres.so.4 +OLD_LIBS+=usr/lib/snmp_mibII.so.4 +OLD_LIBS+=usr/lib/snmp_netgraph.so.4 +OLD_LIBS+=usr/lib/snmp_pf.so.4 # 20070605: sched_core removal OLD_FILES+=usr/share/man/man4/sched_core.4.gz +# 20070603: BIND 9.4.1 import +OLD_LIBS+=lib/liblwres.so.10 # 20070521: shared library version bump OLD_LIBS+=lib/libatm.so.4 OLD_LIBS+=lib/libbegemot.so.2 @@ -74,6 +117,7 @@ OLD_LIBS+=usr/lib/libthread_db.so.2 OLD_LIBS+=usr/lib/libugidfw.so.2 OLD_LIBS+=usr/lib/libusbhid.so.2 +OLD_LIBS+=usr/lib/libvgl.so.4 OLD_LIBS+=usr/lib/libwrap.so.4 OLD_LIBS+=usr/lib/libypclnt.so.2 OLD_LIBS+=usr/lib/snmp_atm.so.3 ==== //depot/projects/wifi/contrib/less/NEWS#4 (text+ko) ==== @@ -13,7 +13,7 @@ ====================================================================== - Major changes between "less" versions 394 and 403 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/wifi/contrib/less/README#4 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 403 + Less, version 406 - This is the distribution of less, version 403, released 25 May 2007. + This is the distribution of less, version 406, released 19 Jun 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/wifi/contrib/less/cmdbuf.c#4 (text+ko) ==== @@ -1390,11 +1390,14 @@ } if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) ml = &mlist_search; + else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { #if SHELL_ESCAPE || PIPEC - else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) ml = &mlist_shell; +#else + ml = NULL; #endif - else if (*line == '"') + } else if (*line == '"') { if (ml != NULL) cmd_addhist(ml, line+1); @@ -1444,11 +1447,18 @@ #if CMD_HISTORY char *filename; FILE *f; + int modified = 0; filename = histfile_name(); if (filename == NULL) return; - if (!mlist_search.modified && !mlist_shell.modified) + if (mlist_search.modified) + modified = 1; +#if SHELL_ESCAPE || PIPEC + if (mlist_shell.modified) + modified = 1; +#endif + if (!modified) return; f = fopen(filename, "w"); free(filename); ==== //depot/projects/wifi/contrib/less/command.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -87,7 +87,7 @@ cmd_exec() { clear_attn(); - line_left(); + clear_bot(); flush(); } ==== //depot/projects/wifi/contrib/less/forwback.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/forwback.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/forwback.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,9 +142,6 @@ clear(); home(); } - } else - { - clear_bot(); } if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) ==== //depot/projects/wifi/contrib/less/less.man#4 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 403: 25 May 2007 LESS(1) + Version 406: 19 Jun 2007 LESS(1) ==== //depot/projects/wifi/contrib/less/less.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 403: 25 May 2007" +.TH LESS 1 "Version 406: 19 Jun 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/lessecho.man#3 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 403: 25 May 2007 LESSECHO(1) + Version 406: 19 Jun 2007 LESSECHO(1) ==== //depot/projects/wifi/contrib/less/lessecho.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 403: 25 May 2007" +.TH LESSECHO 1 "Version 406: 19 Jun 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/lesskey.man#4 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 403: 25 May 2007 LESSKEY(1) + Version 406: 19 Jun 2007 LESSKEY(1) ==== //depot/projects/wifi/contrib/less/lesskey.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 403: 25 May 2007" +.TH LESSKEY 1 "Version 406: 19 Jun 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/wifi/contrib/less/main.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.7 2007/06/16 02:43:44 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,7 +142,8 @@ if (s != NULL) scan_option(save(s)); -#define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') +#define isoptstring(s) less_is_more ? (((s)[0] == '-') && (s)[1] != '\0') : \ + (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') while (argc > 0 && (isoptstring(*argv) || isoptpending())) { s = *argv++; ==== //depot/projects/wifi/contrib/less/optfunc.c#4 (text+ko) ==== @@ -45,6 +45,9 @@ extern char *wproto; extern IFILE curr_ifile; extern char version[]; +extern int jump_sline; +extern int jump_sline_fraction; +extern int less_is_more; #if LOGFILE extern char *namelogfile; extern int force_logfile; @@ -53,9 +56,6 @@ #if TAGS public char *tagoption = NULL; extern char *tags; -extern int jump_sline; -extern int jump_sline_fraction; -extern int less_is_more; #endif #if MSDOS_COMPILER extern int nm_fg_color, nm_bg_color; ==== //depot/projects/wifi/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -626,7 +626,25 @@ char *capname; { char name[16]; + char *s; + s = lgetenv("LESS_TERMCAP_DEBUG"); + if (s != NULL && *s != '\0') + { + struct env { struct env *next; char *name; char *value; }; + static struct env *envs = NULL; + struct env *p; + for (p = envs; p != NULL; p = p->next) + if (strcmp(p->name, capname) == 0) + return p->value; + p = (struct env *) ecalloc(1, sizeof(struct env)); + p->name = save(capname); + p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); + sprintf(p->value, "<%s>", capname); + p->next = envs; + envs = p; + return p->value; + } strcpy(name, "LESS_TERMCAP_"); strcat(name, capname); return (lgetenv(name)); ==== //depot/projects/wifi/contrib/less/search.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/search.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/search.c,v 1.8 2007/06/17 23:20:43 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -294,6 +294,7 @@ POSITION old_end_attnpos; POSITION pos; POSITION epos; + int moved = 0; if (start_attnpos == NULL_POSITION) return; @@ -321,8 +322,11 @@ (void) forw_line(pos); goto_line(slinenum); put_line(); + moved = 1; } } + if (moved) + lower_left(); } #endif ==== //depot/projects/wifi/contrib/less/version.c#4 (text+ko) ==== @@ -690,6 +690,9 @@ v402 3/30/07 Fix autoconf bug when memcpy etc are inline; fix bug in terminating number following -j option. v403 5/25/07 Fix Windows build. +v404 6/5/07 Fix display bug with F command and long lines. +v405 6/17/07 Fix display bug when using -w option. +v406 6/17/07 Fix secure build. */ -char version[] = "403"; +char version[] = "406"; ==== //depot/projects/wifi/etc/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.358 2006/09/26 23:26:48 piso Exp $ +# $FreeBSD: src/etc/Makefile,v 1.359 2007/06/18 05:44:38 dougb Exp $ .include @@ -64,11 +64,6 @@ .endif .endif -.if ${MK_BIND_ETC} != "no" -NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost -.endif - PPPCNF= ppp.conf .if ${MK_SENDMAIL} == "no" @@ -135,6 +130,15 @@ .if ${MK_I4B} != "no" cd ${.CURDIR}/isdn; ${MAKE} install .endif +.if ${MK_BIND_MTREE} != "no" + @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ + set -x; \ + ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ + fi +.endif +.if ${MK_BIND_ETC} != "no" + cd ${.CURDIR}/namedb; ${MAKE} install +.endif .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif @@ -163,16 +167,6 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${NAMEDB} ${DESTDIR}/var/named/etc/namedb -.endif -.if ${MK_BIND_MTREE} != "no" - @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ - set -x; \ - ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ - fi -.endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/wifi/etc/devd.conf#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -239,6 +239,19 @@ action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; }; +# User requested suspend, so perform preparation steps and then execute +# the actual suspend process. +notify 10 { + match "system" "ACPI"; + match "subsystem" "Suspend"; + action "/etc/rc.suspend acpi $notify"; +}; +notify 10 { + match "system" "ACPI"; + match "subsystem" "Resume"; + action "/etc/rc.resume acpi $notify"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might @@ -277,6 +290,7 @@ # Button: Button pressed (0 for power, 1 for sleep) # CMBAT: ACPI battery events # Lid: Lid state (0 is closed, 1 is open) +# Suspend, Resume: Suspend and resume notification # Thermal: ACPI thermal zone events # # This example calls a script when the AC state changes, passing the ==== //depot/projects/wifi/etc/namedb/Makefile#4 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $ +# $FreeBSD: src/etc/namedb/Makefile,v 1.5 2007/06/18 05:44:38 dougb Exp $ + +SUBDIR= master + +FILES= named.conf named.root -FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ - make-localhost NO_OBJ= -FILESDIR= /etc/namedb -FILESMODE= 644 +FILESDIR= /etc/namedb +FILESMODE= 644 .include ==== //depot/projects/wifi/etc/namedb/named.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.22 2005/09/05 13:42:22 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.24 2007/06/18 06:29:45 dougb Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -9,11 +9,16 @@ // or cause huge amounts of useless Internet traffic. options { + // Relative to the chroot directory, if any directory "/etc/namedb"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. @@ -28,7 +33,7 @@ // server to never initiate queries of its own, but always ask its // forwarders only, by enabling the following line: // -// forward only; +// forward only; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you @@ -52,21 +57,178 @@ // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. +/* Slaving the following zones from the root name servers has some + significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots + 3. Greater resilience to any potential root server failure/DDoS + + If you do not wish to slave these zones from the root servers + use the entry below instead. + zone "." { type hint; file "named.root"; }; +*/ zone "." { - type hint; - file "named.root"; + type slave; + file "slave/root.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "arpa" { + type slave; + file "slave/arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "in-addr.arpa" { + type slave; + file "slave/in-addr.arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + 192.228.79.201; // B.ROOT-SERVERS.NET. + 192.33.4.12; // C.ROOT-SERVERS.NET. + 192.112.36.4; // G.ROOT-SERVERS.NET. + 193.0.14.129; // K.ROOT-SERVERS.NET. + }; + notify no; }; -zone "0.0.127.IN-ADDR.ARPA" { - type master; - file "master/localhost.rev"; -}; +/* Serving the following zones locally will prevent any queries + for these zones leaving your network and going to the root + name servers. This has two significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots +*/ +// RFC 1912 +zone "localhost" { type master; file "master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; + +// RFC 1912-style zone for IPv6 localhost address +zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; + +// "This" Network (RFCs 1912 and 3330) +zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IANA Reserved - Unlikely to ever be assigned +zone "1.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "2.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "223.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Public Data Networks (RFC 3330) +zone "14.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Private Use Networks (RFC 1918) +zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Link-local/APIPA (RFCs 3330 and 3927) +zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; + +// TEST-NET for Documentation (RFC 3330) +zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Router Benchmark Testing (RFC 2544) +zone "18.192.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IANA Reserved - Old Class E Space +zone "240.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Unassigned Addresses (RFC 4291) +zone "1.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 ULA (RFC 4193) +zone "c.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Link Local (RFC 4291) +zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Deprecated Site-Local Addresses (RFC 3879) +zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; }; -// RFC 3152 -zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA" { - type master; - file "master/localhost-v6.rev"; -}; +// IP6.INT is Deprecated (RFC 4159) +zone "ip6.int" { type master; file "master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! @@ -74,30 +236,23 @@ // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible -// primary. +// master name server. // -// Never forget to include the reverse lookup (IN-ADDR.ARPA) zone! -// (This is named after the first bytes of the IP address, in reverse -// order, with ".IN-ADDR.ARPA" appended.) +// Do not forget to include the reverse lookup zone! +// This is named after the first bytes of the IP address, in reverse +// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // -// Before starting to set up a primary zone, make sure you fully -// understand how DNS and BIND works. There are sometimes -// non-obvious pitfalls. Setting up a slave zone is simpler. +// Before starting to set up a master zone, make sure you fully +// understand how DNS and BIND work. There are sometimes +// non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 23 00:04: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 01D5716A46F; Sat, 23 Jun 2007 00:04: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 48CD716A468 for ; Sat, 23 Jun 2007 00:04:04 +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 37CBE13C44C for ; Sat, 23 Jun 2007 00:04:03 +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 l5N042QZ054830 for ; Sat, 23 Jun 2007 00:04:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N042wR054827 for perforce@freebsd.org; Sat, 23 Jun 2007 00:04:02 GMT (envelope-from sam@freebsd.org) Date: Sat, 23 Jun 2007 00:04:02 GMT Message-Id: <200706230004.l5N042wR054827@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 122172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 00:04:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=122172 Change 122172 by sam@sam_aku on 2007/06/23 00:03:42 process tx callbacks when draining the tx q; this fixes a problem where a device timeout that occurs with a mgt frame on the tx q will leave the net80211 layer w/o any way to make progress Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#146 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#146 (text+ko) ==== @@ -4865,8 +4865,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); From owner-p4-projects@FreeBSD.ORG Sat Jun 23 01:42: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 9FA4716A469; Sat, 23 Jun 2007 01:42: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 31C6F16A400 for ; Sat, 23 Jun 2007 01:42:05 +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 23BE513C44B for ; Sat, 23 Jun 2007 01:42:05 +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 l5N1g5RO082742 for ; Sat, 23 Jun 2007 01:42:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N1g3Km082738 for perforce@freebsd.org; Sat, 23 Jun 2007 01:42:03 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 23 Jun 2007 01:42:03 GMT Message-Id: <200706230142.l5N1g3Km082738@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 122174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 01:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=122174 Change 122174 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/23 01:41:43 IFC opentoe Affected files ... .. //depot/projects/opentoe/contrib/less/NEWS#3 integrate .. //depot/projects/opentoe/contrib/less/README#3 integrate .. //depot/projects/opentoe/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/opentoe/contrib/less/command.c#3 integrate .. //depot/projects/opentoe/contrib/less/forwback.c#3 integrate .. //depot/projects/opentoe/contrib/less/less.man#3 integrate .. //depot/projects/opentoe/contrib/less/less.nro#3 integrate .. //depot/projects/opentoe/contrib/less/lessecho.man#3 integrate .. //depot/projects/opentoe/contrib/less/lessecho.nro#3 integrate .. //depot/projects/opentoe/contrib/less/lesskey.man#3 integrate .. //depot/projects/opentoe/contrib/less/lesskey.nro#3 integrate .. //depot/projects/opentoe/contrib/less/main.c#3 integrate .. //depot/projects/opentoe/contrib/less/optfunc.c#3 integrate .. //depot/projects/opentoe/contrib/less/screen.c#3 integrate .. //depot/projects/opentoe/contrib/less/version.c#3 integrate .. //depot/projects/opentoe/etc/devd.conf#3 integrate .. //depot/projects/opentoe/etc/rc.resume#2 integrate .. //depot/projects/opentoe/etc/rc.suspend#2 integrate .. //depot/projects/opentoe/lib/libarchive/Makefile#6 integrate .. //depot/projects/opentoe/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/opentoe/lib/libc/net/sctp_sys_calls.c#4 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/opentoe/share/man/man9/lock.9#3 integrate .. //depot/projects/opentoe/share/man/man9/locking.9#4 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/common/jhash.h#2 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.c#5 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.h#7 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#10 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#9 integrate .. //depot/projects/opentoe/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/opentoe/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#3 delete .. //depot/projects/opentoe/sys/dev/cxgb/ulp/toecore/toedev.h#4 integrate .. //depot/projects/opentoe/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ural.c#8 integrate .. //depot/projects/opentoe/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/ucycom.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/umass.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/ums.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/urio.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_port.h#3 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/opentoe/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/opentoe/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/opentoe/sys/net/bridgestp.c#2 integrate .. //depot/projects/opentoe/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/opentoe/sys/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/opentoe/sys/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/opentoe/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/opentoe/sys/netatm/uni/uniarp.c#2 integrate .. //depot/projects/opentoe/sys/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/opentoe/sys/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/opentoe/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/opentoe/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/opentoe/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#12 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/opentoe/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/opentoe/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/opentoe/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/opentoe/usr.sbin/periodic/periodic.8#2 integrate .. //depot/projects/opentoe/usr.sbin/periodic/periodic.sh#2 integrate Differences ... ==== //depot/projects/opentoe/contrib/less/NEWS#3 (text+ko) ==== @@ -13,7 +13,7 @@ ====================================================================== - Major changes between "less" versions 394 and 403 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/opentoe/contrib/less/README#3 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 403 + Less, version 406 - This is the distribution of less, version 403, released 25 May 2007. + This is the distribution of less, version 406, released 19 Jun 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/opentoe/contrib/less/cmdbuf.c#3 (text+ko) ==== @@ -1390,11 +1390,14 @@ } if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) ml = &mlist_search; + else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { #if SHELL_ESCAPE || PIPEC - else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) ml = &mlist_shell; +#else + ml = NULL; #endif - else if (*line == '"') + } else if (*line == '"') { if (ml != NULL) cmd_addhist(ml, line+1); @@ -1444,11 +1447,18 @@ #if CMD_HISTORY char *filename; FILE *f; + int modified = 0; filename = histfile_name(); if (filename == NULL) return; - if (!mlist_search.modified && !mlist_shell.modified) + if (mlist_search.modified) + modified = 1; +#if SHELL_ESCAPE || PIPEC + if (mlist_shell.modified) + modified = 1; +#endif + if (!modified) return; f = fopen(filename, "w"); free(filename); ==== //depot/projects/opentoe/contrib/less/command.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/command.c,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -87,7 +87,7 @@ cmd_exec() { clear_attn(); - line_left(); + clear_bot(); flush(); } ==== //depot/projects/opentoe/contrib/less/forwback.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/forwback.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/forwback.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,9 +142,6 @@ clear(); home(); } - } else - { - clear_bot(); } if (pos != position(BOTTOM_PLUS_ONE) || empty_screen()) ==== //depot/projects/opentoe/contrib/less/less.man#3 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 403: 25 May 2007 LESS(1) + Version 406: 19 Jun 2007 LESS(1) ==== //depot/projects/opentoe/contrib/less/less.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 403: 25 May 2007" +.TH LESS 1 "Version 406: 19 Jun 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/opentoe/contrib/less/lessecho.man#3 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 403: 25 May 2007 LESSECHO(1) + Version 406: 19 Jun 2007 LESSECHO(1) ==== //depot/projects/opentoe/contrib/less/lessecho.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 403: 25 May 2007" +.TH LESSECHO 1 "Version 406: 19 Jun 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/opentoe/contrib/less/lesskey.man#3 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 403: 25 May 2007 LESSKEY(1) + Version 406: 19 Jun 2007 LESSKEY(1) ==== //depot/projects/opentoe/contrib/less/lesskey.nro#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 403: 25 May 2007" +.TH LESSKEY 1 "Version 406: 19 Jun 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/opentoe/contrib/less/main.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.7 2007/06/16 02:43:44 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -142,7 +142,8 @@ if (s != NULL) scan_option(save(s)); -#define isoptstring(s) (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') +#define isoptstring(s) less_is_more ? (((s)[0] == '-') && (s)[1] != '\0') : \ + (((s)[0] == '-' || (s)[0] == '+') && (s)[1] != '\0') while (argc > 0 && (isoptstring(*argv) || isoptpending())) { s = *argv++; ==== //depot/projects/opentoe/contrib/less/optfunc.c#3 (text+ko) ==== @@ -45,6 +45,9 @@ extern char *wproto; extern IFILE curr_ifile; extern char version[]; +extern int jump_sline; +extern int jump_sline_fraction; +extern int less_is_more; #if LOGFILE extern char *namelogfile; extern int force_logfile; @@ -53,9 +56,6 @@ #if TAGS public char *tagoption = NULL; extern char *tags; -extern int jump_sline; -extern int jump_sline_fraction; -extern int less_is_more; #endif #if MSDOS_COMPILER extern int nm_fg_color, nm_bg_color; ==== //depot/projects/opentoe/contrib/less/screen.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.6 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -626,7 +626,25 @@ char *capname; { char name[16]; + char *s; + s = lgetenv("LESS_TERMCAP_DEBUG"); + if (s != NULL && *s != '\0') + { + struct env { struct env *next; char *name; char *value; }; + static struct env *envs = NULL; + struct env *p; + for (p = envs; p != NULL; p = p->next) + if (strcmp(p->name, capname) == 0) + return p->value; + p = (struct env *) ecalloc(1, sizeof(struct env)); + p->name = save(capname); + p->value = (char *) ecalloc(strlen(capname)+3, sizeof(char)); + sprintf(p->value, "<%s>", capname); + p->next = envs; + envs = p; + return p->value; + } strcpy(name, "LESS_TERMCAP_"); strcat(name, capname); return (lgetenv(name)); ==== //depot/projects/opentoe/contrib/less/version.c#3 (text+ko) ==== @@ -690,6 +690,9 @@ v402 3/30/07 Fix autoconf bug when memcpy etc are inline; fix bug in terminating number following -j option. v403 5/25/07 Fix Windows build. +v404 6/5/07 Fix display bug with F command and long lines. +v405 6/17/07 Fix display bug when using -w option. +v406 6/17/07 Fix secure build. */ -char version[] = "403"; +char version[] = "406"; ==== //depot/projects/opentoe/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.37 2007/04/08 16:05:23 pjd Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -239,6 +239,19 @@ action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'"; }; +# User requested suspend, so perform preparation steps and then execute +# the actual suspend process. +notify 10 { + match "system" "ACPI"; + match "subsystem" "Suspend"; + action "/etc/rc.suspend acpi $notify"; +}; +notify 10 { + match "system" "ACPI"; + match "subsystem" "Resume"; + action "/etc/rc.resume acpi $notify"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might @@ -277,6 +290,7 @@ # Button: Button pressed (0 for power, 1 for sleep) # CMBAT: ACPI battery events # Lid: Lid state (0 is closed, 1 is open) +# Suspend, Resume: Suspend and resume notification # Thermal: ACPI thermal zone events # # This example calls a script when the AC state changes, passing the ==== //depot/projects/opentoe/etc/rc.resume#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.8 2007/06/21 22:50:36 njl Exp $ # # sample run command file for APM Resume Event if [ $# -ne 2 ]; then - echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + echo "Usage: $0 [apm|acpi] [standby,suspend|1-4]" exit 1 fi @@ -48,9 +48,13 @@ # pccardq | awk -F '~' '$5 == "inactive" \ # { printf("pccardc power %d 1", $1); }' | sh -# UHCI has trouble resuming so we just load/unload it. You -# should add any other kernel modules you want reloaded here. -# kldload usb +# If a device driver has problems resuming, try unloading it before +# suspend and reloading it on resume. Example: +# kldunload usb + +# wpa_supplicant(8) doesn't seem to reassociate during resume. Uncomment +# the following to signal it to reassociate. +# /usr/sbin/wpa_cli reassociate logger -t $subsystem resumed at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync ==== //depot/projects/opentoe/etc/rc.suspend#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.suspend,v 1.6 2004/01/21 03:03:40 njl Exp $ +# $FreeBSD: src/etc/rc.suspend,v 1.7 2007/06/21 22:50:36 njl Exp $ # # sample run command file for APM Suspend Event if [ $# -ne 2 ]; then - echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]" + echo "Usage: $0 [apm|acpi] [standby,suspend|1-4]" exit 1 fi @@ -48,15 +48,20 @@ # pccardq | awk -F '~' '$5 == "filled" && $4 ~ /sio/ \ # { printf("pccardc power %d 0", $1); }' | sh -# UHCI has trouble resuming so we just load/unload it. You -# should add any other kernel modules you want unloaded here. +# If a device driver has problems suspending, try unloading it before +# suspend and reloading it on resume. Example: # kldunload usb logger -t $subsystem suspend at `date +'%Y%m%d %H:%M:%S'` sync && sync && sync -[ $subsystem = "apm" ] && sleep 3 +sleep 3 rm -f /var/run/rc.suspend.pid -[ $subsystem = "apm" ] && zzz +if [ $subsystem = "apm" ]; then + /usr/sbin/zzz +else + # Notify the kernel to continue the suspend process + /usr/sbin/acpiconf -k 0 +fi exit 0 ==== //depot/projects/opentoe/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.72 2007/05/29 01:00:18 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -87,6 +87,7 @@ archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ + archive_write_set_format_cpio_newc.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ ==== //depot/projects/opentoe/lib/libarchive/archive.h.in#6 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.44 2007/05/29 01:00:18 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -390,6 +390,7 @@ int archive_write_set_format_ar_bsd(struct archive *); int archive_write_set_format_ar_svr4(struct archive *); int archive_write_set_format_cpio(struct archive *); +int archive_write_set_format_cpio_newc(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ int archive_write_set_format_pax(struct archive *); int archive_write_set_format_pax_restricted(struct archive *); ==== //depot/projects/opentoe/lib/libarchive/archive_write_set_format.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.4 2007/01/09 08:05:56 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -42,6 +42,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] = { { ARCHIVE_FORMAT_CPIO, archive_write_set_format_cpio }, + { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC, archive_write_set_format_cpio_newc }, { ARCHIVE_FORMAT_CPIO_POSIX, archive_write_set_format_cpio }, { ARCHIVE_FORMAT_SHAR, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_BASE, archive_write_set_format_shar }, ==== //depot/projects/opentoe/lib/libarchive/archive_write_set_format_by_name.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.6 2007/04/14 22:34:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -49,6 +49,8 @@ { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, + { "newc", archive_write_set_format_cpio_newc }, + { "odc", archive_write_set_format_cpio }, { "pax", archive_write_set_format_pax }, { "posix", archive_write_set_format_pax }, { "shar", archive_write_set_format_shar }, ==== //depot/projects/opentoe/lib/libarchive/test/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.7 2007/06/13 03:35:37 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.9 2007/06/22 05:49:13 kientzle Exp $ TESTS= \ test_acl_basic.c \ @@ -37,6 +37,7 @@ test_write_disk_perms.c \ test_write_disk_secure.c \ test_write_format_ar.c \ + test_write_format_cpio.c \ test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ ==== //depot/projects/opentoe/lib/libc/net/sctp_sys_calls.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.8 2007/06/11 21:05:29 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.9 2007/06/22 13:59:54 rrs Exp $"); #include #include #include @@ -152,14 +152,14 @@ sd = socket(AF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP); #endif if (sd == -1) { - return (errno); + return (-1); } error = getsockopt(sd, IPPROTO_SCTP, SCTP_GET_ADDR_LEN, &av, &siz); close(sd); if (error == 0) { return ((int)av.assoc_value); } else { - return (error); + return (-1); } } @@ -256,8 +256,8 @@ for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; fam = sa->sa_family; - ((struct sockaddr_in *)&addrs[i])->sin_port = ((struct sockaddr_in *)sa)->sin_port; if ((fam != AF_INET) && (fam != AF_INET6)) { + free(gaddrs); errno = EINVAL; return (-1); } ==== //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1044 2007/06/19 15:56:32 rrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1045 2007/06/21 20:27:23 bmah Exp $ 2000 @@ -2177,7 +2177,7 @@ 4.1.8 to 4.1.23. less has been updated from v381 - to v403. + to v406. libpcap has been updated from 0.9.1 to 0.9.4. &merged; ==== //depot/projects/opentoe/share/man/man9/lock.9#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/share/man/man9/lock.9,v 1.16 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.17 2007/06/21 16:39:25 brueffer Exp $ .\" .Dd June 20, 2006 .Dt LOCK 9 @@ -273,7 +273,6 @@ will be the result of trying. .Sh SEE ALSO .Xr condvar 9 , -.Xr mutex 9 , .Xr locking 9 , .Xr mutex 9 , .Xr rwlock 9 , ==== //depot/projects/opentoe/share/man/man9/locking.9#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/locking.9,v 1.9 2007/06/01 03:11:47 delphij Exp $ +.\" $FreeBSD: src/share/man/man9/locking.9,v 1.10 2007/06/21 16:39:25 brueffer Exp $ .\" .Dd March 14, 2007 .Dt LOCKING 9 @@ -300,14 +300,14 @@ .El .Sh SEE ALSO .Xr condvar 9 , -.Xr lock 9 +.Xr lock 9 , .Xr mtx_pool 9 , .Xr rwlock 9 , .Xr sema 9 , .Xr sleep 9 , -.Xr sx 9 +.Xr sx 9 , .Xr LOCK_PROFILING 9 , -.Xr WITNESS 9 , +.Xr WITNESS 9 .Sh HISTORY These functions appeared in ==== //depot/projects/opentoe/sys/dev/acpica/acpi.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.239 2007/06/15 18:02:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); #include "opt_acpi.h" #include @@ -136,6 +136,7 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); @@ -410,6 +411,7 @@ sc = device_get_softc(dev); sc->acpi_dev = dev; + callout_init(&sc->susp_force_to, TRUE); error = ENXIO; @@ -592,7 +594,7 @@ /* Pick the first valid sleep state for the sleep button default. */ sc->acpi_sleep_button_sx = ACPI_S_STATES_MAX + 1; - for (state = ACPI_STATE_S1; state < ACPI_STATE_S5; state++) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) { sc->acpi_sleep_button_sx = state; break; @@ -2118,7 +2120,151 @@ return (acpi_SetInteger(ACPI_ROOT_OBJECT, "_PIC", model)); } +/* + * DEPRECATED. This interface has serious deficiencies and will be + * removed. + * + * Immediately enter the sleep state. In the old model, acpiconf(8) ran + * rc.suspend and rc.resume so we don't have to notify devd(8) to do this. + */ +ACPI_STATUS +acpi_SetSleepState(struct acpi_softc *sc, int state) +{ + static int once; + + if (!once) { + printf( +"warning: acpi_SetSleepState() deprecated, need to update your software\n"); + once = 1; + } + return (acpi_EnterSleepState(sc, state)); +} + static void +acpi_sleep_force(void *arg) +{ + struct acpi_softc *sc; + + printf("acpi: suspend request timed out, forcing sleep now\n"); + sc = arg; + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + printf("acpi: force sleep state S%d failed\n", sc->acpi_next_sstate); +} + +/* + * Request that the system enter the given suspend state. All /dev/apm + * devices and devd(8) will be notified. Userland then has a chance to + * save state and acknowledge the request. The system sleeps once all + * acks are in. + */ +int +acpi_ReqSleepState(struct acpi_softc *sc, int state) +{ + struct apm_clone_data *clone; + + if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5) + return (EINVAL); + + /* S5 (soft-off) should be entered directly with no waiting. */ + if (state == ACPI_STATE_S5) { + if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state))) + return (0); + else + return (ENXIO); + } + + /* If a suspend request is already in progress, just return. */ + ACPI_LOCK(acpi); + if (sc->acpi_next_sstate != 0) { + ACPI_UNLOCK(acpi); + return (0); + } + + /* Record the pending state and notify all apm devices. */ + sc->acpi_next_sstate = state; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + clone->notify_status = APM_EV_NONE; + if ((clone->flags & ACPI_EVF_DEVD) == 0) { + selwakeuppri(&clone->sel_read, PZERO); + KNOTE_UNLOCKED(&clone->sel_read.si_note, 0); + } + } + + /* Now notify devd(8) also. */ + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + + /* + * Set a timeout to fire if userland doesn't ack the suspend request + * in time. This way we still eventually go to sleep if we were + * overheating or running low on battery, even if userland is hung. + * We cancel this timeout once all userland acks are in or the + * suspend request is aborted. + */ + callout_reset(&sc->susp_force_to, 10 * hz, acpi_sleep_force, sc); + ACPI_UNLOCK(acpi); + return (0); +} + +/* + * Acknowledge (or reject) a pending sleep state. The caller has + * prepared for suspend and is now ready for it to proceed. If the + * error argument is non-zero, it indicates suspend should be cancelled + * and gives an errno value describing why. Once all votes are in, + * we suspend the system. + */ +int +acpi_AckSleepState(struct apm_clone_data *clone, int error) +{ + struct acpi_softc *sc; + int ret, sleeping; + + /* If no pending sleep state, return an error. */ + ACPI_LOCK(acpi); + sc = clone->acpi_sc; + if (sc->acpi_next_sstate == 0) { + ACPI_UNLOCK(acpi); + return (ENXIO); + } + + /* Caller wants to abort suspend process. */ + if (error) { + sc->acpi_next_sstate = 0; + callout_stop(&sc->susp_force_to); + printf("acpi: listener on %s cancelled the pending suspend\n", + devtoname(clone->cdev)); + ACPI_UNLOCK(acpi); + return (0); + } + + /* + * Mark this device as acking the suspend request. Then, walk through + * all devices, seeing if they agree yet. We only count devices that + * are writable since read-only devices couldn't ack the request. + */ + clone->notify_status = APM_EV_ACKED; + sleeping = TRUE; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + if ((clone->flags & ACPI_EVF_WRITE) != 0 && + clone->notify_status != APM_EV_ACKED) { + sleeping = FALSE; + break; + } + } + + /* If all devices have voted "yes", we will suspend now. */ + if (sleeping) + callout_stop(&sc->susp_force_to); + ACPI_UNLOCK(acpi); + ret = 0; + if (sleeping) { + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + ret = ENODEV; + } + + return (ret); +} + +static void acpi_sleep_enable(void *arg) { @@ -2134,12 +2280,12 @@ }; /* - * Set the system sleep state + * Enter the desired system sleep state. * * Currently we support S1-S5 but S4 is only S4BIOS */ -ACPI_STATUS -acpi_SetSleepState(struct acpi_softc *sc, int state) +static ACPI_STATUS +acpi_EnterSleepState(struct acpi_softc *sc, int state) { ACPI_STATUS status; UINT8 TypeA; @@ -2148,14 +2294,13 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + /* Re-entry once we're suspending is not allowed. */ status = AE_OK; ACPI_LOCK(acpi); if (sc->acpi_sleep_disabled) { - if (sc->acpi_sstate != ACPI_STATE_S0) - status = AE_ERROR; ACPI_UNLOCK(acpi); printf("acpi: suspend request ignored (not ready yet)\n"); - return (status); + return (AE_ERROR); } sc->acpi_sleep_disabled = 1; ACPI_UNLOCK(acpi); @@ -2251,6 +2396,7 @@ * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ + sc->acpi_next_sstate = 0; if (slp_state >= ACPI_SS_GPE_SET) { acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; @@ -2264,7 +2410,10 @@ /* Allow another sleep request after a while. */ if (state != ACPI_STATE_S5) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME); + + /* Run /etc/rc.resume after we are back. */ + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); mtx_unlock(&Giant); return_ACPI_STATUS (status); @@ -2574,11 +2723,15 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { + int ret; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) - acpi_SetSleepState((struct acpi_softc *)arg, state); + /* Request that the system prepare to enter the given suspend state. */ + ret = acpi_ReqSleepState((struct acpi_softc *)arg, state); + if (ret != 0) + printf("acpi: request to enter state S%d failed (err %d)\n", + state, ret); return_VOID; } @@ -2840,7 +2993,20 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_SETSLPSTATE: + case ACPIIO_REQSLPSTATE: + state = *(int *)addr; + if (state != ACPI_STATE_S5) + error = acpi_ReqSleepState(sc, state); + else { + printf("power off via acpi ioctl not supported\n"); + error = ENXIO; + } + break; + case ACPIIO_ACKSLPSTATE: + error = *(int *)addr; + error = acpi_AckSleepState(sc->acpi_clone, error); + break; + case ACPIIO_SETSLPSTATE: /* DEPRECATED */ error = EINVAL; state = *(int *)addr; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -3171,7 +3337,8 @@ goto out; } - acpi_SetSleepState(sc, acpi_state); + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + error = ENXIO; break; default: error = EINVAL; ==== //depot/projects/opentoe/sys/dev/acpica/acpiio.h#2 (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/acpica/acpiio.h,v 1.16 2005/10/23 00:16:41 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIIO_H_ @@ -33,7 +33,13 @@ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) +#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) /* DEPRECATED */ + +/* Request S1-5 sleep state. User is notified and then sleep proceeds. */ +#define ACPIIO_REQSLPSTATE _IOW('P', 4, int) + +/* Allow suspend to continue (0) or abort it (errno). */ +#define ACPIIO_ACKSLPSTATE _IOW('P', 5, int) struct acpi_battinfo { int cap; /* percent */ ==== //depot/projects/opentoe/sys/dev/acpica/acpivar.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.106 2007/06/15 18:02:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.107 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIVAR_H_ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 23 01:52: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 037C016A46B; Sat, 23 Jun 2007 01:52: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 A5C6516A41F for ; Sat, 23 Jun 2007 01:52:18 +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 9975713C469 for ; Sat, 23 Jun 2007 01:52:18 +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 l5N1qIoc084604 for ; Sat, 23 Jun 2007 01:52:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N1qIoU084600 for perforce@freebsd.org; Sat, 23 Jun 2007 01:52:18 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 23 Jun 2007 01:52:18 GMT Message-Id: <200706230152.l5N1qIoU084600@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 122175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 01:52:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=122175 Change 122175 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/23 01:51:31 update Makefile for recent changes fix integration error in cxgb_offload.c Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#11 edit .. //depot/projects/opentoe/sys/modules/cxgb/cxgb/Makefile#2 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#11 (text+ko) ==== @@ -241,7 +241,7 @@ /* Failover triggered by the interface link down */ t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset, 0); t3_read_reg(adapter, A_XGM_RX_CTRL + mac->offset); - t3_write_reg(adapter, A_XGM_RX_CTRL + mac->;A offset, + t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset, F_RXEN); } } ==== //depot/projects/opentoe/sys/modules/cxgb/cxgb/Makefile#2 (text+ko) ==== @@ -6,20 +6,20 @@ KMOD= if_cxgb SRCS= cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c SRCS+= cxgb_xgmac.c cxgb_t3_hw.c cxgb_main.c cxgb_sge.c cxgb_lro.c -SRCS+= uipc_mvec.c cxgb_offload.c cxgb_l2t.c +SRCS+= cxgb_vsc7323.c uipc_mvec.c cxgb_offload.c cxgb_l2t.c SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h -CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DDEFAULT_JUMBO -DCONFIG_DEFINED +CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DDEFAULT_JUMBO -DCONFIG_DEFINED -I${CXGB} .if ${MACHINE_ARCH} != "ia64" # ld is broken on ia64 -t3fw-4.0.0.bin: ${CXGB}/t3fw-4.0.0.bin.gz.uu - uudecode -p < ${CXGB}/t3fw-4.0.0.bin.gz.uu \ +t3fw-4.1.0.bin: ${CXGB}/t3fw-4.1.0.bin.gz.uu + uudecode -p < ${CXGB}/t3fw-4.1.0.bin.gz.uu \ | gzip -dc > ${.TARGET} -FIRMWS= t3fw-4.0.0.bin:t3fw400 -CLEANFILES+= t3fw-4.0.0.bin +FIRMWS= t3fw-4.1.0.bin:t3fw410 +CLEANFILES+= t3fw-4.1.0.bin .endif From owner-p4-projects@FreeBSD.ORG Sat Jun 23 02:23: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 1BA5516A46C; Sat, 23 Jun 2007 02:23: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 C79FE16A421 for ; Sat, 23 Jun 2007 02:23:57 +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 BAC9113C4B7 for ; Sat, 23 Jun 2007 02:23:57 +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 l5N2NvtE091730 for ; Sat, 23 Jun 2007 02:23:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N2NvrB091727 for perforce@freebsd.org; Sat, 23 Jun 2007 02:23:57 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 23 Jun 2007 02:23:57 GMT Message-Id: <200706230223.l5N2NvrB091727@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 122176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 02:23:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122176 Change 122176 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/23 02:23:48 remove binary re-distribution clause Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.c#6 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#12 edit .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#10 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_l2t.c#6 (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. ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.c#12 (text+ko) ==== @@ -10,11 +10,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. ==== //depot/projects/opentoe/sys/dev/cxgb/cxgb_offload.h#10 (text+ko) ==== @@ -10,11 +10,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. From owner-p4-projects@FreeBSD.ORG Sat Jun 23 02:52: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 F41ED16A46B; Sat, 23 Jun 2007 02:52: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 9185616A41F for ; Sat, 23 Jun 2007 02:52:33 +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 83C9913C469 for ; Sat, 23 Jun 2007 02:52:33 +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 l5N2qXDF097107 for ; Sat, 23 Jun 2007 02:52:33 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N2qXgL097104 for perforce@freebsd.org; Sat, 23 Jun 2007 02:52:33 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 02:52:33 GMT Message-Id: <200706230252.l5N2qXgL097104@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 122177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 02:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122177 Change 122177 by andrew@andrew_hermies on 2007/06/23 02:51:39 Add facund_server_add_call to register a call handler function in a hash table Use trhe hash table to lookup the call handler then execute it Add a ping handler to the backend Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#8 edit .. //depot/projects/soc2007/andrew-update/lib/facund_connection.h#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#8 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include /* Check if there are updates every 30min */ static const time_t default_check_period = 30 * 60; @@ -58,6 +59,9 @@ static char **get_base_dirs(char *); static void *do_communication(void *); +static struct facund_response *facund_call_ping(const char *, + struct facund_object *); + /* * Looks for updates on the system with a root of basedir */ @@ -258,6 +262,15 @@ return NULL; } +static struct facund_response * +facund_call_ping(const char *id, struct facund_object *obj) +{ + printf("CALL: ping\nID: %s\nArgs:\n", id); + facund_object_print(obj); + putchar('\n'); + return NULL; +} + int main(int argc __unused, char *argv[] __unused) { @@ -322,6 +335,9 @@ errx(1, "Could not open a socket: %s\n", strerror(errno)); } + /* Add the callbacks for each call */ + facund_server_add_call("ping", facund_call_ping); + pthread_create(&update_thread, NULL, look_for_updates, base_dirs); pthread_create(&comms_thread, NULL, do_communication, conn); ==== //depot/projects/soc2007/andrew-update/lib/facund_connection.h#3 (text+ko) ==== @@ -31,6 +31,7 @@ #include struct facund_conn; +struct facund_response; struct facund_conn *facund_connect_server(const char *); struct facund_conn *facund_connect_client(const char *); @@ -45,4 +46,10 @@ int facund_server_finish(struct facund_conn *); int facund_server_get_request(struct facund_conn *); +/* This is the call handler. The data passed in is the call id and argument */ +typedef struct facund_response *facund_call_cb(const char *, + struct facund_object *); + +int facund_server_add_call(const char *call, facund_call_cb *); + #endif /* FACUND_CONNECT_H */ ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#8 (text+ko) ==== @@ -25,7 +25,12 @@ * */ +#include + #include +#include +#include +#include #include #include #include @@ -42,6 +47,8 @@ static void facund_server_end_tag(void *, const XML_Char *); static void facund_server_text(void *, const XML_Char *, int); +static DB *call_db = NULL; + /* * Waits for a client to connect and send the start message * next it replys with the server start and returns @@ -113,19 +120,62 @@ return 0; } +/* + * Calls the correct function for the given call + */ static void facund_server_call(struct facund_conn *conn, const char *name, const char *id, struct facund_object *arg) { + facund_call_cb *cb; + DBT key, data; + int ret; + + /* Find the callback and execute it if it exists */ + key.data = __DECONST(void *, name); + key.size = (strlen(name) + 1) * sizeof(char); + ret = call_db->get(call_db, &key, &data, 0); + if (ret == 0) { + /* Get the callback and execute it */ + cb = *(facund_call_cb **)data.data; + assert(cb != NULL); + cb(id, arg); + } else { + /* TODO: send a bad request response */ + } + /* This is not really a valid command. It is just used for testing */ if (strcmp(name, "ping") == 0) { const char *msg = ""; facund_send(conn, msg, strlen(msg)); return; } - printf("Call: %s\nID: %s\nArg:\n", name, id); - facund_object_print(arg); - putchar('\n'); +} + +/* + * Registers a callback to the system for when a remote call is made + */ +int +facund_server_add_call(const char *call, facund_call_cb *cb) +{ + DBT key, data; + int ret; + + if (call == NULL || cb == NULL) + return -1; + + if (call_db == NULL) { + call_db = dbopen(NULL, O_CREAT|O_RDWR, 0, DB_HASH, NULL); + } + + /* Store a pointer to the callback for this function */ + key.data = __DECONST(void *, call); + key.size = (strlen(call) + 1) * sizeof(char); + data.data = &cb; + data.size = sizeof(facund_call_cb *); + ret = call_db->put(call_db, &key, &data, R_NOOVERWRITE); + + return ((ret == 0) ? 0 : -1); } static void From owner-p4-projects@FreeBSD.ORG Sat Jun 23 02:56: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 D93B616A469; Sat, 23 Jun 2007 02:56: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 92BC716A400 for ; Sat, 23 Jun 2007 02:56:40 +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 6CE4713C455 for ; Sat, 23 Jun 2007 02:56:40 +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 l5N2uecG097854 for ; Sat, 23 Jun 2007 02:56:40 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N2uegG097851 for perforce@freebsd.org; Sat, 23 Jun 2007 02:56:40 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 02:56:40 GMT Message-Id: <200706230256.l5N2uegG097851@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 122178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 02:56:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=122178 Change 122178 by andrew@andrew_hermies on 2007/06/23 02:55:43 Fix the build. facund_call_cb requires a forward declaration of struct facund_object to exist Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_connection.h#4 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_connection.h#4 (text+ko) ==== @@ -31,6 +31,7 @@ #include struct facund_conn; +struct facund_object; struct facund_response; struct facund_conn *facund_connect_server(const char *); From owner-p4-projects@FreeBSD.ORG Sat Jun 23 04:45: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 AFE7916A474; Sat, 23 Jun 2007 04:45: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 65ABA16A46C for ; Sat, 23 Jun 2007 04:45:01 +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 54F5D13C43E for ; Sat, 23 Jun 2007 04:45:01 +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 l5N4j1l4025298 for ; Sat, 23 Jun 2007 04:45:01 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N4j1MW025295 for perforce@freebsd.org; Sat, 23 Jun 2007 04:45:01 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 23 Jun 2007 04:45:01 GMT Message-Id: <200706230445.l5N4j1MW025295@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 122183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 04:45:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=122183 Change 122183 by mjacob@mjexp_sparc64 on 2007/06/23 04:45:01 Fix 2300 and 2400 cards so that they actually work on sparc. Surprisingly nobody has noticed so far. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#22 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#22 (text+ko) ==== @@ -812,7 +812,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_32(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, @@ -855,7 +855,7 @@ for (;;) { uint32_t nxtaddr; - isp_prt(isp, ISP_LOGDEBUG0, + isp_prt(isp, ISP_LOGALL, "load 0x%x words of code at load address 0x%x", ptr[3], la); @@ -875,7 +875,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_16(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, From owner-p4-projects@FreeBSD.ORG Sat Jun 23 05:39:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 210EA16A46D; Sat, 23 Jun 2007 05:39: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 D31DC16A400 for ; Sat, 23 Jun 2007 05:39:07 +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 C2AEF13C489 for ; Sat, 23 Jun 2007 05:39:07 +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 l5N5d7mY044907 for ; Sat, 23 Jun 2007 05:39:07 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N5d7T7044904 for perforce@freebsd.org; Sat, 23 Jun 2007 05:39:07 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 05:39:07 GMT Message-Id: <200706230539.l5N5d7T7044904@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 122185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 05:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122185 Change 122185 by andrew@andrew_hermies on 2007/06/23 05:38:41 Add facund_object_xml_string to get an XML string containing the data to send to the front end Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#4 edit .. //depot/projects/soc2007/andrew-update/lib/facund_object.h#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#5 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#4 (text+ko) ==== @@ -33,6 +33,8 @@ #include "facund_object.h" #include "facund_private.h" +static const char *obj_names[] = { "bool", "int", "unsigned int", "string", + "array" }; static struct facund_object *facund_object_new(void); /* Internal function to create an empty facund_object */ @@ -313,6 +315,9 @@ free(obj->obj_array); } + if (obj->obj_xml_string != NULL) + free(obj->obj_xml_string); + free(obj); } @@ -386,6 +391,64 @@ return obj->obj_error; } +const char * +facund_object_xml_string(struct facund_object *obj __unused) +{ + if (obj == NULL) + return NULL; + + if (obj->obj_xml_string == NULL) { + char *data; + + assert(obj->obj_assigned == 1); + + data = NULL; + switch (obj->obj_type) { + case FACUND_BOOL: + asprintf(&data, "%s", + (facund_object_get_bool(obj) ? "true" : "false")); + break; + case FACUND_INT: + asprintf(&data, "%d", facund_object_get_int(obj)); + break; + case FACUND_UINT: + asprintf(&data, "%u", facund_object_get_uint(obj)); + break; + case FACUND_STRING: + data = strdup(facund_object_get_string(obj)); + break; + case FACUND_ARRAY: { + size_t pos; + + for (pos = 0; pos < obj->obj_array_count; pos++) { + struct facund_object *curobj; + const char *tmpdata; + char *olddata; + + curobj = __DECONST(struct facund_object *, + facund_object_get_array_item(obj, pos)); + tmpdata = facund_object_xml_string(curobj); + + /* Append the new data to the end of the data */ + olddata = data; + asprintf(&data, "%s%s", data, tmpdata); + free(olddata); + } + + break; + } + } + if (data != NULL) { + asprintf(&obj->obj_xml_string, + "%s", + obj_names[obj->obj_type], data); + free(data); + } + } + + return obj->obj_xml_string; +} + /* * Debugging function to print the type and contents of an object * If the object is an array it will also recurse into the array @@ -393,8 +456,6 @@ void facund_object_print(struct facund_object *obj) { - static const char *obj_names[] = { "bool", "int", "unsigned int", - "string", "array" }; unsigned int depth; if (obj == NULL) { ==== //depot/projects/soc2007/andrew-update/lib/facund_object.h#3 (text+ko) ==== @@ -79,6 +79,7 @@ const char *); enum facund_object_error facund_object_get_error(struct facund_object*); +const char *facund_object_xml_string(struct facund_object *); void facund_object_print(struct facund_object *); #endif /*FACUND_TYPE_H */ ==== //depot/projects/soc2007/andrew-update/lib/facund_private.h#5 (text+ko) ==== @@ -48,6 +48,8 @@ struct facund_object **obj_array;/* Used in array type */ size_t obj_array_count; + char *obj_xml_string; + /* Used for indenting arrays */ unsigned int obj_depth; }; From owner-p4-projects@FreeBSD.ORG Sat Jun 23 05:41:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B11B16A46B; Sat, 23 Jun 2007 05:41:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E779316A400 for ; Sat, 23 Jun 2007 05:41:10 +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 D6EB013C45D for ; Sat, 23 Jun 2007 05:41:10 +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 l5N5fAQ6045473 for ; Sat, 23 Jun 2007 05:41:10 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N5fARZ045465 for perforce@freebsd.org; Sat, 23 Jun 2007 05:41:10 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 05:41:10 GMT Message-Id: <200706230541.l5N5fARZ045465@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 122186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 05:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=122186 Change 122186 by andrew@andrew_hermies on 2007/06/23 05:40:51 Add a response object to handle the response to a call Affected files ... .. //depot/projects/soc2007/andrew-update/lib/Makefile#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_response.c#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_response.h#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/lib/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ LIB=facund -SRCS=facund_connection.c facund_object.c facund_server.c +SRCS=facund_connection.c facund_object.c facund_response.c facund_server.c WARNS=6 From owner-p4-projects@FreeBSD.ORG Sat Jun 23 05:43: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 8169216A46C; Sat, 23 Jun 2007 05:43: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 3371F16A469 for ; Sat, 23 Jun 2007 05:43:42 +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 22ACE13C43E for ; Sat, 23 Jun 2007 05:43:42 +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 l5N5hgxC046202 for ; Sat, 23 Jun 2007 05:43:42 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N5hfKg046198 for perforce@freebsd.org; Sat, 23 Jun 2007 05:43:41 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 05:43:41 GMT Message-Id: <200706230543.l5N5hfKg046198@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 122187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 05:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=122187 Change 122187 by andrew@andrew_hermies on 2007/06/23 05:42:41 Send the response from the request handler to the front end Support the ping request with a pong response Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#9 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#9 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#9 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include /* Check if there are updates every 30min */ static const time_t default_check_period = 30 * 60; @@ -263,12 +264,15 @@ } static struct facund_response * -facund_call_ping(const char *id, struct facund_object *obj) +facund_call_ping(const char *id, struct facund_object *obj __unused) { - printf("CALL: ping\nID: %s\nArgs:\n", id); - facund_object_print(obj); - putchar('\n'); - return NULL; + struct facund_response *resp; + struct facund_object *pong; + + pong = facund_object_new_string(); + facund_object_set_string(pong, "pong"); + resp = facund_response_new(id, 0, "No error", pong); + return resp; } int ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#9 (text+ko) ==== @@ -37,6 +37,7 @@ #include "facund_connection.h" #include "facund_object.h" +#include "facund_response.h" #include "facund_private.h" #define BUF_SIZE 128 @@ -127,10 +128,14 @@ facund_server_call(struct facund_conn *conn, const char *name, const char *id, struct facund_object *arg) { + const char *msg; + struct facund_response *resp; facund_call_cb *cb; DBT key, data; int ret; + resp = NULL; + /* Find the callback and execute it if it exists */ key.data = __DECONST(void *, name); key.size = (strlen(name) + 1) * sizeof(char); @@ -139,16 +144,15 @@ /* Get the callback and execute it */ cb = *(facund_call_cb **)data.data; assert(cb != NULL); - cb(id, arg); + resp = cb(id, arg); + } else { /* TODO: send a bad request response */ } - /* This is not really a valid command. It is just used for testing */ - if (strcmp(name, "ping") == 0) { - const char *msg = ""; + msg = facund_response_string(resp); + if (msg != NULL) { facund_send(conn, msg, strlen(msg)); - return; } } From owner-p4-projects@FreeBSD.ORG Sat Jun 23 09:46: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 77D8A16A46B; Sat, 23 Jun 2007 09:46: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 2BAF916A468 for ; Sat, 23 Jun 2007 09:46:01 +0000 (UTC) (envelope-from karma@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 00EE213C45A for ; Sat, 23 Jun 2007 09:46:01 +0000 (UTC) (envelope-from karma@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 l5N9k0GB005702 for ; Sat, 23 Jun 2007 09:46:00 GMT (envelope-from karma@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N9k0S4005699 for perforce@freebsd.org; Sat, 23 Jun 2007 09:46:00 GMT (envelope-from karma@FreeBSD.org) Date: Sat, 23 Jun 2007 09:46:00 GMT Message-Id: <200706230946.l5N9k0S4005699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to karma@FreeBSD.org using -f From: Alexey Mikhailov To: Perforce Change Reviews Cc: Subject: PERFORCE change 122195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 09:46:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=122195 Change 122195 by karma@karma_ez on 2007/06/23 09:45:00 File hierarchy addition Affected files ... .. //depot/projects/soc2007/karma_audit/dlog/config.h#1 add .. //depot/projects/soc2007/karma_audit/dlog/lib/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 23 09:48: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 A855816A468; Sat, 23 Jun 2007 09:48: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 5254916A400 for ; Sat, 23 Jun 2007 09:48:04 +0000 (UTC) (envelope-from karma@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F3B213C447 for ; Sat, 23 Jun 2007 09:48:04 +0000 (UTC) (envelope-from karma@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 l5N9m43T005839 for ; Sat, 23 Jun 2007 09:48:04 GMT (envelope-from karma@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N9m36g005836 for perforce@freebsd.org; Sat, 23 Jun 2007 09:48:03 GMT (envelope-from karma@FreeBSD.org) Date: Sat, 23 Jun 2007 09:48:03 GMT Message-Id: <200706230948.l5N9m36g005836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to karma@FreeBSD.org using -f From: Alexey Mikhailov To: Perforce Change Reviews Cc: Subject: PERFORCE change 122196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 09:48:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=122196 Change 122196 by karma@karma_ez on 2007/06/23 09:47:03 Initial hacking around distribute logging user-space library Affected files ... .. //depot/projects/soc2007/karma_audit/dlog/config.h#2 edit .. //depot/projects/soc2007/karma_audit/dlog/lib/Makefile#2 edit .. //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.c#2 edit .. //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.h#2 edit Differences ... ==== //depot/projects/soc2007/karma_audit/dlog/config.h#2 (text+ko) ==== ==== //depot/projects/soc2007/karma_audit/dlog/lib/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.c#2 (text+ko) ==== @@ -1,0 +1,160 @@ +#include "../config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define BUF_SIZE PATH_MAX+KEYWORD_MAX+2 + +static int timeout = 1000; + +static int dlogd_send (int fd, const char * buf, size_t len); +static int dlogd_connect (); + +/* Submit log file + + On success: 0 returned +*/ + +int +dlogd_submit (const char * pathname, const char * keyword) +{ + int fd, rc; + size_t len; + char buf[BUF_SIZE]; + + if (strlen(pathname) > PATH_MAX) + { + return (-1); + } + else if (strlen(keyword) > KEYWORD_MAX) + { + return (-1); + } + + if ((fd = dlogd_connect()) < 0) + { + return fd; + } + + snprintf(buf, BUF_SIZE, "%s\n%s\n", keyword, pathname); + len = strlen(buf); + + rc = dlogd_send(fd, buf, len); + + if (rc < 0) + return rc; + + /* TODO: write dlogd_receive and wait for server's reply */ + + return 0; +} + +/* Send buf through fd descriptor + + On success: 0 returned + + On failure: -1 returned +*/ + +static int +dlogd_send (int fd, const char * buf, size_t len) +{ + struct pollfd fds; + int rc, bytes; + + fds.fd = fd; + fds.events = POLLOUT; + + while (len) + { + fds.revents = 0; + rc = poll(&fds, 1, timeout * 1000); + if (rc == 0) + return (-1); /* timeout */ + else if (rc < 0) + { + if (errno == EINTR || errno == EAGAIN) + continue; + else + return (-1); + } + + if (!fds.revents) + return (-1); + + bytes = write(fd,buf,len); + + if (bytes < 0) + { + if (errno == EINTR) + continue; + else + return (-1); + } + + len -= bytes; + buf += bytes; + } + + return 0; +} + +/* Connect to local daemon through PF_LOCAL socket. + + On success: descriptor returned + + On failure: -1 -- can't create socket + -2 -- can't bind + -3 -- can't chmod + -4 -- can't connect +*/ + +static int +dlogd_connect () +{ + int fd, len; + struct sockaddr_un un; + + if ((fd = socket(AF_UNIX, SOCK_STREAM,0)) < 0) + return (-1); /* can't create socket */ + + bzero(&un, sizeof(un)); + un.sun_family = AF_UNIX; + sprintf(un.sun_path, "%sdlog.%05d", DL_SOCKET_DIR, getpid()); + len = offsetof(struct sockaddr_un, sun_path) + strlen(un.sun_path); + unlink(un.sun_path); + + if (bind(fd, (struct sockaddr *) &un, len) < 0) + { + close (fd); + return (-2); /* can't bind */ + } + + if (chmod(un.sun_path, S_IRWXU) < 0) + { + close (fd); + return (-3); /* can't chmod */ + } + + bzero(&un, sizeof(un)); + un.sun_family = AF_UNIX; + strcpy(un.sun_path, DL_SOCKET); + len = offsetof(struct sockaddr_un, sun_path) + strlen(DL_SOCKET); + if (connect(fd, (struct sockaddr *) &un, len) < 0) + { + close(fd); + return (-4); /* can't connect */ + } + + return fd; + +} ==== //depot/projects/soc2007/karma_audit/dlog/lib/libdlogd.h#2 (text+ko) ==== @@ -1,0 +1,6 @@ +#ifndef DLOG_LIB_H +#define DLOG_LIB_H + +int dlogd_submit(const char * pathname, const char * keyword); + +#endif From owner-p4-projects@FreeBSD.ORG Sat Jun 23 10:11: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 68F3C16A468; Sat, 23 Jun 2007 10:11: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 24A6E16A400 for ; Sat, 23 Jun 2007 10:11:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 11A6413C448 for ; Sat, 23 Jun 2007 10:11:34 +0000 (UTC) (envelope-from gabor@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 l5NABXCa011935 for ; Sat, 23 Jun 2007 10:11:33 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NABXn8011931 for perforce@freebsd.org; Sat, 23 Jun 2007 10:11:33 GMT (envelope-from gabor@freebsd.org) Date: Sat, 23 Jun 2007 10:11:33 GMT Message-Id: <200706231011.l5NABXn8011931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 10:11:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122197 Change 122197 by gabor@gabor_server on 2007/06/23 10:11:18 - Revert the DESTDIR_ENV part, I'll do it in an other way - Add some commented out lines for checking if PORTSDIR is already mounted Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#24 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#24 (text+ko) ==== @@ -1089,60 +1089,29 @@ .include "${PORTSDIR}/Mk/bsd.commands.mk" -# These need to be absolute since we don't know how deep in the ports -# tree we are and thus can't go relative. They can, of course, be overridden -# by individual Makefiles or local system make configuration. -PORTSDIR?= /usr/ports -LOCALBASE?= /usr/local -X11BASE?= ${LOCALBASE} -LINUXBASE?= /compat/linux -DISTDIR?= ${PORTSDIR}/distfiles -_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} -INDEXDIR?= ${PORTSDIR} -INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} - -PACKAGES?= ${PORTSDIR}/packages -TEMPLATES?= ${PORTSDIR}/Templates - -.if defined(USE_X_PREFIX) -PREFIX?= ${X11BASE} -.elif defined(USE_LINUX_PREFIX) -PREFIX?= ${LINUXBASE} -NO_MTREE= yes -.else -PREFIX?= ${LOCALBASE} -.endif - -# where pkg_add records its dirty deeds. -PKG_DBDIR?= /var/db/pkg - -# where 'make config' records user configuration options -PORT_DBDIR?= /var/db/ports - # # DESTDIR section to start a chrooted process if invoked with DESTDIR set # .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) - -DESTDIR_ENV= LOCALBASE=${LOCALBASE} LINUXBASE=${LINUXBASE} \ - X11BASE=${X11BASE} PREFIX=${PREFIX} PORTSDIR=${PORTSDIR} \ - DISTDIR=${DISTDIR} PACKAGES=${PACKAGES} TEMPLATES=${TEMPLATES} \ - WRKDIRPREFIX=${WRKDIRPREFIX} PKG_DBDIR=${PKG_DBDIR} \ - PORT_DBDIR=${PORT_DBDIR} DESTDIR= CHROOTED=YES - .BEGIN: ${MKDIR} ${DESTDIR}${PORTSDIR} -.if !exists(${DESTDIR}${PORTSDIR}/Makefile) - ${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \ - ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR} -.endif +# found=0; \ +# for i in `${MOUNT} | ${AWK} {'print $$3'}` ; do \ +# if [ `${REALPATH} ${DESTDIR}${PORTSDIR}` == `${REALPATH} $${i}` ]; then \ +# found=1; \ +# fi ; \ +# done ; \ +# if [ $${found} != 1 ]; then \ +# ${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \ +# ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR}; \ +# fi .if !exists (${DESTDIR}/dev/null) ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ ${MOUNT} -t devfs devfs ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})" + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" .else # Look for ${WRKSRC}/.../*.orig files, and (re-)create @@ -1268,6 +1237,9 @@ USE_SUBMAKE= yes .endif +# where 'make config' records user configuration options +PORT_DBDIR?= /var/db/ports + LDCONFIG_DIR= libdata/ldconfig LDCONFIG32_DIR= libdata/ldconfig32 @@ -1357,6 +1329,18 @@ PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} +# These need to be absolute since we don't know how deep in the ports +# tree we are and thus can't go relative. They can, of course, be overridden +# by individual Makefiles or local system make configuration. +PORTSDIR?= /usr/ports +LOCALBASE?= /usr/local +X11BASE?= ${LOCALBASE} +LINUXBASE?= /compat/linux +DISTDIR?= ${PORTSDIR}/distfiles +_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +INDEXDIR?= ${PORTSDIR} +INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} + DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME} @@ -1397,6 +1381,8 @@ .else EXTRACT_SUFX?= .tar.gz .endif +PACKAGES?= ${PORTSDIR}/packages +TEMPLATES?= ${PORTSDIR}/Templates PATCHDIR?= ${MASTERDIR}/files FILESDIR?= ${MASTERDIR}/files @@ -1412,6 +1398,14 @@ .if defined(USE_X_PREFIX) USE_XLIB= yes .endif +.if defined(USE_X_PREFIX) +PREFIX?= ${X11BASE} +.elif defined(USE_LINUX_PREFIX) +PREFIX?= ${LINUXBASE} +NO_MTREE= yes +.else +PREFIX?= ${LOCALBASE} +.endif .if defined(USE_LINUX_PREFIX) LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE} @@ -2351,6 +2345,8 @@ .else PKG_SUFX?= .tbz .endif +# where pkg_add records its dirty deeds. +PKG_DBDIR?= /var/db/pkg MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp From owner-p4-projects@FreeBSD.ORG Sat Jun 23 10:49: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 8092F16A46E; Sat, 23 Jun 2007 10:49: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 3814916A469 for ; Sat, 23 Jun 2007 10:49:26 +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 0CDFA13C48C for ; Sat, 23 Jun 2007 10:49:26 +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 l5NAnKVT018483 for ; Sat, 23 Jun 2007 10:49:20 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NAnKUq018480 for perforce@freebsd.org; Sat, 23 Jun 2007 10:49:20 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 10:49:20 GMT Message-Id: <200706231049.l5NAnKUq018480@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 122198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 10:49:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=122198 Change 122198 by andrew@andrew_hermies on 2007/06/23 10:48:28 Add the python facund data types Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#5 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/data.py#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#5 (text+ko) ==== @@ -25,5 +25,6 @@ # from computer import Computer +from data import * __all__ = ["gui", "network"] From owner-p4-projects@FreeBSD.ORG Sat Jun 23 10:54: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 4343016A421; Sat, 23 Jun 2007 10:54: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 044E116A400 for ; Sat, 23 Jun 2007 10:54:30 +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 E5C7A13C43E for ; Sat, 23 Jun 2007 10:54:29 +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 l5NAsTVd019713 for ; Sat, 23 Jun 2007 10:54:29 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NAsT1S019708 for perforce@freebsd.org; Sat, 23 Jun 2007 10:54:29 GMT (envelope-from andrew@freebsd.org) Date: Sat, 23 Jun 2007 10:54:29 GMT Message-Id: <200706231054.l5NAsT1S019708@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 122199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 10:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=122199 Change 122199 by andrew@andrew_hermies on 2007/06/23 10:54:13 Read in the facund data types from the network Fix a typo send -> sent Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#6 (text+ko) ==== @@ -24,6 +24,7 @@ # SUCH DAMAGE. # +import facund import socket import threading import xml.sax.handler @@ -32,6 +33,9 @@ '''A class that works as a client with the Facund XML IPC''' def __init__(self, server): self.isReady = False + + self.__data = None + self.bufSize = 1024 self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.socket.connect(server) @@ -71,16 +75,49 @@ def startElement(self, name, attributes): print "> " + name + " " + str(attributes.items()) - if self.isReady and name == "pong": - self.socket.send("") + + if name == "data": + data_type = None + data = None + for attr in attributes.items(): + if attr[0] == "type": + # TODO: If data_type is not None then raise exception + data_type = attr[1] + + if data_type == "bool": + data = facund.Bool() + elif data_type == "int": + data = facund.Int() + elif data_type == "unsigned int": + data = facund.UInt() + elif data_type == "string": + data = facund.String() + elif data_type == "array": + data = facund.Array() + + # TODO: Check if data == None + data.setParent(self.__data) + self.__data = data - if name == "facund-server": + elif name == "facund-server": self.__connected_lock.acquire() def endElement(self, name): print "< " + name - # The server send a close message - if name == "facund-server": + + if name == "data": + data = self.__data.getParent() + if data is not None: + self.__data = data + + elif name == "response": + print str(self.__data) + + elif name == "facund-server": + # The server sent a close message self.__connected_lock.release() self.canClose = True + def characters(self, text): + print "==> " + text + self.__data.setData(text) From owner-p4-projects@FreeBSD.ORG Sat Jun 23 12:02:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 867C616A475; Sat, 23 Jun 2007 12:02: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 05F6C16A46C for ; Sat, 23 Jun 2007 12:02:55 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E621213C4B8 for ; Sat, 23 Jun 2007 12:02:54 +0000 (UTC) (envelope-from sephe@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 l5NC2sA8033878 for ; Sat, 23 Jun 2007 12:02:54 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NC2sv1033875 for perforce@freebsd.org; Sat, 23 Jun 2007 12:02:54 GMT (envelope-from sephe@FreeBSD.org) Date: Sat, 23 Jun 2007 12:02:54 GMT Message-Id: <200706231202.l5NC2sv1033875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 122200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 12:02:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=122200 Change 122200 by sephe@sephe_enigma:sam_wifi on 2007/06/23 12:02:41 Filter atapci device on Intel PRO/1000 PM (a NIC). This makes my installed system boot, when I plug this funny NIC in. Affected files ... .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#17 edit Differences ... ==== //depot/projects/wifi/sys/dev/ata/ata-pci.c#17 (text+ko) ==== @@ -56,6 +56,17 @@ #define IOMASK 0xfffffffc #define ATA_PROBE_OK -10 +static const struct none_atapci { + uint16_t vendor; + uint16_t device; + uint16_t subvendor; + uint16_t subdevice; +} none_atapci_table[] = { + /* Appears on Intel PRO/1000 PM */ + { ATA_INTEL_ID, 0x108d, ATA_INTEL_ID, 0x0000 }, + { 0xffff, 0, 0, 0 } +}; + int ata_legacy(device_t dev) { @@ -173,6 +184,19 @@ /* unknown chipset, try generic DMA if it seems possible */ if ((pci_get_class(dev) == PCIC_STORAGE) && (pci_get_subclass(dev) == PCIS_STORAGE_IDE)) { + uint16_t vendor, device, subvendor, subdevice; + const struct none_atapci *e; + + vendor = pci_get_vendor(dev); + device = pci_get_device(dev); + subvendor = pci_get_subvendor(dev); + subdevice = pci_get_subdevice(dev); + for (e = none_atapci_table; e->vendor != 0xffff; ++e) { + if (e->vendor == vendor && e->device == device && + e->subvendor == subvendor && e->subdevice == subdevice) + return ENXIO; + } + if (!ata_generic_ident(dev)) return ATA_PROBE_OK; } From owner-p4-projects@FreeBSD.ORG Sat Jun 23 15:59: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 3D25016A469; Sat, 23 Jun 2007 15:59: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 D951516A421 for ; Sat, 23 Jun 2007 15:59:56 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CBDAF13C45D for ; Sat, 23 Jun 2007 15:59:56 +0000 (UTC) (envelope-from lulf@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 l5NFxugC004353 for ; Sat, 23 Jun 2007 15:59:56 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NFxuV1004350 for perforce@freebsd.org; Sat, 23 Jun 2007 15:59:56 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 23 Jun 2007 15:59:56 GMT Message-Id: <200706231559.l5NFxuV1004350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 15:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=122210 Change 122210 by lulf@lulf_carrot on 2007/06/23 15:59:52 - Use gv_plex_size where it should be used. - Modify to adjust subdisk size according to the stripesize in gv_sd_to_plex. - Consistency in output. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#10 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#10 (text+ko) ==== @@ -275,11 +275,16 @@ /* Check correct size of this subdisk. */ s2 = LIST_FIRST(&p->subdisks); - if (s2 != NULL && gv_is_striped(p) && (s2->size != s->size)) { - printf("VINUM: need equal sized subdisks for this plex " - "organisation - %s (%jd) <-> %s (%jd)\n", - s2->name, s2->size, s->name, s->size); - return (GV_ERR_BADSIZE); + /* Adjust the subdisk-size if necessary. */ + if (s2 != NULL && gv_is_striped(p)) { + remainder = s->size % p->stripesize; + if (remainder) { + printf("VINUM: size of sd %s is not a " + "multiple of plex stripesize, taking off " + "%jd bytes\n", s->name, + (intmax_t)remainder); + gv_adjust_freespace(s, remainder); + } } /* Find the correct plex offset for this subdisk, if needed. */ @@ -451,7 +456,7 @@ LIST_FOREACH(s, &p->subdisks, in_plex) { remainder = s->size % p->stripesize; if (remainder) { - printf("gvinum: size of sd %s is not a " + printf("VINUM: size of sd %s is not a " "multiple of plex stripesize, taking off " "%jd bytes\n", s->name, (intmax_t)remainder); @@ -460,30 +465,7 @@ } } - /* Adjust the size of our plex. */ - if (p->sdcount > 0) { - p->size = 0; - switch (p->org) { - case GV_PLEX_CONCAT: - LIST_FOREACH(s, &p->subdisks, in_plex) - p->size += s->size; - break; - - case GV_PLEX_STRIPED: - s = LIST_FIRST(&p->subdisks); - p->size = p->sdcount * s->size; - break; - - case GV_PLEX_RAID5: - s = LIST_FIRST(&p->subdisks); - p->size = (p->sdcount - 1) * s->size; - break; - - default: - break; - } - } - + p->size = gv_plex_size(p); if (p->sdcount == 0) state = GV_PLEX_DOWN; else if ((p->flags & GV_PLEX_ADDED) || @@ -1120,6 +1102,7 @@ error = gv_sd_to_plex(s, p); if (error) return (error); + gv_update_plex_config(p); if (rename) { snprintf(s->name, GV_MAXSDNAME, "%s.%d", s->plex, From owner-p4-projects@FreeBSD.ORG Sat Jun 23 16:02:00 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 23D8416A469; Sat, 23 Jun 2007 16:02:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F037C16A46C for ; Sat, 23 Jun 2007 16:01:59 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA52513C489 for ; Sat, 23 Jun 2007 16:01:59 +0000 (UTC) (envelope-from lulf@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 l5NG1xKo005281 for ; Sat, 23 Jun 2007 16:01:59 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NG1x2t005276 for perforce@freebsd.org; Sat, 23 Jun 2007 16:01:59 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 23 Jun 2007 16:01:59 GMT Message-Id: <200706231601.l5NG1x2t005276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jun 2007 16:02:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=122211 Change 122211 by lulf@lulf_carrot on 2007/06/23 16:01:31 - Add undeclared variable. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#11 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#11 (text+ko) ==== @@ -267,7 +267,7 @@ gv_sd_to_plex(struct gv_sd *s, struct gv_plex *p) { struct gv_sd *s2; - off_t psizeorig; + off_t psizeorig, remainder; /* If this subdisk was already given to this plex, do nothing. */ if (s->plex_sc == p)